From fa49f6b32a0cd1699aaa087419f2f22ffdd04b5e Mon Sep 17 00:00:00 2001 From: costellobot <102549341+costellobot@users.noreply.github.com> Date: Thu, 10 Apr 2025 20:24:26 +0000 Subject: [PATCH 1/5] Update .NET SDK Update .NET SDK to version 10.0.100-preview.3.25201.16. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-version: 10.0.100-preview.3.25201.16 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com> --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" } From ddd795a7b1ae9fbe9cf4628c7b8085fca3f4eb9d Mon Sep 17 00:00:00 2001 From: costellobot <102549341+costellobot@users.noreply.github.com> Date: Thu, 10 Apr 2025 20:27:32 +0000 Subject: [PATCH 2/5] Bump .NET NuGet packages Bumps .NET dependencies to their latest versions for the .NET 10.0.100-preview.3.25201.16 SDK. Bumps Microsoft.AspNetCore.Mvc.Testing from 10.0.0-preview.2.25164.1 to 10.0.0-preview.3.25172.1. Bumps Microsoft.AspNetCore.OpenApi from 10.0.0-preview.2.25164.1 to 10.0.0-preview.3.25172.1. Bumps Microsoft.EntityFrameworkCore.Sqlite from 10.0.0-preview.2.25163.8 to 10.0.0-preview.3.25171.6. Bumps Microsoft.Extensions.ApiDescription.Server from 10.0.0-preview.2.25164.1 to 10.0.0-preview.3.25172.1. --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-version: 10.0.0-preview.3.25172.1 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.AspNetCore.OpenApi dependency-version: 10.0.0-preview.3.25172.1 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.EntityFrameworkCore.Sqlite dependency-version: 10.0.0-preview.3.25171.6 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.ApiDescription.Server dependency-version: 10.0.0-preview.3.25172.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com> --- src/TodoApp/TodoApp.csproj | 6 +++--- tests/TodoApp.Tests/TodoApp.Tests.csproj | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/TodoApp/TodoApp.csproj b/src/TodoApp/TodoApp.csproj index 4826434e..42682da7 100644 --- a/src/TodoApp/TodoApp.csproj +++ b/src/TodoApp/TodoApp.csproj @@ -14,9 +14,9 @@ latest - - - + + + diff --git a/tests/TodoApp.Tests/TodoApp.Tests.csproj b/tests/TodoApp.Tests/TodoApp.Tests.csproj index 2867cadc..f7810b9f 100644 --- a/tests/TodoApp.Tests/TodoApp.Tests.csproj +++ b/tests/TodoApp.Tests/TodoApp.Tests.csproj @@ -10,7 +10,7 @@ - + From 98b577cbb146265ae389da6e5a8e0325d6a3126d Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Thu, 10 Apr 2025 22:01:51 +0100 Subject: [PATCH 3/5] Bump NuGet packages Update Microsoft.OpenApi for ASP.NET Core 10 preview 3. --- src/TodoApp/TodoApp.csproj | 2 +- tests/TodoApp.Tests/TodoApp.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TodoApp/TodoApp.csproj b/src/TodoApp/TodoApp.csproj index 42682da7..83b69683 100644 --- a/src/TodoApp/TodoApp.csproj +++ b/src/TodoApp/TodoApp.csproj @@ -17,7 +17,7 @@ - + diff --git a/tests/TodoApp.Tests/TodoApp.Tests.csproj b/tests/TodoApp.Tests/TodoApp.Tests.csproj index f7810b9f..b94ea2c7 100644 --- a/tests/TodoApp.Tests/TodoApp.Tests.csproj +++ b/tests/TodoApp.Tests/TodoApp.Tests.csproj @@ -12,7 +12,7 @@ - + From ab2da7955da77df203dec255491f58c4f8eeb0a7 Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Thu, 10 Apr 2025 22:22:40 +0100 Subject: [PATCH 4/5] Bump Swashbuckle.AspNetCore Update Swashbuckle packages for ASP.NET Core 10 preview 3. --- src/TodoApp/TodoApp.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TodoApp/TodoApp.csproj b/src/TodoApp/TodoApp.csproj index 83b69683..3fba5ea9 100644 --- a/src/TodoApp/TodoApp.csproj +++ b/src/TodoApp/TodoApp.csproj @@ -20,8 +20,8 @@ - - + + From a39d3d390fd93f25c643fd543bd0402ab7b3b9e8 Mon Sep 17 00:00:00 2001 From: martincostello Date: Thu, 10 Apr 2025 22:43:36 +0100 Subject: [PATCH 5/5] Fix build Updates for Microsoft.OpenApi 2.0.0-preview.11. --- src/TodoApp/OpenApi/AspNetCore/AspNetCoreOpenApiEndpoints.cs | 4 ++-- src/TodoApp/OpenApi/Swashbuckle/AddDocumentTagsFilter.cs | 2 +- ...ApiTests.Schema_Is_Correct_schemaUrl=openapi.verified.txt | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) 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/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: {