Skip to content

Commit 08c1a8d

Browse files
authored
Merge pull request #277 from DuendeSoftware/dh/dotnet10-rc2
.NET 10 RC2
2 parents 3207234 + a6759cc commit 08c1a8d

File tree

24 files changed

+1965
-353
lines changed

24 files changed

+1965
-353
lines changed

.github/workflow-gen/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ public static void EnvDefaults(this Workflow workflow)
300300
public static void StepSetupDotNet(this Job job)
301301
=> job.Step()
302302
.Name("Setup .NET")
303-
.ActionsSetupDotNet("d4c94342e560b34958eacfc5d055d21461ed1c5d", ["8.0.414", "9.0.305", "10.0.x"]); // v5.0.0
303+
.ActionsSetupDotNet("d4c94342e560b34958eacfc5d055d21461ed1c5d", ["8.0.414", "9.0.305", "10.0.100-rc.2.25502.107"]); // v5.0.0
304304

305305
public static Step IfRefMain(this Step step)
306306
=> step.If("github.ref == 'refs/heads/main'");

.github/workflows/access-token-management-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
dotnet-version: |-
5050
8.0.414
5151
9.0.305
52-
10.0.x
52+
10.0.100-rc.2.25502.107
5353
- name: Restore
5454
run: dotnet restore ../
5555
- name: Verify Formatting

.github/workflows/access-token-management-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
dotnet-version: |-
5050
8.0.414
5151
9.0.305
52-
10.0.x
52+
10.0.100-rc.2.25502.107
5353
- name: Git Config
5454
run: |-
5555
git config --global user.email "github-bot@duendesoftware.com"
@@ -108,7 +108,7 @@ jobs:
108108
dotnet-version: |-
109109
8.0.414
110110
9.0.305
111-
10.0.x
111+
10.0.100-rc.2.25502.107
112112
- name: List files
113113
run: tree
114114
shell: bash

.github/workflows/identity-model-ci.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,31 +55,34 @@ jobs:
5555
dotnet-version: |-
5656
8.0.414
5757
9.0.305
58-
10.0.x
58+
10.0.100-rc.2.25502.107
5959
- name: Restore
6060
run: dotnet restore ../
6161
- name: Verify Formatting
6262
run: dotnet format ../ --verify-no-changes --no-restore
6363
- name: Test - IdentityModel.Tests
6464
if: matrix.os != 'windows-latest'
6565
run: dotnet test -c Release test/IdentityModel.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=IdentityModel.Tests.trx" --collect:"XPlat Code Coverage"
66-
- name: Test - IdentityModel.Tests-net481
67-
if: matrix.os == 'windows-latest'
68-
run: dotnet test -c Release test/IdentityModel.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=IdentityModel.Tests-net481.trx" --collect:"XPlat Code Coverage" --framework net481
66+
# This is different from what WorkflowGen would generate
67+
# We remove the 481 Target Framework because we had issues building with net10 RC2
68+
69+
# - name: Test - IdentityModel.Tests-net481
70+
# if: matrix.os == 'windows-latest'
71+
# run: dotnet test -c Release test/IdentityModel.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=IdentityModel.Tests-net481.trx" --collect:"XPlat Code Coverage" --framework net481
6972
- name: Test report
7073
if: matrix.os != 'windows-latest'
7174
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
7275
with:
7376
name: test-results
7477
path: identity-model/test/IdentityModel.Tests/TestResults/IdentityModel.Tests.trx
7578
retention-days: 5
76-
- name: Test report-net481
77-
if: matrix.os == 'windows-latest'
78-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
79-
with:
80-
name: test-results-net481
81-
path: identity-model/test/IdentityModel.Tests/TestResults/IdentityModel.Tests-net481.trx
82-
retention-days: 5
79+
# - name: Test report-net481
80+
# if: matrix.os == 'windows-latest'
81+
# uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
82+
# with:
83+
# name: test-results-net481
84+
# path: identity-model/test/IdentityModel.Tests/TestResults/IdentityModel.Tests-net481.trx
85+
# retention-days: 5
8386
- name: Tool restore
8487
run: dotnet tool restore
8588
- name: Pack IdentityModel

.github/workflows/identity-model-oidc-client-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
dotnet-version: |-
5050
8.0.414
5151
9.0.305
52-
10.0.x
52+
10.0.100-rc.2.25502.107
5353
- name: Restore
5454
run: dotnet restore ../
5555
- name: Verify Formatting

.github/workflows/identity-model-oidc-client-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
dotnet-version: |-
5050
8.0.414
5151
9.0.305
52-
10.0.x
52+
10.0.100-rc.2.25502.107
5353
- name: Git Config
5454
run: |-
5555
git config --global user.email "github-bot@duendesoftware.com"
@@ -108,7 +108,7 @@ jobs:
108108
dotnet-version: |-
109109
8.0.414
110110
9.0.305
111-
10.0.x
111+
10.0.100-rc.2.25502.107
112112
- name: List files
113113
run: tree
114114
shell: bash

.github/workflows/identity-model-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
dotnet-version: |-
5050
8.0.414
5151
9.0.305
52-
10.0.x
52+
10.0.100-rc.2.25502.107
5353
- name: Git Config
5454
run: |-
5555
git config --global user.email "github-bot@duendesoftware.com"
@@ -106,7 +106,7 @@ jobs:
106106
dotnet-version: |-
107107
8.0.414
108108
9.0.305
109-
10.0.x
109+
10.0.100-rc.2.25502.107
110110
- name: List files
111111
run: tree
112112
shell: bash

.github/workflows/ignore-this-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
dotnet-version: |-
5050
8.0.414
5151
9.0.305
52-
10.0.x
52+
10.0.100-rc.2.25502.107
5353
- name: Restore
5454
run: dotnet restore ../
5555
- name: Verify Formatting

.github/workflows/ignore-this-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
dotnet-version: |-
5050
8.0.414
5151
9.0.305
52-
10.0.x
52+
10.0.100-rc.2.25502.107
5353
- name: Git Config
5454
run: |-
5555
git config --global user.email "github-bot@duendesoftware.com"
@@ -106,7 +106,7 @@ jobs:
106106
dotnet-version: |-
107107
8.0.414
108108
9.0.305
109-
10.0.x
109+
10.0.100-rc.2.25502.107
110110
- name: List files
111111
run: tree
112112
shell: bash

.github/workflows/introspection-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
dotnet-version: |-
5050
8.0.414
5151
9.0.305
52-
10.0.x
52+
10.0.100-rc.2.25502.107
5353
- name: Restore
5454
run: dotnet restore ../
5555
- name: Verify Formatting

0 commit comments

Comments
 (0)