Update to ASP.NET Core 10 RC1 (#1104)

martincostello · web-flow · commit 5fec0128dde4 · 2025-09-09T14:36:34.000+01:00
- Update to release candidate 1 of ASP.NET Core 10.
- Fix obsolete usage of `WebHostBuilder`.
- Update `JetBrains.Annotations` and `Microsoft.IdentityModel.Protocols.OpenIdConnect` to their latest versions.
- Disable `IDE0058`.
diff --git a/.editorconfig b/.editorconfig
@@ -152,3 +152,5 @@ csharp_space_between_method_call_empty_parameter_list_parentheses = false
 # Wrapping preferences
 csharp_preserve_single_line_statements = true
 csharp_preserve_single_line_blocks = true
+
+dotnet_diagnostic.IDE0058.severity = none
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,13 +1,13 @@
 <Project>
 
   <ItemGroup>
-    <PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2025.2.2" />
     <PackageVersion Include="JustEat.HttpClientInterception" Version="5.1.2" />
     <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.6.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.0-preview.7.25380.108" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-preview.7.25380.108" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-preview.7.25380.108" />
-    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.12.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.0-rc.1.25451.107" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-rc.1.25451.107" />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-rc.1.25451.107" />
+    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.14.0" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="Shouldly" Version="4.3.0" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -6,9 +6,9 @@
     <PatchVersion>0</PatchVersion>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <PackageValidationBaselineVersion Condition=" '$(EnablePackageValidation)' == 'true' AND '$(PackageValidationBaselineVersion)' == '' ">10.0.0</PackageValidationBaselineVersion>
-    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>7</PreReleaseVersionIteration>
-    <PreReleaseBrandingLabel>Preview $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
+    <PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
+    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
+    <PreReleaseBrandingLabel>Release Candidate $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
     <IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
diff --git a/global.json b/global.json
@@ -1,12 +1,12 @@
 {
   "sdk": {
-    "version": "10.0.100-preview.7.25380.108",
+    "version": "10.0.100-rc.1.25451.107",
     "allowPrerelease": true,
     "rollForward": "major"
   },
 
   "tools": {
-    "dotnet": "10.0.100-preview.7.25380.108"
+    "dotnet": "10.0.100-rc.1.25451.107"
   },
 
   "msbuild-sdks": {
diff --git a/test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleClientSecretGeneratorTests.cs b/test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleClientSecretGeneratorTests.cs
@@ -8,21 +8,15 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.JsonWebTokens;
 
 namespace AspNet.Security.OAuth.Apple;
 
-public class AppleClientSecretGeneratorTests
+public class AppleClientSecretGeneratorTests(ITestOutputHelper outputHelper)
 {
-    private readonly ITestOutputHelper _outputHelper;
-
-    public AppleClientSecretGeneratorTests(ITestOutputHelper outputHelper)
-    {
-        _outputHelper = outputHelper;
-    }
-
     [Fact]
     public async Task GenerateAsync_Generates_Valid_Signed_Jwt()
     {
@@ -186,13 +180,16 @@ private async Task GenerateTokenAsync(
         Func<AppleGenerateClientSecretContext, Task> actAndAssert)
     {
         // Arrange
-        var builder = new WebHostBuilder()
-            .ConfigureLogging((p) => p.AddXUnit(_outputHelper).SetMinimumLevel(LogLevel.Debug))
-            .Configure((app) => app.UseAuthentication())
-            .ConfigureServices((services) =>
+        var builder = new HostBuilder()
+            .ConfigureWebHost((builder) =>
             {
-                services.AddAuthentication()
-                        .AddApple();
+                builder.ConfigureLogging((p) => p.AddXUnit(outputHelper).SetMinimumLevel(LogLevel.Debug))
+                       .Configure((app) => app.UseAuthentication())
+                       .ConfigureServices((services) =>
+                       {
+                           services.AddAuthentication()
+                                   .AddApple();
+                       });
             });
 
         using var host = builder.Build();
diff --git a/test/AspNet.Security.OAuth.Providers.Tests/Infrastructure/ApplicationFactory.cs b/test/AspNet.Security.OAuth.Providers.Tests/Infrastructure/ApplicationFactory.cs
@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Http;
 using Microsoft.Extensions.Logging;
 
@@ -137,10 +138,15 @@ private static string IdentityToXmlString(ClaimsPrincipal user)
 
     private sealed class TestApplicationFactory : WebApplicationFactory<Program>
     {
-        protected override IWebHostBuilder CreateWebHostBuilder()
+        protected override void ConfigureWebHost(IWebHostBuilder builder)
         {
-            return new WebHostBuilder()
-                .UseSetting("TEST_CONTENTROOT_ASPNET_SECURITY_OAUTH_PROVIDERS_TESTS", "."); // Use a dummy content root
+            base.ConfigureWebHost(builder);
+            builder.UseContentRoot("."); // Use a dummy content root
+        }
+
+        protected override IHostBuilder? CreateHostBuilder()
+        {
+            return new HostBuilder();
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using Microsoft.AspNetCore.Builder;`
`10`	`10`	`using Microsoft.AspNetCore.Hosting;`
`11`	`11`	`using Microsoft.AspNetCore.Mvc.Testing;`
	`12`	`+using Microsoft.Extensions.Hosting;`
`12`	`13`	`using Microsoft.Extensions.Http;`
`13`	`14`	`using Microsoft.Extensions.Logging;`
`14`	`15`
`@@ -137,10 +138,15 @@ private static string IdentityToXmlString(ClaimsPrincipal user)`
`137`	`138`
`138`	`139`	`private sealed class TestApplicationFactory : WebApplicationFactory<Program>`
`139`	`140`	`{`
`140`		`- protected override IWebHostBuilder CreateWebHostBuilder()`
	`141`	`+ protected override void ConfigureWebHost(IWebHostBuilder builder)`
`141`	`142`	`{`
`142`		`- return new WebHostBuilder()`
`143`		`- .UseSetting("TEST_CONTENTROOT_ASPNET_SECURITY_OAUTH_PROVIDERS_TESTS", "."); // Use a dummy content root`
	`143`	`+ base.ConfigureWebHost(builder);`
	`144`	`+ builder.UseContentRoot("."); // Use a dummy content root`
	`145`	`+ }`
	`146`	`+`
	`147`	`+ protected override IHostBuilder? CreateHostBuilder()`
	`148`	`+ {`
	`149`	`+ return new HostBuilder();`
`144`	`150`	`}`
`145`	`151`	`}`
`146`	`152`	`}`