DYN-7393 Update RestSharp to v112.0.0 (#15494)

QilongTang · web-flow · commit 702c7f808a9c · 2024-09-23T14:15:53.000-04:00
diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj
@@ -31,10 +31,10 @@
   </ItemGroup>
   <ItemGroup Label="Common dependencies">
     <PackageReference Include="Autodesk.IDSDK" Version="1.1.8" />
-    <PackageReference Include="Greg" Version="3.0.2.5756" />
+    <PackageReference Include="Greg" Version="3.0.2.6284" />
     <PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.6246" GeneratePathProperty="true" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" CopyXML="true" />
-    <PackageReference Include="RestSharp" Version="108.0.1" CopyXML="true" />
+    <PackageReference Include="RestSharp" Version="112.0.0" CopyXML="true" />
     <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
     <PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
     <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />
diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -189,10 +189,10 @@
       <PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.6246"/>
     <PackageReference Include="FontAwesome5" Version="2.1.11" />
     <PackageReference Include="AvalonEdit" Version="6.3.0.90" CopyXML="true" />
-    <PackageReference Include="Greg" Version="3.0.2.5756" />
+    <PackageReference Include="Greg" Version="3.0.2.6284" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2478.35" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="RestSharp" Version="108.0.1" />
+    <PackageReference Include="RestSharp" Version="112.0.0" />
     <PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
     <PackageReference Include="SharpDX" Version="4.2.0" />
     <PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0">
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -741,7 +741,7 @@ public List<FilterEntry> InitializeHostFilter()
             var hostFilter = new List<FilterEntry>();
             try
             {
-                foreach (var host in PackageManagerClientViewModel.Model.GetKnownHosts())
+                foreach (var host in PackageManagerClientViewModel.Model?.GetKnownHosts())
                 {
                     hostFilter.Add(new FilterEntry(host, Resources.PackageFilterByHost, Resources.PackageHostDependencyFilterContextItem, this));
                 }
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
@@ -1229,9 +1229,16 @@ internal List<string> GetCommonPaths(string[] paths)
         private List<HostComboboxEntry> initializeHostSelections()
         {
             var hostSelections = new List<HostComboboxEntry>();
-            foreach (var host in dynamoViewModel.PackageManagerClientViewModel.Model.GetKnownHosts())
+            try
+            {
+                foreach (var host in dynamoViewModel.PackageManagerClientViewModel.Model?.GetKnownHosts())
+                {
+                    hostSelections.Add(new HostComboboxEntry(host));
+                }
+            }
+            catch (Exception ex)
             {
-                hostSelections.Add(new HostComboboxEntry(host));
+                dynamoViewModel.Model.Logger.Log("Could not fetch hosts: " + ex.Message);
             }
             return hostSelections;
         }
diff --git a/src/DynamoMLDataPipeline/DynamoMLDataPipeline.csproj b/src/DynamoMLDataPipeline/DynamoMLDataPipeline.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
   <ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="RestSharp" Version="108.0.1" />
-        <PackageReference Include="Greg" Version="3.0.2.5756" />
+        <PackageReference Include="RestSharp" Version="112.0.0" />
+        <PackageReference Include="Greg" Version="3.0.2.6284" />
   </ItemGroup>
   <ItemGroup>
 	<ProjectReference Include="..\DynamoCore\DynamoCore.csproj">
diff --git a/src/DynamoPackages/DynamoPackages.csproj b/src/DynamoPackages/DynamoPackages.csproj
@@ -30,9 +30,9 @@
     <Content Include="PackageManagerExtension_ExtensionDefinition.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Greg" Version="3.0.2.5756" />
+    <PackageReference Include="Greg" Version="3.0.2.6284" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="RestSharp" Version="108.0.1" />
+    <PackageReference Include="RestSharp" Version="112.0.0" />
     <PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj
@@ -14,9 +14,9 @@
     <EnableDefaultPageItems>false</EnableDefaultPageItems>
   </PropertyGroup>
   <ItemGroup>
-	<PackageReference Include="Greg" Version="3.0.2.5756" />
+	<PackageReference Include="Greg" Version="3.0.2.6284" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-	<PackageReference Include="RestSharp" Version="108.0.1" />
+	<PackageReference Include="RestSharp" Version="112.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DynamoCoreWpf\DynamoCoreWpf.csproj">
diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj
@@ -12,12 +12,12 @@
   </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.8.0" />
-        <PackageReference Include="Greg" Version="3.0.2.5756" />
+        <PackageReference Include="Greg" Version="3.0.2.6284" />
         <PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.6246" />
         <PackageReference Include="Magick.NET.Core" Version="7.0.1" />
         <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="7.24.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="RestSharp" Version="108.0.1" />
+        <PackageReference Include="RestSharp" Version="112.0.0" />
         <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
     </ItemGroup>
   <ItemGroup>
diff --git a/test/DynamoCoreTests/DynamoCoreTests.csproj b/test/DynamoCoreTests/DynamoCoreTests.csproj
@@ -34,7 +34,7 @@
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Greg" Version="3.0.2.5756">
+        <PackageReference Include="Greg" Version="3.0.2.6284">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
@@ -45,7 +45,7 @@
 
         <PackageReference Include="JUnitTestLogger" Version="1.1.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="RestSharp" Version="108.0.1">
+        <PackageReference Include="RestSharp" Version="112.0.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
@@ -37,13 +37,13 @@
       
     <PackageReference Include="Moq" Version="4.18.4" />
 	  <PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
-	  <PackageReference Include="Greg" Version="3.0.2.5756">
+	  <PackageReference Include="Greg" Version="3.0.2.6284">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
 	  <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	  <PackageReference Include="NUnit" Version="3.13.3" />
-	  <PackageReference Include="RestSharp" Version="108.0.1">
+	  <PackageReference Include="RestSharp" Version="112.0.0">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
diff --git a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj
@@ -14,13 +14,13 @@
   </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-        <PackageReference Include="RestSharp" Version="108.0.1">
+        <PackageReference Include="RestSharp" Version="112.0.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
         <PackageReference Include="Moq" Version="4.18.4" />
-        <PackageReference Include="Greg" Version="3.0.2.5756">
+        <PackageReference Include="Greg" Version="3.0.2.6284">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -741,7 +741,7 @@ public List<FilterEntry> InitializeHostFilter()`
`741`	`741`	`var hostFilter = new List<FilterEntry>();`
`742`	`742`	`try`
`743`	`743`	`{`
`744`		`- foreach (var host in PackageManagerClientViewModel.Model.GetKnownHosts())`
	`744`	`+ foreach (var host in PackageManagerClientViewModel.Model?.GetKnownHosts())`
`745`	`745`	`{`
`746`	`746`	`hostFilter.Add(new FilterEntry(host, Resources.PackageFilterByHost, Resources.PackageHostDependencyFilterContextItem, this));`
`747`	`747`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1229,9 +1229,16 @@ internal List<string> GetCommonPaths(string[] paths)`
`1229`	`1229`	`private List<HostComboboxEntry> initializeHostSelections()`
`1230`	`1230`	`{`
`1231`	`1231`	`var hostSelections = new List<HostComboboxEntry>();`
`1232`		`- foreach (var host in dynamoViewModel.PackageManagerClientViewModel.Model.GetKnownHosts())`
	`1232`	`+ try`
	`1233`	`+ {`
	`1234`	`+ foreach (var host in dynamoViewModel.PackageManagerClientViewModel.Model?.GetKnownHosts())`
	`1235`	`+ {`
	`1236`	`+ hostSelections.Add(new HostComboboxEntry(host));`
	`1237`	`+ }`
	`1238`	`+ }`
	`1239`	`+ catch (Exception ex)`
`1233`	`1240`	`{`
`1234`		`- hostSelections.Add(new HostComboboxEntry(host));`
	`1241`	`+ dynamoViewModel.Model.Logger.Log("Could not fetch hosts: " + ex.Message);`
`1235`	`1242`	`}`
`1236`	`1243`	`return hostSelections;`
`1237`	`1244`	`}`