NuGet package updates (#468)

marain-dotnet · Nov 28, 2022 · 138da60 · 138da60
1 parent a8a8801
commit 138da60
Show file tree

Hide file tree

Showing 20 changed files with 1,216 additions and 1,211 deletions.
diff --git a/Solutions/Marain.Tenancy.Cli/Marain.Tenancy.Cli.csproj b/Solutions/Marain.Tenancy.Cli/Marain.Tenancy.Cli.csproj
@@ -34,13 +34,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Corvus.Identity.MicrosoftRest" Version="3.0.0" />
-    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.2">
+    <PackageReference Include="Corvus.Identity.MicrosoftRest" Version="3.1.0" />
+    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.1" />
-    <PackageReference Include="McMaster.Extensions.Hosting.CommandLine" Version="4.0.1" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.2" />
+    <PackageReference Include="McMaster.Extensions.Hosting.CommandLine" Version="4.0.2" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="[6.0.*,)" />
     <PackageReference Include="ConsoleTables" Version="2.4.2" />
   </ItemGroup>

diff --git a/Solutions/Marain.Tenancy.Cli/Marain/Tenancy/Cli/Program.cs b/Solutions/Marain.Tenancy.Cli/Marain/Tenancy/Cli/Program.cs
@@ -14,6 +14,7 @@ namespace Marain.Tenancy.Cli
     using Microsoft.Extensions.Hosting;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Converters;
+    using Newtonsoft.Json.Serialization;
 
     /// <summary>
     /// The entry point for the application. Configures the commands.
@@ -35,7 +36,7 @@ public static async Task Main(string[] args)
                 services.AddJsonNetPropertyBag();
                 services.AddJsonNetCultureInfoConverter();
                 services.AddJsonNetDateTimeOffsetToIso8601AndUnixTimeConverter();
-                services.AddSingleton<JsonConverter>(new StringEnumConverter(true));
+                services.AddSingleton<JsonConverter>(new StringEnumConverter(new CamelCaseNamingStrategy()));
 
                 var msiTokenSourceOptions = new LegacyAzureServiceTokenProviderOptions
                 {

diff --git a/Solutions/Marain.Tenancy.Cli/packages.lock.json b/Solutions/Marain.Tenancy.Cli/packages.lock.json
diff --git a/Solutions/Marain.Tenancy.Client/Marain.Tenancy.Client.csproj b/Solutions/Marain.Tenancy.Client/Marain.Tenancy.Client.csproj
@@ -22,16 +22,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CacheCow.Client" Version="2.9.0" />
-    <PackageReference Include="Corvus.ContentHandling.Json" Version="2.0.11" />
-    <PackageReference Include="Corvus.Extensions" Version="1.1.4" />
-    <PackageReference Include="Corvus.Identity.MicrosoftRest" Version="3.0.0" />
-    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.2">
+    <PackageReference Include="CacheCow.Client" Version="2.11.3" />
+    <PackageReference Include="Corvus.ContentHandling.Json" Version="3.0.0" />
+    <PackageReference Include="Corvus.Extensions" Version="1.1.10" />
+    <PackageReference Include="Corvus.Identity.MicrosoftRest" Version="3.1.0" />
+    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[6.0.0.*,)" />
-    <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.23" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
   </ItemGroup>
 
 </Project>
diff --git a/Solutions/Marain.Tenancy.ClientTenantProvider/Marain.Tenancy.ClientTenantProvider.csproj b/Solutions/Marain.Tenancy.ClientTenantProvider/Marain.Tenancy.ClientTenantProvider.csproj
@@ -17,8 +17,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Corvus.Tenancy.Abstractions" Version="3.2.0" />
-    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.2">
+    <PackageReference Include="Corvus.Tenancy.Abstractions" Version="3.4.0" />
+    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Solutions/Marain.Tenancy.ClientTenantProvider/Marain/Tenancy/ClientTenantStore.cs b/Solutions/Marain.Tenancy.ClientTenantProvider/Marain/Tenancy/ClientTenantStore.cs
@@ -101,27 +101,27 @@ public async Task<TenantCollectionResult> GetChildrenAsync(string tenantId, int
 
             var haldoc = (JObject)result.Body;
 
-            JToken getTenantLinks = haldoc["_links"]["getTenant"];
+            JToken? getTenantLinks = haldoc["_links"]?["getTenant"];
 
             IEnumerable<string> tenantIds;
 
-            if (getTenantLinks == null)
+            if (getTenantLinks is null)
             {
                 tenantIds = Array.Empty<string>();
             }
             else if (getTenantLinks is JArray)
             {
-                tenantIds = getTenantLinks.Cast<JObject>().Select(link => this.TenantMapper.ExtractTenantIdFrom(this.TenantService.BaseUri, (string)link["href"]));
+                tenantIds = getTenantLinks.Cast<JObject>().Select(link => this.TenantMapper.ExtractTenantIdFrom(this.TenantService.BaseUri, (string)link["href"]!));
             }
             else
             {
                 tenantIds = new string[]
                 {
-                    this.TenantMapper.ExtractTenantIdFrom(this.TenantService.BaseUri, (string)getTenantLinks["href"]),
+                    this.TenantMapper.ExtractTenantIdFrom(this.TenantService.BaseUri, (string)getTenantLinks["href"]!),
                 };
             }
 
-            string? ct = this.TenantMapper.ExtractContinationTokenFrom(this.TenantService.BaseUri, (string)haldoc.SelectToken("_links.next.href"));
+            string? ct = this.TenantMapper.ExtractContinationTokenFrom(this.TenantService.BaseUri, (string)haldoc.SelectToken("_links.next.href")!);
             return new TenantCollectionResult(tenantIds.ToList(), ct);
         }
 

diff --git a/Solutions/Marain.Tenancy.ClientTenantProvider/Marain/Tenancy/Mappers/TenantMapper.cs b/Solutions/Marain.Tenancy.ClientTenantProvider/Marain/Tenancy/Mappers/TenantMapper.cs
@@ -32,7 +32,7 @@ public TenantMapper(
         /// <inheritdoc/>
         public ITenant MapTenant(object source)
         {
-            Client.Models.Tenant tenantFromService = ((JObject)source).ToObject<Client.Models.Tenant>();
+            Client.Models.Tenant tenantFromService = ((JObject)source).ToObject<Client.Models.Tenant>()!;
             return new Tenant(
                 tenantFromService.Id,
                 tenantFromService.Name,

diff --git a/Solutions/Marain.Tenancy.Host.AspNetCore/Marain.Tenancy.Host.AspNetCore.csproj b/Solutions/Marain.Tenancy.Host.AspNetCore/Marain.Tenancy.Host.AspNetCore.csproj
@@ -14,11 +14,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.2">
+    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
   </ItemGroup>
 
   <ItemGroup>