Merge pull request #774 from neozhu/dotnet9rc2

[Feat] .NET9 Support
neozhu · Nov 13, 2024 · 44852e5 · 44852e5
2 parents 804af81 + 0a9662e
commit 44852e5
Show file tree

Hide file tree

Showing 142 changed files with 840 additions and 9,376 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -57,7 +57,8 @@ jobs:
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: 9.0.x
+
 
     - name: Restore dependencies
       run: dotnet restore  CleanArchitecture.Blazor.sln

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -19,7 +19,8 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
+
     - name: Restore dependencies
       run: dotnet restore CleanArchitecture.Blazor.sln
     - name: Build

diff --git a/CleanArchitecture.Blazor.sln b/CleanArchitecture.Blazor.sln
@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 		CleanArchitecture.Blazor.nuspec = CleanArchitecture.Blazor.nuspec
 		README.md = README.md
+		Dockerfile = Dockerfile
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{21DC0B96-ED87-4130-BA8D-E8CF73903344}"

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 # apt update and install fonts
 RUN echo "deb http://deb.debian.org/debian/ bookworm main contrib" > /etc/apt/sources.list && \
     echo "deb-src http://deb.debian.org/debian/ bookworm main contrib" >> /etc/apt/sources.list && \
@@ -33,7 +33,7 @@ EXPOSE 443
 
 
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["src/Migrators/Migrators.MSSQL/Migrators.MSSQL.csproj", "src/Migrators/Migrators.MSSQL/"]

diff --git a/README.md b/README.md
@@ -49,10 +49,12 @@ Explore the application's features and design through screenshots and a video wa
 
 To get started with development, ensure you have the following tools and environments set up:
 
-- Microsoft Visual Studio Community 2022 (64-bit)
-- Docker
-- .NET 8.0
-- Unit Test Framework
+
+- [.NET 9.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/9.0)
+- [Microsoft Visual Studio 2022](https://visualstudio.microsoft.com/downloads/) or [Rider](https://www.jetbrains.com/rider/)
+- [Docker](https://www.docker.com/)
+
+
 
 
 ## Authentication Setup

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.8'
 
 services:
   dashboard:
@@ -16,6 +16,13 @@ services:
       - SmtpClientOptions__Port=
       - SmtpClientOptions__User=
       - SmtpClientOptions__Password=
+      - SmtpClientOptions__DefaultFromEmail=
+      - Authentication__Microsoft__ClientId=
+      - Authentication__Microsoft__ClientSecret=
+      - Authentication__Google__ClientId=
+      - Authentication__Google__ClientSecret=
+      - ASPNETCORE_HTTP_PORTS=80
+      - ASPNETCORE_HTTPS_PORTS=443
       - ASPNETCORE_URLS=https://+:443;http://+:80
       #- ASPNETCORE_Kestrel__Certificates__Default__Password=Password@123
       #- ASPNETCORE_Kestrel__Certificates__Default__Path=/root/.aspnet/https/CleanArchitecture.Blazor.Server.UI.pfx
@@ -30,7 +37,7 @@ services:
     restart: on-failure
 
   sqldb:
-    image: "mcr.microsoft.com/mssql/server:2019-latest"
+    image: "mcr.microsoft.com/mssql/server:2022-latest"
     environment:
       - "SA_PASSWORD=Password@123"
       - "ACCEPT_EULA=Y"

diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>CleanArchitecture.Blazor.Application</RootNamespace>
         <AssemblyName>CleanArchitecture.Blazor.Application</AssemblyName>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
+        <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.0-beta.105" />
         <PackageReference Include="Ardalis.Specification" Version="8.0.0" />
         <PackageReference Include="Ardalis.Specification.EntityFrameworkCore" Version="8.0.0" />
         <PackageReference Include="ClosedXML" Version="0.104.1" />
@@ -17,17 +17,14 @@
         <PackageReference Include="jcamp.FluentEmail.Razor" Version="3.8.0" />
         <PackageReference Include="FluentValidation" Version="11.10.0" />
         <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.10.0" />
-        <PackageReference Include="LazyCache" Version="2.4.0" />
-        <PackageReference Include="LazyCache.AspNetCore" Version="2.4.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.10" />
-        <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.10" />
-        <PackageReference Include="Riok.Mapperly" Version="4.1.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Riok.Mapperly" Version="4.1.1-next.0" />
         <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.8" />
         <PackageReference Include="Hangfire.Core" Version="1.8.15" />
-        <PackageReference Include="Hangfire.AspNetCore" Version="1.8.15" />
-        <PackageReference Include="Hangfire.InMemory" Version="1.0.0" />
-        <PackageReference Include="ZiggyCreatures.FusionCache" Version="1.4.1" />
-        <PackageReference Include="ActualLab.Fusion" Version="9.5.59" />
+        <PackageReference Include="ZiggyCreatures.FusionCache" Version="2.0.0-preview-1" />
+           <PackageReference Include="ActualLab.Fusion" Version="9.5.59" />
         <PackageReference Include="ActualLab.Fusion.Blazor" Version="9.5.59" />
         <PackageReference Include="ActualLab.Generators" Version="9.5.59" />
     </ItemGroup>

diff --git a/src/Application/Common/FusionCache/FusionCacheFactory.cs b/src/Application/Common/FusionCache/FusionCacheFactory.cs
@@ -0,0 +1,41 @@
+using Microsoft.Extensions.DependencyInjection;
+using ZiggyCreatures.Caching.Fusion;
+
+namespace CleanArchitecture.Blazor.Application.Common.FusionCache;
+public static class FusionCacheFactory
+{
+    private static IServiceProvider? _serviceProvider;
+
+    public static void Configure(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+    }
+
+    public static IFusionCache GetCache()
+    {
+        if (_serviceProvider == null)
+            throw new InvalidOperationException("Service provider not configured.");
+
+        return _serviceProvider.GetRequiredService<IFusionCache>();
+    }
+    public static void ClearCache()
+    {
+        if (_serviceProvider == null)
+            throw new InvalidOperationException("Service provider not configured.");
+        var cache = _serviceProvider.GetRequiredService<IFusionCache>();
+        cache.Clear();
+    }
+    public static void RemoveByTags(IEnumerable<string>? tags)
+    {
+        if (_serviceProvider == null)
+            throw new InvalidOperationException("Service provider not configured.");
+        var cache = _serviceProvider.GetRequiredService<IFusionCache>();
+        if(tags is not null && tags.Any())
+        {
+            foreach(var tag in tags)
+            {
+                cache.RemoveByTag(tag);
+            }
+        }
+    }
+}
diff --git a/src/Application/Common/Interfaces/Caching/ICacheInvalidatorRequest.cs b/src/Application/Common/Interfaces/Caching/ICacheInvalidatorRequest.cs
@@ -6,7 +6,7 @@ namespace CleanArchitecture.Blazor.Application.Common.Interfaces.Caching;
 public interface ICacheInvalidatorRequest<TResponse> : IRequest<TResponse>
 {
     string CacheKey => string.Empty;
-    CancellationTokenSource? SharedExpiryTokenSource { get; }
+    IEnumerable<string>? Tags { get; }
 }
 
 public interface IFusionCacheRefreshRequest<TResponse> : IRequest<TResponse>

diff --git a/src/Application/Common/Interfaces/Caching/ICacheableRequest.cs b/src/Application/Common/Interfaces/Caching/ICacheableRequest.cs
@@ -6,7 +6,7 @@ namespace CleanArchitecture.Blazor.Application.Common.Interfaces.Caching;
 public interface ICacheableRequest<TResponse> : IRequest<TResponse>
 {
     string CacheKey => string.Empty;
-    MemoryCacheEntryOptions? Options { get; }
+    IEnumerable<string>? Tags { get; }
 }
 
 public interface IFusionCacheRequest<TResponse> : IRequest<TResponse>

diff --git a/src/Application/Common/Interfaces/Identity/ICurrentUserAccessor.cs b/src/Application/Common/Interfaces/Identity/ICurrentUserAccessor.cs
@@ -1,6 +1,4 @@
-using Org.BouncyCastle.Bcpg;
-
-namespace CleanArchitecture.Blazor.Application.Common.Interfaces.Identity;
+namespace CleanArchitecture.Blazor.Application.Common.Interfaces.Identity;
 
 /// <summary>
 /// Interface to access the current user's session information.

diff --git a/src/Application/Common/Interfaces/Identity/ICurrentUserContextSetter.cs b/src/Application/Common/Interfaces/Identity/ICurrentUserContextSetter.cs
@@ -1,4 +1,6 @@
-namespace CleanArchitecture.Blazor.Application.Common.Interfaces.Identity;
+using System.Security.Claims;
+
+namespace CleanArchitecture.Blazor.Application.Common.Interfaces.Identity;
 
 /// <summary>
 /// Interface for setting and clearing the current user context.
@@ -8,8 +10,8 @@ public interface ICurrentUserContextSetter
     /// <summary>
     /// Sets the current user context with the provided session information.
     /// </summary>
-    /// <param name="sessionInfo">The session information of the current user.</param>
-    void SetCurrentUser(SessionInfo sessionInfo);
+    /// <param name="user">The session information of the current user.</param>
+    void SetCurrentUser(ClaimsPrincipal user);
 
     /// <summary>
     /// Clears the current user context.

diff --git a/src/Application/Common/Mappings/MappingExtensions.cs b/src/Application/Common/Mappings/MappingExtensions.cs
diff --git a/src/Application/DependencyInjection.cs b/src/Application/DependencyInjection.cs
@@ -5,6 +5,7 @@
 using CleanArchitecture.Blazor.Application.Pipeline;
 using CleanArchitecture.Blazor.Application.Pipeline.PreProcessors;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace CleanArchitecture.Blazor.Application;
 
@@ -20,14 +21,15 @@ public static IServiceCollection AddApplication(this IServiceCollection services
             config.NotificationPublisher = new ParallelNoWaitPublisher();
             config.AddRequestPreProcessor(typeof(IRequestPreProcessor<>), typeof(ValidationPreProcessor<>));
             config.AddOpenBehavior(typeof(PerformanceBehaviour<,>));
-            config.AddOpenBehavior(typeof(MemoryCacheBehaviour<,>));
             config.AddOpenBehavior(typeof(FusionCacheBehaviour<,>));
             config.AddOpenBehavior(typeof(CacheInvalidationBehaviour<,>));
 
         });
-
-        services.AddLazyCache();
         services.AddScoped<UserProfileStateService>();
         return services;
     }
+    public static void InitializeCacheFactory(this IHost host)
+    {
+        FusionCacheFactory.Configure(host.Services);
+    }
 }
diff --git a/src/Application/Features/AuditTrails/Caching/AuditTrailsCacheKey.cs b/src/Application/Features/AuditTrails/Caching/AuditTrailsCacheKey.cs
@@ -6,42 +6,16 @@ namespace CleanArchitecture.Blazor.Application.Features.AuditTrails.Caching;
 public static class AuditTrailsCacheKey
 {
     public const string GetAllCacheKey = "all-audittrails";
-    private static readonly TimeSpan RefreshInterval = TimeSpan.FromSeconds(30);
-    private static readonly object _tokenLock = new();
-    private static CancellationTokenSource _tokenSource = new(RefreshInterval);
-
-
-    public static MemoryCacheEntryOptions MemoryCacheEntryOptions =>
-        new MemoryCacheEntryOptions().AddExpirationToken(new CancellationChangeToken(GetOrCreateTokenSource().Token));
 
     public static string GetPaginationCacheKey(string parameters)
     {
         return $"AuditTrailsWithPaginationQuery,{parameters}";
     }
 
-    public static CancellationTokenSource GetOrCreateTokenSource()
-    {
-        lock (_tokenLock)
-        {
-            if (_tokenSource.IsCancellationRequested)
-            {
-                _tokenSource.Dispose();
-                _tokenSource = new CancellationTokenSource(RefreshInterval);
-            }
-            return _tokenSource;
-        }
-    }
-
+    public static IEnumerable<string>? Tags => new string[] { "audittrail" };
     public static void Refresh()
     {
-        lock (_tokenLock)
-        {
-            if (!_tokenSource.IsCancellationRequested)
-            {
-                _tokenSource.Cancel();
-                _tokenSource.Dispose();
-                _tokenSource = new CancellationTokenSource(RefreshInterval);
-            }
-        }
+        FusionCacheFactory.RemoveByTags(Tags);
     }
+
 }
diff --git a/...pplication/Features/AuditTrails/Queries/PaginationQuery/AuditTrailsWithPaginationQuery.cs b/...pplication/Features/AuditTrails/Queries/PaginationQuery/AuditTrailsWithPaginationQuery.cs
@@ -12,7 +12,7 @@ public class AuditTrailsWithPaginationQuery : AuditTrailAdvancedFilter, ICacheab
 {
     public AuditTrailAdvancedSpecification Specification => new(this);
     public string CacheKey => AuditTrailsCacheKey.GetPaginationCacheKey($"{this}");
-    public MemoryCacheEntryOptions? Options => AuditTrailsCacheKey.MemoryCacheEntryOptions;
+    public IEnumerable<string>? Tags => AuditTrailsCacheKey.Tags;
 
     public override string ToString()
     {