From 03b11f02e921df26d9a70b9904c2502eb267701d Mon Sep 17 00:00:00 2001 From: Michael Kirschner Date: Wed, 20 Oct 2021 10:03:50 -0400 Subject: [PATCH] Update Greg.dll and Restsharp (#12165) * add null checking to method * remove greg and rest sharp deps from libraryviewextension * remove viewextenlibTests ref on restsharp * updated ref to greg and restsharp - this builds but targets net452 version of restsharp * update to latest greg version * revert shared info version * fix bad merge conflict and bad hint path * fix Co-authored-by: michael kirschner --- src/DynamoCore/DynamoCore.csproj | 9 +++++---- src/DynamoCore/packages.config | 4 ++-- src/DynamoCoreWpf/DynamoCoreWpf.csproj | 8 ++++---- src/DynamoPackages/DynamoPackages.csproj | 9 +++++---- src/DynamoPackages/PackageDirectoryBuilder.cs | 2 +- src/DynamoPackages/packages.config | 4 ++-- src/LibraryViewExtension/packages.config | 2 -- test/DynamoCoreTests/DynamoCoreTests.csproj | 9 +++++---- test/DynamoCoreTests/packages.config | 4 ++-- test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj | 9 +++++---- test/DynamoCoreWpfTests/packages.config | 4 ++-- .../PackageManagerTests/PackageManagerTests.csproj | 9 +++++---- test/Libraries/PackageManagerTests/packages.config | 4 ++-- .../ViewExtensionLibraryTests.csproj | 3 --- test/ViewExtensionLibraryTests/packages.config | 3 +-- 15 files changed, 41 insertions(+), 42 deletions(-) diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj index 65c2805cb81..6bfa7877a9d 100644 --- a/src/DynamoCore/DynamoCore.csproj +++ b/src/DynamoCore/DynamoCore.csproj @@ -74,8 +74,8 @@ limitations under the License. ..\..\extern\Analytics.NET\Analytics.NET.Google.dll - - ..\packages\Greg.2.0.7843.19074\lib\net48\Greg.dll + + ..\packages\Greg.2.1.7962.24801\lib\net48\Greg.dll @@ -85,14 +85,15 @@ limitations under the License. ..\packages\DynamoVisualProgramming.LibG_227_0_0.2.12.0.5475\lib\net48\ProtoGeometry.dll - - ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + + ..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll + diff --git a/src/DynamoCore/packages.config b/src/DynamoCore/packages.config index a78ac6997eb..9f193b05cca 100644 --- a/src/DynamoCore/packages.config +++ b/src/DynamoCore/packages.config @@ -3,7 +3,7 @@ - + - + \ No newline at end of file diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj index 85cd1011546..5ee99456958 100644 --- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj +++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj @@ -47,9 +47,9 @@ ..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll - + True - ..\packages\Greg.2.0.7843.19074\lib\net48\Greg.dll + ..\packages\Greg.2.1.7962.24801\lib\net48\Greg.dll ..\packages\HelixToolkit.2.16.1\lib\netstandard1.1\HelixToolkit.dll @@ -77,8 +77,8 @@ ..\packages\DynamoVisualProgramming.LibG_227_0_0.2.12.0.5475\lib\net48\ProtoGeometry.dll False - - ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + + ..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll ..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll diff --git a/src/DynamoPackages/DynamoPackages.csproj b/src/DynamoPackages/DynamoPackages.csproj index 524f063ed33..6e49929eafd 100644 --- a/src/DynamoPackages/DynamoPackages.csproj +++ b/src/DynamoPackages/DynamoPackages.csproj @@ -39,19 +39,20 @@ false - - ..\packages\Greg.2.0.7843.19074\lib\net48\Greg.dll + + ..\packages\Greg.2.1.7962.24801\lib\net48\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 fcbf800f84b..78d7af56b9a 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 a0824661ca1..95bafc986e6 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/packages.config b/src/LibraryViewExtension/packages.config index 589b0b1b874..9cdc7e0ce4d 100644 --- a/src/LibraryViewExtension/packages.config +++ b/src/LibraryViewExtension/packages.config @@ -4,7 +4,5 @@ - - \ No newline at end of file diff --git a/test/DynamoCoreTests/DynamoCoreTests.csproj b/test/DynamoCoreTests/DynamoCoreTests.csproj index cb68b178e60..69ed513221e 100644 --- a/test/DynamoCoreTests/DynamoCoreTests.csproj +++ b/test/DynamoCoreTests/DynamoCoreTests.csproj @@ -45,8 +45,8 @@ False ..\..\extern\Analytics.NET\Analytics.NET.Core.dll - - ..\..\src\packages\Greg.2.0.7843.19074\lib\net48\Greg.dll + + ..\..\src\packages\Greg.2.1.7962.24801\lib\net48\Greg.dll @@ -61,12 +61,13 @@ ..\..\src\packages\NUnit.2.6.3\lib\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 3ad4d104159..eb8d8643fdf 100644 --- a/test/DynamoCoreTests/packages.config +++ b/test/DynamoCoreTests/packages.config @@ -1,7 +1,7 @@  - + - + \ No newline at end of file diff --git a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj index 1dcd5ed3a61..e55ea225b6a 100644 --- a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj +++ b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj @@ -47,8 +47,8 @@ True ..\..\src\packages\Cyotek.Drawing.BitmapFont.2.0.0\lib\net48\Cyotek.Drawing.BitmapFont.dll - - ..\..\src\packages\Greg.2.0.7843.19074\lib\net48\Greg.dll + + ..\..\src\packages\Greg.2.1.7962.24801\lib\net48\Greg.dll ..\..\src\packages\HelixToolkit.2.16.1\lib\netstandard1.1\HelixToolkit.dll @@ -83,8 +83,8 @@ - - ..\..\src\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + + ..\..\src\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll ..\..\src\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll @@ -112,6 +112,7 @@ + diff --git a/test/DynamoCoreWpfTests/packages.config b/test/DynamoCoreWpfTests/packages.config index fda39cb3299..f26c548ac54 100644 --- a/test/DynamoCoreWpfTests/packages.config +++ b/test/DynamoCoreWpfTests/packages.config @@ -2,13 +2,13 @@ - + - + diff --git a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj index 11ebe1c53b4..a2ff8eff096 100644 --- a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj +++ b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj @@ -34,8 +34,8 @@ 4 - - ..\..\..\src\packages\Greg.2.0.7843.19074\lib\net48\Greg.dll + + ..\..\..\src\packages\Greg.2.1.7962.24801\lib\net48\Greg.dll ..\..\..\src\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll @@ -48,11 +48,12 @@ ..\..\..\src\packages\NUnit.2.6.3\lib\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 fa63e9ede82..f8302206bcc 100644 --- a/test/Libraries/PackageManagerTests/packages.config +++ b/test/Libraries/PackageManagerTests/packages.config @@ -1,8 +1,8 @@  - + - + \ No newline at end of file diff --git a/test/ViewExtensionLibraryTests/ViewExtensionLibraryTests.csproj b/test/ViewExtensionLibraryTests/ViewExtensionLibraryTests.csproj index c36836c2d9d..630b04c1120 100644 --- a/test/ViewExtensionLibraryTests/ViewExtensionLibraryTests.csproj +++ b/test/ViewExtensionLibraryTests/ViewExtensionLibraryTests.csproj @@ -68,9 +68,6 @@ - - ..\..\src\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll - diff --git a/test/ViewExtensionLibraryTests/packages.config b/test/ViewExtensionLibraryTests/packages.config index bf98ccb7180..3d41b4ef363 100644 --- a/test/ViewExtensionLibraryTests/packages.config +++ b/test/ViewExtensionLibraryTests/packages.config @@ -1,4 +1,4 @@ - + @@ -7,5 +7,4 @@ - \ No newline at end of file