From d0bf65880b2ff23bc291e390f3e11058919131cc Mon Sep 17 00:00:00 2001 From: Dat <62109015+datlam162@users.noreply.github.com> Date: Mon, 12 Jan 2026 16:21:31 +0700 Subject: [PATCH] ASMO-7533: Update dotnet 10 for swagger --- .github/workflows/cicd.yaml | 2 +- .../Guest/ConfigureSwaggerGenGuest.cs | 31 ++++++++----------- .../Jwt/ConfigureSwaggerGen.cs | 11 ++----- .../Samhammer.Swagger.Authentication.csproj | 8 ++--- .../ConfigureSwaggerGen.cs | 2 +- .../Samhammer.Swagger.Default.csproj | 6 ++-- .../Samhammer.Swagger.Example.csproj | 6 ++-- .../ConfigureSwaggerGen.cs | 14 +++------ .../Samhammer.Swagger.Versioning.csproj | 8 ++--- 9 files changed, 36 insertions(+), 52 deletions(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 6b1496d..12fa11c 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -20,7 +20,7 @@ jobs: id: tag - uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x - run: echo "::remove-matcher owner=csc::" - uses: reviewdog/action-setup@v1 - run: dotnet --info diff --git a/src/Samhammer.Swagger.Authentication/Guest/ConfigureSwaggerGenGuest.cs b/src/Samhammer.Swagger.Authentication/Guest/ConfigureSwaggerGenGuest.cs index a504697..a6eb654 100644 --- a/src/Samhammer.Swagger.Authentication/Guest/ConfigureSwaggerGenGuest.cs +++ b/src/Samhammer.Swagger.Authentication/Guest/ConfigureSwaggerGenGuest.cs @@ -1,22 +1,18 @@ -using Microsoft.Extensions.DependencyInjection; +using System.Collections.Generic; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using Swashbuckle.AspNetCore.Filters; using Swashbuckle.AspNetCore.SwaggerGen; namespace Samhammer.Swagger.Authentication.Guest { - public class ConfigureSwaggerGenGuest : IConfigureOptions + public class ConfigureSwaggerGenGuest(IOptions options) : IConfigureOptions { - private SwaggerGuestOptions Options { get; } + private SwaggerGuestOptions Options { get; } = options.Value; private const string HeaderKey = "GuestID"; - public ConfigureSwaggerGenGuest(IOptions options) - { - Options = options.Value; - } - public void Configure(SwaggerGenOptions swaggerGen) { if (!Options.Enabled) @@ -24,24 +20,23 @@ public void Configure(SwaggerGenOptions swaggerGen) return; } - var apiKeyRef = new OpenApiReference - { - Id = "Guest", - Type = ReferenceType.SecurityScheme, - }; + const string schemeId = "Guest"; var apiKeyScheme = new OpenApiSecurityScheme { - Reference = apiKeyRef, Type = SecuritySchemeType.ApiKey, In = ParameterLocation.Header, Name = HeaderKey, }; - swaggerGen.AddSecurityDefinition(apiKeyRef.Id, apiKeyScheme); - swaggerGen.AddSecurityRequirement(new OpenApiSecurityRequirement { { apiKeyScheme, new string[] { } } }); + swaggerGen.AddSecurityDefinition(schemeId, apiKeyScheme); + + swaggerGen.AddSecurityRequirement(document => new OpenApiSecurityRequirement + { + [new OpenApiSecuritySchemeReference(schemeId, document)] = new List(), + }); - swaggerGen.OperationFilter(true, apiKeyScheme.Reference.Id); + swaggerGen.OperationFilter(true, schemeId); if (!swaggerGen.OperationFilterDescriptors.Exists(f => f.Type == typeof(AppendAuthorizeToSummaryOperationFilter))) { diff --git a/src/Samhammer.Swagger.Authentication/Jwt/ConfigureSwaggerGen.cs b/src/Samhammer.Swagger.Authentication/Jwt/ConfigureSwaggerGen.cs index 1c777cb..45c20be 100644 --- a/src/Samhammer.Swagger.Authentication/Jwt/ConfigureSwaggerGen.cs +++ b/src/Samhammer.Swagger.Authentication/Jwt/ConfigureSwaggerGen.cs @@ -1,20 +1,15 @@ using System; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using Swashbuckle.AspNetCore.Filters; using Swashbuckle.AspNetCore.SwaggerGen; namespace Samhammer.Swagger.Authentication.Jwt { - public class ConfigureSwaggerGen : IConfigureOptions + public class ConfigureSwaggerGen(IOptions options) : IConfigureOptions { - private SwaggerAuthOptions Options { get; } - - public ConfigureSwaggerGen(IOptions options) - { - Options = options.Value; - } + private SwaggerAuthOptions Options { get; } = options.Value; public void Configure(SwaggerGenOptions swaggerGen) { diff --git a/src/Samhammer.Swagger.Authentication/Samhammer.Swagger.Authentication.csproj b/src/Samhammer.Swagger.Authentication/Samhammer.Swagger.Authentication.csproj index a643bb9..09d4882 100644 --- a/src/Samhammer.Swagger.Authentication/Samhammer.Swagger.Authentication.csproj +++ b/src/Samhammer.Swagger.Authentication/Samhammer.Swagger.Authentication.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 ..\stylecop.ruleset Samhammer AG Samhammer AG @@ -17,11 +17,11 @@ - + all runtime; build; native; contentfiles; analyzers - - + + diff --git a/src/Samhammer.Swagger.Default/ConfigureSwaggerGen.cs b/src/Samhammer.Swagger.Default/ConfigureSwaggerGen.cs index 1dd5b4c..5912b98 100644 --- a/src/Samhammer.Swagger.Default/ConfigureSwaggerGen.cs +++ b/src/Samhammer.Swagger.Default/ConfigureSwaggerGen.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using Swashbuckle.AspNetCore.SwaggerGen; namespace Samhammer.Swagger.Default diff --git a/src/Samhammer.Swagger.Default/Samhammer.Swagger.Default.csproj b/src/Samhammer.Swagger.Default/Samhammer.Swagger.Default.csproj index 442eb5b..64efa54 100644 --- a/src/Samhammer.Swagger.Default/Samhammer.Swagger.Default.csproj +++ b/src/Samhammer.Swagger.Default/Samhammer.Swagger.Default.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 ..\stylecop.ruleset Samhammer AG Samhammer AG @@ -17,10 +17,10 @@ - + all runtime; build; native; contentfiles; analyzers - + diff --git a/src/Samhammer.Swagger.Example/Samhammer.Swagger.Example.csproj b/src/Samhammer.Swagger.Example/Samhammer.Swagger.Example.csproj index 63b488d..21d402e 100644 --- a/src/Samhammer.Swagger.Example/Samhammer.Swagger.Example.csproj +++ b/src/Samhammer.Swagger.Example/Samhammer.Swagger.Example.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 ..\stylecop.ruleset enable enable @@ -12,11 +12,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Samhammer.Swagger.Versioning/ConfigureSwaggerGen.cs b/src/Samhammer.Swagger.Versioning/ConfigureSwaggerGen.cs index c4bf81d..d8bbaf5 100644 --- a/src/Samhammer.Swagger.Versioning/ConfigureSwaggerGen.cs +++ b/src/Samhammer.Swagger.Versioning/ConfigureSwaggerGen.cs @@ -2,22 +2,16 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using Swashbuckle.AspNetCore.SwaggerGen; namespace Samhammer.Swagger.Versioning { - public class ConfigureSwaggerGen : IConfigureOptions + public class ConfigureSwaggerGen(IApiVersionDescriptionProvider provider, IWebHostEnvironment hostingEnv) : IConfigureOptions { - private IApiVersionDescriptionProvider Provider { get; } + private IApiVersionDescriptionProvider Provider { get; } = provider; - private IWebHostEnvironment HostingEnv { get; } - - public ConfigureSwaggerGen(IApiVersionDescriptionProvider provider, IWebHostEnvironment hostingEnv) - { - Provider = provider; - HostingEnv = hostingEnv; - } + private IWebHostEnvironment HostingEnv { get; } = hostingEnv; public void Configure(SwaggerGenOptions options) { diff --git a/src/Samhammer.Swagger.Versioning/Samhammer.Swagger.Versioning.csproj b/src/Samhammer.Swagger.Versioning/Samhammer.Swagger.Versioning.csproj index 0054e49..40e77a6 100644 --- a/src/Samhammer.Swagger.Versioning/Samhammer.Swagger.Versioning.csproj +++ b/src/Samhammer.Swagger.Versioning/Samhammer.Swagger.Versioning.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 ..\stylecop.ruleset Samhammer AG Samhammer AG @@ -17,11 +17,11 @@ - - + + all runtime; build; native; contentfiles; analyzers - +