Skip to content

Commit d0bf658

Browse files
datlam162datlam162
committed
ASMO-7533: Update dotnet 10 for swagger
1 parent 204463d commit d0bf658

9 files changed

Lines changed: 36 additions & 52 deletions

File tree

‎.github/workflows/cicd.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
id: tag
2121
- uses: actions/setup-dotnet@v4
2222
with:
23-
dotnet-version: 8.0.x
23+
dotnet-version: 10.0.x
2424
- run: echo "::remove-matcher owner=csc::"
2525
- uses: reviewdog/action-setup@v1
2626
- run: dotnet --info

‎src/Samhammer.Swagger.Authentication/Guest/ConfigureSwaggerGenGuest.cs‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,42 @@
1-
using Microsoft.Extensions.DependencyInjection;
1+
using System.Collections.Generic;
2+
using Microsoft.Extensions.DependencyInjection;
23
using Microsoft.Extensions.Options;
3-
using Microsoft.OpenApi.Models;
4+
using Microsoft.OpenApi;
45
using Swashbuckle.AspNetCore.Filters;
56
using Swashbuckle.AspNetCore.SwaggerGen;
67

78
namespace Samhammer.Swagger.Authentication.Guest
89
{
9-
public class ConfigureSwaggerGenGuest : IConfigureOptions<SwaggerGenOptions>
10+
public class ConfigureSwaggerGenGuest(IOptions<SwaggerGuestOptions> options) : IConfigureOptions<SwaggerGenOptions>
1011
{
11-
private SwaggerGuestOptions Options { get; }
12+
private SwaggerGuestOptions Options { get; } = options.Value;
1213

1314
private const string HeaderKey = "GuestID";
1415

15-
public ConfigureSwaggerGenGuest(IOptions<SwaggerGuestOptions> options)
16-
{
17-
Options = options.Value;
18-
}
19-
2016
public void Configure(SwaggerGenOptions swaggerGen)
2117
{
2218
if (!Options.Enabled)
2319
{
2420
return;
2521
}
2622

27-
var apiKeyRef = new OpenApiReference
28-
{
29-
Id = "Guest",
30-
Type = ReferenceType.SecurityScheme,
31-
};
23+
const string schemeId = "Guest";
3224

3325
var apiKeyScheme = new OpenApiSecurityScheme
3426
{
35-
Reference = apiKeyRef,
3627
Type = SecuritySchemeType.ApiKey,
3728
In = ParameterLocation.Header,
3829
Name = HeaderKey,
3930
};
4031

41-
swaggerGen.AddSecurityDefinition(apiKeyRef.Id, apiKeyScheme);
42-
swaggerGen.AddSecurityRequirement(new OpenApiSecurityRequirement { { apiKeyScheme, new string[] { } } });
32+
swaggerGen.AddSecurityDefinition(schemeId, apiKeyScheme);
33+
34+
swaggerGen.AddSecurityRequirement(document => new OpenApiSecurityRequirement
35+
{
36+
[new OpenApiSecuritySchemeReference(schemeId, document)] = new List<string>(),
37+
});
4338

44-
swaggerGen.OperationFilter<SecurityRequirementsOperationFilter>(true, apiKeyScheme.Reference.Id);
39+
swaggerGen.OperationFilter<SecurityRequirementsOperationFilter>(true, schemeId);
4540

4641
if (!swaggerGen.OperationFilterDescriptors.Exists(f => f.Type == typeof(AppendAuthorizeToSummaryOperationFilter)))
4742
{

‎src/Samhammer.Swagger.Authentication/Jwt/ConfigureSwaggerGen.cs‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
using System;
22
using Microsoft.Extensions.DependencyInjection;
33
using Microsoft.Extensions.Options;
4-
using Microsoft.OpenApi.Models;
4+
using Microsoft.OpenApi;
55
using Swashbuckle.AspNetCore.Filters;
66
using Swashbuckle.AspNetCore.SwaggerGen;
77

88
namespace Samhammer.Swagger.Authentication.Jwt
99
{
10-
public class ConfigureSwaggerGen : IConfigureOptions<SwaggerGenOptions>
10+
public class ConfigureSwaggerGen(IOptions<SwaggerAuthOptions> options) : IConfigureOptions<SwaggerGenOptions>
1111
{
12-
private SwaggerAuthOptions Options { get; }
13-
14-
public ConfigureSwaggerGen(IOptions<SwaggerAuthOptions> options)
15-
{
16-
Options = options.Value;
17-
}
12+
private SwaggerAuthOptions Options { get; } = options.Value;
1813

1914
public void Configure(SwaggerGenOptions swaggerGen)
2015
{

‎src/Samhammer.Swagger.Authentication/Samhammer.Swagger.Authentication.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
55
<Authors>Samhammer AG</Authors>
66
<Company>Samhammer AG</Company>
@@ -17,11 +17,11 @@
1717
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
1818
</ItemGroup>
1919
<ItemGroup>
20-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.376">
20+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2323
</PackageReference>
24-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
25-
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.1" />
24+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.0" />
25+
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="10.0.1" />
2626
</ItemGroup>
2727
</Project>

‎src/Samhammer.Swagger.Default/ConfigureSwaggerGen.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.Extensions.DependencyInjection;
22
using Microsoft.Extensions.Options;
3-
using Microsoft.OpenApi.Models;
3+
using Microsoft.OpenApi;
44
using Swashbuckle.AspNetCore.SwaggerGen;
55

66
namespace Samhammer.Swagger.Default

‎src/Samhammer.Swagger.Default/Samhammer.Swagger.Default.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
55
<Authors>Samhammer AG</Authors>
66
<Company>Samhammer AG</Company>
@@ -17,10 +17,10 @@
1717
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
1818
</ItemGroup>
1919
<ItemGroup>
20-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.376">
20+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2323
</PackageReference>
24-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
24+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.0" />
2525
</ItemGroup>
2626
</Project>

‎src/Samhammer.Swagger.Example/Samhammer.Swagger.Example.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
66
<Nullable>enable</Nullable>
77
<ImplicitUsings>enable</ImplicitUsings>
@@ -12,11 +12,11 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.376">
15+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>
19-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
19+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎src/Samhammer.Swagger.Versioning/ConfigureSwaggerGen.cs‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,16 @@
22
using Microsoft.AspNetCore.Hosting;
33
using Microsoft.Extensions.DependencyInjection;
44
using Microsoft.Extensions.Options;
5-
using Microsoft.OpenApi.Models;
5+
using Microsoft.OpenApi;
66
using Swashbuckle.AspNetCore.SwaggerGen;
77

88
namespace Samhammer.Swagger.Versioning
99
{
10-
public class ConfigureSwaggerGen : IConfigureOptions<SwaggerGenOptions>
10+
public class ConfigureSwaggerGen(IApiVersionDescriptionProvider provider, IWebHostEnvironment hostingEnv) : IConfigureOptions<SwaggerGenOptions>
1111
{
12-
private IApiVersionDescriptionProvider Provider { get; }
12+
private IApiVersionDescriptionProvider Provider { get; } = provider;
1313

14-
private IWebHostEnvironment HostingEnv { get; }
15-
16-
public ConfigureSwaggerGen(IApiVersionDescriptionProvider provider, IWebHostEnvironment hostingEnv)
17-
{
18-
Provider = provider;
19-
HostingEnv = hostingEnv;
20-
}
14+
private IWebHostEnvironment HostingEnv { get; } = hostingEnv;
2115

2216
public void Configure(SwaggerGenOptions options)
2317
{

‎src/Samhammer.Swagger.Versioning/Samhammer.Swagger.Versioning.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
55
<Authors>Samhammer AG</Authors>
66
<Company>Samhammer AG</Company>
@@ -17,11 +17,11 @@
1717
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
1818
</ItemGroup>
1919
<ItemGroup>
20-
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.0.0" />
21-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.376">
20+
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.1" />
21+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2424
</PackageReference>
25-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
25+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.0" />
2626
</ItemGroup>
2727
</Project>

0 commit comments

Comments
 (0)