From 86a7e2daa354b137c3e2c56b3596bee6f4a0767d Mon Sep 17 00:00:00 2001 From: Joe DeCock Date: Tue, 14 Oct 2025 16:42:39 -0500 Subject: [PATCH 1/2] Update to .NET 10 rc 2 --- .github/workflow-gen/StepExtensions.cs | 2 +- ...aspnetcore-authentication-jwtbearer-ci.yml | 8 ++++---- ...tcore-authentication-jwtbearer-release.yml | 4 ++-- .github/workflows/bff-ci.yml | 20 ++++++++----------- .github/workflows/bff-release.yml | 4 ++-- .github/workflows/identity-server-ci.yml | 20 ++++++++----------- .github/workflows/identity-server-release.yml | 4 ++-- .github/workflows/templates-release.yml | 4 ++-- Directory.Packages.props | 16 +++++++-------- global.json | 2 +- identity-server/hosts/UI/Main/UI.Main.csproj | 1 - 11 files changed, 38 insertions(+), 47 deletions(-) diff --git a/.github/workflow-gen/StepExtensions.cs b/.github/workflow-gen/StepExtensions.cs index d2775b398..fb40cfd62 100644 --- a/.github/workflow-gen/StepExtensions.cs +++ b/.github/workflow-gen/StepExtensions.cs @@ -18,7 +18,7 @@ public static class StepExtensions 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 index 107a32e46..1bc2136ea 100644 --- 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 @@ -155,7 +155,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 @@ -198,7 +198,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 index a4ea71f87..d2919e4a9 100644 --- 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 index 08243b31a..98f45b7a0 100644 --- 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 index 3ee1eb41d..28e75d673 100644 --- 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 index 1b07fc6f8..ecd590c6f 100644 --- 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 index 7682d6087..f8d45df40 100644 --- 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 index 89783176d..b9d29177e 100644 --- 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 index 619d9b19e..ab4e81320 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -22,15 +22,15 @@ 9.0.9 - 10.0.0-rc.1.25451.107 - 10.0.0-rc.1.25451.107 - 10.0.0-rc.1.25451.107 - 10.0.0-rc.1.25451.107 - 10.0.0-rc.1.25451.107 + 10.0.0-rc.2.25502.107 + 10.0.0-rc.2.25502.107 + 10.0.0-rc.2.25502.107 + 10.0.0-rc.2.25502.107 + 10.0.0-rc.2.25502.107 8.0.1 - 10.0.0-rc.1.25451.107 - 10.0.0-rc.1.25451.107 - 10.0.0-rc.1.25451.107 + 10.0.0-rc.2.25502.107 + 10.0.0-rc.2.25502.107 + 10.0.0-rc.2.25502.107 diff --git a/global.json b/global.json index ee2f03f57..d34fe265a 100644 --- 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 } diff --git a/identity-server/hosts/UI/Main/UI.Main.csproj b/identity-server/hosts/UI/Main/UI.Main.csproj index 29b5b2f58..8b60abf68 100644 --- a/identity-server/hosts/UI/Main/UI.Main.csproj +++ b/identity-server/hosts/UI/Main/UI.Main.csproj @@ -16,7 +16,6 @@ - From 0569815d5301c5c82b6eeed2dfcdefde83b12586 Mon Sep 17 00:00:00 2001 From: Joe DeCock Date: Tue, 14 Oct 2025 21:04:09 -0500 Subject: [PATCH 2/2] Workaround for embedded file provider issuer --- identity-server/hosts/UI/Main/UI.Main.csproj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/identity-server/hosts/UI/Main/UI.Main.csproj b/identity-server/hosts/UI/Main/UI.Main.csproj index 8b60abf68..b396d5c26 100644 --- a/identity-server/hosts/UI/Main/UI.Main.csproj +++ b/identity-server/hosts/UI/Main/UI.Main.csproj @@ -16,9 +16,17 @@ + + + + + + + +