V3 - Use new .NET CDN URLs and update to latest install scripts (#567)

* Update new cdn

* new cdn changes

* update latest install scripts

* Format install scripts

* Fix Ubuntu-latest issues

* Fallback logic

* Format check

* Update signed version

.github/workflows/basic-validation.yml

@@ -15,5 +15,3 @@ jobs:
   call-basic-validation:
     name: Basic validation
     uses: actions/reusable-workflows/.github/workflows/basic-validation.yml@main
-    with:
-      node-version: '20'

.github/workflows/check-dist.yml

@@ -15,5 +15,3 @@ jobs:
   call-check-dist:
     name: Check dist/
     uses: actions/reusable-workflows/.github/workflows/check-dist.yml@main
-    with:
-      node-version: '20'

.github/workflows/e2e-tests.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macOS-latest]
+        operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -40,7 +40,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macOS-latest]
+        operating-system: [ubuntu-22.04, windows-latest, macos-13]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -69,7 +69,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macOS-latest]
+        operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -94,7 +94,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macOS-latest]
+        operating-system: [ubuntu-22.04, windows-latest, macos-13]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -114,7 +114,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macOS-latest]
+        operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -138,7 +138,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macOS-latest]
+        operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -159,7 +159,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macOS-latest]
+        operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -183,7 +183,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macOS-latest]
+        operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -209,7 +209,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macOS-latest]
+        operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -229,37 +229,12 @@ jobs:
         shell: pwsh
         run: __tests__/verify-dotnet.ps1 -Patterns "^2.2"
 
-  test-global-json-with-comments:
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      fail-fast: false
-      matrix:
-        operating-system: [ubuntu-latest, windows-latest, macOS-latest]
-    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 '/* should support comments */ {"sdk":{"version": "2.2.207","rollForward": "latestFeature"}} // should support comments' > ./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 "^2.2"
-
   test-setup-with-dotnet-quality:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macOS-latest]
+        operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -281,7 +256,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
+        operating-system: [ubuntu-22.04, windows-latest, macos-latest]
     env:
       NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
     steps:
@@ -312,7 +287,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
+        operating-system: [ubuntu-22.04, windows-latest, macos-latest]
     env:
       NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
     steps:
@@ -341,7 +316,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macOS-latest]
+        operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -367,7 +342,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macOS-latest]
+        operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -391,7 +366,7 @@ jobs:
           if (-not ($version -eq '${{steps.step2.outputs.dotnet-version}}')) { throw "Unexpected output value" }
 
   test-proxy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container:
       image: ubuntu:latest
       options: --dns 127.0.0.1
@@ -431,7 +406,7 @@ jobs:
           __tests__/verify-dotnet.ps1 -Patterns "^6.0" -CheckNugetConfig
 
   test-bypass-proxy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       https_proxy: http://no-such-proxy:3128
       no_proxy: github.com,dotnetcli.blob.core.windows.net,download.visualstudio.microsoft.com,api.nuget.org,dotnetcli.azureedge.net
@@ -451,33 +426,3 @@ jobs:
       - name: Verify dotnet
         shell: pwsh
         run: __tests__/verify-dotnet.ps1 -Patterns "^3.1.201$" -CheckNugetConfig
-
-  test-sequential-version-installation:
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      fail-fast: false
-      matrix:
-        operating-system: [ubuntu-latest, windows-latest, macOS-latest]
-        lower-version: ['3.1.426']
-        higher-version: ['7.0.203']
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Clear toolcache
-        shell: pwsh
-        run: __tests__/clear-toolcache.ps1 ${{ runner.os }}
-      # Install one version, use it for something, then switch to next version
-      - name: Setup dotnet (lower version)
-        uses: ./
-        with:
-          dotnet-version: ${{ matrix.lower-version }}
-      - name: Verify dotnet (lower version)
-        shell: pwsh
-        run: __tests__/verify-dotnet.ps1 -Patterns "^${{ matrix.lower-version }}$"
-      - name: Setup dotnet (higher version)
-        uses: ./
-        with:
-          dotnet-version: ${{ matrix.higher-version }}
-      - name: Verify dotnet (higher version)
-        shell: pwsh
-        run: __tests__/verify-dotnet.ps1 -Patterns "^${{ matrix.lower-version }}$", "^${{ matrix.higher-version }}$"

.github/workflows/test-dotnet.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macOS-latest]
+        operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
         dotnet-version: ['2.1', '2.2', '3.0', '3.1', '5.0', '6.0', '7.0', '8.0']
     steps:
       - name: Checkout

__tests__/__snapshots__/authutil.test.ts.snap

@@ -1,184 +1,184 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`authutil tests existing config not in repo root, sets up a partial NuGet.config user/PAT for GPR 1`] = `
-"<?xml version="1.0"?>
+"<?xml version=\\"1.0\\"?>
 <configuration>
   <config>
-    <add key="defaultPushSource" value="https://nuget.pkg.github.com/OwnerName/index.json"/>
+    <add key=\\"defaultPushSource\\" value=\\"https://nuget.pkg.github.com/OwnerName/index.json\\"/>
   </config>
   <packageSourceCredentials>
     <GPR>
-      <add key="Username" value="OwnerName"/>
-      <add key="ClearTextPassword" value="TEST_FAKE_AUTH_TOKEN"/>
+      <add key=\\"Username\\" value=\\"OwnerName\\"/>
+      <add key=\\"ClearTextPassword\\" value=\\"TEST_FAKE_AUTH_TOKEN\\"/>
     </GPR>
   </packageSourceCredentials>
 </configuration>"
 `;
 
 exports[`authutil tests existing config w/ Azure Artifacts source and NuGet.org, sets up a partial NuGet.config user/PAT for GPR 1`] = `
-"<?xml version="1.0"?>
+"<?xml version=\\"1.0\\"?>
 <configuration>
   <config>
-    <add key="defaultPushSource" value="https://pkgs.dev.azure.com/amullans/_packaging/GitHubBuilds/nuget/v3/index.json"/>
+    <add key=\\"defaultPushSource\\" value=\\"https://pkgs.dev.azure.com/amullans/_packaging/GitHubBuilds/nuget/v3/index.json\\"/>
   </config>
   <packageSourceCredentials>
     <AzureArtifacts>
-      <add key="Username" value="OwnerName"/>
-      <add key="ClearTextPassword" value="TEST_FAKE_AUTH_TOKEN"/>
+      <add key=\\"Username\\" value=\\"OwnerName\\"/>
+      <add key=\\"ClearTextPassword\\" value=\\"TEST_FAKE_AUTH_TOKEN\\"/>
     </AzureArtifacts>
   </packageSourceCredentials>
 </configuration>"
 `;
 
 exports[`authutil tests existing config w/ GPR source and NuGet.org, sets up a partial NuGet.config user/PAT for GPR 1`] = `
-"<?xml version="1.0"?>
+"<?xml version=\\"1.0\\"?>
 <configuration>
   <config>
-    <add key="defaultPushSource" value="https://nuget.pkg.github.com/OwnerName/index.json"/>
+    <add key=\\"defaultPushSource\\" value=\\"https://nuget.pkg.github.com/OwnerName/index.json\\"/>
   </config>
   <packageSourceCredentials>
     <GPR>
-      <add key="Username" value="OwnerName"/>
-      <add key="ClearTextPassword" value="TEST_FAKE_AUTH_TOKEN"/>
+      <add key=\\"Username\\" value=\\"OwnerName\\"/>
+      <add key=\\"ClearTextPassword\\" value=\\"TEST_FAKE_AUTH_TOKEN\\"/>
     </GPR>
   </packageSourceCredentials>
 </configuration>"
 `;
 
 exports[`authutil tests existing config w/ no GPR sources, sets up a full NuGet.config with URL and user/PAT for GPR 1`] = `
-"<?xml version="1.0"?>
+"<?xml version=\\"1.0\\"?>
 <configuration>
   <config>
-    <add key="defaultPushSource" value="https://nuget.pkg.github.com/OwnerName/index.json"/>
+    <add key=\\"defaultPushSource\\" value=\\"https://nuget.pkg.github.com/OwnerName/index.json\\"/>
   </config>
   <packageSources>
-    <add key="Source" value="https://nuget.pkg.github.com/OwnerName/index.json"/>
+    <add key=\\"Source\\" value=\\"https://nuget.pkg.github.com/OwnerName/index.json\\"/>
   </packageSources>
   <packageSourceCredentials>
     <Source>
-      <add key="Username" value="OwnerName"/>
-      <add key="ClearTextPassword" value="TEST_FAKE_AUTH_TOKEN"/>
+      <add key=\\"Username\\" value=\\"OwnerName\\"/>
+      <add key=\\"ClearTextPassword\\" value=\\"TEST_FAKE_AUTH_TOKEN\\"/>
     </Source>
   </packageSourceCredentials>
 </configuration>"
 `;
 
 exports[`authutil tests existing config w/ no sources, sets up a full NuGet.config with URL and user/PAT for GPR 1`] = `
-"<?xml version="1.0"?>
+"<?xml version=\\"1.0\\"?>
 <configuration>
   <config>
-    <add key="defaultPushSource" value="https://nuget.pkg.github.com/OwnerName/index.json"/>
+    <add key=\\"defaultPushSource\\" value=\\"https://nuget.pkg.github.com/OwnerName/index.json\\"/>
   </config>
   <packageSources>
-    <add key="Source" value="https://nuget.pkg.github.com/OwnerName/index.json"/>
+    <add key=\\"Source\\" value=\\"https://nuget.pkg.github.com/OwnerName/index.json\\"/>
   </packageSources>
   <packageSourceCredentials>
     <Source>
-      <add key="Username" value="OwnerName"/>
-      <add key="ClearTextPassword" value="TEST_FAKE_AUTH_TOKEN"/>
+      <add key=\\"Username\\" value=\\"OwnerName\\"/>
+      <add key=\\"ClearTextPassword\\" value=\\"TEST_FAKE_AUTH_TOKEN\\"/>
     </Source>
   </packageSourceCredentials>
 </configuration>"
 `;
 
 exports[`authutil tests existing config w/ only Azure Artifacts source, sets up a partial NuGet.config user/PAT for GPR 1`] = `
-"<?xml version="1.0"?>
+"<?xml version=\\"1.0\\"?>
 <configuration>
   <config>
-    <add key="defaultPushSource" value="https://pkgs.dev.azure.com/amullans/_packaging/GitHubBuilds/nuget/v3/index.json"/>
+    <add key=\\"defaultPushSource\\" value=\\"https://pkgs.dev.azure.com/amullans/_packaging/GitHubBuilds/nuget/v3/index.json\\"/>
   </config>
   <packageSourceCredentials>
     <AzureArtifacts>
-      <add key="Username" value="OwnerName"/>
-      <add key="ClearTextPassword" value="TEST_FAKE_AUTH_TOKEN"/>
+      <add key=\\"Username\\" value=\\"OwnerName\\"/>
+      <add key=\\"ClearTextPassword\\" value=\\"TEST_FAKE_AUTH_TOKEN\\"/>
     </AzureArtifacts>
   </packageSourceCredentials>
 </configuration>"
 `;
 
 exports[`authutil tests existing config w/ only GPR source, sets up a partial NuGet.config user/PAT for GPR 1`] = `
-"<?xml version="1.0"?>
+"<?xml version=\\"1.0\\"?>
 <configuration>
   <config>
-    <add key="defaultPushSource" value="https://nuget.pkg.github.com/OwnerName/index.json"/>
+    <add key=\\"defaultPushSource\\" value=\\"https://nuget.pkg.github.com/OwnerName/index.json\\"/>
   </config>
   <packageSourceCredentials>
     <GPR>
-      <add key="Username" value="OwnerName"/>
-      <add key="ClearTextPassword" value="TEST_FAKE_AUTH_TOKEN"/>
+      <add key=\\"Username\\" value=\\"OwnerName\\"/>
+      <add key=\\"ClearTextPassword\\" value=\\"TEST_FAKE_AUTH_TOKEN\\"/>
     </GPR>
   </packageSourceCredentials>
 </configuration>"
 `;
 
 exports[`authutil tests existing config w/ two GPR sources, sets up a partial NuGet.config user/PAT for GPR 1`] = `
-"<?xml version="1.0"?>
+"<?xml version=\\"1.0\\"?>
 <configuration>
   <config>
-    <add key="defaultPushSource" value="https://nuget.pkg.github.com"/>
+    <add key=\\"defaultPushSource\\" value=\\"https://nuget.pkg.github.com\\"/>
   </config>
   <packageSourceCredentials>
     <GPR-GitHub>
-      <add key="Username" value="OwnerName"/>
-      <add key="ClearTextPassword" value="TEST_FAKE_AUTH_TOKEN"/>
+      <add key=\\"Username\\" value=\\"OwnerName\\"/>
+      <add key=\\"ClearTextPassword\\" value=\\"TEST_FAKE_AUTH_TOKEN\\"/>
     </GPR-GitHub>
     <GPR-Actions>
-      <add key="Username" value="OwnerName"/>
-      <add key="ClearTextPassword" value="TEST_FAKE_AUTH_TOKEN"/>
+      <add key=\\"Username\\" value=\\"OwnerName\\"/>
+      <add key=\\"ClearTextPassword\\" value=\\"TEST_FAKE_AUTH_TOKEN\\"/>
     </GPR-Actions>
   </packageSourceCredentials>
 </configuration>"
 `;
 
 exports[`authutil tests no existing config, sets up a full NuGet.config with URL and other owner/PAT for GPR 1`] = `
-"<?xml version="1.0"?>
+"<?xml version=\\"1.0\\"?>
 <configuration>
   <config>
-    <add key="defaultPushSource" value="https://nuget.pkg.github.com/otherorg/index.json"/>
+    <add key=\\"defaultPushSource\\" value=\\"https://nuget.pkg.github.com/otherorg/index.json\\"/>
   </config>
   <packageSources>
-    <add key="Source" value="https://nuget.pkg.github.com/otherorg/index.json"/>
+    <add key=\\"Source\\" value=\\"https://nuget.pkg.github.com/otherorg/index.json\\"/>
   </packageSources>
   <packageSourceCredentials>
     <Source>
-      <add key="Username" value="otherorg"/>
-      <add key="ClearTextPassword" value="TEST_FAKE_AUTH_TOKEN"/>
+      <add key=\\"Username\\" value=\\"otherorg\\"/>
+      <add key=\\"ClearTextPassword\\" value=\\"TEST_FAKE_AUTH_TOKEN\\"/>
     </Source>
   </packageSourceCredentials>
 </configuration>"
 `;
 
 exports[`authutil tests no existing config, sets up a full NuGet.config with URL and token for other source 1`] = `
-"<?xml version="1.0"?>
+"<?xml version=\\"1.0\\"?>
 <configuration>
   <config>
-    <add key="defaultPushSource" value="https://pkgs.dev.azure.com/amullans/_packaging/GitHubBuilds/nuget/v3/index.json"/>
+    <add key=\\"defaultPushSource\\" value=\\"https://pkgs.dev.azure.com/amullans/_packaging/GitHubBuilds/nuget/v3/index.json\\"/>
   </config>
   <packageSources>
-    <add key="Source" value="https://pkgs.dev.azure.com/amullans/_packaging/GitHubBuilds/nuget/v3/index.json"/>
+    <add key=\\"Source\\" value=\\"https://pkgs.dev.azure.com/amullans/_packaging/GitHubBuilds/nuget/v3/index.json\\"/>
   </packageSources>
   <packageSourceCredentials>
     <Source>
-      <add key="Username" value="OwnerName"/>
-      <add key="ClearTextPassword" value="TEST_FAKE_AUTH_TOKEN"/>
+      <add key=\\"Username\\" value=\\"OwnerName\\"/>
+      <add key=\\"ClearTextPassword\\" value=\\"TEST_FAKE_AUTH_TOKEN\\"/>
     </Source>
   </packageSourceCredentials>
 </configuration>"
 `;
 
 exports[`authutil tests no existing config, sets up a full NuGet.config with URL and user/PAT for GPR 1`] = `
-"<?xml version="1.0"?>
+"<?xml version=\\"1.0\\"?>
 <configuration>
   <config>
-    <add key="defaultPushSource" value="https://nuget.pkg.github.com/OwnerName/index.json"/>
+    <add key=\\"defaultPushSource\\" value=\\"https://nuget.pkg.github.com/OwnerName/index.json\\"/>
   </config>
   <packageSources>
-    <add key="Source" value="https://nuget.pkg.github.com/OwnerName/index.json"/>
+    <add key=\\"Source\\" value=\\"https://nuget.pkg.github.com/OwnerName/index.json\\"/>
   </packageSources>
   <packageSourceCredentials>
     <Source>
-      <add key="Username" value="OwnerName"/>
-      <add key="ClearTextPassword" value="TEST_FAKE_AUTH_TOKEN"/>
+      <add key=\\"Username\\" value=\\"OwnerName\\"/>
+      <add key=\\"ClearTextPassword\\" value=\\"TEST_FAKE_AUTH_TOKEN\\"/>
     </Source>
   </packageSourceCredentials>
 </configuration>"

__tests__/installer.test.ts

@@ -102,15 +102,8 @@ describe('installer tests', () => {
 
         await dotnetInstaller.installDotnet();
 
-        /**
-         * First time script would be called to
-         * install runtime, here we checking only the
-         * second one that installs actual SDK. i.e. 1
-         */
-        const callIndex = 1;
-
         const scriptArguments = (
-          getExecOutputSpy.mock.calls[callIndex][1] as string[]
+          getExecOutputSpy.mock.calls[0][1] as string[]
         ).join(' ');
         const expectedArgument = IS_WINDOWS
           ? `-Version ${inputVersion}`
@@ -192,15 +185,8 @@ describe('installer tests', () => {
 
           await dotnetInstaller.installDotnet();
 
-          /**
-           * First time script would be called to
-           * install runtime, here we checking only the
-           * second one that installs actual SDK. i.e. 1
-           */
-          const callIndex = 1;
-
           const scriptArguments = (
-            getExecOutputSpy.mock.calls[callIndex][1] as string[]
+            getExecOutputSpy.mock.calls[0][1] as string[]
           ).join(' ');
           const expectedArgument = IS_WINDOWS
             ? `-Quality ${inputQuality}`
@@ -232,15 +218,8 @@ describe('installer tests', () => {
 
           await dotnetInstaller.installDotnet();
 
-          /**
-           * First time script would be called to
-           * install runtime, here we checking only the
-           * second one that installs actual SDK. i.e. 1
-           */
-          const callIndex = 1;
-
           const scriptArguments = (
-            getExecOutputSpy.mock.calls[callIndex][1] as string[]
+            getExecOutputSpy.mock.calls[0][1] as string[]
           ).join(' ');
           const expectedArgument = IS_WINDOWS
             ? `-Channel 6.0`
@@ -273,15 +252,8 @@ describe('installer tests', () => {
 
           await dotnetInstaller.installDotnet();
 
-          /**
-           * First time script would be called to
-           * install runtime, here we checking only the
-           * second one that installs actual SDK. i.e. 1
-           */
-          const callIndex = 1;
-
           const scriptArguments = (
-            getExecOutputSpy.mock.calls[callIndex][1] as string[]
+            getExecOutputSpy.mock.calls[0][1] as string[]
           ).join(' ');
 
           expect(scriptArguments).toContain(
@@ -311,15 +283,8 @@ describe('installer tests', () => {
 
           await dotnetInstaller.installDotnet();
 
-          /**
-           * First time script would be called to
-           * install runtime, here we checking only the
-           * second one that installs actual SDK. i.e. 1
-           */
-          const callIndex = 1;
-
           const scriptArguments = (
-            getExecOutputSpy.mock.calls[callIndex][1] as string[]
+            getExecOutputSpy.mock.calls[0][1] as string[]
           ).join(' ');
 
           expect(scriptArguments).toContain(
@@ -332,14 +297,14 @@ describe('installer tests', () => {
     describe('addToPath() tests', () => {
       it(`should export DOTNET_ROOT env.var with value from DOTNET_INSTALL_DIR env.var`, async () => {
         process.env['DOTNET_INSTALL_DIR'] = 'fictitious/dotnet/install/dir';
-        installer.DotnetInstallDir.addToPath();
+        installer.DotnetCoreInstaller.addToPath();
         const dotnet_root = process.env['DOTNET_ROOT'];
         expect(dotnet_root).toBe(process.env['DOTNET_INSTALL_DIR']);
       });
 
       it(`should export value from DOTNET_INSTALL_DIR env.var to the PATH`, async () => {
         process.env['DOTNET_INSTALL_DIR'] = 'fictitious/dotnet/install/dir';
-        installer.DotnetInstallDir.addToPath();
+        installer.DotnetCoreInstaller.addToPath();
         const path = process.env['PATH'];
         expect(path).toContain(process.env['DOTNET_INSTALL_DIR']);
       });
@@ -347,7 +312,7 @@ describe('installer tests', () => {
   });
 
   describe('DotnetVersionResolver tests', () => {
-    describe('createDotnetVersion() tests', () => {
+    describe('createDotNetVersion() tests', () => {
       each([
         '3.1',
         '3.x',
@@ -364,7 +329,7 @@ describe('installer tests', () => {
             version
           );
           const versionObject =
-            await dotnetVersionResolver.createDotnetVersion();
+            await dotnetVersionResolver.createDotNetVersion();
 
           expect(!!versionObject.value).toBe(true);
         }
@@ -403,7 +368,7 @@ describe('installer tests', () => {
           );
 
           await expect(
-            async () => await dotnetVersionResolver.createDotnetVersion()
+            async () => await dotnetVersionResolver.createDotNetVersion()
           ).rejects.toThrow();
         }
       );
@@ -415,7 +380,7 @@ describe('installer tests', () => {
             version
           );
           const versionObject =
-            await dotnetVersionResolver.createDotnetVersion();
+            await dotnetVersionResolver.createDotNetVersion();
 
           expect(versionObject.type.toLowerCase().includes('channel')).toBe(
             true
@@ -430,7 +395,7 @@ describe('installer tests', () => {
             version
           );
           const versionObject =
-            await dotnetVersionResolver.createDotnetVersion();
+            await dotnetVersionResolver.createDotNetVersion();
 
           expect(versionObject.type.toLowerCase().includes('channel')).toBe(
             true
@@ -446,7 +411,7 @@ describe('installer tests', () => {
             version
           );
           const versionObject =
-            await dotnetVersionResolver.createDotnetVersion();
+            await dotnetVersionResolver.createDotNetVersion();
 
           expect(versionObject.type.toLowerCase().includes('version')).toBe(
             true
@@ -462,7 +427,7 @@ describe('installer tests', () => {
             version
           );
           const versionObject =
-            await dotnetVersionResolver.createDotnetVersion();
+            await dotnetVersionResolver.createDotNetVersion();
           const windowsRegEx = new RegExp(/^-(Version|Channel)/);
           const nonWindowsRegEx = new RegExp(/^--(version|channel)/);
 
@@ -482,7 +447,7 @@ describe('installer tests', () => {
           version
         );
         await expect(
-          async () => await dotnetVersionResolver.createDotnetVersion()
+          async () => await dotnetVersionResolver.createDotNetVersion()
         ).rejects.toThrow(
           `'dotnet-version' was supplied in invalid format: ${version}! The A.B.Cxx syntax is available since the .NET 5.0 release.`
         );

__tests__/setup-dotnet.test.ts

@@ -4,7 +4,7 @@ import semver from 'semver';
 import * as auth from '../src/authutil';
 
 import * as setup from '../src/setup-dotnet';
-import {DotnetCoreInstaller, DotnetInstallDir} from '../src/installer';
+import {DotnetCoreInstaller} from '../src/installer';
 import * as cacheUtils from '../src/cache-utils';
 import * as cacheRestore from '../src/cache-restore';
 
@@ -28,25 +28,22 @@ describe('setup-dotnet tests', () => {
     DotnetCoreInstaller.prototype,
     'installDotnet'
   );
-
+  const addToPathSpy = jest.spyOn(DotnetCoreInstaller, 'addToPath');
   const isCacheFeatureAvailableSpy = jest.spyOn(
     cacheUtils,
     'isCacheFeatureAvailable'
   );
   const restoreCacheSpy = jest.spyOn(cacheRestore, 'restoreCache');
   const configAuthenticationSpy = jest.spyOn(auth, 'configAuthentication');
-  const addToPathOriginal = DotnetInstallDir.addToPath;
 
   describe('run() tests', () => {
     beforeEach(() => {
-      DotnetInstallDir.addToPath = jest.fn();
       getMultilineInputSpy.mockImplementation(input => inputs[input as string]);
       getInputSpy.mockImplementation(input => inputs[input as string]);
       getBooleanInputSpy.mockImplementation(input => inputs[input as string]);
     });
 
     afterEach(() => {
-      DotnetInstallDir.addToPath = addToPathOriginal;
       jest.clearAllMocks();
       jest.resetAllMocks();
     });
@@ -107,9 +104,10 @@ describe('setup-dotnet tests', () => {
       inputs['dotnet-quality'] = '';
 
       installDotnetSpy.mockImplementation(() => Promise.resolve(''));
+      addToPathSpy.mockImplementation(() => {});
 
       await setup.run();
-      expect(DotnetInstallDir.addToPath).toHaveBeenCalledTimes(1);
+      expect(addToPathSpy).toHaveBeenCalledTimes(1);
     });
 
     it('should call auth.configAuthentication() if source-url input is provided', async () => {
@@ -150,9 +148,10 @@ describe('setup-dotnet tests', () => {
       installDotnetSpy.mockImplementation(() =>
         Promise.resolve(`${inputs['dotnet-version']}`)
       );
+      addToPathSpy.mockImplementation(() => {});
 
       await setup.run();
-      expect(DotnetInstallDir.addToPath).toHaveBeenCalledTimes(1);
+      expect(setOutputSpy).toHaveBeenCalledTimes(1);
     });
 
     it(`shouldn't call setOutput() if parsing dotnet-installer logs failed`, async () => {
@@ -160,6 +159,7 @@ describe('setup-dotnet tests', () => {
       const warningMessage = `Failed to output the installed version of .NET. The 'dotnet-version' output will not be set.`;
 
       installDotnetSpy.mockImplementation(() => Promise.resolve(null));
+      addToPathSpy.mockImplementation(() => {});
 
       await setup.run();
       expect(warningSpy).toHaveBeenCalledWith(warningMessage);
@@ -170,6 +170,8 @@ describe('setup-dotnet tests', () => {
       inputs['dotnet-version'] = [];
       const warningMessage = `The 'dotnet-version' output will not be set.`;
 
+      addToPathSpy.mockImplementation(() => {});
+
       await setup.run();
 
       expect(infoSpy).toHaveBeenCalledWith(warningMessage);
@@ -183,6 +185,7 @@ describe('setup-dotnet tests', () => {
       inputs['cache-dependency-path'] = 'fictitious.package.lock.json';
 
       installDotnetSpy.mockImplementation(() => Promise.resolve(''));
+      addToPathSpy.mockImplementation(() => {});
 
       isCacheFeatureAvailableSpy.mockImplementation(() => true);
       restoreCacheSpy.mockImplementation(() => Promise.resolve());
@@ -200,6 +203,7 @@ describe('setup-dotnet tests', () => {
       inputs['cache'] = false;
 
       installDotnetSpy.mockImplementation(() => Promise.resolve(''));
+      addToPathSpy.mockImplementation(() => {});
 
       isCacheFeatureAvailableSpy.mockImplementation(() => true);
       restoreCacheSpy.mockImplementation(() => Promise.resolve());
@@ -214,6 +218,7 @@ describe('setup-dotnet tests', () => {
       inputs['cache'] = true;
 
       installDotnetSpy.mockImplementation(() => Promise.resolve(''));
+      addToPathSpy.mockImplementation(() => {});
 
       isCacheFeatureAvailableSpy.mockImplementation(() => false);
       restoreCacheSpy.mockImplementation(() => Promise.resolve());

action.yml

@@ -30,7 +30,7 @@ outputs:
   dotnet-version:
     description: 'Contains the installed by action .NET SDK version for reuse.'
 runs:
-  using: 'node20'
+  using: 'node16'
   main: 'dist/setup/index.js'
   post: 'dist/cache-save/index.js'
   post-if: success()

externals/install-dotnet.sh

@@ -298,11 +298,20 @@ get_machine_architecture() {
     if command -v uname > /dev/null; then
         CPUName=$(uname -m)
         case $CPUName in
+        armv1*|armv2*|armv3*|armv4*|armv5*|armv6*)
+            echo "armv6-or-below"
+            return 0
+            ;;
         armv*l)
             echo "arm"
             return 0
             ;;
         aarch64|arm64)
+            if [ "$(getconf LONG_BIT)" -lt 64 ]; then
+                # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
+                echo "arm"
+                return 0
+            fi
             echo "arm64"
             return 0
             ;;
@@ -318,6 +327,14 @@ get_machine_architecture() {
             echo "loongarch64"
             return 0
             ;;
+        riscv64)
+            echo "riscv64"
+            return 0
+            ;;
+        powerpc|ppc)
+            echo "ppc"
+            return 0
+            ;;
         esac
     fi
 
@@ -334,7 +351,13 @@ get_normalized_architecture_from_architecture() {
     local architecture="$(to_lowercase "$1")"
 
     if [[ $architecture == \<auto\> ]]; then
-        echo "$(get_machine_architecture)"
+        machine_architecture="$(get_machine_architecture)"
+        if [[ "$machine_architecture" == "armv6-or-below" ]]; then
+            say_err "Architecture \`$machine_architecture\` not supported. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues"
+            return 1
+        fi
+
+        echo $machine_architecture
         return 0
     fi
 
@@ -400,11 +423,17 @@ get_normalized_architecture_for_specific_sdk_version() {
 # args:
 # version or channel - $1
 is_arm64_supported() {
-    #any channel or version that starts with the specified versions
-    case "$1" in
-        ( "1"* | "2"* | "3"*  | "4"* | "5"*) 
-            echo false
-            return 0
+    # Extract the major version by splitting on the dot
+    major_version="${1%%.*}"
+
+    # Check if the major version is a valid number and less than 6
+    case "$major_version" in
+        [0-9]*)  
+            if [ "$major_version" -lt 6 ]; then
+                echo false
+                return 0
+            fi
+            ;;
     esac
 
     echo true
@@ -927,6 +956,37 @@ get_absolute_path() {
     return 0
 }
 
+# args:
+# override - $1 (boolean, true or false)
+get_cp_options() {
+    eval $invocation
+
+    local override="$1"
+    local override_switch=""
+
+    if [ "$override" = false ]; then
+        override_switch="-n"
+
+        # create temporary files to check if 'cp -u' is supported
+        tmp_dir="$(mktemp -d)"
+        tmp_file="$tmp_dir/testfile"
+        tmp_file2="$tmp_dir/testfile2"
+
+        touch "$tmp_file"
+
+        # use -u instead of -n if it's available
+        if cp -u "$tmp_file" "$tmp_file2" 2>/dev/null; then
+            override_switch="-u"
+        fi
+
+        # clean up
+        rm -f "$tmp_file" "$tmp_file2"
+        rm -rf "$tmp_dir"
+    fi
+
+    echo "$override_switch"
+}
+
 # args:
 # input_files - stdin
 # root_path - $1
@@ -938,15 +998,7 @@ copy_files_or_dirs_from_list() {
     local root_path="$(remove_trailing_slash "$1")"
     local out_path="$(remove_trailing_slash "$2")"
     local override="$3"
-    local osname="$(get_current_os_name)"
-    local override_switch=$(
-        if [ "$override" = false ]; then
-            if [ "$osname" = "linux-musl" ]; then
-                printf -- "-u";
-            else
-                printf -- "-n";
-            fi
-        fi)
+    local override_switch="$(get_cp_options "$override")"
 
     cat | uniq | while read -r file_path; do
         local path="$(remove_beginning_slash "${file_path#$root_path}")"
@@ -1008,7 +1060,7 @@ extract_dotnet_package() {
     
     rm -rf "$temp_out_path"
     if [ -z ${keep_zip+x} ]; then
-        rm -f "$zip_path" && say_verbose "Temporary zip file $zip_path was removed"
+        rm -f "$zip_path" && say_verbose "Temporary archive file $zip_path was removed"
     fi
 
     if [ "$failed" = true ]; then
@@ -1220,6 +1272,61 @@ downloadwget() {
     return 0
 }
 
+extract_stem() {
+    local url="$1"
+    # extract the protocol
+    proto="$(echo $1 | grep :// | sed -e's,^\(.*://\).*,\1,g')"
+    # remove the protocol
+    url="${1/$proto/}"
+    # extract the path (if any) - since we know all of our feeds have a first path segment, we can skip the first one. otherwise we'd use -f2- to get the full path
+    full_path="$(echo $url | grep / | cut -d/ -f2-)"
+    path="$(echo $full_path | cut -d/ -f2-)"
+    echo $path
+}
+
+check_url_exists() {
+    eval $invocation
+    local url="$1"
+
+    local code=""
+    if machine_has "curl"
+    then
+        code=$(curl --head -o /dev/null -w "%{http_code}" -s --fail "$url");
+    elif machine_has "wget"
+    then
+        # get the http response, grab the status code
+        server_response=$(wget -qO- --method=HEAD --server-response "$url" 2>&1)
+        code=$(echo "$server_response" | grep "HTTP/" | awk '{print $2}')
+    fi
+    if [ $code = "200" ]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+sanitize_redirect_url() {
+    eval $invocation
+
+    local url_stem
+    url_stem=$(extract_stem "$1")
+    say_verbose "Checking configured feeds for the asset at ${yellow:-}$url_stem${normal:-}"
+
+    for feed in "${feeds[@]}"
+    do
+        local trial_url="$feed/$url_stem"
+        say_verbose "Checking ${yellow:-}$trial_url${normal:-}"
+        if check_url_exists "$trial_url"; then
+            say_verbose "Found a match at ${yellow:-}$trial_url${normal:-}"
+            echo "$trial_url"
+            return 0
+        else
+            say_verbose "No match at ${yellow:-}$trial_url${normal:-}"
+        fi
+    done
+    return 1
+}
+
 get_download_link_from_aka_ms() {
     eval $invocation
 
@@ -1256,6 +1363,12 @@ get_download_link_from_aka_ms() {
     http_codes=$( echo "$response" | awk '$1 ~ /^HTTP/ {print $2}' )
     # They all need to be 301, otherwise some links are broken (except for the last, which is not a redirect but 200 or 404).
     broken_redirects=$( echo "$http_codes" | sed '$d' | grep -v '301' )
+    # The response may end without final code 2xx/4xx/5xx somehow, e.g. network restrictions on www.bing.com causes redirecting to bing.com fails with connection refused.
+    # In this case it should not exclude the last.
+    last_http_code=$(  echo "$http_codes" | tail -n 1 )
+    if ! [[ $last_http_code =~ ^(2|4|5)[0-9][0-9]$ ]]; then
+        broken_redirects=$( echo "$http_codes" | grep -v '301' )
+    fi
 
     # All HTTP codes are 301 (Moved Permanently), the redirect link exists.
     if [[ -z "$broken_redirects" ]]; then
@@ -1266,6 +1379,11 @@ get_download_link_from_aka_ms() {
             return 1
         fi
 
+        sanitized_redirect_url=$(sanitize_redirect_url "$aka_ms_download_link")
+        if [[ -n "$sanitized_redirect_url" ]]; then
+            aka_ms_download_link="$sanitized_redirect_url"
+        fi
+
         say_verbose "The redirect location retrieved: '$aka_ms_download_link'."
         return 0
     else
@@ -1277,7 +1395,9 @@ get_download_link_from_aka_ms() {
 get_feeds_to_use()
 {
     feeds=(
+    "https://builds.dotnet.microsoft.com/dotnet"
     "https://dotnetcli.azureedge.net/dotnet"
+    "https://ci.dot.net/public"
     "https://dotnetbuilds.azureedge.net/public"
     )
 
@@ -1507,7 +1627,7 @@ install_dotnet() {
 
     mkdir -p "$install_root"
     zip_path="${zip_path:-$(mktemp "$temporary_file_template")}"
-    say_verbose "Zip path: $zip_path"
+    say_verbose "Archive path: $zip_path"
 
     for link_index in "${!download_links[@]}"
     do
@@ -1531,7 +1651,7 @@ install_dotnet() {
                 say "Failed to download $link_type link '$download_link': $download_error_msg"
                 ;;
             esac
-            rm -f "$zip_path" 2>&1 && say_verbose "Temporary zip file $zip_path was removed"
+            rm -f "$zip_path" 2>&1 && say_verbose "Temporary archive file $zip_path was removed"
         else
             download_completed=true
             break
@@ -1546,7 +1666,7 @@ install_dotnet() {
 
     remote_file_size="$(get_remote_file_size "$download_link")"
 
-    say "Extracting zip from $download_link"
+    say "Extracting archive from $download_link"
     extract_dotnet_package "$zip_path" "$install_root" "$remote_file_size" || return 1
 
     #  Check if the SDK version is installed; if not, fail the installation.
@@ -1706,9 +1826,13 @@ do
             zip_path="$1"
             ;;
         -?|--?|-h|--help|-[Hh]elp)
-            script_name="$(basename "$0")"
+            script_name="dotnet-install.sh"
             echo ".NET Tools Installer"
-            echo "Usage: $script_name [-c|--channel <CHANNEL>] [-v|--version <VERSION>] [-p|--prefix <DESTINATION>]"
+            echo "Usage:"
+            echo "       # Install a .NET SDK of a given Quality from a given Channel"
+            echo "       $script_name [-c|--channel <CHANNEL>] [-q|--quality <QUALITY>]"
+            echo "       # Install a .NET SDK of a specific public version"
+            echo "       $script_name [-v|--version <VERSION>]"
             echo "       $script_name -h|-?|--help"
             echo ""
             echo "$script_name is a simple command line interface for obtaining dotnet cli."

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-dotnet",
-  "version": "4.0.0",
+  "version": "3.0.2",
   "private": true,
   "description": "setup dotnet action",
   "main": "dist/setup/index.js",
@@ -29,32 +29,31 @@
     "@actions/cache": "^3.0.0",
     "@actions/core": "^1.10.0",
     "@actions/exec": "^1.1.1",
-    "@actions/github": "^6.0.0",
-    "@actions/glob": "^0.4.0",
+    "@actions/github": "^1.1.0",
+    "@actions/glob": "^0.3.0",
     "@actions/http-client": "^2.0.1",
     "@actions/io": "^1.0.2",
-    "fast-xml-parser": "^4.2.4",
-    "json5": "^2.2.3",
-    "semver": "^7.5.4"
+    "fast-xml-parser": "^4.0.10",
+    "semver": "^6.3.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.10",
-    "@types/node": "^20.9.4",
-    "@types/semver": "^7.5.6",
-    "@typescript-eslint/eslint-plugin": "^6.12.0",
-    "@typescript-eslint/parser": "^6.12.0",
-    "@vercel/ncc": "^0.38.1",
+    "@types/jest": "^27.5.2",
+    "@types/node": "^16.11.25",
+    "@types/semver": "^6.2.2",
+    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/parser": "^5.54.0",
+    "@vercel/ncc": "^0.34.0",
     "eslint": "^8.35.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-node": "^11.1.0",
     "husky": "^8.0.1",
-    "jest": "^29.7.0",
-    "jest-circus": "^29.7.0",
-    "jest-each": "^29.7.0",
-    "prettier": "^3.1.0",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.3.2",
+    "jest": "^27.5.1",
+    "jest-circus": "^27.5.1",
+    "jest-each": "^27.5.1",
+    "prettier": "^2.8.4",
+    "ts-jest": "^27.0.5",
+    "typescript": "^4.8.4",
     "wget-improved": "^3.2.1"
   },
   "jest": {

src/installer.ts

@@ -7,7 +7,7 @@ import {chmodSync} from 'fs';
 import path from 'path';
 import os from 'os';
 import semver from 'semver';
-import {IS_WINDOWS, PLATFORM} from './utils';
+import {IS_LINUX, IS_WINDOWS} from './utils';
 import {QualityOptions} from './setup-dotnet';
 
 export interface DotnetVersion {
@@ -81,7 +81,7 @@ export class DotnetVersionResolver {
       parseInt(major) >= QUALITY_INPUT_MINIMAL_MAJOR_TAG ? true : false;
   }
 
-  public async createDotnetVersion(): Promise<DotnetVersion> {
+  public async createDotNetVersion(): Promise<DotnetVersion> {
     await this.resolveVersionInput();
     if (!this.resolvedArgument.type) {
       return this.resolvedArgument;
@@ -101,9 +101,18 @@ export class DotnetVersionResolver {
       allowRetries: true,
       maxRetries: 3
     });
-    const response = await httpClient.getJson<any>(
-      DotnetVersionResolver.DotnetCoreIndexUrl
-    );
+
+    let response;
+    try {
+      response = await httpClient.getJson<any>(
+        DotnetVersionResolver.DotNetCoreIndexUrl
+      );
+    } catch (error) {
+      response = await httpClient.getJson<any>(
+        DotnetVersionResolver.DotnetCoreIndexFallbackUrl
+      );
+    }
+
     const result = response.result || {};
     const releasesInfo: any[] = result['releases-index'];
 
@@ -114,37 +123,88 @@ export class DotnetVersionResolver {
 
     if (!releaseInfo) {
       throw new Error(
-        `Could not find info for version with major tag: "${majorTag}" at ${DotnetVersionResolver.DotnetCoreIndexUrl}`
+        `Could not find info for version with major tag: "${majorTag}" at ${DotnetVersionResolver.DotNetCoreIndexUrl}`
       );
     }
 
     return releaseInfo['channel-version'];
   }
 
-  static DotnetCoreIndexUrl =
+  static DotNetCoreIndexUrl =
+    'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json';
+
+  static DotnetCoreIndexFallbackUrl =
     'https://dotnetcli.azureedge.net/dotnet/release-metadata/releases-index.json';
 }
 
-export class DotnetInstallScript {
-  private scriptName = IS_WINDOWS ? 'install-dotnet.ps1' : 'install-dotnet.sh';
-  private escapedScript: string;
-  private scriptArguments: string[] = [];
+export class DotnetCoreInstaller {
+  private version: string;
+  private quality: QualityOptions;
 
-  constructor() {
-    this.escapedScript = path
-      .join(__dirname, '..', '..', 'externals', this.scriptName)
-      .replace(/'/g, "''");
-
-    if (IS_WINDOWS) {
-      this.setupScriptPowershell();
-      return;
+  static {
+    const installationDirectoryWindows = path.join(
+      process.env['PROGRAMFILES'] + '',
+      'dotnet'
+    );
+    const installationDirectoryLinux = '/usr/share/dotnet';
+    const installationDirectoryMac = path.join(
+      process.env['HOME'] + '',
+      '.dotnet'
+    );
+    const dotnetInstallDir: string | undefined =
+      process.env['DOTNET_INSTALL_DIR'];
+    if (dotnetInstallDir) {
+      process.env['DOTNET_INSTALL_DIR'] =
+        this.convertInstallPathToAbsolute(dotnetInstallDir);
+    } else {
+      if (IS_WINDOWS) {
+        process.env['DOTNET_INSTALL_DIR'] = installationDirectoryWindows;
+      } else {
+        process.env['DOTNET_INSTALL_DIR'] = IS_LINUX
+          ? installationDirectoryLinux
+          : installationDirectoryMac;
+      }
     }
-
-    this.setupScriptBash();
   }
 
-  private setupScriptPowershell() {
-    this.scriptArguments = [
+  constructor(version: string, quality: QualityOptions) {
+    this.version = version;
+    this.quality = quality;
+  }
+
+  private static convertInstallPathToAbsolute(installDir: string): string {
+    let transformedPath;
+    if (path.isAbsolute(installDir)) {
+      transformedPath = installDir;
+    } else {
+      transformedPath = installDir.startsWith('~')
+        ? path.join(os.homedir(), installDir.slice(1))
+        : (transformedPath = path.join(process.cwd(), installDir));
+    }
+    return path.normalize(transformedPath);
+  }
+
+  static addToPath() {
+    core.addPath(process.env['DOTNET_INSTALL_DIR']!);
+    core.exportVariable('DOTNET_ROOT', process.env['DOTNET_INSTALL_DIR']);
+  }
+
+  private setQuality(
+    dotnetVersion: DotnetVersion,
+    scriptArguments: string[]
+  ): void {
+    const option = IS_WINDOWS ? '-Quality' : '--quality';
+    if (dotnetVersion.qualityFlag) {
+      scriptArguments.push(option, this.quality);
+    } else {
+      core.warning(
+        `The 'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A, A.x and A.B.Cxx formats where the major tag is higher than 5. You specified: ${this.version}. 'dotnet-quality' input is ignored.`
+      );
+    }
+  }
+
+  public async installDotnet(): Promise<string | null> {
+    const windowsDefaultOptions = [
       '-NoLogo',
       '-Sta',
       '-NoProfile',
@@ -153,160 +213,68 @@ export class DotnetInstallScript {
       'Unrestricted',
       '-Command'
     ];
+    const scriptName = IS_WINDOWS ? 'install-dotnet.ps1' : 'install-dotnet.sh';
+    const escapedScript = path
+      .join(__dirname, '..', '..', 'externals', scriptName)
+      .replace(/'/g, "''");
+    let scriptArguments: string[];
+    let scriptPath = '';
 
-    this.scriptArguments.push('&', `'${this.escapedScript}'`);
+    const versionResolver = new DotnetVersionResolver(this.version);
+    const dotnetVersion = await versionResolver.createDotNetVersion();
 
-    if (process.env['https_proxy'] != null) {
-      this.scriptArguments.push(`-ProxyAddress ${process.env['https_proxy']}`);
-    }
-    // This is not currently an option
-    if (process.env['no_proxy'] != null) {
-      this.scriptArguments.push(`-ProxyBypassList ${process.env['no_proxy']}`);
-    }
-  }
-
-  private setupScriptBash() {
-    chmodSync(this.escapedScript, '777');
-  }
-
-  private async getScriptPath() {
     if (IS_WINDOWS) {
-      return (await io.which('pwsh', false)) || io.which('powershell', true);
+      scriptArguments = ['&', `'${escapedScript}'`];
+
+      if (dotnetVersion.type) {
+        scriptArguments.push(dotnetVersion.type, dotnetVersion.value);
+      }
+
+      if (this.quality) {
+        this.setQuality(dotnetVersion, scriptArguments);
+      }
+
+      if (process.env['https_proxy'] != null) {
+        scriptArguments.push(`-ProxyAddress ${process.env['https_proxy']}`);
+      }
+      // This is not currently an option
+      if (process.env['no_proxy'] != null) {
+        scriptArguments.push(`-ProxyBypassList ${process.env['no_proxy']}`);
+      }
+
+      scriptPath =
+        (await io.which('pwsh', false)) || (await io.which('powershell', true));
+      scriptArguments = windowsDefaultOptions.concat(scriptArguments);
+    } else {
+      chmodSync(escapedScript, '777');
+      scriptPath = await io.which(escapedScript, true);
+      scriptArguments = [];
+
+      if (dotnetVersion.type) {
+        scriptArguments.push(dotnetVersion.type, dotnetVersion.value);
+      }
+
+      if (this.quality) {
+        this.setQuality(dotnetVersion, scriptArguments);
+      }
     }
-
-    return io.which(this.escapedScript, true);
-  }
-
-  public useArguments(...args: string[]) {
-    this.scriptArguments.push(...args);
-    return this;
-  }
-
-  public useVersion(dotnetVersion: DotnetVersion, quality?: QualityOptions) {
-    if (dotnetVersion.type) {
-      this.useArguments(dotnetVersion.type, dotnetVersion.value);
-    }
-
-    if (quality && !dotnetVersion.qualityFlag) {
-      core.warning(
-        `The 'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A, A.x and A.B.Cxx formats where the major tag is higher than 5. You specified: ${dotnetVersion.value}. 'dotnet-quality' input is ignored.`
-      );
-      return this;
-    }
-
-    if (quality) {
-      this.useArguments(IS_WINDOWS ? '-Quality' : '--quality', quality);
-    }
-
-    return this;
-  }
-
-  public async execute() {
+    // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
     const getExecOutputOptions = {
       ignoreReturnCode: true,
       env: process.env as {string: string}
     };
-
-    return exec.getExecOutput(
-      `"${await this.getScriptPath()}"`,
-      this.scriptArguments,
+    const {exitCode, stdout, stderr} = await exec.getExecOutput(
+      `"${scriptPath}"`,
+      scriptArguments,
       getExecOutputOptions
     );
-  }
-}
-
-export abstract class DotnetInstallDir {
-  private static readonly default = {
-    linux: '/usr/share/dotnet',
-    mac: path.join(process.env['HOME'] + '', '.dotnet'),
-    windows: path.join(process.env['PROGRAMFILES'] + '', 'dotnet')
-  };
-
-  public static readonly dirPath = process.env['DOTNET_INSTALL_DIR']
-    ? DotnetInstallDir.convertInstallPathToAbsolute(
-        process.env['DOTNET_INSTALL_DIR']
-      )
-    : DotnetInstallDir.default[PLATFORM];
-
-  private static convertInstallPathToAbsolute(installDir: string): string {
-    if (path.isAbsolute(installDir)) return path.normalize(installDir);
-
-    const transformedPath = installDir.startsWith('~')
-      ? path.join(os.homedir(), installDir.slice(1))
-      : path.join(process.cwd(), installDir);
-
-    return path.normalize(transformedPath);
-  }
-
-  public static addToPath() {
-    core.addPath(process.env['DOTNET_INSTALL_DIR']!);
-    core.exportVariable('DOTNET_ROOT', process.env['DOTNET_INSTALL_DIR']);
-  }
-
-  public static setEnvironmentVariable() {
-    process.env['DOTNET_INSTALL_DIR'] = DotnetInstallDir.dirPath;
-  }
-}
-
-export class DotnetCoreInstaller {
-  static {
-    DotnetInstallDir.setEnvironmentVariable();
-  }
-
-  constructor(
-    private version: string,
-    private quality: QualityOptions
-  ) {}
-
-  public async installDotnet(): Promise<string | null> {
-    const versionResolver = new DotnetVersionResolver(this.version);
-    const dotnetVersion = await versionResolver.createDotnetVersion();
-
-    /**
-     * Install dotnet runitme first in order to get
-     * the latest stable version of dotnet CLI
-     */
-    const runtimeInstallOutput = await new DotnetInstallScript()
-      // If dotnet CLI is already installed - avoid overwriting it
-      .useArguments(
-        IS_WINDOWS ? '-SkipNonVersionedFiles' : '--skip-non-versioned-files'
-      )
-      // Install only runtime + CLI
-      .useArguments(IS_WINDOWS ? '-Runtime' : '--runtime', 'dotnet')
-      // Use latest stable version
-      .useArguments(IS_WINDOWS ? '-Channel' : '--channel', 'LTS')
-      .execute();
-
-    if (runtimeInstallOutput.exitCode) {
-      /**
-       * dotnetInstallScript will install CLI and runtime even if previous script haven't succeded,
-       * so at this point it's too early to throw an error
-       */
-      core.warning(
-        `Failed to install dotnet runtime + cli, exit code: ${runtimeInstallOutput.exitCode}. ${runtimeInstallOutput.stderr}`
-      );
-    }
-
-    /**
-     * Install dotnet over the latest version of
-     * dotnet CLI
-     */
-    const dotnetInstallOutput = await new DotnetInstallScript()
-      // Don't overwrite CLI because it should be already installed
-      .useArguments(
-        IS_WINDOWS ? '-SkipNonVersionedFiles' : '--skip-non-versioned-files'
-      )
-      // Use version provided by user
-      .useVersion(dotnetVersion, this.quality)
-      .execute();
-
-    if (dotnetInstallOutput.exitCode) {
+    if (exitCode) {
       throw new Error(
-        `Failed to install dotnet, exit code: ${dotnetInstallOutput.exitCode}. ${dotnetInstallOutput.stderr}`
+        `Failed to install dotnet, exit code: ${exitCode}. ${stderr}`
       );
     }
 
-    return this.parseInstalledVersion(dotnetInstallOutput.stdout);
+    return this.parseInstalledVersion(stdout);
   }
 
   private parseInstalledVersion(stdout: string): string | null {

src/setup-dotnet.ts

@@ -1,5 +1,5 @@
 import * as core from '@actions/core';
-import {DotnetCoreInstaller, DotnetInstallDir} from './installer';
+import {DotnetCoreInstaller} from './installer';
 import * as fs from 'fs';
 import path from 'path';
 import semver from 'semver';
@@ -7,7 +7,6 @@ import * as auth from './authutil';
 import {isCacheFeatureAvailable} from './cache-utils';
 import {restoreCache} from './cache-restore';
 import {Outputs} from './constants';
-import JSON5 from 'json5';
 
 const qualityOptions = [
   'daily',
@@ -73,7 +72,7 @@ export async function run() {
         const installedVersion = await dotnetInstaller.installDotnet();
         installedDotnetVersions.push(installedVersion);
       }
-      DotnetInstallDir.addToPath();
+      DotnetCoreInstaller.addToPath();
     }
 
     const sourceUrl: string = core.getInput('source-url');
@@ -98,14 +97,9 @@ export async function run() {
 
 function getVersionFromGlobalJson(globalJsonPath: string): string {
   let version = '';
-  const globalJson = JSON5.parse(
+  const globalJson = JSON.parse(
     // .trim() is necessary to strip BOM https://github.com/nodejs/node/issues/20649
-    fs.readFileSync(globalJsonPath, {encoding: 'utf8'}).trim(),
-    // is necessary as JSON5 supports wider variety of options for numbers: https://www.npmjs.com/package/json5#numbers
-    (key, value) => {
-      if (key === 'version' || key === 'rollForward') return String(value);
-      return value;
-    }
+    fs.readFileSync(globalJsonPath, {encoding: 'utf8'}).trim()
   );
   if (globalJson.sdk && globalJson.sdk.version) {
     version = globalJson.sdk.version;

src/utils.ts

@@ -1,6 +1,2 @@
 export const IS_WINDOWS = process.platform === 'win32';
-export const PLATFORM = ((): 'windows' | 'linux' | 'mac' => {
-  if (process.platform === 'win32') return 'windows';
-  if (process.platform === 'linux') return 'linux';
-  return 'mac';
-})();
+export const IS_LINUX = process.platform === 'linux';