mirror of
https://github.com/DuendeSoftware/products
synced 2026-05-24 01:18:22 +00:00
Merge pull request #2382 from DuendeSoftware/dh/is-im-8.0.1
Update FOSS dependencies rippled up from IdentityModel 8.0.1
This commit is contained in:
commit
020d97530d
13 changed files with 42 additions and 42 deletions
4
.github/workflow-gen/StepExtensions.cs
vendored
4
.github/workflow-gen/StepExtensions.cs
vendored
|
|
@ -18,7 +18,7 @@ public static class StepExtensions
|
|||
|
||||
job.Step()
|
||||
.Name("Setup .NET")
|
||||
.ActionsSetupDotNet("3e891b0cb619bf60e2c25674b222b8940e2c1c25", ["8.0.x", "9.0.203", "10.0.100"]);
|
||||
.ActionsSetupDotNet("3e891b0cb619bf60e2c25674b222b8940e2c1c25", ["8.0.x", "9.0.203", "10.0.200"]);
|
||||
// v4.1.0
|
||||
}
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ public static class StepExtensions
|
|||
public static void StepDotNetDevCerts(this Job job)
|
||||
=> job.Step()
|
||||
.Name("Dotnet devcerts")
|
||||
.Run("dotnet dev-certs https --trust");
|
||||
.Run("SSL_CERT_DIR=$HOME/.aspnet/dev-certs/trust dotnet dev-certs https --trust");
|
||||
|
||||
public static void CachePlaywrightAssets(this Job job)
|
||||
=> job.Step("playwright-cache")
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- name: Restore
|
||||
run: dotnet restore aspnetcore-authentication-jwtbearer.slnf
|
||||
- name: Verify Formatting
|
||||
|
|
@ -87,13 +87,13 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- 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
|
||||
run: SSL_CERT_DIR=$HOME/.aspnet/dev-certs/trust 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
|
||||
|
|
@ -176,7 +176,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- name: Tool restore
|
||||
run: dotnet tool restore
|
||||
- name: Pack aspnetcore-authentication-jwtbearer.slnf
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- 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
|
||||
10.0.200
|
||||
- name: List files
|
||||
run: tree
|
||||
shell: bash
|
||||
|
|
|
|||
12
.github/workflows/bff-ci.yml
vendored
12
.github/workflows/bff-ci.yml
vendored
|
|
@ -53,7 +53,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- name: Restore
|
||||
run: dotnet restore bff.slnf
|
||||
- name: Verify Formatting
|
||||
|
|
@ -87,13 +87,13 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- name: Restore
|
||||
run: dotnet restore bff.slnf
|
||||
- name: Build
|
||||
run: dotnet build bff.slnf --no-restore -c Release
|
||||
- name: Dotnet devcerts
|
||||
run: dotnet dev-certs https --trust
|
||||
run: SSL_CERT_DIR=$HOME/.aspnet/dev-certs/trust dotnet dev-certs https --trust
|
||||
- name: Test - test/Bff.Tests
|
||||
run: dotnet test test/Bff.Tests -c Release --no-build --logger "console;verbosity=normal" --logger "trx;LogFileName=test/Bff.Tests-tests.trx" --collect:"XPlat Code Coverage"
|
||||
- id: test-report-test-Bff-Tests
|
||||
|
|
@ -136,7 +136,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- name: Restore
|
||||
run: dotnet restore bff.slnf
|
||||
- name: Build
|
||||
|
|
@ -152,7 +152,7 @@ jobs:
|
|||
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||
run: pwsh test/Hosts.Tests/bin/Release/net10.0/playwright.ps1 install --with-deps
|
||||
- name: Dotnet devcerts
|
||||
run: dotnet dev-certs https --trust
|
||||
run: SSL_CERT_DIR=$HOME/.aspnet/dev-certs/trust dotnet dev-certs https --trust
|
||||
- name: Test - test/Hosts.Tests
|
||||
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
|
||||
|
|
@ -223,7 +223,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- name: Tool restore
|
||||
run: dotnet tool restore
|
||||
- name: Pack bff.slnf
|
||||
|
|
|
|||
4
.github/workflows/bff-release.yml
vendored
4
.github/workflows/bff-release.yml
vendored
|
|
@ -68,7 +68,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- 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
|
||||
10.0.200
|
||||
- name: List files
|
||||
run: tree
|
||||
shell: bash
|
||||
|
|
|
|||
8
.github/workflows/docs-mcp-ci.yml
vendored
8
.github/workflows/docs-mcp-ci.yml
vendored
|
|
@ -53,7 +53,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- name: Restore
|
||||
run: dotnet restore docs-mcp.slnf
|
||||
- name: Verify Formatting
|
||||
|
|
@ -87,13 +87,13 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- name: Restore
|
||||
run: dotnet restore docs-mcp.slnf
|
||||
- name: Build
|
||||
run: dotnet build docs-mcp.slnf --no-restore -c Release
|
||||
- name: Dotnet devcerts
|
||||
run: dotnet dev-certs https --trust
|
||||
run: SSL_CERT_DIR=$HOME/.aspnet/dev-certs/trust dotnet dev-certs https --trust
|
||||
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')
|
||||
|
|
@ -162,7 +162,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- name: Tool restore
|
||||
run: dotnet tool restore
|
||||
- name: Pack docs-mcp.slnf
|
||||
|
|
|
|||
4
.github/workflows/docs-mcp-release.yml
vendored
4
.github/workflows/docs-mcp-release.yml
vendored
|
|
@ -68,7 +68,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- name: Pack docs-mcp.slnf
|
||||
run: dotnet pack -c Release docs-mcp.slnf -o artifacts
|
||||
- name: Tool restore
|
||||
|
|
@ -110,7 +110,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- name: List files
|
||||
run: tree
|
||||
shell: bash
|
||||
|
|
|
|||
12
.github/workflows/identity-server-ci.yml
vendored
12
.github/workflows/identity-server-ci.yml
vendored
|
|
@ -53,7 +53,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- name: Restore
|
||||
run: dotnet restore identity-server.slnf
|
||||
- name: Verify Formatting
|
||||
|
|
@ -87,13 +87,13 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- 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
|
||||
run: SSL_CERT_DIR=$HOME/.aspnet/dev-certs/trust 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
|
||||
|
|
@ -150,7 +150,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- name: Restore
|
||||
run: dotnet restore identity-server.slnf
|
||||
- name: Build
|
||||
|
|
@ -166,7 +166,7 @@ jobs:
|
|||
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
|
||||
run: SSL_CERT_DIR=$HOME/.aspnet/dev-certs/trust 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
|
||||
|
|
@ -237,7 +237,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- name: Tool restore
|
||||
run: dotnet tool restore
|
||||
- name: Pack identity-server.slnf
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- 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
|
||||
10.0.200
|
||||
- name: List files
|
||||
run: tree
|
||||
shell: bash
|
||||
|
|
|
|||
4
.github/workflows/templates-release.yml
vendored
4
.github/workflows/templates-release.yml
vendored
|
|
@ -46,7 +46,7 @@ jobs:
|
|||
dotnet-version: |-
|
||||
8.0.x
|
||||
9.0.203
|
||||
10.0.100
|
||||
10.0.200
|
||||
- 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
|
||||
10.0.200
|
||||
- name: List files
|
||||
run: tree
|
||||
shell: bash
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ that supports the target frameworks our products target (8, 9, 10) -->
|
|||
<IdentityModelVersion>8.0.1</IdentityModelVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(TargetFramework)' == 'net10.0'">
|
||||
<FrameworkVersion>10.0.0</FrameworkVersion>
|
||||
<FrameworkVersion>10.0.4</FrameworkVersion>
|
||||
<EFCoreVersion>10.0.0</EFCoreVersion>
|
||||
<IdentityEFCoreVersion>10.0.0</IdentityEFCoreVersion>
|
||||
<MvcRazorRuntimeCompilationVersion>10.0.0</MvcRazorRuntimeCompilationVersion>
|
||||
|
|
@ -38,11 +38,11 @@ that supports the target frameworks our products target (8, 9, 10) -->
|
|||
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
|
||||
<!-- Added aspire transitive package to resolve package vulnerability -->
|
||||
<PackageVersion Include="KubernetesClient" Version="17.0.14" />
|
||||
<PackageVersion Include="Duende.AccessTokenManagement" Version="4.1.0" />
|
||||
<PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="4.1.0" />
|
||||
<PackageVersion Include="Duende.AccessTokenManagement" Version="4.1.2" />
|
||||
<PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="4.1.2" />
|
||||
<PackageVersion Include="Duende.AspNetCore.Authentication.JwtBearer" Version="0.1.3" />
|
||||
<PackageVersion Include="Duende.IdentityModel" Version="8.0.0" />
|
||||
<PackageVersion Include="Duende.IdentityModel.OidcClient" Version="7.0.0" />
|
||||
<PackageVersion Include="Duende.IdentityModel" Version="8.0.1" />
|
||||
<PackageVersion Include="Duende.IdentityModel.OidcClient" Version="7.0.1" />
|
||||
<PackageVersion Include="Duende.IdentityServer" Version="7.4.0-preview.2" />
|
||||
<PackageVersion Include="Duende.Private.Licensing" Version="1.0.0" />
|
||||
<PackageVersion Include="IdentityModel.AspNetCore.OAuth2Introspection" Version="6.2.0" />
|
||||
|
|
|
|||
2
global.json
vendored
2
global.json
vendored
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "10.0.100",
|
||||
"version": "10.0.200",
|
||||
"rollForward": "latestMajor",
|
||||
"allowPrerelease": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
<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="Duende.AccessTokenManagement.OpenIdConnect" Version="3.2.0" />
|
||||
<PackageReference Include="Duende.IdentityModel" Version="7.0.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.6" />
|
||||
<PackageReference Include="Duende.AccessTokenManagement.OpenIdConnect" Version="4.1.2" />
|
||||
<PackageReference Include="Duende.IdentityModel" Version="8.0.1" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.4" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
Loading…
Reference in a new issue