Merge pull request #2245 from DuendeSoftware/beh/net10-rc2-take-2

pgermishuys · web-flow · commit 1ca65a578260 · 2025-10-16T08:03:04.000+02:00
.NET 10 RC2
diff --git a/.github/workflow-gen/StepExtensions.cs b/.github/workflow-gen/StepExtensions.cs
@@ -18,7 +18,7 @@ public static void StepSetupDotNet(this Job job)
 
         job.Step()
             .Name("Setup .NET")
-            .ActionsSetupDotNet("3e891b0cb619bf60e2c25674b222b8940e2c1c25", ["8.0.x", "9.0.203", "10.0.100-rc.1.25451.107"]);
+            .ActionsSetupDotNet("3e891b0cb619bf60e2c25674b222b8940e2c1c25", ["8.0.x", "9.0.203", "10.0.100-rc.2.25502.107"]);
         // v4.1.0
     }
 
diff --git a/.github/workflows/aspnetcore-authentication-jwtbearer-ci.yml b/.github/workflows/aspnetcore-authentication-jwtbearer-ci.yml
@@ -53,7 +53,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Restore
       run: dotnet restore aspnetcore-authentication-jwtbearer.slnf
     - name: Verify Formatting
@@ -85,7 +85,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Restore
       run: dotnet restore aspnetcore-authentication-jwtbearer.slnf
     - name: Build
@@ -128,7 +128,8 @@ jobs:
         fetch-depth: 0
   codeql:
     name: CodeQL analyze
-    if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) || (github.event_name == 'push') || (github.event_name == 'workflow_dispatch')
+    # Remove once https://github.com/github/codeql-action/issues/3207#issuecomment-3405956414 has been resolved
+    if: false && ((github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) || (github.event_name == 'push') || (github.event_name == 'workflow_dispatch'))
     runs-on:
       group: large
       labels: [ubuntu-latest-x64-16core]
@@ -147,6 +148,7 @@ jobs:
         languages: csharp
         build-mode: manual
         db-location: ~/.codeql/databases
+        debug: true
     - name: List .net sdks
       run: dotnet --list-sdks
     - name: Setup Dotnet
@@ -155,11 +157,11 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Restore
       run: dotnet restore aspnetcore-authentication-jwtbearer.slnf
     - name: Build
-      run: dotnet build aspnetcore-authentication-jwtbearer.slnf --no-restore -c Release
+      run: dotnet build aspnetcore-authentication-jwtbearer.slnf --no-restore --no-incremental -c Release
     - name: Perform CodeQL Analysis
       if: ${{ env.DISABLE_CODEQL_ANALYSIS != 'true' }}
       uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0
@@ -198,7 +200,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Tool restore
       run: dotnet tool restore
     - name: Pack aspnetcore-authentication-jwtbearer.slnf
diff --git a/.github/workflows/aspnetcore-authentication-jwtbearer-release.yml b/.github/workflows/aspnetcore-authentication-jwtbearer-release.yml
@@ -68,7 +68,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Pack aspnetcore-authentication-jwtbearer.slnf
       run: dotnet pack -c Release aspnetcore-authentication-jwtbearer.slnf -o artifacts
     - name: Tool restore
@@ -110,7 +110,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: List files
       run: tree
       shell: bash
diff --git a/.github/workflows/bff-ci.yml b/.github/workflows/bff-ci.yml
@@ -53,7 +53,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Restore
       run: dotnet restore bff.slnf
     - name: Verify Formatting
@@ -85,7 +85,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Restore
       run: dotnet restore bff.slnf
     - name: Build
@@ -134,15 +134,11 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Restore
       run: dotnet restore bff.slnf
     - name: Build
-      # This build is using Debug config because of a known issue in net10.0 rc1
-      # https://github.com/dotnet/aspnetcore/issues/63364
-      # We do not intend to keep using Debug config after it is fixed in net10.0 rc2.
-      # Re-generating the workflows with workflow-gen will overwrite this.
-      run: dotnet build bff.slnf --no-restore -c Debug
+      run: dotnet build bff.slnf --no-restore -c Release
     - id: playwright-cache
       name: Cache Playwright assets
       uses: actions/cache@v4
@@ -152,11 +148,11 @@ jobs:
         restore-keys: playwright-${{ runner.os }}-
     - name: Install Playwright
       if: steps.playwright-cache.outputs.cache-hit != 'true'
-      run: pwsh test/Hosts.Tests/bin/Debug/net10.0/playwright.ps1 install --with-deps
+      run: pwsh test/Hosts.Tests/bin/Release/net10.0/playwright.ps1 install --with-deps
     - name: Dotnet devcerts
       run: dotnet dev-certs https --trust
     - name: Test - test/Hosts.Tests
-      run: dotnet test test/Hosts.Tests -c Debug --no-build --logger "console;verbosity=normal" --logger "trx;LogFileName=test/Hosts.Tests-tests.trx" --collect:"XPlat Code Coverage"
+      run: dotnet test test/Hosts.Tests -c Release --no-build --logger "console;verbosity=normal" --logger "trx;LogFileName=test/Hosts.Tests-tests.trx" --collect:"XPlat Code Coverage"
     - id: test-report-test-Hosts-Tests
       name: Test report - test/Hosts.Tests
       if: github.event_name == 'push' && (success() || failure())
@@ -206,7 +202,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Restore
       run: dotnet restore bff.slnf
     - name: Build
@@ -249,7 +245,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Tool restore
       run: dotnet tool restore
     - name: Pack bff.slnf
diff --git a/.github/workflows/bff-release.yml b/.github/workflows/bff-release.yml
@@ -68,7 +68,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Pack bff.slnf
       run: dotnet pack -c Release bff.slnf -o artifacts
     - name: Tool restore
@@ -110,7 +110,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: List files
       run: tree
       shell: bash
diff --git a/.github/workflows/identity-server-ci.yml b/.github/workflows/identity-server-ci.yml
@@ -53,7 +53,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Restore
       run: dotnet restore identity-server.slnf
     - name: Verify Formatting
@@ -85,7 +85,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Restore
       run: dotnet restore identity-server.slnf
     - name: Build
@@ -148,15 +148,11 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Restore
       run: dotnet restore identity-server.slnf
     - name: Build
-      # This build is using Debug config because of a known issue in net10.0 rc1
-      # https://github.com/dotnet/aspnetcore/issues/63364
-      # We do not intend to keep using Debug config after it is fixed in net10.0 rc2.
-      # Re-generating the workflows with workflow-gen will overwrite this.
-      run: dotnet build identity-server.slnf --no-restore -c Debug
+      run: dotnet build identity-server.slnf --no-restore -c Release
     - id: playwright-cache
       name: Cache Playwright assets
       uses: actions/cache@v4
@@ -166,11 +162,11 @@ jobs:
         restore-keys: playwright-${{ runner.os }}-
     - name: Install Playwright
       if: steps.playwright-cache.outputs.cache-hit != 'true'
-      run: pwsh test/IdentityServer.EndToEndTests/bin/Debug/net10.0/playwright.ps1 install --with-deps
+      run: pwsh test/IdentityServer.EndToEndTests/bin/Release/net10.0/playwright.ps1 install --with-deps
     - name: Dotnet devcerts
       run: dotnet dev-certs https --trust
     - name: Test - test/IdentityServer.EndToEndTests
-      run: dotnet test test/IdentityServer.EndToEndTests -c Debug --no-build --logger "console;verbosity=normal" --logger "trx;LogFileName=test/IdentityServer.EndToEndTests-tests.trx" --collect:"XPlat Code Coverage"
+      run: dotnet test test/IdentityServer.EndToEndTests -c Release --no-build --logger "console;verbosity=normal" --logger "trx;LogFileName=test/IdentityServer.EndToEndTests-tests.trx" --collect:"XPlat Code Coverage"
     - id: test-report-test-IdentityServer-EndToEndTests
       name: Test report - test/IdentityServer.EndToEndTests
       if: github.event_name == 'push' && (success() || failure())
@@ -220,7 +216,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Restore
       run: dotnet restore identity-server.slnf
     - name: Build
@@ -263,7 +259,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Tool restore
       run: dotnet tool restore
     - name: Pack identity-server.slnf
diff --git a/.github/workflows/identity-server-release.yml b/.github/workflows/identity-server-release.yml
@@ -68,7 +68,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Pack identity-server.slnf
       run: dotnet pack -c Release identity-server.slnf -o artifacts
     - name: Tool restore
@@ -110,7 +110,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: List files
       run: tree
       shell: bash
diff --git a/.github/workflows/templates-release.yml b/.github/workflows/templates-release.yml
@@ -46,7 +46,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: Checkout target branch
       if: github.event.inputs.branch != 'main'
       run: git checkout ${{ github.event.inputs.branch }}
@@ -110,7 +110,7 @@ jobs:
         dotnet-version: |-
           8.0.x
           9.0.203
-          10.0.100-rc.1.25451.107
+          10.0.100-rc.2.25502.107
     - name: List files
       run: tree
       shell: bash
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -22,15 +22,15 @@
     <LoggingAbstractionsVersion>9.0.9</LoggingAbstractionsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net10.0'">
-    <FrameworkVersion>10.0.0-rc.1.25451.107</FrameworkVersion>
-    <EFCoreVersion>10.0.0-rc.1.25451.107</EFCoreVersion>
-    <IdentityEFCoreVersion>10.0.0-rc.1.25451.107</IdentityEFCoreVersion>
-    <RuntimeCompilationVersion>10.0.0-rc.1.25451.107</RuntimeCompilationVersion>
-    <AuthenticationCertificateVersion>10.0.0-rc.1.25451.107</AuthenticationCertificateVersion>
+    <FrameworkVersion>10.0.0-rc.2.25502.107</FrameworkVersion>
+    <EFCoreVersion>10.0.0-rc.2.25502.107</EFCoreVersion>
+    <IdentityEFCoreVersion>10.0.0-rc.2.25502.107</IdentityEFCoreVersion>
+    <RuntimeCompilationVersion>10.0.0-rc.2.25502.107</RuntimeCompilationVersion>
+    <AuthenticationCertificateVersion>10.0.0-rc.2.25502.107</AuthenticationCertificateVersion>
     <IdentityModelVersion>8.0.1</IdentityModelVersion>
-    <CachingMemoryVersion>10.0.0-rc.1.25451.107</CachingMemoryVersion>
-    <SystemTextJsonVersion>10.0.0-rc.1.25451.107</SystemTextJsonVersion>
-    <LoggingAbstractionsVersion>10.0.0-rc.1.25451.107</LoggingAbstractionsVersion>
+    <CachingMemoryVersion>10.0.0-rc.2.25502.107</CachingMemoryVersion>
+    <SystemTextJsonVersion>10.0.0-rc.2.25502.107</SystemTextJsonVersion>
+    <LoggingAbstractionsVersion>10.0.0-rc.2.25502.107</LoggingAbstractionsVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AngleSharp" Version="1.1.2" />
diff --git a/aspnetcore-authentication-jwtbearer/src/AspNetCore.Authentication.JwtBearer/AspNetCore.Authentication.JwtBearer.csproj b/aspnetcore-authentication-jwtbearer/src/AspNetCore.Authentication.JwtBearer/AspNetCore.Authentication.JwtBearer.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <RootNamespace>Duende.AspNetCore.Authentication.JwtBearer</RootNamespace>
     <AssemblyName>Duende.AspNetCore.Authentication.JwtBearer</AssemblyName>
diff --git a/aspnetcore-authentication-jwtbearer/test/AspNetCore.Authentication.JwtBearer.Tests/AspNetCore.Authentication.JwtBearer.Tests.csproj b/aspnetcore-authentication-jwtbearer/test/AspNetCore.Authentication.JwtBearer.Tests/AspNetCore.Authentication.JwtBearer.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <AssemblyName>Duende.AspNetCore.Authentication.JwtBearer.Tests</AssemblyName>
     <RootNameSpace>Duende.AspNetCore.Authentication.JwtBearer</RootNameSpace>
@@ -15,7 +15,7 @@
     <PackageReference Include="Duende.IdentityServer" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" VersionOverride="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="Meziantou.Extensions.Logging.Xunit" />
     <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" />
     <PackageReference Include="NSubstitute" />
@@ -26,4 +26,4 @@
     <ProjectReference
       Include="..\..\src\AspNetCore.Authentication.JwtBearer\AspNetCore.Authentication.JwtBearer.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.100-rc.1.25451.107",
+    "version": "10.0.100-rc.2.25502.107",
     "rollForward": "latestMajor",
     "allowPrerelease": true
   }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public static void StepSetupDotNet(this Job job)`
`18`	`18`
`19`	`19`	`job.Step()`
`20`	`20`	`.Name("Setup .NET")`
`21`		`- .ActionsSetupDotNet("3e891b0cb619bf60e2c25674b222b8940e2c1c25", ["8.0.x", "9.0.203", "10.0.100-rc.1.25451.107"]);`
	`21`	`+ .ActionsSetupDotNet("3e891b0cb619bf60e2c25674b222b8940e2c1c25", ["8.0.x", "9.0.203", "10.0.100-rc.2.25502.107"]);`
`22`	`22`	`// v4.1.0`
`23`	`23`	`}`
`24`	`24`