From 702c7f808a9cfdf8dedbc971955618b4ec8afb08 Mon Sep 17 00:00:00 2001 From: "Aaron (Qilong)" <173288704@qq.com> Date: Mon, 23 Sep 2024 14:15:53 -0400 Subject: [PATCH] DYN-7393 Update RestSharp to v112.0.0 (#15494) --- src/DynamoCore/DynamoCore.csproj | 4 ++-- src/DynamoCoreWpf/DynamoCoreWpf.csproj | 4 ++-- .../PackageManager/PackageManagerSearchViewModel.cs | 2 +- .../PackageManager/PublishPackageViewModel.cs | 11 +++++++++-- src/DynamoMLDataPipeline/DynamoMLDataPipeline.csproj | 4 ++-- src/DynamoPackages/DynamoPackages.csproj | 4 ++-- .../PackageDetailsViewExtension.csproj | 4 ++-- .../NodeDocumentationMarkdownGenerator.csproj | 4 ++-- test/DynamoCoreTests/DynamoCoreTests.csproj | 4 ++-- test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj | 4 ++-- .../PackageManagerTests/PackageManagerTests.csproj | 4 ++-- 11 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj index 413a2128321..d076b3fd06b 100644 --- a/src/DynamoCore/DynamoCore.csproj +++ b/src/DynamoCore/DynamoCore.csproj @@ -31,10 +31,10 @@ - + - + diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj index 7a129dbfde9..b9f35da89f6 100644 --- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj +++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj @@ -189,10 +189,10 @@ - + - + diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs index f39bfd4b617..85a90e865e5 100644 --- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs @@ -741,7 +741,7 @@ public List InitializeHostFilter() var hostFilter = new List(); 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 index 7a578a773a2..881ab28b6ab 100644 --- a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs @@ -1229,9 +1229,16 @@ internal List GetCommonPaths(string[] paths) private List initializeHostSelections() { var hostSelections = new List(); - 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 index ec432450d8e..4230fb66a10 100644 --- a/src/DynamoMLDataPipeline/DynamoMLDataPipeline.csproj +++ b/src/DynamoMLDataPipeline/DynamoMLDataPipeline.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/src/DynamoPackages/DynamoPackages.csproj b/src/DynamoPackages/DynamoPackages.csproj index 0e66655da88..b4a19a0df20 100644 --- a/src/DynamoPackages/DynamoPackages.csproj +++ b/src/DynamoPackages/DynamoPackages.csproj @@ -30,9 +30,9 @@ - + - + diff --git a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj index fe4875fbd01..1b67027e0f6 100644 --- a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj +++ b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj @@ -14,9 +14,9 @@ false - + - + diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj index 4d1de497f1e..fb551db0c7e 100644 --- a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj +++ b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj @@ -12,12 +12,12 @@ - + - + diff --git a/test/DynamoCoreTests/DynamoCoreTests.csproj b/test/DynamoCoreTests/DynamoCoreTests.csproj index 916f8403d9b..164208d1ec4 100644 --- a/test/DynamoCoreTests/DynamoCoreTests.csproj +++ b/test/DynamoCoreTests/DynamoCoreTests.csproj @@ -34,7 +34,7 @@ - + all compile; build; native; contentfiles; analyzers; buildtransitive @@ -45,7 +45,7 @@ - + all compile; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj index ee4e62637cd..1320ea0b1c7 100644 --- a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj +++ b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj @@ -37,13 +37,13 @@ - + all compile; build; native; contentfiles; analyzers; buildtransitive - + all compile; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj index 5ffe5931ac8..52541ad4eb1 100644 --- a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj +++ b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj @@ -14,13 +14,13 @@ - + all compile; build; native; contentfiles; analyzers; buildtransitive - + all compile; build; native; contentfiles; analyzers; buildtransitive