Update to .NET 10 and centralize package management

pwelter34 · pwelter34 · commit 64afd925fefd · 2025-11-11T18:30:50.000-06:00
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Install .NET Core
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.x
+          dotnet-version: 10.x
 
       - name: Restore Dependencies
         run: dotnet restore
diff --git a/AspNetCore.SecurityKey.slnx b/AspNetCore.SecurityKey.slnx
@@ -1,6 +1,7 @@
 <Solution>
   <Folder Name="/Build/">
     <File Path=".github/workflows/dotnet.yml" />
+    <File Path="Directory.Packages.props" />
     <File Path="README.md" />
     <File Path="src/Directory.Build.props" />
   </Folder>
@@ -12,7 +13,6 @@
     <Project Path="samples/Sample.Shared/Sample.Shared.csproj" />
   </Folder>
   <Folder Name="/Tests/">
-    <File Path="test/Directory.Build.props" />
     <Project Path="test/AspNetCore.SecurityKey.Tests/AspNetCore.SecurityKey.Tests.csproj" />
   </Folder>
   <Project Path="src/AspNetCore.SecurityKey/AspNetCore.SecurityKey.csproj" />
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,20 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="AssemblyMetadata.Generators" Version="2.1.0" />
+    <PackageVersion Include="Bogus" Version="35.6.5" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageVersion Include="MinVer" Version="6.0.0" />
+    <PackageVersion Include="Scalar.AspNetCore" Version="2.10.3" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="10.0.0" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="XUnit.Hosting" Version="3.1.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
+    <PackageVersion Include="xunit.v3" Version="3.2.0" />
+  </ItemGroup>
+</Project>
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -24,9 +24,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AssemblyMetadata.Generators" Version="2.1.0" PrivateAssets="All" />
-    <PackageReference Include="Bogus" Version="35.6.5" />
-    <PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="All" />
+    <PackageReference Include="AssemblyMetadata.Generators" PrivateAssets="All" />
+    <PackageReference Include="Bogus" />
+    <PackageReference Include="MinVer" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Sample.Controllers/Sample.Controllers.csproj b/samples/Sample.Controllers/Sample.Controllers.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
+    <PackageReference Include="Swashbuckle.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Sample.Middleware/Sample.Middleware.csproj b/samples/Sample.Middleware/Sample.Middleware.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
+    <PackageReference Include="Swashbuckle.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Sample.MinimalApi/Program.cs b/samples/Sample.MinimalApi/Program.cs
@@ -33,17 +33,14 @@ public static void Main(string[] args)
         app.UseAuthorization();
 
         app.MapGet("/weather", () => WeatherFaker.Instance.Generate(5))
-            .WithName("GetWeatherForecast")
-            .WithOpenApi();
+            .WithName("GetWeatherForecast");
 
         app.MapGet("/users", () => UserFaker.Instance.Generate(10))
             .WithName("GetUsers")
-            .WithOpenApi()
             .RequireSecurityKey();
 
         app.MapGet("/addresses", () => AddressFaker.Instance.Generate(10))
             .WithName("GetAddresses")
-            .WithOpenApi()
             .RequireAuthorization();
 
         app.MapGet("/current", (ClaimsPrincipal? principal) =>
@@ -54,8 +51,7 @@ public static void Main(string[] args)
                     Data = WeatherFaker.Instance.Generate(5)
                 };
             })
-            .WithName("GetCurrentUser")
-            .WithOpenApi();
+            .WithName("GetCurrentUser");
 
         app.MapOpenApi();
         app.MapScalarApiReference();
diff --git a/samples/Sample.MinimalApi/Sample.MinimalApi.csproj b/samples/Sample.MinimalApi/Sample.MinimalApi.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
-    <PackageReference Include="Scalar.AspNetCore" Version="2.10.3" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
+    <PackageReference Include="Scalar.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Sample.Shared/Sample.Shared.csproj b/samples/Sample.Shared/Sample.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/AspNetCore.SecurityKey/AspNetCore.SecurityKey.csproj b/src/AspNetCore.SecurityKey/AspNetCore.SecurityKey.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -10,8 +10,8 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
   </ItemGroup>
 
 </Project>
diff --git a/src/AspNetCore.SecurityKey/SecurityKeyDocumentTransformer.cs b/src/AspNetCore.SecurityKey/SecurityKeyDocumentTransformer.cs
@@ -1,9 +1,9 @@
-#if NET9_0_OR_GREATER
+#if NET10_0_OR_GREATER
 
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.OpenApi;
 using Microsoft.Extensions.Options;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace AspNetCore.SecurityKey;
 
@@ -37,6 +37,7 @@ public async Task TransformAsync(OpenApiDocument document, OpenApiDocumentTransf
 
         var headerName = securityKeyOptions.Value.HeaderName;
 
+        // Add the security scheme at the document level
         var openApiSecurityScheme1 = new OpenApiSecurityScheme
         {
             Type = SecuritySchemeType.ApiKey,
@@ -45,30 +46,24 @@ public async Task TransformAsync(OpenApiDocument document, OpenApiDocumentTransf
             Name = headerName
         };
 
-        var requirements = new Dictionary<string, OpenApiSecurityScheme>
+        var requirements = new Dictionary<string, IOpenApiSecurityScheme>
         {
             ["API Key"] = openApiSecurityScheme1
         };
 
         document.Components ??= new OpenApiComponents();
         document.Components.SecuritySchemes = requirements;
 
-        foreach (var operation in document.Paths.Values.SelectMany(path => path.Operations))
+        // Apply it as a requirement for all operations
+        foreach (var operation in document.Paths.Values.SelectMany(path => path.Operations ?? []))
         {
-            var openApiSecurityScheme = new OpenApiSecurityScheme
+            OpenApiSecurityRequirement securityRequirement = new()
             {
-                Reference = new OpenApiReference
-                {
-                    Id = "API Key",
-                    Type = ReferenceType.SecurityScheme
-                }
-            };
-            var requirement = new OpenApiSecurityRequirement
-            {
-                [openApiSecurityScheme] = Array.Empty<string>()
+                [new OpenApiSecuritySchemeReference("API Key", document)] = []
             };
 
-            operation.Value.Security.Add(requirement);
+            operation.Value.Security ??= [];
+            operation.Value.Security.Add(securityRequirement);
         }
     }
 }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -38,8 +38,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AssemblyMetadata.Generators" Version="2.1.0" PrivateAssets="All" />
-    <PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="All" />
+    <PackageReference Include="AssemblyMetadata.Generators" PrivateAssets="All" />
+    <PackageReference Include="MinVer" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/AspNetCore.SecurityKey.Tests/AspNetCore.SecurityKey.Tests.csproj b/test/AspNetCore.SecurityKey.Tests/AspNetCore.SecurityKey.Tests.csproj
@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
+    <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -16,16 +17,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.4">
+    <PackageReference Include="coverlet.collector">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
-    <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="xunit.v3" />
   </ItemGroup>
 
   <ItemGroup>
@@ -36,9 +37,4 @@
     <Using Include="Xunit" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Bogus" Version="35.6.5" />
-    <PackageReference Update="XUnit.Hosting" Version="3.1.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/AspNetCore.SecurityKey.Tests/SecurityKeyExtractorTests.cs b/test/AspNetCore.SecurityKey.Tests/SecurityKeyExtractorTests.cs
@@ -127,7 +127,7 @@ public void GetRemoteAddress_FromXForwardedForSingleIp_ReturnsXForwardedForValue
     }
 
     [Fact]
-    public void GetRemoteAddress_FromXForwardedForMultipleIps_ReturnsFirstIp()
+    public void GetRemoteAddress_FromXForwardedForMultipleIPs_ReturnsFirstIp()
     {
         var securityKeyOptions = new SecurityKeyOptions();
         var options = new OptionsWrapper<SecurityKeyOptions>(securityKeyOptions);
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -30,15 +30,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AssemblyMetadata.Generators" Version="2.1.0" PrivateAssets="All" />
-    <PackageReference Include="Bogus" Version="35.6.5" />
-    <PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="All" />
-    <PackageReference Include="XUnit.Hosting" Version="3.1.0" />
+    <PackageReference Include="AssemblyMetadata.Generators" PrivateAssets="All" />
+    <PackageReference Include="Bogus" />
+    <PackageReference Include="MinVer" PrivateAssets="All" />
+    <PackageReference Include="XUnit.Hosting" />
   </ItemGroup>
 
   <ItemGroup>
     <Using Include="Xunit" />
-    <Using Include="Xunit.Abstractions" />
   </ItemGroup>
 
 </Project>
