Skip to content

Commit 5da4acc

Browse files
committed
Ensure .NET9 installed on runner
1 parent 224ccad commit 5da4acc

9 files changed

+18
-16
lines changed

.github/workflow-gen/Program.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,12 @@ public static void EnvDefaults(this Workflow workflow)
172172
("DOTNET_CLI_TELEMETRY_OPTOUT", "true"));
173173

174174
public static void StepSetupDotNet(this Job job)
175-
=> job.Step()
176-
.Name("Setup .NET")
177-
.ActionsSetupDotNet("8.0.x");
175+
{
176+
job.Step()
177+
.Name("Setup Dotnet")
178+
.Uses($"actions/setup-dotnet@v4")
179+
.With(("dotnet-version", "['8.0.x', '9.0.x']"));
180+
}
178181

179182
public static Step IfRefMain(this Step step)
180183
=> step.If("github.ref == 'refs/heads/main'");
@@ -217,7 +220,6 @@ sudo update-ca-certificates
217220
public static void StepToolRestore(this Job job)
218221
=> job.Step()
219222
.Name("Tool restore")
220-
//.IfRefMain()
221223
.Run("dotnet tool restore");
222224

223225
public static void StepPack(this Job job, string project)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup Dotnet
3232
uses: actions/setup-dotnet@v4
3333
with:
34-
dotnet-version: 8.0.x
34+
dotnet-version: "['8.0.x', '9.0.x']"
3535
- name: Test - AccessTokenManagement.Tests
3636
run: dotnet test -c Release test/AccessTokenManagement.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
3737
- name: Test report - AccessTokenManagement.Tests

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup Dotnet
3232
uses: actions/setup-dotnet@v4
3333
with:
34-
dotnet-version: 8.0.x
34+
dotnet-version: "['8.0.x', '9.0.x']"
3535
- name: Git tag
3636
run: |-
3737
git config --global user.email "github-bot@duendesoftware.com"
@@ -84,7 +84,7 @@ jobs:
8484
- name: Setup Dotnet
8585
uses: actions/setup-dotnet@v4
8686
with:
87-
dotnet-version: 8.0.x
87+
dotnet-version: "['8.0.x', '9.0.x']"
8888
- name: List files
8989
run: tree
9090
shell: bash

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup Dotnet
3232
uses: actions/setup-dotnet@v4
3333
with:
34-
dotnet-version: 8.0.x
34+
dotnet-version: "['8.0.x', '9.0.x']"
3535
- name: Test - IdentityModel.Tests
3636
run: dotnet test -c Release test/IdentityModel.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
3737
- name: Test report - IdentityModel.Tests

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup Dotnet
3232
uses: actions/setup-dotnet@v4
3333
with:
34-
dotnet-version: 8.0.x
34+
dotnet-version: "['8.0.x', '9.0.x']"
3535
- name: Test - IdentityModel.OidcClient.Tests
3636
run: dotnet test -c Release test/IdentityModel.OidcClient.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
3737
- name: Test report - IdentityModel.OidcClient.Tests

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup Dotnet
3232
uses: actions/setup-dotnet@v4
3333
with:
34-
dotnet-version: 8.0.x
34+
dotnet-version: "['8.0.x', '9.0.x']"
3535
- name: Git tag
3636
run: |-
3737
git config --global user.email "github-bot@duendesoftware.com"
@@ -84,7 +84,7 @@ jobs:
8484
- name: Setup Dotnet
8585
uses: actions/setup-dotnet@v4
8686
with:
87-
dotnet-version: 8.0.x
87+
dotnet-version: "['8.0.x', '9.0.x']"
8888
- name: List files
8989
run: tree
9090
shell: bash

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup Dotnet
3232
uses: actions/setup-dotnet@v4
3333
with:
34-
dotnet-version: 8.0.x
34+
dotnet-version: "['8.0.x', '9.0.x']"
3535
- name: Git tag
3636
run: |-
3737
git config --global user.email "github-bot@duendesoftware.com"
@@ -82,7 +82,7 @@ jobs:
8282
- name: Setup Dotnet
8383
uses: actions/setup-dotnet@v4
8484
with:
85-
dotnet-version: 8.0.x
85+
dotnet-version: "['8.0.x', '9.0.x']"
8686
- name: List files
8787
run: tree
8888
shell: bash

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup Dotnet
3232
uses: actions/setup-dotnet@v4
3333
with:
34-
dotnet-version: 8.0.x
34+
dotnet-version: "['8.0.x', '9.0.x']"
3535
- name: Test - IgnoreThis.Tests
3636
run: dotnet test -c Release test/IgnoreThis.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
3737
- name: Test report - IgnoreThis.Tests

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup Dotnet
3232
uses: actions/setup-dotnet@v4
3333
with:
34-
dotnet-version: 8.0.x
34+
dotnet-version: "['8.0.x', '9.0.x']"
3535
- name: Git tag
3636
run: |-
3737
git config --global user.email "github-bot@duendesoftware.com"
@@ -82,7 +82,7 @@ jobs:
8282
- name: Setup Dotnet
8383
uses: actions/setup-dotnet@v4
8484
with:
85-
dotnet-version: 8.0.x
85+
dotnet-version: "['8.0.x', '9.0.x']"
8686
- name: List files
8787
run: tree
8888
shell: bash

0 commit comments

Comments
 (0)