From 228023baf08c46f80be7cb5d986759c3870dd6cd Mon Sep 17 00:00:00 2001 From: Luiz Adolfo Date: Mon, 19 Jan 2026 19:47:41 -0300 Subject: [PATCH 1/2] updated to .net10 --- samples/SourceApi/Program.cs | 10 +++------- samples/SourceApi/SourceApi.csproj | 11 +++++----- samples/TargetApi/Program.cs | 20 ++++++------------- samples/TargetApi/TargetApi.csproj | 5 ++--- ...Interceptor.Extensions.Abstractions.csproj | 4 ++++ ...nInterceptor.Extensions.HybridCache.csproj | 4 ++-- src/Directory.Build.props | 10 +++++++--- tests/Directory.Build.props | 4 ++-- 8 files changed, 31 insertions(+), 37 deletions(-) diff --git a/samples/SourceApi/Program.cs b/samples/SourceApi/Program.cs index 74ae50e..e070b6e 100644 --- a/samples/SourceApi/Program.cs +++ b/samples/SourceApi/Program.cs @@ -11,7 +11,7 @@ var builder = WebApplication.CreateBuilder(args); builder.Services.AddEndpointsApiExplorer(); -builder.Services.AddSwaggerGen(); +builder.Services.AddOpenApiDocument(); // Add the cache options builder.Services.AddMemoryCache(); @@ -71,12 +71,8 @@ .ConfigureHttpClient(c => c.BaseAddress = new Uri("http://localhost:5121")); var app = builder.Build(); - -if (app.Environment.IsDevelopment()) -{ - app.UseSwagger(); - app.UseSwaggerUI(); -} +app.UseOpenApi(); +app.UseSwaggerUi(); app.MapGet("/test/TargetApiWithNoInterceptor", async (IHttpClientFactory factory) => { diff --git a/samples/SourceApi/SourceApi.csproj b/samples/SourceApi/SourceApi.csproj index 1626732..b8e3747 100644 --- a/samples/SourceApi/SourceApi.csproj +++ b/samples/SourceApi/SourceApi.csproj @@ -1,17 +1,16 @@  - net8.0 + net10.0 enable enable - - - - - + + + + diff --git a/samples/TargetApi/Program.cs b/samples/TargetApi/Program.cs index 70b8786..a13eab3 100644 --- a/samples/TargetApi/Program.cs +++ b/samples/TargetApi/Program.cs @@ -1,20 +1,15 @@ using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; using System.Text.Json.Serialization; var builder = WebApplication.CreateBuilder(args); builder.Services.AddEndpointsApiExplorer(); -builder.Services.AddSwaggerGen(); +builder.Services.AddOpenApiDocument(); builder.Services.AddSingleton(new UserContainer()); var app = builder.Build(); - -if (app.Environment.IsDevelopment()) -{ - app.UseSwagger(); - app.UseSwaggerUI(); -} +app.UseOpenApi(); +app.UseSwaggerUi(); app.MapPost("/auth", (UserContainer users, ILoggerFactory loggerFactory) => { @@ -33,8 +28,7 @@ users.Users.Add(user); return user; }) -.WithName("auth") -.WithOpenApi(); +.WithName("auth"); app.MapPost("/refresh", (UserContainer users, [FromQuery] string refresh, ILoggerFactory loggerFactory) => { @@ -61,8 +55,7 @@ users.Users.Add(user); return Results.Ok(user); }) -.WithName("refresh") -.WithOpenApi(); +.WithName("refresh"); app.MapGet("/data", (HttpRequest request, UserContainer users, ILoggerFactory loggerFactory, [FromHeader(Name = "Authorization")] string? token = null) => { @@ -78,8 +71,7 @@ return Results.Ok(); }) -.WithName("data") -.WithOpenApi(); +.WithName("data"); app.Run(); diff --git a/samples/TargetApi/TargetApi.csproj b/samples/TargetApi/TargetApi.csproj index d85fd38..8c317dd 100644 --- a/samples/TargetApi/TargetApi.csproj +++ b/samples/TargetApi/TargetApi.csproj @@ -1,14 +1,13 @@ - net8.0 + net10.0 enable enable - - + diff --git a/src/AuthorizationInterceptor.Extensions.Abstractions/AuthorizationInterceptor.Extensions.Abstractions.csproj b/src/AuthorizationInterceptor.Extensions.Abstractions/AuthorizationInterceptor.Extensions.Abstractions.csproj index 89ff0d9..c96ecf8 100644 --- a/src/AuthorizationInterceptor.Extensions.Abstractions/AuthorizationInterceptor.Extensions.Abstractions.csproj +++ b/src/AuthorizationInterceptor.Extensions.Abstractions/AuthorizationInterceptor.Extensions.Abstractions.csproj @@ -1,5 +1,9 @@  + + + + diff --git a/src/AuthorizationInterceptor.Extensions.HybridCache/AuthorizationInterceptor.Extensions.HybridCache.csproj b/src/AuthorizationInterceptor.Extensions.HybridCache/AuthorizationInterceptor.Extensions.HybridCache.csproj index 0547b21..88a377d 100644 --- a/src/AuthorizationInterceptor.Extensions.HybridCache/AuthorizationInterceptor.Extensions.HybridCache.csproj +++ b/src/AuthorizationInterceptor.Extensions.HybridCache/AuthorizationInterceptor.Extensions.HybridCache.csproj @@ -1,9 +1,9 @@  - net8.0;net9.0 + net8.0;net9.0;net10.0 - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 646af5a..a79308a 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,10 +1,10 @@ - 13 + 14 enable enable - 5.2.0 - net6.0;net7.0;net8.0;net9.0 + 5.3.0 + net6.0;net7.0;net8.0;net9.0;net10.0 Authorization Interceptor Adolfok3 MIT @@ -41,6 +41,10 @@ + + + + diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 45ba37e..9488fd7 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -1,9 +1,9 @@ - 13 + 14 enable enable - net9.0 + net10.0 false From ef4dcf2dd2825ce09ed2c48db428d0c3a3a07155 Mon Sep 17 00:00:00 2001 From: Luiz Adolfo Date: Mon, 19 Jan 2026 19:52:23 -0300 Subject: [PATCH 2/2] updated github actions --- .github/workflows/main.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5d5d857..206efcc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Restore run: dotnet restore --property NuGetAudit=true --property NuGetAuditMode=All --property NuGetAuditLevel=Moderate - name: Build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2396bb9..1568da8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Generate Package run: | dotnet clean -c Release