From 6f8e0f43509f0cdcae944dca8de45c07c9901240 Mon Sep 17 00:00:00 2001 From: "Aaron (Qilong)" <173288704@qq.com> Date: Mon, 18 Apr 2022 08:54:08 -0400 Subject: [PATCH 1/4] 2.6.2 Hotfix - Update RestSharp and Greg (#12804) * Update RestSharp and Greg * Update * versions * version updates for net452 * Update Greg version * Update Greg version --- src/DynamoCore/DynamoCore.csproj | 10 ++++++++-- src/DynamoCore/packages.config | 4 ++-- src/DynamoCoreWpf/DynamoCoreWpf.csproj | 7 +++++-- src/DynamoCoreWpf/packages.config | 4 ++-- src/DynamoPackages/DynamoPackages.csproj | 7 +++++-- src/DynamoPackages/PackageDirectoryBuilder.cs | 2 +- src/DynamoPackages/packages.config | 2 +- src/DynamoPackagesUI/DynamoPackagesUI.csproj | 6 ++++-- src/DynamoPackagesUI/packages.config | 4 ++-- src/LibraryViewExtension/LibraryViewExtension.csproj | 7 +++++-- src/LibraryViewExtension/packages.config | 4 ++-- test/DynamoCoreTests/DynamoCoreTests.csproj | 7 +++++-- test/DynamoCoreTests/packages.config | 4 ++-- test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj | 7 +++++-- test/DynamoCoreWpfTests/packages.config | 4 ++-- .../PackageManagerTests/PackageManagerTests.csproj | 7 +++++-- test/Libraries/PackageManagerTests/packages.config | 4 ++-- .../ViewExtensionLibraryTests.csproj | 3 --- test/ViewExtensionLibraryTests/packages.config | 1 - .../CBNLanguageComparisonTests.csproj | 6 +++--- 20 files changed, 61 insertions(+), 39 deletions(-) diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj index aefff4b48db..b0ee4ef9de7 100644 --- a/src/DynamoCore/DynamoCore.csproj +++ b/src/DynamoCore/DynamoCore.csproj @@ -80,6 +80,9 @@ limitations under the License. ..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll + + ..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll + True @@ -90,8 +93,8 @@ limitations under the License. False ..\..\extern\ProtoGeometry\ProtoGeometry.dll - - ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + + ..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll @@ -100,6 +103,7 @@ limitations under the License. + @@ -387,6 +391,7 @@ limitations under the License. + @@ -407,6 +412,7 @@ limitations under the License. + diff --git a/src/DynamoCore/packages.config b/src/DynamoCore/packages.config index 2c42b7c9a8c..83b21193c4c 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 af4db5ad98f..42a07308929 100644 --- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj +++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj @@ -52,6 +52,9 @@ ..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll + + ..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll + True ..\packages\HelixToolkit.2015.1.629\lib\portable-net4+sl4+wp71+win8\HelixToolkit.dll @@ -83,8 +86,8 @@ ..\..\extern\ProtoGeometry\ProtoGeometry.dll False - - ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + + ..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll $(SharpDXPackageBinDir)\SharpDX.dll diff --git a/src/DynamoCoreWpf/packages.config b/src/DynamoCoreWpf/packages.config index 52fe90066f0..903eccbaccf 100644 --- a/src/DynamoCoreWpf/packages.config +++ b/src/DynamoCoreWpf/packages.config @@ -1,12 +1,12 @@  - + - + diff --git a/src/DynamoPackages/DynamoPackages.csproj b/src/DynamoPackages/DynamoPackages.csproj index 1d17477c44f..086b4880055 100644 --- a/src/DynamoPackages/DynamoPackages.csproj +++ b/src/DynamoPackages/DynamoPackages.csproj @@ -41,17 +41,20 @@ ..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll + + ..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll True - - ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + + ..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll + diff --git a/src/DynamoPackages/PackageDirectoryBuilder.cs b/src/DynamoPackages/PackageDirectoryBuilder.cs index 4486c09a5d6..de6b603b9bb 100644 --- a/src/DynamoPackages/PackageDirectoryBuilder.cs +++ b/src/DynamoPackages/PackageDirectoryBuilder.cs @@ -4,7 +4,7 @@ using System.Linq; using Dynamo.PackageManager.Interfaces; using Dynamo.Utilities; -using RestSharp.Serializers; +using RestSharp.Serialization.Json; namespace Dynamo.PackageManager { diff --git a/src/DynamoPackages/packages.config b/src/DynamoPackages/packages.config index 2c42b7c9a8c..659b93bd5ec 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/DynamoPackagesUI/DynamoPackagesUI.csproj b/src/DynamoPackagesUI/DynamoPackagesUI.csproj index b3acf4a2c90..2d563c4c7de 100644 --- a/src/DynamoPackagesUI/DynamoPackagesUI.csproj +++ b/src/DynamoPackagesUI/DynamoPackagesUI.csproj @@ -35,6 +35,8 @@ ..\packages\Greg.1.0.6176.18754\lib\net45\Greg.dll + + ..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll True @@ -51,8 +53,8 @@ - - ..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll + + ..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll True diff --git a/src/DynamoPackagesUI/packages.config b/src/DynamoPackagesUI/packages.config index 7b01ab3646a..5334eaedd24 100644 --- a/src/DynamoPackagesUI/packages.config +++ b/src/DynamoPackagesUI/packages.config @@ -5,7 +5,7 @@ - + - + \ No newline at end of file diff --git a/src/LibraryViewExtension/LibraryViewExtension.csproj b/src/LibraryViewExtension/LibraryViewExtension.csproj index 37f774a3413..a931f24b581 100644 --- a/src/LibraryViewExtension/LibraryViewExtension.csproj +++ b/src/LibraryViewExtension/LibraryViewExtension.csproj @@ -39,6 +39,8 @@ ..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll + + ..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll False @@ -50,13 +52,14 @@ - - ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + + ..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll + False diff --git a/src/LibraryViewExtension/packages.config b/src/LibraryViewExtension/packages.config index a51ddf6b8c9..471c6f1d443 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 47d43440ab8..55d1d896179 100644 --- a/test/DynamoCoreTests/DynamoCoreTests.csproj +++ b/test/DynamoCoreTests/DynamoCoreTests.csproj @@ -47,6 +47,9 @@ ..\..\src\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll + + ..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll + True @@ -62,8 +65,8 @@ False $(NunitPath)\nunit.framework.dll - - ..\..\src\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + + ..\..\src\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll diff --git a/test/DynamoCoreTests/packages.config b/test/DynamoCoreTests/packages.config index 2c42b7c9a8c..83b21193c4c 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 389ba2475cb..e8c207ab416 100644 --- a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj +++ b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj @@ -47,6 +47,9 @@ ..\..\src\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll + + ..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll + True ..\..\src\packages\HelixToolkit.2015.1.629\lib\portable-net4+sl4+wp71+win8\HelixToolkit.dll @@ -85,8 +88,8 @@ - - ..\..\src\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + + ..\..\src\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll $(SharpDXPackageBinDir)\SharpDX.dll diff --git a/test/DynamoCoreWpfTests/packages.config b/test/DynamoCoreWpfTests/packages.config index 2c42b7c9a8c..83b21193c4c 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 3a84a4e447b..f04010a5c08 100644 --- a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj +++ b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj @@ -36,6 +36,8 @@ ..\..\..\src\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll + + ..\..\..\src\packages\Greg.2.2.0.1080\lib\net452\Greg.dll ..\..\..\src\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll @@ -49,11 +51,12 @@ False ..\..\..\extern\NUnit\nunit.framework.dll - - ..\..\..\src\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + + ..\..\..\src\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll + diff --git a/test/Libraries/PackageManagerTests/packages.config b/test/Libraries/PackageManagerTests/packages.config index c64b7db0fb9..e78ade35a71 100644 --- a/test/Libraries/PackageManagerTests/packages.config +++ b/test/Libraries/PackageManagerTests/packages.config @@ -1,7 +1,7 @@  - + - + \ No newline at end of file diff --git a/test/ViewExtensionLibraryTests/ViewExtensionLibraryTests.csproj b/test/ViewExtensionLibraryTests/ViewExtensionLibraryTests.csproj index 501481f9f6d..b52e3825154 100644 --- a/test/ViewExtensionLibraryTests/ViewExtensionLibraryTests.csproj +++ b/test/ViewExtensionLibraryTests/ViewExtensionLibraryTests.csproj @@ -71,9 +71,6 @@ - - ..\..\src\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll - diff --git a/test/ViewExtensionLibraryTests/packages.config b/test/ViewExtensionLibraryTests/packages.config index b9bb35ef755..091742fb880 100644 --- a/test/ViewExtensionLibraryTests/packages.config +++ b/test/ViewExtensionLibraryTests/packages.config @@ -6,5 +6,4 @@ - \ No newline at end of file diff --git a/tools/CBNLanguageComparisonTests/CBNLanguageComparisonTests.csproj b/tools/CBNLanguageComparisonTests/CBNLanguageComparisonTests.csproj index b6384264f36..cb1dea9f812 100644 --- a/tools/CBNLanguageComparisonTests/CBNLanguageComparisonTests.csproj +++ b/tools/CBNLanguageComparisonTests/CBNLanguageComparisonTests.csproj @@ -70,9 +70,9 @@ False $(DynamoPath)\GraphToDSCompiler.dll - - False - ..\..\extern\greg\Greg.dll + + ..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll + True From afa38c4ff1ed581ab47e9b1c0c8f0928f831e066 Mon Sep 17 00:00:00 2001 From: tanga Date: Mon, 18 Apr 2022 09:10:37 -0400 Subject: [PATCH 2/4] Update version --- src/DynamoCore/DynamoCore.csproj | 3 --- src/DynamoCoreWpf/DynamoCoreWpf.csproj | 2 -- src/DynamoPackages/DynamoPackages.csproj | 2 -- src/DynamoPackagesUI/DynamoPackagesUI.csproj | 2 -- src/LibraryViewExtension/LibraryViewExtension.csproj | 2 -- test/DynamoCoreTests/DynamoCoreTests.csproj | 2 -- test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj | 2 -- test/Libraries/PackageManagerTests/PackageManagerTests.csproj | 2 -- 8 files changed, 17 deletions(-) diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj index b0ee4ef9de7..3a2521a79d2 100644 --- a/src/DynamoCore/DynamoCore.csproj +++ b/src/DynamoCore/DynamoCore.csproj @@ -78,8 +78,6 @@ limitations under the License. ..\..\extern\Analytics.NET\Analytics.NET.Google.dll - - ..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll ..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll True @@ -391,7 +389,6 @@ limitations under the License. - diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj index 42a07308929..fef67530d59 100644 --- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj +++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj @@ -50,8 +50,6 @@ ..\..\extern\FontAwesome\FontAwesome.WPF.dll - - ..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll ..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll True diff --git a/src/DynamoPackages/DynamoPackages.csproj b/src/DynamoPackages/DynamoPackages.csproj index 086b4880055..55eac86c522 100644 --- a/src/DynamoPackages/DynamoPackages.csproj +++ b/src/DynamoPackages/DynamoPackages.csproj @@ -39,8 +39,6 @@ false - - ..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll ..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll diff --git a/src/DynamoPackagesUI/DynamoPackagesUI.csproj b/src/DynamoPackagesUI/DynamoPackagesUI.csproj index 2d563c4c7de..9b035a94354 100644 --- a/src/DynamoPackagesUI/DynamoPackagesUI.csproj +++ b/src/DynamoPackagesUI/DynamoPackagesUI.csproj @@ -33,8 +33,6 @@ 4 - - ..\packages\Greg.1.0.6176.18754\lib\net45\Greg.dll ..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll True diff --git a/src/LibraryViewExtension/LibraryViewExtension.csproj b/src/LibraryViewExtension/LibraryViewExtension.csproj index a931f24b581..9feefb929d6 100644 --- a/src/LibraryViewExtension/LibraryViewExtension.csproj +++ b/src/LibraryViewExtension/LibraryViewExtension.csproj @@ -37,8 +37,6 @@ 4 - - ..\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll ..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll diff --git a/test/DynamoCoreTests/DynamoCoreTests.csproj b/test/DynamoCoreTests/DynamoCoreTests.csproj index 55d1d896179..4ab8f7525e6 100644 --- a/test/DynamoCoreTests/DynamoCoreTests.csproj +++ b/test/DynamoCoreTests/DynamoCoreTests.csproj @@ -45,8 +45,6 @@ False ..\..\extern\Analytics.NET\Analytics.NET.Core.dll - - ..\..\src\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll ..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll True diff --git a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj index e8c207ab416..beb46a8ac78 100644 --- a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj +++ b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj @@ -45,8 +45,6 @@ None - - ..\..\src\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll ..\packages\Greg.2.2.0.1080\lib\net452\Greg.dll True diff --git a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj index f04010a5c08..5fcf667c2f2 100644 --- a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj +++ b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj @@ -34,8 +34,6 @@ 4 - - ..\..\..\src\packages\Greg.1.1.7040.19960\lib\net47\Greg.dll ..\..\..\src\packages\Greg.2.2.0.1080\lib\net452\Greg.dll From 5865000005a1e7b7883d44dcf639de298b18e817 Mon Sep 17 00:00:00 2001 From: tanga Date: Mon, 18 Apr 2022 09:21:58 -0400 Subject: [PATCH 3/4] version number --- src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs b/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs index 7601f5a91d0..00786151e0f 100644 --- a/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs +++ b/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs @@ -45,7 +45,7 @@ // to distinguish one build from another. AssemblyFileVersion is specified // in AssemblyVersionInfo.cs so that it can be easily incremented by the // automated build process. -[assembly: AssemblyVersion("2.3.1.11724")] +[assembly: AssemblyVersion("2.3.2.15684")] // By default, the "Product version" shown in the file properties window is @@ -64,4 +64,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyFileVersion("2.3.1.11724")] +[assembly: AssemblyFileVersion("2.3.2.15684")] From 234590a83868892d1eee81b0efa77c17d38837e6 Mon Sep 17 00:00:00 2001 From: tanga Date: Mon, 18 Apr 2022 12:05:18 -0400 Subject: [PATCH 4/4] revert version number --- src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs b/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs index 00786151e0f..7601f5a91d0 100644 --- a/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs +++ b/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs @@ -45,7 +45,7 @@ // to distinguish one build from another. AssemblyFileVersion is specified // in AssemblyVersionInfo.cs so that it can be easily incremented by the // automated build process. -[assembly: AssemblyVersion("2.3.2.15684")] +[assembly: AssemblyVersion("2.3.1.11724")] // By default, the "Product version" shown in the file properties window is @@ -64,4 +64,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyFileVersion("2.3.2.15684")] +[assembly: AssemblyFileVersion("2.3.1.11724")]