bump dependencies and address some changes

AerisG222 · Jun 9, 2023 · fcc4d9d · fcc4d9d
1 parent 6454244
commit fcc4d9d
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 32 deletions.
diff --git a/src/Maw.Cache/Maw.Cache.csproj b/src/Maw.Cache/Maw.Cache.csproj
@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-        <PackageReference Include="StackExchange.Redis" Version="2.6.96" />
+        <PackageReference Include="StackExchange.Redis" Version="2.6.111" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Maw.Data/Maw.Data.csproj b/src/Maw.Data/Maw.Data.csproj
@@ -15,8 +15,8 @@
 
     <ItemGroup>
         <PackageReference Include="Dapper" Version="2.0.123" />
-        <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
-        <PackageReference Include="Npgsql" Version="7.0.2" />
+        <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
+        <PackageReference Include="Npgsql" Version="7.0.4" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Maw.Domain.Models/Maw.Domain.Models.csproj b/src/Maw.Domain.Models/Maw.Domain.Models.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="IdentityModel" Version="6.0.0" />
+        <PackageReference Include="IdentityModel" Version="6.1.0" />
         <PackageReference Include="SolrNet.Core" Version="1.1.1" />
     </ItemGroup>
 </Project>
diff --git a/src/Maw.Domain/Maw.Domain.csproj b/src/Maw.Domain/Maw.Domain.csproj
@@ -18,12 +18,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Google.Apis.Gmail.v1" Version="1.60.0.2958" />
-        <PackageReference Include="IdentityModel" Version="6.0.0" />
-        <PackageReference Include="MailKit" Version="3.6.0" />
+        <PackageReference Include="Google.Apis.Gmail.v1" Version="1.60.0.3056" />
+        <PackageReference Include="IdentityModel" Version="6.1.0" />
+        <PackageReference Include="MailKit" Version="4.0.0" />
         <PackageReference Include="MedallionShell" Version="1.6.2" />
         <PackageReference Include="Microsoft.FeatureManagement" Version="2.5.1" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.0.0" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
         <PackageReference Include="SolrNet.Core" Version="1.1.1" />
     </ItemGroup>
 

diff --git a/src/api/api.csproj b/src/api/api.csproj
@@ -14,10 +14,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.4" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.4" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.5" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.5" />
         <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="7.0.0" />
-        <PackageReference Include="NSwag.AspNetCore" Version="13.18.2" />
+        <PackageReference Include="NSwag.AspNetCore" Version="13.19.0" />
         <PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
         <PackageReference Include="SolrNet.Core" Version="1.1.1" />
         <PackageReference Include="SolrNet.Microsoft.DependencyInjection" Version="1.1.1" />

diff --git a/src/auth/Controllers/AccountController.cs b/src/auth/Controllers/AccountController.cs
@@ -184,9 +184,7 @@ public async Task<IActionResult> Logout(string logoutId)
 
         await _signInManager.SignOutAsync();
 
-#pragma warning disable SCS0027
-        return Redirect(logout.PostLogoutRedirectUri);
-#pragma warning restore SCS0027
+        return Redirect(logout?.PostLogoutRedirectUri ?? "/login");
     }
 
     [HttpGet("forgot-password")]

diff --git a/src/auth/Services/PersistedGrantStore.cs b/src/auth/Services/PersistedGrantStore.cs
@@ -40,7 +40,7 @@ public Task<IEnumerable<PersistedGrant>> GetAllAsync(PersistedGrantFilter filter
         );
     }
 
-    public Task<PersistedGrant> GetAsync(string key)
+    public Task<PersistedGrant?> GetAsync(string key)
     {
         if(string.IsNullOrWhiteSpace(key))
         {
@@ -50,7 +50,7 @@ public Task<PersistedGrant> GetAsync(string key)
         Log.LogDebug("getting grant for key: {Key}", key);
 
         return RunAsync(conn =>
-            conn.QuerySingleOrDefaultAsync<PersistedGrant>(
+            conn.QuerySingleOrDefaultAsync<PersistedGrant?>(
                 "SELECT * FROM idsrv.get_persisted_grant(@key);",
                 new
                 {

diff --git a/src/auth/auth.csproj b/src/auth/auth.csproj
@@ -14,15 +14,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Duende.IdentityServer" Version="6.2.3" />
-        <PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="6.2.3" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="7.0.4" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="7.0.4" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="7.0.4" />
+        <PackageReference Include="Duende.IdentityServer" Version="6.3.2" />
+        <PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="6.3.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="7.0.5" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="7.0.5" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="7.0.5" />
         <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="7.0.0" />
-        <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="7.0.0" />
+        <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="7.0.2" />
         <PackageReference Include="Dapper" Version="2.0.123" />
-        <PackageReference Include="Npgsql" Version="7.0.2" />
+        <PackageReference Include="Npgsql" Version="7.0.4" />
         <PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
     </ItemGroup>
 

diff --git a/src/www/www.csproj b/src/www/www.csproj
@@ -14,11 +14,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.4" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.5" />
         <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="7.0.0" />
-        <PackageReference Include="IdentityModel" Version="6.0.0" />
+        <PackageReference Include="IdentityModel" Version="6.1.0" />
         <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="2.5.1" />
-        <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
+        <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
         <PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
     </ItemGroup>
 

diff --git a/tests/Maw.Cache.Tests/Maw.Cache.Tests.csproj b/tests/Maw.Cache.Tests/Maw.Cache.Tests.csproj
@@ -8,14 +8,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-        <PackageReference Include="StackExchange.Redis" Version="2.6.96" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+        <PackageReference Include="StackExchange.Redis" Version="2.6.111" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.2.0">
+        <PackageReference Include="coverlet.collector" Version="6.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/tests/Maw.Data.Tests/Maw.Data.Tests.csproj b/tests/Maw.Data.Tests/Maw.Data.Tests.csproj
@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/Maw.Domain.Models.Tests/Maw.Domain.Models.Tests.csproj b/tests/Maw.Domain.Models.Tests/Maw.Domain.Models.Tests.csproj
@@ -8,13 +8,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>