From 2cff95da3a5e3aff3c38c571a5c30aa47fc2803b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 13 Nov 2025 00:24:46 +0000 Subject: [PATCH] Upgrade to .NET 10 with updated dependencies Co-authored-by: collinbarrett <6483057+collinbarrett@users.noreply.github.com> --- global.json | 2 +- .../FilterLists.Directory.Api/Endpoints.cs | 14 +++----------- .../FilterLists.Directory.Api.csproj | 10 +++++----- .../OpenApi/OpenApiGenConfiguration.cs | 2 +- .../OpenApi/OpenApiTags.cs | 8 ++++---- .../FilterLists.Directory.Application.csproj | 2 +- ...ists.Directory.Infrastructure.Migrations.csproj | 2 +- .../FilterLists.Directory.Infrastructure.csproj | 4 ++-- .../FilterLists.AppHost/FilterLists.AppHost.csproj | 8 ++++---- .../FilterLists.ServiceDefaults.csproj | 4 ++-- 10 files changed, 24 insertions(+), 32 deletions(-) diff --git a/global.json b/global.json index a610e61bb..82c419544 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { "rollForward": "latestPatch", - "version": "9.0.306" + "version": "10.0.100" } } \ No newline at end of file diff --git a/services/Directory/FilterLists.Directory.Api/Endpoints.cs b/services/Directory/FilterLists.Directory.Api/Endpoints.cs index b618cc12f..fd516df96 100644 --- a/services/Directory/FilterLists.Directory.Api/Endpoints.cs +++ b/services/Directory/FilterLists.Directory.Api/Endpoints.cs @@ -1,7 +1,7 @@ +using System.Text.Json.Nodes; using FilterLists.Directory.Application.Queries; using Microsoft.AspNetCore.Http.HttpResults; -using Microsoft.OpenApi.Any; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using static FilterLists.Directory.Api.OpenApi.OpenApiTags; namespace FilterLists.Directory.Api; @@ -17,7 +17,6 @@ internal static void MapEndpoints(this WebApplication app) .Produces>() .WithOpenApi(operation => new OpenApiOperation(operation) { - Tags = [LanguagesTag], Summary = "Gets the languages targeted by the FilterLists.", OperationId = nameof(GetLanguages) }) @@ -29,7 +28,6 @@ internal static void MapEndpoints(this WebApplication app) .Produces>() .WithOpenApi(operation => new OpenApiOperation(operation) { - Tags = [LicensesTag], Summary = "Gets the licenses applied to the FilterLists.", OperationId = nameof(GetLicenses) }) @@ -41,7 +39,6 @@ internal static void MapEndpoints(this WebApplication app) .Produces>() .WithOpenApi(operation => new OpenApiOperation(operation) { - Tags = [FilterListsTag], Summary = "Gets the FilterLists.", OperationId = nameof(GetLists) }) @@ -61,7 +58,6 @@ internal static void MapEndpoints(this WebApplication app) .Produces(StatusCodes.Status404NotFound) .WithOpenApi(operation => new OpenApiOperation(operation) { - Tags = [FilterListsTag], Summary = "Gets the details of the FilterList.", OperationId = nameof(GetListDetails), Parameters = @@ -72,7 +68,7 @@ internal static void MapEndpoints(this WebApplication app) In = ParameterLocation.Path, Description = "The identifier of the FilterList.", Required = true, - Example = new OpenApiInteger(1) + Example = JsonValue.Create(1) } ] }) @@ -84,7 +80,6 @@ internal static void MapEndpoints(this WebApplication app) .Produces>() .WithOpenApi(operation => new OpenApiOperation(operation) { - Tags = [MaintainersTag], Summary = "Gets the maintainers of the FilterLists.", OperationId = nameof(GetMaintainers) }) @@ -96,7 +91,6 @@ internal static void MapEndpoints(this WebApplication app) .Produces>() .WithOpenApi(operation => new OpenApiOperation(operation) { - Tags = [SoftwareTag], Summary = "Gets the software that subscribes to the FilterLists.", OperationId = nameof(GetSoftware) }) @@ -108,7 +102,6 @@ internal static void MapEndpoints(this WebApplication app) .Produces>() .WithOpenApi(operation => new OpenApiOperation(operation) { - Tags = [SyntaxesTag], Summary = "Gets the syntaxes of the FilterLists.", OperationId = nameof(GetSyntaxes) }) @@ -120,7 +113,6 @@ internal static void MapEndpoints(this WebApplication app) .Produces>() .WithOpenApi(operation => new OpenApiOperation(operation) { - Tags = [TagsTag], Summary = "Gets the tags of the FilterLists.", OperationId = nameof(GetTags) }) diff --git a/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj b/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj index dd213a098..6678ff89e 100644 --- a/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj +++ b/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj @@ -1,13 +1,13 @@ - net9.0 + net10.0 true true - mcr.microsoft.com/dotnet/runtime-deps:9.0-azurelinux3.0-distroless-extra + mcr.microsoft.com/dotnet/runtime-deps:10.0-azurelinux3.0-distroless-extra linux-x64 @@ -17,12 +17,12 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/services/Directory/FilterLists.Directory.Api/OpenApi/OpenApiGenConfiguration.cs b/services/Directory/FilterLists.Directory.Api/OpenApi/OpenApiGenConfiguration.cs index 2652dba80..2632800d1 100644 --- a/services/Directory/FilterLists.Directory.Api/OpenApi/OpenApiGenConfiguration.cs +++ b/services/Directory/FilterLists.Directory.Api/OpenApi/OpenApiGenConfiguration.cs @@ -1,4 +1,4 @@ -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using Swashbuckle.AspNetCore.SwaggerGen; using ConfigurationExtensions = FilterLists.Directory.Application.ConfigurationExtensions; diff --git a/services/Directory/FilterLists.Directory.Api/OpenApi/OpenApiTags.cs b/services/Directory/FilterLists.Directory.Api/OpenApi/OpenApiTags.cs index ca682e1e6..fb8629042 100644 --- a/services/Directory/FilterLists.Directory.Api/OpenApi/OpenApiTags.cs +++ b/services/Directory/FilterLists.Directory.Api/OpenApi/OpenApiTags.cs @@ -1,6 +1,6 @@ using FilterLists.Directory.Infrastructure.Persistence.Queries.Context; using FilterLists.Directory.Infrastructure.Persistence.Queries.Entities; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using Swashbuckle.AspNetCore.SwaggerGen; namespace FilterLists.Directory.Api.OpenApi; @@ -89,8 +89,8 @@ internal sealed class TagDescriptionsDocumentFilter : IDocumentFilter { public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context) { - swaggerDoc.Tags = - [ + swaggerDoc.Tags = new HashSet + { LanguagesTag, LicensesTag, FilterListsTag, @@ -98,7 +98,7 @@ public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context) SoftwareTag, SyntaxesTag, TagsTag - ]; + }; } } } \ No newline at end of file diff --git a/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj index 4f08306c2..4a84b17c5 100644 --- a/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj +++ b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 true $(NoWarn);1591 diff --git a/services/Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj index 80dea1383..2710345c9 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj +++ b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 $(NoWarn);CA1707;CA1861 diff --git a/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj b/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj index 11b3f3692..2151d22fd 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj +++ b/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj @@ -1,11 +1,11 @@  - net9.0 + net10.0 - + \ No newline at end of file diff --git a/services/FilterLists.AppHost/FilterLists.AppHost.csproj b/services/FilterLists.AppHost/FilterLists.AppHost.csproj index 78b1418c9..8835b19ce 100644 --- a/services/FilterLists.AppHost/FilterLists.AppHost.csproj +++ b/services/FilterLists.AppHost/FilterLists.AppHost.csproj @@ -1,10 +1,10 @@ - + Exe - net9.0 + net10.0 c7967ef0-ced7-4e18-8282-7302b3c0002b @@ -13,8 +13,8 @@ - - + + diff --git a/services/FilterLists.ServiceDefaults/FilterLists.ServiceDefaults.csproj b/services/FilterLists.ServiceDefaults/FilterLists.ServiceDefaults.csproj index 3ca2cfd2e..4e86e3810 100644 --- a/services/FilterLists.ServiceDefaults/FilterLists.ServiceDefaults.csproj +++ b/services/FilterLists.ServiceDefaults/FilterLists.ServiceDefaults.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 true @@ -10,7 +10,7 @@ - +