Update packages

fretje · Mar 9, 2023 · 3690e9b · 3690e9b
1 parent 65487cf
commit 3690e9b
Show file tree

Hide file tree

Showing 41 changed files with 1,527 additions and 1,434 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -23,12 +23,12 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.4.33">
+        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.5.22">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <!-- See https://github.com/dotnet/roslyn-analyzers/issues/6141 and https://github.com/dotnet/roslyn-analyzers/issues/6285 -->
-        <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0">
+        <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview1.23080.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/src/Admin/Admin.Application/Admin.Application.csproj b/src/Admin/Admin.Application/Admin.Application.csproj
@@ -12,10 +12,10 @@
         <PackageReference Include="Fluxor.Blazor.Web" Version="5.7.0" />
         <PackageReference Include="Humanizer.Core" Version="2.14.1" />
         <PackageReference Include="Mapster" Version="7.3.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.2" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.2" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.3" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.3" PrivateAssets="all" />
         <PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.3" />
         <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0" />
     </ItemGroup>
@@ -36,5 +36,5 @@
     <ItemGroup>
       <Folder Include="wwwroot\img\" />
     </ItemGroup>
-    
+
 </Project>
diff --git a/src/Admin/Admin.Application/packages.lock.json b/src/Admin/Admin.Application/packages.lock.json
diff --git a/src/Admin/Admin.Host/Admin.Host.csproj b/src/Admin/Admin.Host/Admin.Host.csproj
@@ -10,7 +10,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.3" />
         <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
     </ItemGroup>
 

diff --git a/src/Admin/Admin.Host/packages.lock.json b/src/Admin/Admin.Host/packages.lock.json
diff --git a/src/Admin/Admin.Infrastructure/Admin.Infrastructure.csproj b/src/Admin/Admin.Infrastructure/Admin.Infrastructure.csproj
@@ -9,14 +9,13 @@
     <ItemGroup>
         <PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
         <PackageReference Include="Fluxor.Persist" Version="2.4.0" />
-        <PackageReference Include="MediatR.Courier.DependencyInjection" Version="5.0.0" />
-        <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.2" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.2" />
-        <PackageReference Include="Microsoft.Authentication.WebAssembly.Msal" Version="7.0.2" />
+        <PackageReference Include="MediatR.Courier" Version="6.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.3" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.3" />
+        <PackageReference Include="Microsoft.Authentication.WebAssembly.Msal" Version="7.0.3" />
         <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.2" />
-        <PackageReference Include="MudBlazor" Version="6.1.8" />
+        <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.3" />
+        <PackageReference Include="MudBlazor" Version="6.1.9" />
         <PackageReference Include="NSwag.MSBuild" Version="13.18.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Admin/Admin.Infrastructure/Auth/Jwt/AccessTokenProviderAccessor.cs b/src/Admin/Admin.Infrastructure/Auth/Jwt/AccessTokenProviderAccessor.cs
@@ -4,7 +4,7 @@
 
 namespace Heroplate.Admin.Infrastructure.Auth.Jwt;
 
-internal class AccessTokenProviderAccessor : IAccessTokenProviderAccessor
+internal sealed class AccessTokenProviderAccessor : IAccessTokenProviderAccessor
 {
     private readonly IServiceProvider _provider;
     private IAccessTokenProvider? _tokenProvider;

diff --git a/src/Admin/Admin.Infrastructure/Auth/Jwt/JwtAuthenticationService.cs b/src/Admin/Admin.Infrastructure/Auth/Jwt/JwtAuthenticationService.cs
@@ -5,7 +5,7 @@
 
 namespace Heroplate.Admin.Infrastructure.Auth.Jwt;
 
-public class JwtAuthenticationService : AuthenticationStateProvider, IAuthenticationService, IAccessTokenProvider
+public sealed class JwtAuthenticationService : AuthenticationStateProvider, IAuthenticationService, IAccessTokenProvider, IDisposable
 {
     private const string AuthTokenKey = "AuthToken";
     private const string RefreshTokenKey = "RefreshToken";
@@ -198,7 +198,7 @@ private static IEnumerable<Claim> GetClaimsFromJwt(string jwt)
                 string? rolesString = roles.ToString();
                 if (!string.IsNullOrEmpty(rolesString))
                 {
-                    if (rolesString.Trim().StartsWith("["))
+                    if (rolesString.Trim().StartsWith("[", StringComparison.Ordinal))
                     {
                         string[]? parsedRoles = JsonSerializer.Deserialize<string[]>(rolesString);
 
@@ -228,4 +228,6 @@ private static byte[] ParseBase64WithoutPadding(string payload)
         string base64 = payload.PadRight(payload.Length + ((4 - (payload.Length % 4)) % 4), '=');
         return Convert.FromBase64String(base64);
     }
+
+    public void Dispose() => _semaphore?.Dispose();
 }
diff --git a/src/Admin/Admin.Infrastructure/Notifications/Startup.cs b/src/Admin/Admin.Infrastructure/Notifications/Startup.cs
@@ -1,7 +1,6 @@
 using Heroplate.Api.Contracts.Notifications;
 using MediatR;
 using MediatR.Courier;
-using MediatR.Courier.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Heroplate.Admin.Infrastructure.Notifications;
@@ -13,7 +12,7 @@ public static IServiceCollection AddNotifications(this IServiceCollection servic
         // Add mediator processing of notifications
         var assemblies = AppDomain.CurrentDomain.GetAssemblies();
         services
-            .AddMediatR(assemblies)
+            .AddMediatR(options => options.RegisterServicesFromAssemblies(assemblies))
             .AddCourier(assemblies)
             .AddTransient<INotificationPublisher, NotificationPublisher>();