prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Upgrade to .NET 10 with updated dependencies

Browse source 
Co-authored-by: collinbarrett <6483057+collinbarrett@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2025-11-13 00:24:46 +00:00 committed by Collin Barrett
parent 11366ca3ba
commit 2cff95da3a
10 changed files with 24 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
global.json
View file

@ -1,6 +1,6 @@
{
"sdk": {
"rollForward": "latestPatch",
"version": "9.0.306"
"version": "10.0.100"
}
}

14
services/Directory/FilterLists.Directory.Api/Endpoints.cs
View file

@ -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<List<GetLanguages.Response>>()
.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<List<GetLicenses.Response>>()
.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<List<GetLists.Response>>()
.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<List<GetMaintainers.Response>>()
.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<List<GetSoftware.Response>>()
.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<List<GetSyntaxes.Response>>()
.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<List<GetTags.Response>>()
.WithOpenApi(operation => new OpenApiOperation(operation)
{
Tags = [TagsTag],
Summary = "Gets the tags of the FilterLists.",
OperationId = nameof(GetTags)
})

10
services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj
View file

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<SelfContained>true</SelfContained>
<PublishReadyToRunComposite>true</PublishReadyToRunComposite>
<ContainerBaseImage>mcr.microsoft.com/dotnet/runtime-deps:9.0-azurelinux3.0-distroless-extra</ContainerBaseImage>
<ContainerBaseImage>mcr.microsoft.com/dotnet/runtime-deps:10.0-azurelinux3.0-distroless-extra</ContainerBaseImage>
<ContainerRuntimeIdentifier>linux-x64</ContainerRuntimeIdentifier>
</PropertyGroup>
@ -17,12 +17,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.11"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.16">
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6"/>
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1"/>
</ItemGroup>
<ItemGroup>

2
services/Directory/FilterLists.Directory.Api/OpenApi/OpenApiGenConfiguration.cs
View file

@ -1,4 +1,4 @@
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi;
using Swashbuckle.AspNetCore.SwaggerGen;
using ConfigurationExtensions = FilterLists.Directory.Application.ConfigurationExtensions;

8
services/Directory/FilterLists.Directory.Api/OpenApi/OpenApiTags.cs
View file

@ -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<OpenApiTag>
{
LanguagesTag,
LicensesTag,
FilterListsTag,
@ -98,7 +98,7 @@ public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
SoftwareTag,
SyntaxesTag,
TagsTag
];
};
}
}
}

2
services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj
View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);1591</NoWarn>
</PropertyGroup>

2
services/Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj
View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<NoWarn>$(NoWarn);CA1707;CA1861</NoWarn>
</PropertyGroup>

4
services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj
View file

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="8.2.2"/>
<PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="13.0.0"/>
</ItemGroup>
</Project>

8
services/FilterLists.AppHost/FilterLists.AppHost.csproj
View file

@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Aspire.AppHost.Sdk" Version="9.4.0" />
<Sdk Name="Aspire.AppHost.Sdk" Version="13.0.0" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<UserSecretsId>c7967ef0-ced7-4e18-8282-7302b3c0002b</UserSecretsId>
</PropertyGroup>
@ -13,8 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.5.2" />
<PackageReference Include="Aspire.Hosting.SqlServer" Version="9.5.2" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.0.0" />
<PackageReference Include="Aspire.Hosting.SqlServer" Version="13.0.0" />
<PackageReference Include="KubernetesClient" Version="18.0.5" />
</ItemGroup>

4
services/FilterLists.ServiceDefaults/FilterLists.ServiceDefaults.csproj
View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsAspireSharedProject>true</IsAspireSharedProject>
</PropertyGroup>
@ -10,7 +10,7 @@
<PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.3.0" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.10.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.2" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />