From e2516f8ac11b60d2f0bf85dea0280a2660a1db42 Mon Sep 17 00:00:00 2001 From: mjkkirschner Date: Mon, 13 Apr 2020 13:23:52 -0400 Subject: [PATCH 1/2] update greg - this changes the name of zipped temp package files --- src/DynamoCore/DynamoCore.csproj | 4 ++-- src/DynamoCore/packages.config | 2 +- src/DynamoCoreWpf/DynamoCoreWpf.csproj | 4 ++-- src/DynamoCoreWpf/packages.config | 2 +- src/DynamoPackages/DynamoPackages.csproj | 4 ++-- src/DynamoPackages/packages.config | 2 +- src/LibraryViewExtension/LibraryViewExtension.csproj | 4 ++-- src/LibraryViewExtension/packages.config | 2 +- test/DynamoCoreTests/DynamoCoreTests.csproj | 5 ++--- test/DynamoCoreTests/packages.config | 2 +- test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj | 4 ++-- test/DynamoCoreWpfTests/packages.config | 2 +- .../Libraries/PackageManagerTests/PackageManagerTests.csproj | 4 ++-- test/Libraries/PackageManagerTests/packages.config | 2 +- 14 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj index 04a8863d307..2db3e54a5b0 100644 --- a/src/DynamoCore/DynamoCore.csproj +++ b/src/DynamoCore/DynamoCore.csproj @@ -78,9 +78,9 @@ limitations under the License. ..\..\extern\Analytics.NET\Analytics.NET.Google.dll - - ..\packages\Greg.1.3.7396.24567\lib\net47\Greg.dll True + + ..\packages\Greg.1.3.7408.23353\lib\net47\Greg.dll diff --git a/src/DynamoCore/packages.config b/src/DynamoCore/packages.config index efa07f6392e..578e19dae49 100644 --- a/src/DynamoCore/packages.config +++ b/src/DynamoCore/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj index d3713ed61ab..d0ec66d5417 100644 --- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj +++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj @@ -50,9 +50,9 @@ ..\..\extern\FontAwesome\FontAwesome.WPF.dll - - ..\packages\Greg.1.3.7396.24567\lib\net47\Greg.dll True + + ..\packages\Greg.1.3.7408.23353\lib\net47\Greg.dll ..\packages\HelixToolkit.2015.1.629\lib\portable-net4+sl4+wp71+win8\HelixToolkit.dll diff --git a/src/DynamoCoreWpf/packages.config b/src/DynamoCoreWpf/packages.config index 320fa29009e..55eccfc1185 100644 --- a/src/DynamoCoreWpf/packages.config +++ b/src/DynamoCoreWpf/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/DynamoPackages/DynamoPackages.csproj b/src/DynamoPackages/DynamoPackages.csproj index 2140a04d714..1524640ec0e 100644 --- a/src/DynamoPackages/DynamoPackages.csproj +++ b/src/DynamoPackages/DynamoPackages.csproj @@ -39,8 +39,8 @@ false - - ..\packages\Greg.1.3.7396.24567\lib\net47\Greg.dll + + ..\packages\Greg.1.3.7408.23353\lib\net47\Greg.dll ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/src/DynamoPackages/packages.config b/src/DynamoPackages/packages.config index efa07f6392e..578e19dae49 100644 --- a/src/DynamoPackages/packages.config +++ b/src/DynamoPackages/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/LibraryViewExtension/LibraryViewExtension.csproj b/src/LibraryViewExtension/LibraryViewExtension.csproj index 75b3dea9690..b4526a8ef60 100644 --- a/src/LibraryViewExtension/LibraryViewExtension.csproj +++ b/src/LibraryViewExtension/LibraryViewExtension.csproj @@ -37,9 +37,9 @@ 4 - - ..\packages\Greg.1.3.7396.24567\lib\net47\Greg.dll True + + ..\packages\Greg.1.3.7408.23353\lib\net47\Greg.dll False diff --git a/src/LibraryViewExtension/packages.config b/src/LibraryViewExtension/packages.config index 7634e0628bb..6ee2551e80e 100644 --- a/src/LibraryViewExtension/packages.config +++ b/src/LibraryViewExtension/packages.config @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/test/DynamoCoreTests/DynamoCoreTests.csproj b/test/DynamoCoreTests/DynamoCoreTests.csproj index 9192d414290..401c5060f91 100644 --- a/test/DynamoCoreTests/DynamoCoreTests.csproj +++ b/test/DynamoCoreTests/DynamoCoreTests.csproj @@ -45,9 +45,8 @@ False ..\..\extern\Analytics.NET\Analytics.NET.Core.dll - - ..\..\src\packages\Greg.1.3.7396.24567\lib\net47\Greg.dll - True + + ..\..\src\packages\Greg.1.3.7408.23353\lib\net47\Greg.dll diff --git a/test/DynamoCoreTests/packages.config b/test/DynamoCoreTests/packages.config index efa07f6392e..578e19dae49 100644 --- a/test/DynamoCoreTests/packages.config +++ b/test/DynamoCoreTests/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj index 92706bf1ca7..519e7a7d829 100644 --- a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj +++ b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj @@ -45,9 +45,9 @@ None - - ..\..\src\packages\Greg.1.3.7396.24567\lib\net47\Greg.dll True + + ..\..\src\packages\Greg.1.3.7408.23353\lib\net47\Greg.dll ..\..\src\packages\HelixToolkit.2015.1.629\lib\portable-net4+sl4+wp71+win8\HelixToolkit.dll diff --git a/test/DynamoCoreWpfTests/packages.config b/test/DynamoCoreWpfTests/packages.config index efa07f6392e..578e19dae49 100644 --- a/test/DynamoCoreWpfTests/packages.config +++ b/test/DynamoCoreWpfTests/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj index 3ec6d7dc0e4..15cfc022f37 100644 --- a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj +++ b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj @@ -34,9 +34,9 @@ 4 - - ..\..\..\src\packages\Greg.1.3.7396.24567\lib\net47\Greg.dll True + + ..\..\..\src\packages\Greg.1.3.7408.23353\lib\net47\Greg.dll ..\..\..\src\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll diff --git a/test/Libraries/PackageManagerTests/packages.config b/test/Libraries/PackageManagerTests/packages.config index 08a0ef76d2e..01b1a32b0a6 100644 --- a/test/Libraries/PackageManagerTests/packages.config +++ b/test/Libraries/PackageManagerTests/packages.config @@ -1,6 +1,6 @@  - + From 607206e8b49af8ae745b250debb3ff46f1bc9fc2 Mon Sep 17 00:00:00 2001 From: mjkkirschner Date: Mon, 13 Apr 2020 13:44:43 -0400 Subject: [PATCH 2/2] private has to be a child of reference element --- src/DynamoCore/DynamoCore.csproj | 2 +- src/DynamoCoreWpf/DynamoCoreWpf.csproj | 2 +- src/LibraryViewExtension/LibraryViewExtension.csproj | 2 +- test/DynamoCoreTests/DynamoCoreTests.csproj | 1 + test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj | 2 +- test/Libraries/PackageManagerTests/PackageManagerTests.csproj | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj index 2db3e54a5b0..f7c9bca986a 100644 --- a/src/DynamoCore/DynamoCore.csproj +++ b/src/DynamoCore/DynamoCore.csproj @@ -78,9 +78,9 @@ limitations under the License. ..\..\extern\Analytics.NET\Analytics.NET.Google.dll - True ..\packages\Greg.1.3.7408.23353\lib\net47\Greg.dll + True diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj index d0ec66d5417..33a1f347362 100644 --- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj +++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj @@ -50,8 +50,8 @@ ..\..\extern\FontAwesome\FontAwesome.WPF.dll - True + True ..\packages\Greg.1.3.7408.23353\lib\net47\Greg.dll diff --git a/src/LibraryViewExtension/LibraryViewExtension.csproj b/src/LibraryViewExtension/LibraryViewExtension.csproj index b4526a8ef60..ef2f0d4ac0e 100644 --- a/src/LibraryViewExtension/LibraryViewExtension.csproj +++ b/src/LibraryViewExtension/LibraryViewExtension.csproj @@ -37,9 +37,9 @@ 4 - True ..\packages\Greg.1.3.7408.23353\lib\net47\Greg.dll + True False diff --git a/test/DynamoCoreTests/DynamoCoreTests.csproj b/test/DynamoCoreTests/DynamoCoreTests.csproj index 401c5060f91..ee90aea7fa1 100644 --- a/test/DynamoCoreTests/DynamoCoreTests.csproj +++ b/test/DynamoCoreTests/DynamoCoreTests.csproj @@ -47,6 +47,7 @@ ..\..\src\packages\Greg.1.3.7408.23353\lib\net47\Greg.dll + True diff --git a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj index 519e7a7d829..833a214a23e 100644 --- a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj +++ b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj @@ -45,9 +45,9 @@ None - True ..\..\src\packages\Greg.1.3.7408.23353\lib\net47\Greg.dll + True ..\..\src\packages\HelixToolkit.2015.1.629\lib\portable-net4+sl4+wp71+win8\HelixToolkit.dll diff --git a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj index 15cfc022f37..6eb8d2f036a 100644 --- a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj +++ b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj @@ -34,9 +34,9 @@ 4 - True ..\..\..\src\packages\Greg.1.3.7408.23353\lib\net47\Greg.dll + True ..\..\..\src\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll