From e9785ccd68c4e3c07a06e7fb324ec7db466e4a4c Mon Sep 17 00:00:00 2001 From: Pieter Germishuys Date: Wed, 12 Nov 2025 14:39:56 +0100 Subject: [PATCH] Update .NET 10 from Release Candidate to GA Update FOSS dependencies to their Release Candidate counterparts --- .github/workflow-gen/Program.cs | 12 +- .github/workflow-gen/StepExtensions.cs | 2 +- ...aspnetcore-authentication-jwtbearer-ci.yml | 227 -------------- ...tcore-authentication-jwtbearer-release.yml | 118 -------- .github/workflows/bff-ci.yml | 10 +- .github/workflows/bff-release.yml | 4 +- .github/workflows/identity-server-ci.yml | 286 ------------------ .github/workflows/identity-server-release.yml | 118 -------- .github/workflows/templates-release.yml | 118 -------- Directory.Packages.props | 84 +++-- global.json | 2 +- 11 files changed, 49 insertions(+), 932 deletions(-) delete mode 100644 .github/workflows/aspnetcore-authentication-jwtbearer-ci.yml delete mode 100644 .github/workflows/aspnetcore-authentication-jwtbearer-release.yml delete mode 100644 .github/workflows/identity-server-ci.yml delete mode 100644 .github/workflows/identity-server-release.yml delete mode 100644 .github/workflows/templates-release.yml diff --git a/.github/workflow-gen/Program.cs b/.github/workflow-gen/Program.cs index 4a716aa32..58155b1ff 100644 --- a/.github/workflow-gen/Program.cs +++ b/.github/workflow-gen/Program.cs @@ -7,21 +7,11 @@ var contexts = GitHubContexts.Instance; var products = new Product[] { - new("aspnetcore-authentication-jwtbearer", - "aspnetcore-authentication-jwtbearer.slnf", - "aaj", - ["AspNetCore.Authentication.JwtBearer.Tests"], - []), new("bff", "bff.slnf", "bff", ["Bff.Tests"], - ["Hosts.Tests"]), - new("identity-server", - "identity-server.slnf", - "is", - ["IdentityServer.IntegrationTests", "IdentityServer.UnitTests"], - ["IdentityServer.EndToEndTests"]) + ["Hosts.Tests"]) }; foreach (var product in products) { diff --git a/.github/workflow-gen/StepExtensions.cs b/.github/workflow-gen/StepExtensions.cs index fb40cfd62..5e99c0d50 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.2.25502.107"]); + .ActionsSetupDotNet("3e891b0cb619bf60e2c25674b222b8940e2c1c25", ["8.0.x", "9.0.203", "10.0.100"]); // v4.1.0 } diff --git a/.github/workflows/aspnetcore-authentication-jwtbearer-ci.yml b/.github/workflows/aspnetcore-authentication-jwtbearer-ci.yml deleted file mode 100644 index 09ceffd82..000000000 --- a/.github/workflows/aspnetcore-authentication-jwtbearer-ci.yml +++ /dev/null @@ -1,227 +0,0 @@ -# This was generated by tool. Edits will be overwritten. - -name: aspnetcore-authentication-jwtbearer/ci -on: - workflow_dispatch: - push: - paths: - - .config/dotnet-tools.json - - .github/workflows/aspnetcore-authentication-jwtbearer-** - - aspnetcore-authentication-jwtbearer/** - - .editorconfig - - Directory.Packages.props - - global.json - - src.props - - test.props - pull_request: - paths: - - .config/dotnet-tools.json - - .github/workflows/aspnetcore-authentication-jwtbearer-** - - aspnetcore-authentication-jwtbearer/** - - .editorconfig - - Directory.Packages.props - - global.json - - src.props - - test.props -env: - DOTNET_NOLOGO: true - DOTNET_CLI_TELEMETRY_OPTOUT: true -jobs: - verify-formatting: - name: Verify formatting - 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') - runs-on: - group: large - labels: [ubuntu-latest-x64-16core] - permissions: - contents: read - defaults: - run: - shell: bash - working-directory: aspnetcore-authentication-jwtbearer - timeout-minutes: 15 - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: List .net sdks - run: dotnet --list-sdks - - name: Setup Dotnet - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 - with: - dotnet-version: |- - 8.0.x - 9.0.203 - 10.0.100-rc.2.25502.107 - - name: Restore - run: dotnet restore aspnetcore-authentication-jwtbearer.slnf - - name: Verify Formatting - run: dotnet format aspnetcore-authentication-jwtbearer.slnf --verify-no-changes --no-restore - build: - name: Build and test (unit) - 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') - runs-on: ubuntu-latest - permissions: - actions: read - checks: write - contents: read - packages: write - defaults: - run: - shell: bash - working-directory: aspnetcore-authentication-jwtbearer - timeout-minutes: 15 - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: List .net sdks - run: dotnet --list-sdks - - name: Setup Dotnet - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 - with: - dotnet-version: |- - 8.0.x - 9.0.203 - 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 - - name: Dotnet devcerts - run: dotnet dev-certs https --trust - - name: Test - test/AspNetCore.Authentication.JwtBearer.Tests - run: dotnet test test/AspNetCore.Authentication.JwtBearer.Tests -c Release --no-build --logger "console;verbosity=normal" --logger "trx;LogFileName=test/AspNetCore.Authentication.JwtBearer.Tests-tests.trx" --collect:"XPlat Code Coverage" - - id: test-report-test-AspNetCore-Authentication-JwtBearer-Tests - name: Test report - test/AspNetCore.Authentication.JwtBearer.Tests - if: github.event_name == 'push' && (success() || failure()) - uses: dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5 - with: - name: Test Report - test/AspNetCore.Authentication.JwtBearer.Tests - path: '**/test/AspNetCore.Authentication.JwtBearer.Tests-tests.trx' - reporter: dotnet-trx - fail-on-error: true - fail-on-empty: true - - name: Publish test report link - run: echo "[Test Results - test/AspNetCore.Authentication.JwtBearer.Tests](${{ steps.test-report-test-AspNetCore-Authentication-JwtBearer-Tests.outputs.url_html }})" >> $GITHUB_STEP_SUMMARY - playwright: - name: Playwright tests - 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') - runs-on: - group: large - labels: [ubuntu-latest-x64-16core] - permissions: - actions: read - checks: write - contents: read - defaults: - run: - shell: bash - working-directory: aspnetcore-authentication-jwtbearer - timeout-minutes: 15 - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - codeql: - name: CodeQL analyze - # 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] - defaults: - run: - shell: bash - working-directory: aspnetcore-authentication-jwtbearer - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Initialize CodeQL - uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 - with: - languages: csharp - build-mode: manual - db-location: ~/.codeql/databases - debug: true - - name: List .net sdks - run: dotnet --list-sdks - - name: Setup Dotnet - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 - with: - dotnet-version: |- - 8.0.x - 9.0.203 - 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 --no-incremental -c Release - - name: Perform CodeQL Analysis - if: ${{ env.DISABLE_CODEQL_ANALYSIS != 'true' }} - uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 - with: - category: /language:csharp - pack: - name: Pack, sign and push - 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') - needs: - - verify-formatting - - build - - playwright - - codeql - runs-on: - group: large - labels: [ubuntu-latest-x64-16core] - permissions: - actions: read - contents: read - packages: write - defaults: - run: - shell: bash - working-directory: aspnetcore-authentication-jwtbearer - timeout-minutes: 15 - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: List .net sdks - run: dotnet --list-sdks - - name: Setup Dotnet - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 - with: - dotnet-version: |- - 8.0.x - 9.0.203 - 10.0.100-rc.2.25502.107 - - name: Tool restore - run: dotnet tool restore - - name: Pack aspnetcore-authentication-jwtbearer.slnf - run: dotnet pack -c Release aspnetcore-authentication-jwtbearer.slnf -o artifacts - - name: Sign packages - if: github.event == 'push' - run: |- - for file in artifacts/*.nupkg; do - dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.vault.azure.net/ --azure-key-vault-client-id 18e3de68-2556-4345-8076-a46fad79e474 --azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 --azure-key-vault-client-secret ${{ secrets.SignClientSecret }} --azure-key-vault-certificate NuGetPackageSigning - done - - name: Push packages to GitHub - if: github.ref == 'refs/heads/main' - run: dotnet nuget push artifacts/*.nupkg --source https://nuget.pkg.github.com/DuendeSoftware/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Upload Artifacts - if: github.ref == 'refs/heads/main' - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 - with: - name: artifacts - path: aspnetcore-authentication-jwtbearer/artifacts/*.nupkg - overwrite: true - retention-days: 15 diff --git a/.github/workflows/aspnetcore-authentication-jwtbearer-release.yml b/.github/workflows/aspnetcore-authentication-jwtbearer-release.yml deleted file mode 100644 index d2919e4a9..000000000 --- a/.github/workflows/aspnetcore-authentication-jwtbearer-release.yml +++ /dev/null @@ -1,118 +0,0 @@ -# This was generated by tool. Edits will be overwritten. - -name: aspnetcore-authentication-jwtbearer/release -on: - workflow_dispatch: - inputs: - version: - description: 'Version in format X.Y.Z, X.Y.Z-preview.N, or X.Y.Z-rc.N' - type: string - required: true - default: '0.0.0' - branch: - description: '(Optional) the name of the branch to release from' - type: string - required: false - default: 'main' - remove-tag-if-exists: - description: 'If set, will remove the existing tag. Use this if you have issues with the previous release action' - type: boolean - required: false - default: false -env: - DOTNET_NOLOGO: true - DOTNET_CLI_TELEMETRY_OPTOUT: true -jobs: - tag: - name: Tag and Pack - runs-on: ubuntu-latest - permissions: - contents: write - packages: write - defaults: - run: - shell: bash - working-directory: aspnetcore-authentication-jwtbearer - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Validate Version Input - run: echo '${{ github.event.inputs.version }}' | grep -P '^\d+\.\d+\.\d+(-preview\.\d+|-rc\.\d+)?$' || (echo 'Invalid version format' && exit 1) - - name: Checkout target branch - if: github.event.inputs.branch != 'main' - run: git checkout ${{ github.event.inputs.branch }} - - name: Git Config - run: |- - git config --global user.email "github-bot@duendesoftware.com" - git config --global user.name "Duende Software GitHub Bot" - - name: Git Config - if: github.event.inputs['remove-tag-if-exists'] == 'true' - run: |- - if git rev-parse aaj-${{ github.event.inputs.version }} >/dev/null 2>&1; then - git tag -d aaj-${{ github.event.inputs.version }} - git push --delete origin aaj-${{ github.event.inputs.version }} - else - echo 'Tag aaj-${{ github.event.inputs.version }} does not exist.' - fi - - name: Git Config - run: |- - git tag -a aaj-${{ github.event.inputs.version }} -m "Release v${{ github.event.inputs.version }}" - git push origin aaj-${{ github.event.inputs.version }} - - name: List .net sdks - run: dotnet --list-sdks - - name: Setup Dotnet - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 - with: - dotnet-version: |- - 8.0.x - 9.0.203 - 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 - run: dotnet tool restore - - name: Sign packages - run: |- - for file in artifacts/*.nupkg; do - dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.vault.azure.net/ --azure-key-vault-client-id 18e3de68-2556-4345-8076-a46fad79e474 --azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 --azure-key-vault-client-secret ${{ secrets.SignClientSecret }} --azure-key-vault-certificate NuGetPackageSigning - done - - name: Push packages to GitHub - run: dotnet nuget push artifacts/*.nupkg --source https://nuget.pkg.github.com/DuendeSoftware/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Upload Artifacts - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 - with: - name: artifacts - path: aspnetcore-authentication-jwtbearer/artifacts/*.nupkg - overwrite: true - retention-days: 15 - publish: - name: Publish to nuget.org - needs: - - tag - runs-on: ubuntu-latest - environment: - name: nuget.org - steps: - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 - with: - name: artifacts - path: artifacts - - name: List .net sdks - run: dotnet --list-sdks - - name: Setup Dotnet - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 - with: - dotnet-version: |- - 8.0.x - 9.0.203 - 10.0.100-rc.2.25502.107 - - name: List files - run: tree - shell: bash - - name: Push packages to nuget.org - run: dotnet nuget push artifacts/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_ORG_API_KEY }} --skip-duplicate diff --git a/.github/workflows/bff-ci.yml b/.github/workflows/bff-ci.yml index 98f45b7a0..4e12898b3 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.2.25502.107 + 10.0.100 - 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.2.25502.107 + 10.0.100 - name: Restore run: dotnet restore bff.slnf - name: Build @@ -134,7 +134,7 @@ jobs: dotnet-version: |- 8.0.x 9.0.203 - 10.0.100-rc.2.25502.107 + 10.0.100 - name: Restore run: dotnet restore bff.slnf - name: Build @@ -202,7 +202,7 @@ jobs: dotnet-version: |- 8.0.x 9.0.203 - 10.0.100-rc.2.25502.107 + 10.0.100 - name: Restore run: dotnet restore bff.slnf - name: Build @@ -245,7 +245,7 @@ jobs: dotnet-version: |- 8.0.x 9.0.203 - 10.0.100-rc.2.25502.107 + 10.0.100 - 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 28e75d673..bdfeac09c 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.2.25502.107 + 10.0.100 - 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.2.25502.107 + 10.0.100 - name: List files run: tree shell: bash diff --git a/.github/workflows/identity-server-ci.yml b/.github/workflows/identity-server-ci.yml deleted file mode 100644 index ecd590c6f..000000000 --- a/.github/workflows/identity-server-ci.yml +++ /dev/null @@ -1,286 +0,0 @@ -# This was generated by tool. Edits will be overwritten. - -name: identity-server/ci -on: - workflow_dispatch: - push: - paths: - - .config/dotnet-tools.json - - .github/workflows/identity-server-** - - identity-server/** - - .editorconfig - - Directory.Packages.props - - global.json - - src.props - - test.props - pull_request: - paths: - - .config/dotnet-tools.json - - .github/workflows/identity-server-** - - identity-server/** - - .editorconfig - - Directory.Packages.props - - global.json - - src.props - - test.props -env: - DOTNET_NOLOGO: true - DOTNET_CLI_TELEMETRY_OPTOUT: true -jobs: - verify-formatting: - name: Verify formatting - 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') - runs-on: - group: large - labels: [ubuntu-latest-x64-16core] - permissions: - contents: read - defaults: - run: - shell: bash - working-directory: identity-server - timeout-minutes: 15 - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: List .net sdks - run: dotnet --list-sdks - - name: Setup Dotnet - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 - with: - dotnet-version: |- - 8.0.x - 9.0.203 - 10.0.100-rc.2.25502.107 - - name: Restore - run: dotnet restore identity-server.slnf - - name: Verify Formatting - run: dotnet format identity-server.slnf --verify-no-changes --no-restore - build: - name: Build and test (unit) - 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') - runs-on: ubuntu-latest - permissions: - actions: read - checks: write - contents: read - packages: write - defaults: - run: - shell: bash - working-directory: identity-server - timeout-minutes: 15 - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: List .net sdks - run: dotnet --list-sdks - - name: Setup Dotnet - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 - with: - dotnet-version: |- - 8.0.x - 9.0.203 - 10.0.100-rc.2.25502.107 - - name: Restore - run: dotnet restore identity-server.slnf - - name: Build - run: dotnet build identity-server.slnf --no-restore -c Release - - name: Dotnet devcerts - run: dotnet dev-certs https --trust - - name: Test - test/IdentityServer.IntegrationTests - run: dotnet test test/IdentityServer.IntegrationTests -c Release --no-build --logger "console;verbosity=normal" --logger "trx;LogFileName=test/IdentityServer.IntegrationTests-tests.trx" --collect:"XPlat Code Coverage" - - id: test-report-test-IdentityServer-IntegrationTests - name: Test report - test/IdentityServer.IntegrationTests - if: github.event_name == 'push' && (success() || failure()) - uses: dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5 - with: - name: Test Report - test/IdentityServer.IntegrationTests - path: '**/test/IdentityServer.IntegrationTests-tests.trx' - reporter: dotnet-trx - fail-on-error: true - fail-on-empty: true - - name: Publish test report link - run: echo "[Test Results - test/IdentityServer.IntegrationTests](${{ steps.test-report-test-IdentityServer-IntegrationTests.outputs.url_html }})" >> $GITHUB_STEP_SUMMARY - - name: Test - test/IdentityServer.UnitTests - run: dotnet test test/IdentityServer.UnitTests -c Release --no-build --logger "console;verbosity=normal" --logger "trx;LogFileName=test/IdentityServer.UnitTests-tests.trx" --collect:"XPlat Code Coverage" - - id: test-report-test-IdentityServer-UnitTests - name: Test report - test/IdentityServer.UnitTests - if: github.event_name == 'push' && (success() || failure()) - uses: dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5 - with: - name: Test Report - test/IdentityServer.UnitTests - path: '**/test/IdentityServer.UnitTests-tests.trx' - reporter: dotnet-trx - fail-on-error: true - fail-on-empty: true - - name: Publish test report link - run: echo "[Test Results - test/IdentityServer.UnitTests](${{ steps.test-report-test-IdentityServer-UnitTests.outputs.url_html }})" >> $GITHUB_STEP_SUMMARY - playwright: - name: Playwright tests - 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') - runs-on: - group: large - labels: [ubuntu-latest-x64-16core] - permissions: - actions: read - checks: write - contents: read - defaults: - run: - shell: bash - working-directory: identity-server - timeout-minutes: 15 - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: List .net sdks - run: dotnet --list-sdks - - name: Setup Dotnet - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 - with: - dotnet-version: |- - 8.0.x - 9.0.203 - 10.0.100-rc.2.25502.107 - - name: Restore - run: dotnet restore identity-server.slnf - - name: Build - run: dotnet build identity-server.slnf --no-restore -c Release - - id: playwright-cache - name: Cache Playwright assets - uses: actions/cache@v4 - with: - path: ~/.cache/ms-playwright - key: playwright-${{ runner.os }}-${{ hashFiles('**/Hosts.Tests.csproj') }} - restore-keys: playwright-${{ runner.os }}- - - name: Install Playwright - if: steps.playwright-cache.outputs.cache-hit != 'true' - 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 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()) - uses: dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5 - with: - name: Test Report - test/IdentityServer.EndToEndTests - path: '**/test/IdentityServer.EndToEndTests-tests.trx' - reporter: dotnet-trx - fail-on-error: true - fail-on-empty: true - - name: Publish test report link - run: echo "[Test Results - test/IdentityServer.EndToEndTests](${{ steps.test-report-test-IdentityServer-EndToEndTests.outputs.url_html }})" >> $GITHUB_STEP_SUMMARY - - name: Upload playwright traces - if: success() || failure() - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 - with: - name: playwright-traces - path: identity-server/test/**/playwright-traces/*.zip - overwrite: true - retention-days: 15 - 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') - runs-on: - group: large - labels: [ubuntu-latest-x64-16core] - defaults: - run: - shell: bash - working-directory: identity-server - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Initialize CodeQL - uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 - with: - languages: csharp - build-mode: manual - db-location: ~/.codeql/databases - - name: List .net sdks - run: dotnet --list-sdks - - name: Setup Dotnet - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 - with: - dotnet-version: |- - 8.0.x - 9.0.203 - 10.0.100-rc.2.25502.107 - - name: Restore - run: dotnet restore identity-server.slnf - - name: Build - run: dotnet build identity-server.slnf --no-restore -c Release - - name: Perform CodeQL Analysis - if: ${{ env.DISABLE_CODEQL_ANALYSIS != 'true' }} - uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 - with: - category: /language:csharp - pack: - name: Pack, sign and push - 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') - needs: - - verify-formatting - - build - - playwright - - codeql - runs-on: - group: large - labels: [ubuntu-latest-x64-16core] - permissions: - actions: read - contents: read - packages: write - defaults: - run: - shell: bash - working-directory: identity-server - timeout-minutes: 15 - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: List .net sdks - run: dotnet --list-sdks - - name: Setup Dotnet - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 - with: - dotnet-version: |- - 8.0.x - 9.0.203 - 10.0.100-rc.2.25502.107 - - name: Tool restore - run: dotnet tool restore - - name: Pack identity-server.slnf - run: dotnet pack -c Release identity-server.slnf -o artifacts - - name: Sign packages - if: github.event == 'push' - run: |- - for file in artifacts/*.nupkg; do - dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.vault.azure.net/ --azure-key-vault-client-id 18e3de68-2556-4345-8076-a46fad79e474 --azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 --azure-key-vault-client-secret ${{ secrets.SignClientSecret }} --azure-key-vault-certificate NuGetPackageSigning - done - - name: Push packages to GitHub - if: github.ref == 'refs/heads/main' - run: dotnet nuget push artifacts/*.nupkg --source https://nuget.pkg.github.com/DuendeSoftware/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Upload Artifacts - if: github.ref == 'refs/heads/main' - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 - with: - name: artifacts - path: identity-server/artifacts/*.nupkg - overwrite: true - retention-days: 15 diff --git a/.github/workflows/identity-server-release.yml b/.github/workflows/identity-server-release.yml deleted file mode 100644 index f8d45df40..000000000 --- a/.github/workflows/identity-server-release.yml +++ /dev/null @@ -1,118 +0,0 @@ -# This was generated by tool. Edits will be overwritten. - -name: identity-server/release -on: - workflow_dispatch: - inputs: - version: - description: 'Version in format X.Y.Z, X.Y.Z-preview.N, or X.Y.Z-rc.N' - type: string - required: true - default: '0.0.0' - branch: - description: '(Optional) the name of the branch to release from' - type: string - required: false - default: 'main' - remove-tag-if-exists: - description: 'If set, will remove the existing tag. Use this if you have issues with the previous release action' - type: boolean - required: false - default: false -env: - DOTNET_NOLOGO: true - DOTNET_CLI_TELEMETRY_OPTOUT: true -jobs: - tag: - name: Tag and Pack - runs-on: ubuntu-latest - permissions: - contents: write - packages: write - defaults: - run: - shell: bash - working-directory: identity-server - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Validate Version Input - run: echo '${{ github.event.inputs.version }}' | grep -P '^\d+\.\d+\.\d+(-preview\.\d+|-rc\.\d+)?$' || (echo 'Invalid version format' && exit 1) - - name: Checkout target branch - if: github.event.inputs.branch != 'main' - run: git checkout ${{ github.event.inputs.branch }} - - name: Git Config - run: |- - git config --global user.email "github-bot@duendesoftware.com" - git config --global user.name "Duende Software GitHub Bot" - - name: Git Config - if: github.event.inputs['remove-tag-if-exists'] == 'true' - run: |- - if git rev-parse is-${{ github.event.inputs.version }} >/dev/null 2>&1; then - git tag -d is-${{ github.event.inputs.version }} - git push --delete origin is-${{ github.event.inputs.version }} - else - echo 'Tag is-${{ github.event.inputs.version }} does not exist.' - fi - - name: Git Config - run: |- - git tag -a is-${{ github.event.inputs.version }} -m "Release v${{ github.event.inputs.version }}" - git push origin is-${{ github.event.inputs.version }} - - name: List .net sdks - run: dotnet --list-sdks - - name: Setup Dotnet - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 - with: - dotnet-version: |- - 8.0.x - 9.0.203 - 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 - run: dotnet tool restore - - name: Sign packages - run: |- - for file in artifacts/*.nupkg; do - dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.vault.azure.net/ --azure-key-vault-client-id 18e3de68-2556-4345-8076-a46fad79e474 --azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 --azure-key-vault-client-secret ${{ secrets.SignClientSecret }} --azure-key-vault-certificate NuGetPackageSigning - done - - name: Push packages to GitHub - run: dotnet nuget push artifacts/*.nupkg --source https://nuget.pkg.github.com/DuendeSoftware/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Upload Artifacts - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 - with: - name: artifacts - path: identity-server/artifacts/*.nupkg - overwrite: true - retention-days: 15 - publish: - name: Publish to nuget.org - needs: - - tag - runs-on: ubuntu-latest - environment: - name: nuget.org - steps: - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 - with: - name: artifacts - path: artifacts - - name: List .net sdks - run: dotnet --list-sdks - - name: Setup Dotnet - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 - with: - dotnet-version: |- - 8.0.x - 9.0.203 - 10.0.100-rc.2.25502.107 - - name: List files - run: tree - shell: bash - - name: Push packages to nuget.org - run: dotnet nuget push artifacts/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_ORG_API_KEY }} --skip-duplicate diff --git a/.github/workflows/templates-release.yml b/.github/workflows/templates-release.yml deleted file mode 100644 index b9d29177e..000000000 --- a/.github/workflows/templates-release.yml +++ /dev/null @@ -1,118 +0,0 @@ -# This was generated by tool. Edits will be overwritten. - -name: templates/release -on: - workflow_dispatch: - inputs: - version: - description: 'Version in format X.Y.Z, X.Y.Z-preview.N, or X.Y.Z-rc.N' - type: string - required: true - default: '0.0.0' - branch: - description: '(Optional) the name of the branch to release from' - type: string - required: false - default: 'main' - remove-tag-if-exists: - description: 'If set, will remove the existing tag. Use this if you have issues with the previous release action' - type: boolean - required: false - default: false -env: - DOTNET_NOLOGO: true - DOTNET_CLI_TELEMETRY_OPTOUT: true -jobs: - tag: - name: Tag and Pack - runs-on: ubuntu-latest - permissions: - contents: write - packages: write - defaults: - run: - shell: bash - working-directory: templates - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: List .net sdks - run: dotnet --list-sdks - - name: Setup Dotnet - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 - with: - dotnet-version: |- - 8.0.x - 9.0.203 - 10.0.100-rc.2.25502.107 - - name: Checkout target branch - if: github.event.inputs.branch != 'main' - run: git checkout ${{ github.event.inputs.branch }} - - name: Git Config - run: |- - git config --global user.email "github-bot@duendesoftware.com" - git config --global user.name "Duende Software GitHub Bot" - - name: Git Config - if: github.event.inputs['remove-tag-if-exists'] == 'true' - run: |- - if git rev-parse templates-${{ github.event.inputs.version }} >/dev/null 2>&1; then - git tag -d templates-${{ github.event.inputs.version }} - git push --delete origin templates-${{ github.event.inputs.version }} - else - echo 'Tag templates-${{ github.event.inputs.version }} does not exist.' - fi - - name: Git Config - run: |- - git tag -a templates-${{ github.event.inputs.version }} -m "Release v${{ github.event.inputs.version }}" - git push origin templates-${{ github.event.inputs.version }} - - name: Tool restore - run: dotnet tool restore - - name: build templates - run: dotnet run --project build - - name: Pack ../artifacts/templates.csproj - run: dotnet pack -c Release ../artifacts/templates.csproj -o artifacts - - name: Sign packages - run: |- - for file in artifacts/*.nupkg; do - dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.vault.azure.net/ --azure-key-vault-client-id 18e3de68-2556-4345-8076-a46fad79e474 --azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 --azure-key-vault-client-secret ${{ secrets.SignClientSecret }} --azure-key-vault-certificate NuGetPackageSigning - done - - name: Push packages to GitHub - run: dotnet nuget push artifacts/*.nupkg --source https://nuget.pkg.github.com/DuendeSoftware/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Upload Artifacts - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 - with: - name: artifacts - path: templates/artifacts/*.nupkg - overwrite: true - retention-days: 15 - publish: - name: Publish to nuget.org - needs: - - tag - runs-on: ubuntu-latest - environment: - name: nuget.org - steps: - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 - with: - name: artifacts - path: artifacts - - name: List .net sdks - run: dotnet --list-sdks - - name: Setup Dotnet - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 - with: - dotnet-version: |- - 8.0.x - 9.0.203 - 10.0.100-rc.2.25502.107 - - name: List files - run: tree - shell: bash - - name: Push packages to nuget.org - run: dotnet nuget push artifacts/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_ORG_API_KEY }} --skip-duplicate diff --git a/Directory.Packages.props b/Directory.Packages.props index 9c0fc866a..c0dcd8b67 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,36 +1,32 @@ + 8.0.1 + 9.0.9 8.0.20 - 8.0.20 + 8.0.20 8.0.16 + 7.1.2 - 9.0.3 - 9.0.9 - 9.0.9 9.0.3 9.0.9 9.0.3 - 9.0.3 + 9.0.3 9.0.3 8.0.1 - 9.0.3 - 9.0.9 - 9.0.9 - 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 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 8.0.1 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 @@ -42,15 +38,16 @@ - - + + - - + + + @@ -58,10 +55,9 @@ - - + - + @@ -71,30 +67,28 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - @@ -126,7 +120,7 @@ - + diff --git a/global.json b/global.json index d34fe265a..b48eef46e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.2.25502.107", + "version": "10.0.100", "rollForward": "latestMajor", "allowPrerelease": true }