Update to .NET 8

ductran95 · Feb 7, 2024 · 1ff6b84 · 1ff6b84
1 parent e6d7ac6
commit 1ff6b84
Show file tree

Hide file tree

Showing 14 changed files with 76 additions and 66 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,14 +16,14 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Build
       run: dotnet build FastEndpoints.Extensions.All.sln --configuration Release

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,14 +10,14 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Build
       run: dotnet build FastEndpoints.Extensions.sln --configuration Release
@@ -31,15 +31,15 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v4
 
       - name: Unshallow
         run: git fetch --prune --unshallow
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Create and push NuGet package
         run: |

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,26 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" />
+    <GlobalPackageReference Include="MinVer" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageVersion Include="MinVer" Version="4.3.0" />
+    <PackageVersion Include="FastEndpoints" Version="5.22.0" />
+    <PackageVersion Include="FastEndpoints.Security" Version="5.22.0" />
+    <PackageVersion Include="OpenTelemetry" Version="1.7.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
+    <PackageVersion Include="FluentValidation" Version="11.9.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+  </ItemGroup>
+</Project>
diff --git a/sample/Web/PipelineBehaviors/PostProcessors/MyResponseLogger.cs b/sample/Web/PipelineBehaviors/PostProcessors/MyResponseLogger.cs
@@ -1,14 +1,12 @@
-using FluentValidation.Results;
-
-namespace Web.PipelineBehaviors.PostProcessors;
+namespace Web.PipelineBehaviors.PostProcessors;
 
 public class MyResponseLogger<TRequest, TResponse> : IPostProcessor<TRequest, TResponse>
 {
-    public Task PostProcessAsync(TRequest req, TResponse res, HttpContext ctx, IReadOnlyCollection<ValidationFailure> failures, CancellationToken ct)
+    public Task PostProcessAsync(IPostProcessorContext<TRequest, TResponse> context, CancellationToken ct)
     {
-        var logger = ctx.RequestServices.GetRequiredService<ILogger<TResponse>>();
+        var logger = context.HttpContext.RequestServices.GetRequiredService<ILogger<TResponse>>();
 
-        if (res is Sales.Orders.Create.Response response)
+        if (context.Response is Sales.Orders.Create.Response response)
         {
             logger.LogWarning($"sale complete: {response?.OrderID}");
         }

diff --git a/sample/Web/PipelineBehaviors/PreProcessors/AdminHeaderChecker.cs b/sample/Web/PipelineBehaviors/PreProcessors/AdminHeaderChecker.cs
@@ -1,14 +1,12 @@
-using FluentValidation.Results;
-
 namespace Web.PipelineBehaviors.PreProcessors;
 
 public class AdminHeaderChecker : IGlobalPreProcessor
 {
-    public async Task PreProcessAsync(object req, HttpContext ctx, List<ValidationFailure> failures, CancellationToken ct)
+    public async Task PreProcessAsync(IPreProcessorContext context, CancellationToken ct)
     {
-        if (req is Customers.Create.Request && !ctx.Request.Headers.TryGetValue("tenant-id", out _) && !ctx.Response.HasStarted)
+        if (context.Request is Customers.Create.Request request && !context.HttpContext.Request.Headers.TryGetValue("tenant-id", out _) && !context.HttpContext.Response.HasStarted)
         {
-            await ctx.Response.SendForbiddenAsync(ct);
+            await context.HttpContext.Response.SendForbiddenAsync(ct);
         }
     }
 }
diff --git a/sample/Web/PipelineBehaviors/PreProcessors/MyRequestLogger.cs b/sample/Web/PipelineBehaviors/PreProcessors/MyRequestLogger.cs
@@ -1,14 +1,12 @@
-using FluentValidation.Results;
-
-namespace Web.PipelineBehaviors.PreProcessors;
+namespace Web.PipelineBehaviors.PreProcessors;
 
 public class MyRequestLogger<TRequest> : IPreProcessor<TRequest>
 {
-    public Task PreProcessAsync(TRequest req, HttpContext ctx, List<ValidationFailure> failures, CancellationToken ct)
+    public Task PreProcessAsync(IPreProcessorContext<TRequest> context, CancellationToken ct)
     {
-        var logger = ctx.RequestServices.GetRequiredService<ILogger<TRequest>>();
+        var logger = context.HttpContext.RequestServices.GetRequiredService<ILogger<TRequest>>();
 
-        logger.LogInformation($"request:{req?.GetType().FullName} path: {ctx.Request.Path}");
+        logger.LogInformation($"request:{context.Request?.GetType().FullName} path: {context.HttpContext.Request.Path}");
 
         return Task.CompletedTask;
     }

diff --git a/sample/Web/PipelineBehaviors/PreProcessors/SecurityProcessor.cs b/sample/Web/PipelineBehaviors/PreProcessors/SecurityProcessor.cs
@@ -1,19 +1,17 @@
-using FluentValidation.Results;
-
-namespace Web.PipelineBehaviors.PreProcessors;
+namespace Web.PipelineBehaviors.PreProcessors;
 
 public class SecurityProcessor<TRequest> : IPreProcessor<TRequest>
 {
-    public Task PreProcessAsync(TRequest req, HttpContext ctx, List<ValidationFailure> failures, CancellationToken ct)
+    public Task PreProcessAsync(IPreProcessorContext<TRequest> context, CancellationToken ct)
     {
-        var tenantID = ctx.Request.Headers["tenant-id"].FirstOrDefault();
+        var tenantID = context.HttpContext.Request.Headers["tenant-id"].FirstOrDefault();
 
         if (tenantID == null)
         {
-            failures.Add(new("MissingHeaders", "The [tenant-id] header needs to be set!"));
-            return ctx.Response.SendErrorsAsync(failures);
+            context.ValidationFailures.Add(new("MissingHeaders", "The [tenant-id] header needs to be set!"));
+            return context.HttpContext.Response.SendErrorsAsync(context.ValidationFailures);
         }
 
-        return tenantID != "qwerty" ? ctx.Response.SendForbiddenAsync() : Task.CompletedTask;
+        return tenantID != "qwerty" ? context.HttpContext.Response.SendForbiddenAsync() : Task.CompletedTask;
     }
 }
diff --git a/sample/Web/Web.csproj b/sample/Web/Web.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>CS1591;1701;1702;CA2016;RCS1090;CA2254;CS8618</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FastEndpoints.Security" Version="5.14.0" />
-        <PackageReference Include="FluentValidation" Version="11.6.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.20" />
-        <PackageReference Include="OpenTelemetry" Version="1.5.1" />
-        <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.5.1" />
-        <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.5.1" />
-        <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.5.1-beta.1" />
-        <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.5.1-beta.1" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+        <PackageReference Include="FastEndpoints.Security" />
+        <PackageReference Include="FluentValidation" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+        <PackageReference Include="OpenTelemetry" />
+        <PackageReference Include="OpenTelemetry.Exporter.Console" />
+        <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.Http" />
+        <PackageReference Include="Swashbuckle.AspNetCore" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/sample/Web/[Features]/TestCases/PreProcessorIsRunOnValidationFailure/MyPreProcessor.cs b/sample/Web/[Features]/TestCases/PreProcessorIsRunOnValidationFailure/MyPreProcessor.cs
@@ -1,12 +1,10 @@
-using FluentValidation.Results;
-
-namespace TestCases.PreProcessorIsRunOnValidationFailure;
+namespace TestCases.PreProcessorIsRunOnValidationFailure;
 
 public class MyPreProcessor : IPreProcessor<Request>
 {
-    public Task PreProcessAsync(Request req, HttpContext ctx, List<ValidationFailure> failures, CancellationToken ct)
+    public Task PreProcessAsync(IPreProcessorContext<Request> context, CancellationToken ct)
     {
-        failures.Add(new("x", "blah"));
+        context.ValidationFailures.Add(new("x", "blah"));
         return Task.CompletedTask;
     }
 }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -17,15 +17,9 @@
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
-        <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All"/>
-        <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" PrivateAssets="All"/>
-    </ItemGroup>
-
     <PropertyGroup>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <NoWarn>$(NoWarn);1591</NoWarn>
+        <NoWarn>$(NoWarn);1591;NU1507</NoWarn>
     </PropertyGroup>
 
     <Target Name="CustomVersion" AfterTargets="MinVer">

diff --git a/src/FastEndpoints.ApiExplorer/FastEndpoints.ApiExplorer.csproj b/src/FastEndpoints.ApiExplorer/FastEndpoints.ApiExplorer.csproj
@@ -2,11 +2,11 @@
 
     <PropertyGroup>
         <ImplicitUsings>enable</ImplicitUsings>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="FastEndpoints" Version="5.14.0" />
+      <PackageReference Include="FastEndpoints" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/FastEndpoints.OpenTelemetry/FastEndpoints.OpenTelemetry.csproj b/src/FastEndpoints.OpenTelemetry/FastEndpoints.OpenTelemetry.csproj
@@ -2,12 +2,12 @@
 
     <PropertyGroup>
         <ImplicitUsings>enable</ImplicitUsings>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="FastEndpoints" Version="5.14.0" />
-      <PackageReference Include="OpenTelemetry" Version="1.5.1" />
+      <PackageReference Include="FastEndpoints" />
+      <PackageReference Include="OpenTelemetry" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/FastEndpoints.Reflection/FastEndpoints.Reflection.csproj b/src/FastEndpoints.Reflection/FastEndpoints.Reflection.csproj
@@ -2,11 +2,11 @@
 
     <PropertyGroup>
         <ImplicitUsings>enable</ImplicitUsings>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="FastEndpoints" Version="5.14.0" />
+      <PackageReference Include="FastEndpoints" />
     </ItemGroup>
 
 </Project>
diff --git a/src/FastEndpoints.Swagger.Swashbuckle/FastEndpoints.Swagger.Swashbuckle.csproj b/src/FastEndpoints.Swagger.Swashbuckle/FastEndpoints.Swagger.Swashbuckle.csproj
@@ -2,12 +2,12 @@
 
     <PropertyGroup>
         <ImplicitUsings>enable</ImplicitUsings>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="FastEndpoints" Version="5.14.0" />
-      <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
+      <PackageReference Include="FastEndpoints" />
+      <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" />
     </ItemGroup>
 
     <ItemGroup>