Elgato_dark/products
1
0
Fork 0
mirror of https://github.com/DuendeSoftware/products synced 2026-05-24 01:18:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2242 from DuendeSoftware/jmdc/net10-rc2

Browse source 
.NET 10 rc2
This commit is contained in:
Damian Hickey 2025-10-15 11:30:46 +02:00 committed by GitHub
commit 0f8bbf0611
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 45 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflow-gen/StepExtensions.cs vendored
View file

@ -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
}

8
.github/workflows/aspnetcore-authentication-jwtbearer-ci.yml vendored
View file

@ -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

4
.github/workflows/aspnetcore-authentication-jwtbearer-release.yml vendored
View file

@ -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

20
.github/workflows/bff-ci.yml vendored
View file

@ -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

4
.github/workflows/bff-release.yml vendored
View file

@ -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

20
.github/workflows/identity-server-ci.yml vendored
View file

@ -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

4
.github/workflows/identity-server-release.yml vendored
View file

@ -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

4
.github/workflows/templates-release.yml vendored
View file

@ -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

16
Directory.Packages.props
View file

@ -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" />

2
global.json vendored
View file

@ -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
}

7
identity-server/hosts/UI/Main/UI.Main.csproj
View file

@ -20,6 +20,13 @@
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
</ItemGroup>
<!-- Workaround for https://github.com/dotnet/aspnetcore/issues/63719 -->
<Target Name="_PreserveFileProvidersEmbeddedPackageReference" AfterTargets="AddPrunePackageReferences">
<ItemGroup>
<PrunePackageReference Remove="Microsoft.Extensions.FileProviders.Embedded" />
</ItemGroup>
</Target>
<ItemGroup>
<ProjectReference Include="..\..\..\src\IdentityServer\Duende.IdentityServer.csproj" />
</ItemGroup>