Tweak setup .net step

DuendeSoftware · Nov 10, 2024 · 97090c4 · 97090c4
1 parent 2705dbd
commit 97090c4
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 28 deletions.
diff --git a/.github/workflow-gen/Program.cs b/.github/workflow-gen/Program.cs
@@ -170,9 +170,10 @@ public static void EnvDefaults(this Workflow workflow)
             ("DOTNET_CLI_TELEMETRY_OPTOUT", "true"));
 
     public static void StepSetupDotNet(this Job job)
-    => job.Step()
-        .Name("Setup .NET")
-        .ActionsSetupDotNet("8.0.x", "9.0.x");
+        => job.Step()
+            .Name("Setup .NET")
+            .Uses("actions/setup-dotnet@v4")
+            .With(("dotnet-version", "9.0.x"));
 
     public static Step IfRefMain(this Step step) 
         => step.If("github.ref == 'refs/heads/main'");

diff --git a/.github/workflows/access-token-management-ci.yml b/.github/workflows/access-token-management-ci.yml
@@ -27,10 +27,10 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Setup Dotnet
+    - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x 9.0.x
+        dotnet-version: 9.0.x
     - name: Test - AccessTokenManagement.Tests
       run: dotnet test -c Release test/AccessTokenManagement.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
     - name: Test report - AccessTokenManagement.Tests

diff --git a/.github/workflows/access-token-management-release.yml b/.github/workflows/access-token-management-release.yml
@@ -28,10 +28,10 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Setup Dotnet
+    - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x 9.0.x
+        dotnet-version: 9.0.x
     - name: Git tag
       run: |-
         git config --global user.email "[email protected]"
@@ -81,10 +81,10 @@ jobs:
       with:
         name: artifacts
         path: artifacts
-    - name: Setup Dotnet
+    - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x 9.0.x
+        dotnet-version: 9.0.x
     - name: List files
       run: tree
       shell: bash

diff --git a/.github/workflows/identity-model-ci.yml b/.github/workflows/identity-model-ci.yml
@@ -27,10 +27,10 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Setup Dotnet
+    - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x 9.0.x
+        dotnet-version: 9.0.x
     - name: Test - IdentityModel.Tests
       run: dotnet test -c Release test/IdentityModel.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
     - name: Test report - IdentityModel.Tests

diff --git a/.github/workflows/identity-model-oidc-client-ci.yml b/.github/workflows/identity-model-oidc-client-ci.yml
@@ -27,10 +27,10 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Setup Dotnet
+    - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x 9.0.x
+        dotnet-version: 9.0.x
     - name: Test - IdentityModel.OidcClient.Tests
       run: dotnet test -c Release test/IdentityModel.OidcClient.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
     - name: Test report - IdentityModel.OidcClient.Tests

diff --git a/.github/workflows/identity-model-oidc-client-release.yml b/.github/workflows/identity-model-oidc-client-release.yml
@@ -28,10 +28,10 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Setup Dotnet
+    - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x 9.0.x
+        dotnet-version: 9.0.x
     - name: Git tag
       run: |-
         git config --global user.email "[email protected]"
@@ -81,10 +81,10 @@ jobs:
       with:
         name: artifacts
         path: artifacts
-    - name: Setup Dotnet
+    - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x 9.0.x
+        dotnet-version: 9.0.x
     - name: List files
       run: tree
       shell: bash

diff --git a/.github/workflows/identity-model-release.yml b/.github/workflows/identity-model-release.yml
@@ -28,10 +28,10 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Setup Dotnet
+    - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x 9.0.x
+        dotnet-version: 9.0.x
     - name: Git tag
       run: |-
         git config --global user.email "[email protected]"
@@ -79,10 +79,10 @@ jobs:
       with:
         name: artifacts
         path: artifacts
-    - name: Setup Dotnet
+    - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x 9.0.x
+        dotnet-version: 9.0.x
     - name: List files
       run: tree
       shell: bash

diff --git a/.github/workflows/ignore-this-ci.yml b/.github/workflows/ignore-this-ci.yml
@@ -27,10 +27,10 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Setup Dotnet
+    - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x 9.0.x
+        dotnet-version: 9.0.x
     - name: Test - IgnoreThis.Tests
       run: dotnet test -c Release test/IgnoreThis.Tests --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
     - name: Test report - IgnoreThis.Tests

diff --git a/.github/workflows/ignore-this-release.yml b/.github/workflows/ignore-this-release.yml
@@ -28,10 +28,10 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Setup Dotnet
+    - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x 9.0.x
+        dotnet-version: 9.0.x
     - name: Git tag
       run: |-
         git config --global user.email "[email protected]"
@@ -79,10 +79,10 @@ jobs:
       with:
         name: artifacts
         path: artifacts
-    - name: Setup Dotnet
+    - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x 9.0.x
+        dotnet-version: 9.0.x
     - name: List files
       run: tree
       shell: bash

diff --git a/identity-model/global.json b/identity-model/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "9.0.100-rc.2",
     "rollForward": "latestMajor",
     "allowPrerelease": true
   }