Merge pull request #12 from meysamhadeli/feature/update-to-dotnet-8

feat: update to .Net 8.

.github/workflows/dotnet.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

global.json

@@ -0,0 +1,6 @@
+{
+    "sdk": {
+      "version": "8.0.303",
+      "rollForward": "latestFeature"
+    }
+  }

src/Api/src/Api.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Api</RootNamespace>
   </PropertyGroup>

src/BuildingBlocks/CAP/Extensions.cs

@@ -21,7 +21,7 @@ public static IServiceCollection AddCustomCap(this IServiceCollection services)
         {
             x.UseInMemoryStorage();
             x.UseInMemoryMessageQueue();
-            
+
             x.UseDashboard();
             x.FailedRetryCount = 5;
             x.FailedThresholdCallback = failed =>
@@ -40,11 +40,13 @@ public static IServiceCollection AddCustomCap(this IServiceCollection services)
                 .AsImplementedInterfaces()
                 .WithScopedLifetime());
 
-        services.AddOpenTelemetryTracing(builder => builder
-            .AddAspNetCoreInstrumentation()
-            .AddCapInstrumentation()
-            .AddJaegerExporter()
-        );
+        services.AddOpenTelemetry()
+        .WithTracing(tracing =>
+        {
+            tracing.AddAspNetCoreInstrumentation()
+              .AddCapInstrumentation()
+              .AddJaegerExporter();
+        });
 
         return services;
     }

src/BuildingBlocks/Caching/CachingBehavior.cs

@@ -1,4 +1,4 @@
-using EasyCaching.Core;
+using EasyCaching.Core;
 using MediatR;
 using Microsoft.Extensions.Logging;
 
@@ -8,29 +8,25 @@ public class CachingBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest,
     where TRequest : notnull, IRequest<TResponse>
     where TResponse : notnull
 {
-    private readonly ICacheRequest _cacheRequest;
     private readonly IEasyCachingProvider _cachingProvider;
     private readonly ILogger<CachingBehavior<TRequest, TResponse>> _logger;
     private readonly int defaultCacheExpirationInHours = 1;
 
     public CachingBehavior(IEasyCachingProviderFactory cachingFactory,
-        ILogger<CachingBehavior<TRequest, TResponse>> logger,
-        ICacheRequest cacheRequest)
+        ILogger<CachingBehavior<TRequest, TResponse>> logger)
     {
         _logger = logger;
         _cachingProvider = cachingFactory.GetCachingProvider("mem");
-        _cacheRequest = cacheRequest;
     }
 
-
-    public async Task<TResponse> Handle(TRequest request, CancellationToken cancellationToken,
-        RequestHandlerDelegate<TResponse> next)
+    public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next,
+        CancellationToken cancellationToken)
     {
-        if (request is not ICacheRequest || _cacheRequest == null)
+        if (request is not ICacheRequest cacheRequest)
             // No cache request found, so just continue through the pipeline
             return await next();
 
-        var cacheKey = _cacheRequest.CacheKey;
+        var cacheKey = cacheRequest.CacheKey;
         var cachedResponse = await _cachingProvider.GetAsync<TResponse>(cacheKey);
         if (cachedResponse.Value != null)
         {
@@ -41,7 +37,7 @@ public async Task<TResponse> Handle(TRequest request, CancellationToken cancella
 
         var response = await next();
 
-        var expirationTime = _cacheRequest.AbsoluteExpirationRelativeToNow ??
+        var expirationTime = cacheRequest.AbsoluteExpirationRelativeToNow ??
                              DateTime.Now.AddHours(defaultCacheExpirationInHours);
 
         await _cachingProvider.SetAsync(cacheKey, response, expirationTime.TimeOfDay);
@@ -51,4 +47,4 @@ public async Task<TResponse> Handle(TRequest request, CancellationToken cancella
 
         return response;
     }
-}
+}

src/BuildingBlocks/Caching/InvalidateCachingBehavior.cs

@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using EasyCaching.Core;
 using MediatR;
 using Microsoft.Extensions.Logging;
@@ -14,28 +10,23 @@ public class InvalidateCachingBehavior<TRequest, TResponse> : IPipelineBehavior<
     {
         private readonly ILogger<InvalidateCachingBehavior<TRequest, TResponse>> _logger;
         private readonly IEasyCachingProvider _cachingProvider;
-        private readonly IInvalidateCacheRequest _invalidateCacheRequest;
-
 
         public InvalidateCachingBehavior(IEasyCachingProviderFactory cachingFactory,
-            ILogger<InvalidateCachingBehavior<TRequest, TResponse>> logger,
-            IInvalidateCacheRequest invalidateCacheRequest)
+            ILogger<InvalidateCachingBehavior<TRequest, TResponse>> logger)
         {
             _logger = logger;
             _cachingProvider = cachingFactory.GetCachingProvider("mem");
-            _invalidateCacheRequest = invalidateCacheRequest;
         }
 
-        public async Task<TResponse> Handle(TRequest request, CancellationToken cancellationToken,
-            RequestHandlerDelegate<TResponse> next)
+        public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next, CancellationToken cancellationToken)
         {
-            if (request is not IInvalidateCacheRequest || _invalidateCacheRequest == null)
+            if (request is not IInvalidateCacheRequest invalidateCacheRequest)
             {
                 // No cache request found, so just continue through the pipeline
                 return await next();
             }
 
-            var cacheKey = _invalidateCacheRequest.CacheKey;
+            var cacheKey = invalidateCacheRequest.CacheKey;
             var response = await next();
 
             await _cachingProvider.RemoveAsync(cacheKey);
@@ -45,4 +36,4 @@ public async Task<TResponse> Handle(TRequest request, CancellationToken cancella
             return response;
         }
     }
-}
+}

src/BuildingBlocks/Logging/LoggingBehavior.cs

@@ -15,9 +15,8 @@ public LoggingBehavior(ILogger<LoggingBehavior<TRequest, TResponse>> logger)
         _logger = logger;
     }
 
-
-    public async Task<TResponse> Handle(TRequest request, CancellationToken cancellationToken,
-        RequestHandlerDelegate<TResponse> next)
+    public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next,
+        CancellationToken cancellationToken)
     {
         const string prefix = nameof(LoggingBehavior<TRequest, TResponse>);
 

src/BuildingBlocks/MediatR/Extensions.cs

@@ -11,7 +11,8 @@ public static class Extensions
 {
     public static IServiceCollection AddCustomMediatR(this IServiceCollection services, params Assembly [] assemblies)
     {
-        services.AddMediatR(assemblies);
+        services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(assemblies));
+
         services.AddScoped(typeof(IPipelineBehavior<,>), typeof(ValidationBehavior<,>));
         services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingBehavior<,>));
         services.AddScoped(typeof(IPipelineBehavior<,>), typeof(CachingBehavior<,>));

src/BuildingBlocks/Validation/ValidationBehavior.cs

@@ -14,12 +14,14 @@ public ValidationBehavior(IServiceProvider serviceProvider)
     {
         _serviceProvider = serviceProvider;
     }
-    public async Task<TResponse> Handle(TRequest request, CancellationToken cancellationToken, RequestHandlerDelegate<TResponse> next)
+
+    public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next,
+        CancellationToken cancellationToken)
     {
         _validator = _serviceProvider.GetService<IValidator<TRequest>>();
         if (_validator is null)
             return await next();
-        
+
         await _validator.HandleValidationAsync(request);
 
         return await next();

src/BuildingBlocks/Web/BaseController.cs

@@ -1,7 +1,8 @@
-using AutoMapper;
-using MediatR;
+using MediatR;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
+using Mapster;
+using MapsterMapper;
 
 namespace BuildingBlocks.Web;
 

src/Modules/Booking/src/Booking/Booking.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-	  <TargetFramework>net6.0</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
       <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

src/Modules/Booking/src/Booking/Data/EfTxBookingBehavior.cs

@@ -1,8 +1,6 @@
 using System.Text.Json;
 using BuildingBlocks.Domain;
-using BuildingBlocks.EFCore;
 using MediatR;
-using Microsoft.Extensions.Logging;
 
 namespace Booking.Data;
 
@@ -22,16 +20,12 @@ public EfTxBookingBehavior(
         _busPublisher = busPublisher;
         _dbContext = dbContext;
     }
-
-    public async Task<TResponse> Handle(
-        TRequest request,
-        CancellationToken cancellationToken,
-        RequestHandlerDelegate<TResponse> next)
+    public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next, CancellationToken cancellationToken)
     {
         _logger.LogInformation(
-            "{Prefix} Handled command {MediatrRequest}",
-            nameof(EfTxBookingBehavior<TRequest, TResponse>),
-            typeof(TRequest).FullName);
+          "{Prefix} Handled command {MediatrRequest}",
+          nameof(EfTxBookingBehavior<TRequest, TResponse>),
+          typeof(TRequest).FullName);
 
         _logger.LogDebug(
             "{Prefix} Handled command {MediatrRequest} with content {RequestContent}",
@@ -60,7 +54,7 @@ public async Task<TResponse> Handle(
 
             // ref: https://learn.microsoft.com/en-us/ef/ef6/fundamentals/connection-resiliency/retry-logic?redirectedfrom=MSDN#solution-manually-call-execution-strategy
             await _dbContext.ExecuteTransactionalAsync(cancellationToken);
-            
+
             return response;
         }
     }

src/Modules/Flight/src/Flight/Data/EfTxFlightBehavior.cs

@@ -3,7 +3,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using BuildingBlocks.Domain;
-using BuildingBlocks.EFCore;
 using MediatR;
 using Microsoft.Extensions.Logging;
 
@@ -26,15 +25,12 @@ public EfTxFlightBehavior(
         _dbContext = dbContext;
     }
 
-    public async Task<TResponse> Handle(
-        TRequest request,
-        CancellationToken cancellationToken,
-        RequestHandlerDelegate<TResponse> next)
+    public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next, CancellationToken cancellationToken)
     {
         _logger.LogInformation(
-            "{Prefix} Handled command {MediatrRequest}",
-            nameof(EfTxFlightBehavior<TRequest, TResponse>),
-            typeof(TRequest).FullName);
+    "{Prefix} Handled command {MediatrRequest}",
+    nameof(EfTxFlightBehavior<TRequest, TResponse>),
+    typeof(TRequest).FullName);
 
         _logger.LogDebug(
             "{Prefix} Handled command {MediatrRequest} with content {RequestContent}",
@@ -63,7 +59,7 @@ public async Task<TResponse> Handle(
 
             // ref: https://learn.microsoft.com/en-us/ef/ef6/fundamentals/connection-resiliency/retry-logic?redirectedfrom=MSDN#solution-manually-call-execution-strategy
             await _dbContext.ExecuteTransactionalAsync(cancellationToken);
-            
+
             return response;
         }
     }

src/Modules/Flight/src/Flight/Flight.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-	  <TargetFramework>net6.0</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>