diff --git a/global.json b/global.json index 6798c720..efdbd0d5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-preview.2.25164.34", + "version": "10.0.100-preview.3.25201.16", "allowPrerelease": false, "rollForward": "latestMajor" } diff --git a/src/TodoApp/OpenApi/AspNetCore/AspNetCoreOpenApiEndpoints.cs b/src/TodoApp/OpenApi/AspNetCore/AspNetCoreOpenApiEndpoints.cs index 5a6d8a29..8fc8d2e1 100644 --- a/src/TodoApp/OpenApi/AspNetCore/AspNetCoreOpenApiEndpoints.cs +++ b/src/TodoApp/OpenApi/AspNetCore/AspNetCoreOpenApiEndpoints.cs @@ -51,8 +51,8 @@ public static IServiceCollection AddAspNetCoreOpenApi(this IServiceCollection se document.Components ??= new(); document.Components.SecuritySchemes ??= new Dictionary(); document.Components.SecuritySchemes[reference.Reference.Id] = scheme; - document.SecurityRequirements ??= []; - document.SecurityRequirements.Add(new() { [reference] = [] }); + document.Security ??= []; + document.Security.Add(new() { [reference] = [] }); return Task.CompletedTask; }); diff --git a/src/TodoApp/OpenApi/Swashbuckle/AddDocumentTagsFilter.cs b/src/TodoApp/OpenApi/Swashbuckle/AddDocumentTagsFilter.cs index 837bd683..e96c7126 100644 --- a/src/TodoApp/OpenApi/Swashbuckle/AddDocumentTagsFilter.cs +++ b/src/TodoApp/OpenApi/Swashbuckle/AddDocumentTagsFilter.cs @@ -13,7 +13,7 @@ public class AddDocumentTagsFilter : IDocumentFilter { public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context) { - swaggerDoc.Tags ??= []; + swaggerDoc.Tags ??= new HashSet(); swaggerDoc.Tags.Add(new() { Name = "TodoApp" }); } } diff --git a/src/TodoApp/TodoApp.csproj b/src/TodoApp/TodoApp.csproj index 4826434e..3fba5ea9 100644 --- a/src/TodoApp/TodoApp.csproj +++ b/src/TodoApp/TodoApp.csproj @@ -14,14 +14,14 @@ latest - - - - + + + + - - + + diff --git a/tests/TodoApp.Tests/OpenApiTests.Schema_Is_Correct_schemaUrl=openapi.verified.txt b/tests/TodoApp.Tests/OpenApiTests.Schema_Is_Correct_schemaUrl=openapi.verified.txt index b5268937..8580d9cd 100644 --- a/tests/TodoApp.Tests/OpenApiTests.Schema_Is_Correct_schemaUrl=openapi.verified.txt +++ b/tests/TodoApp.Tests/OpenApiTests.Schema_Is_Correct_schemaUrl=openapi.verified.txt @@ -13,6 +13,11 @@ }, version: v1 }, + servers: [ + { + url: http://localhost/ + } + ], paths: { /api/items: { get: { diff --git a/tests/TodoApp.Tests/TodoApp.Tests.csproj b/tests/TodoApp.Tests/TodoApp.Tests.csproj index 2867cadc..b94ea2c7 100644 --- a/tests/TodoApp.Tests/TodoApp.Tests.csproj +++ b/tests/TodoApp.Tests/TodoApp.Tests.csproj @@ -10,9 +10,9 @@ - + - +