Merge 4456588b5efffeb2ff495375ad05553b81c39f57 into bf4cd79173c0290c09af17cf9003ca2f32edea40

.github/workflows/basic-validation.yml

@@ -5,9 +5,6 @@ on:
     paths-ignore:
       - '**.md'
   push:
-    branches:
-      - main
-      - releases/*
     paths-ignore:
       - '**.md'
 

.github/workflows/check-dist.yml

@@ -2,8 +2,6 @@ name: Check dist/
 
 on:
   push:
-    branches:
-      - main
     paths-ignore:
       - '**.md'
   pull_request:

.github/workflows/codeql-analysis.yml

@@ -2,9 +2,7 @@ name: CodeQL analysis
 
 on:
   push:
-    branches: [main]
   pull_request:
-    branches: [main]
   schedule:
     - cron: '0 3 * * 0'
 

.github/workflows/e2e-tests.yml

@@ -5,9 +5,6 @@ on:
     paths-ignore:
       - '**.md'
   push:
-    branches:
-      - main
-      - releases/*
     paths-ignore:
       - '**.md'
 
@@ -367,6 +364,106 @@ jobs:
         shell: pwsh
         run: __tests__/verify-dotnet.ps1 -Patterns "^8.0", "^9.0"
 
+  test-setup-global-json-rollforward-latestmajor:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-22.04, windows-latest, macos-13]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Clear toolcache
+        shell: pwsh
+        run: __tests__/clear-toolcache.ps1 ${{ runner.os }}
+      - name: Write global.json
+        shell: bash
+        run: |
+          mkdir subdirectory
+          echo '{"sdk":{"version": "3.1.0","rollForward": "latestMajor"}}' > ./subdirectory/global.json
+      - name: Setup dotnet
+        uses: ./
+        with:
+          global-json-file: ./subdirectory/global.json
+      - name: Verify dotnet
+        shell: pwsh
+        run: __tests__/verify-dotnet.ps1 -Patterns "^(?!3)"
+
+  test-setup-global-json-rollforward-latestminor:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-22.04, windows-latest, macos-13]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Clear toolcache
+        shell: pwsh
+        run: __tests__/clear-toolcache.ps1 ${{ runner.os }}
+      - name: Write global.json
+        shell: bash
+        run: |
+          mkdir subdirectory
+          echo '{"sdk":{"version": "3.0.100","rollForward": "latestMinor"}}' > ./subdirectory/global.json
+      - name: Setup dotnet
+        uses: ./
+        with:
+          global-json-file: ./subdirectory/global.json
+      - name: Verify dotnet
+        shell: pwsh
+        run: __tests__/verify-dotnet.ps1 -Patterns "^3.1"
+
+  test-setup-global-json-rollforward-latestfeature:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-22.04, windows-latest, macos-13]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Clear toolcache
+        shell: pwsh
+        run: __tests__/clear-toolcache.ps1 ${{ runner.os }}
+      - name: Write global.json
+        shell: bash
+        run: |
+          mkdir subdirectory
+          echo '{"sdk":{"version": "3.1.100","rollForward": "latestFeature"}}' > ./subdirectory/global.json
+      - name: Setup dotnet
+        uses: ./
+        with:
+          global-json-file: ./subdirectory/global.json
+      - name: Verify dotnet
+        shell: pwsh
+        run: __tests__/verify-dotnet.ps1 -Patterns "^3.1.4"
+
+  test-setup-global-json-rollforward-latestpatch:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-22.04, windows-latest, macos-13]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Clear toolcache
+        shell: pwsh
+        run: __tests__/clear-toolcache.ps1 ${{ runner.os }}
+      - name: Write global.json
+        shell: bash
+        run: |
+          mkdir subdirectory
+          echo '{"sdk":{"version": "5.0.400","rollForward": "latestPatch"}}' > ./subdirectory/global.json
+      - name: Setup dotnet
+        uses: ./
+        with:
+          global-json-file: ./subdirectory/global.json
+      - name: Verify dotnet
+        shell: pwsh
+        run: __tests__/verify-dotnet.ps1 -Patterns "^5.0.408$"
+
   test-setup-global-json-only:
     runs-on: ${{ matrix.operating-system }}
     strategy:

.github/workflows/licensed.yml

@@ -2,11 +2,7 @@ name: Licensed
 
 on:
   push:
-    branches:
-      - main
   pull_request:
-    branches:
-      - main
   workflow_dispatch:
 
 jobs:

.github/workflows/test-dotnet.yml

@@ -5,9 +5,6 @@ on:
     paths-ignore:
       - '**.md'
   push:
-    branches:
-      - main
-      - releases/*
     paths-ignore:
       - '**.md'
 

__tests__/clear-toolcache.ps1

@@ -6,8 +6,8 @@ $dotnetPaths = @{
 
 foreach ($srcPath in $dotnetPaths[$args[0]]) {
     if (Test-Path $srcPath) {
-        Write-Host "Move $srcPath path"
-        $dstPath = Join-Path ([IO.Path]::GetTempPath()) ([IO.Path]::GetRandomFileName())
+        $dstPath = "$srcPath-" + [IO.Path]::GetRandomFileName()
+        Write-Host "Moving $srcPath to $dstPath"
         Move-Item -Path $srcPath -Destination $dstPath
     }
 }

dist/setup/index.js

@@ -99799,9 +99799,23 @@ function getVersionFromGlobalJson(globalJsonPath) {
     if (globalJson.sdk && globalJson.sdk.version) {
         version = globalJson.sdk.version;
         const rollForward = globalJson.sdk.rollForward;
-        if (rollForward && rollForward === 'latestFeature') {
-            const [major, minor] = version.split('.');
-            version = `${major}.${minor}`;
+        if (rollForward) {
+            const [major, minor, featurePatch] = version.split('.');
+            const feature = featurePatch.substring(0, 1);
+            switch (rollForward) {
+                case 'latestMajor':
+                    version = '';
+                    break;
+                case 'latestMinor':
+                    version = `${major}`;
+                    break;
+                case 'latestFeature':
+                    version = `${major}.${minor}`;
+                    break;
+                case 'latestPatch':
+                    version = `${major}.${minor}.${feature}xx`;
+                    break;
+            }
         }
     }
     return version;

src/setup-dotnet.ts

@@ -110,9 +110,27 @@ function getVersionFromGlobalJson(globalJsonPath: string): string {
   if (globalJson.sdk && globalJson.sdk.version) {
     version = globalJson.sdk.version;
     const rollForward = globalJson.sdk.rollForward;
-    if (rollForward && rollForward === 'latestFeature') {
-      const [major, minor] = version.split('.');
-      version = `${major}.${minor}`;
+    if (rollForward) {
+      const [major, minor, featurePatch] = version.split('.');
+      const feature = featurePatch.substring(0, 1);
+
+      switch (rollForward) {
+        case 'latestMajor':
+          version = '';
+          break;
+
+        case 'latestMinor':
+          version = `${major}`;
+          break;
+
+        case 'latestFeature':
+          version = `${major}.${minor}`;
+          break;
+
+        case 'latestPatch':
+          version = `${major}.${minor}.${feature}xx`;
+          break;
+      }
     }
   }
   return version;