Update the link to the .Net Core releases index file (#337)

Refactor nuget cfg parse

.gitattributes

@@ -1 +1 @@
-.licenses/** -diff linguist-generated=true
+.licenses/** -diff linguist-generated=true

.prettierrc.json

@@ -7,5 +7,6 @@
     "trailingComma": "none",
     "bracketSpacing": false,
     "arrowParens": "avoid",
-    "parser": "typescript"
+    "parser": "typescript",
+    "endOfLine": "auto"
   }

README.md

@@ -195,16 +195,24 @@ Some environment variables may be necessary for your particular case or to impro
 
 | **Env.variable**      | **Description** | **Default value** |
 | ----------- | ----------- | ----------- |
+| DOTNET_INSTALL_DIR      |Specifies a directory where .NET SDKs should be installed by the action.|*default value for each OS* |
 | DOTNET_NOLOGO      |Removes logo and telemetry message from first run of dotnet cli|*false*|
 | DOTNET_CLI_TELEMETRY_OPTOUT   |Opt-out of telemetry being sent to Microsoft|*false*|
 | DOTNET_MULTILEVEL_LOOKUP   |Configures whether the global install location is used as a fall-back|*true*|
 
+The default value of the `DOTNET_INSTALL_DIR` environment variable depends on the operation system which is used on a runner:
+| **Operation system**      | **Default value** |
+| ----------- | ----------- |
+| **Windows** | `C:\Program Files\dotnet` |
+| **Ubuntu** | `/usr/share/dotnet` |
+| **macOS** | `/Users/runner/.dotnet` |
+
 **Example usage**:
 ```yml
 build:
   runs-on: ubuntu-latest
   env:
-    DOTNET_NOLOGO: true
+    DOTNET_INSTALL_DIR: "path/to/directory"
   steps:
     - uses: actions/checkout@main
     - uses: actions/setup-dotnet@v3

__tests__/authutil.test.ts

@@ -5,11 +5,7 @@ import path from 'path';
 const fakeSourcesDirForTesting = path.join(
   __dirname,
   'runner',
-  path.join(
-    Math.random()
-      .toString(36)
-      .substring(7)
-  ),
+  path.join(Math.random().toString(36).substring(7)),
   's'
 );
 

package-lock.json

@@ -1,22 +1,21 @@
 {
   "name": "setup-dotnet",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "setup-dotnet",
-      "version": "3.0.0",
+      "version": "3.0.2",
       "license": "MIT",
       "dependencies": {
-        "@actions/core": "^1.9.1",
+        "@actions/core": "^1.10.0",
         "@actions/exec": "^1.0.4",
         "@actions/github": "^1.1.0",
         "@actions/http-client": "^2.0.1",
         "@actions/io": "^1.0.2",
-        "fast-xml-parser": "^3.15.1",
-        "semver": "^6.3.0",
-        "xmlbuilder": "^13.0.2"
+        "fast-xml-parser": "^4.0.10",
+        "semver": "^6.3.0"
       },
       "devDependencies": {
         "@types/jest": "^27.0.2",
@@ -26,16 +25,16 @@
         "husky": "^8.0.1",
         "jest": "^27.2.5",
         "jest-circus": "^27.2.5",
-        "prettier": "^1.19.1",
+        "prettier": "^2.7.1",
         "ts-jest": "^27.0.5",
-        "typescript": "^3.9.7",
+        "typescript": "^4.8.4",
         "wget-improved": "^3.2.1"
       }
     },
     "node_modules/@actions/core": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
-      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
+      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
       "dependencies": {
         "@actions/http-client": "^2.0.1",
         "uuid": "^8.3.2"
@@ -1992,12 +1991,14 @@
       "dev": true
     },
     "node_modules/fast-xml-parser": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.17.4.tgz",
-      "integrity": "sha512-qudnQuyYBgnvzf5Lj/yxMcf4L9NcVWihXJg7CiU1L+oUCq8MUnFEfH2/nXR/W5uq+yvUN1h7z6s7vs2v1WkL1A==",
-      "hasInstallScript": true,
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.0.10.tgz",
+      "integrity": "sha512-mYMMIk7Ho1QOiedyvafdyPamn1Vlda+5n95lcn0g79UiCQoLQ2xfPQ8m3pcxBMpVaftYXtoIE2wrNTjmLQnnkg==",
+      "dependencies": {
+        "strnum": "^1.0.5"
+      },
       "bin": {
-        "xml2js": "cli.js"
+        "fxparser": "src/cli/cli.js"
       },
       "funding": {
         "type": "paypal",
@@ -3883,15 +3884,18 @@
       }
     },
     "node_modules/prettier": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
-      "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
+      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
       "dev": true,
       "bin": {
         "prettier": "bin-prettier.js"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
       }
     },
     "node_modules/pretty-format": {
@@ -4204,6 +4208,11 @@
         "node": ">=6"
       }
     },
+    "node_modules/strnum": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="
+    },
     "node_modules/supports-color": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
@@ -4430,9 +4439,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "3.9.7",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
-      "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -4666,14 +4675,6 @@
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
       "dev": true
     },
-    "node_modules/xmlbuilder": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz",
-      "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==",
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
     "node_modules/xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
@@ -4725,9 +4726,9 @@
   },
   "dependencies": {
     "@actions/core": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
-      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
+      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
       "requires": {
         "@actions/http-client": "^2.0.1",
         "uuid": "^8.3.2"
@@ -6293,9 +6294,12 @@
       "dev": true
     },
     "fast-xml-parser": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.17.4.tgz",
-      "integrity": "sha512-qudnQuyYBgnvzf5Lj/yxMcf4L9NcVWihXJg7CiU1L+oUCq8MUnFEfH2/nXR/W5uq+yvUN1h7z6s7vs2v1WkL1A=="
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.0.10.tgz",
+      "integrity": "sha512-mYMMIk7Ho1QOiedyvafdyPamn1Vlda+5n95lcn0g79UiCQoLQ2xfPQ8m3pcxBMpVaftYXtoIE2wrNTjmLQnnkg==",
+      "requires": {
+        "strnum": "^1.0.5"
+      }
     },
     "fb-watchman": {
       "version": "2.0.1",
@@ -7723,9 +7727,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
-      "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
+      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
       "dev": true
     },
     "pretty-format": {
@@ -7967,6 +7971,11 @@
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true
     },
+    "strnum": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="
+    },
     "supports-color": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
@@ -8123,9 +8132,9 @@
       }
     },
     "typescript": {
-      "version": "3.9.7",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
-      "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
       "dev": true
     },
     "universal-user-agent": {
@@ -8298,11 +8307,6 @@
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
       "dev": true
     },
-    "xmlbuilder": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz",
-      "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ=="
-    },
     "xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-dotnet",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "private": true,
   "description": "setup dotnet action",
   "main": "lib/setup-dotnet.js",
@@ -24,14 +24,13 @@
   "author": "GitHub",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.9.1",
+    "@actions/core": "^1.10.0",
     "@actions/exec": "^1.0.4",
     "@actions/github": "^1.1.0",
     "@actions/http-client": "^2.0.1",
     "@actions/io": "^1.0.2",
-    "fast-xml-parser": "^3.15.1",
-    "semver": "^6.3.0",
-    "xmlbuilder": "^13.0.2"
+    "fast-xml-parser": "^4.0.10",
+    "semver": "^6.3.0"
   },
   "devDependencies": {
     "@types/jest": "^27.0.2",
@@ -41,9 +40,9 @@
     "husky": "^8.0.1",
     "jest": "^27.2.5",
     "jest-circus": "^27.2.5",
-    "prettier": "^1.19.1",
+    "prettier": "^2.7.1",
     "ts-jest": "^27.0.5",
-    "typescript": "^3.9.7",
+    "typescript": "^4.8.4",
     "wget-improved": "^3.2.1"
   },
   "jest": {

src/authutil.ts

@@ -2,8 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as core from '@actions/core';
 import * as github from '@actions/github';
-import * as xmlbuilder from 'xmlbuilder';
-import * as xmlParser from 'fast-xml-parser';
+import {XMLParser, XMLBuilder} from 'fast-xml-parser';
 
 export function configAuthentication(
   feedUrl: string,
@@ -49,7 +48,6 @@ function writeFeedToFile(
   core.info(
     `dotnet-auth: Finding any source references in ${existingFileLocation}, writing a new temporary configuration file with credentials to ${tempFileLocation}`
   );
-  let xml: xmlbuilder.XMLElement;
   let sourceKeys: string[] = [];
   let owner: string = core.getInput('owner');
   let sourceUrl: string = feedUrl;
@@ -66,64 +64,90 @@ function writeFeedToFile(
   if (fs.existsSync(existingFileLocation)) {
     // get key from existing NuGet.config so NuGet/dotnet can match credentials
     const curContents: string = fs.readFileSync(existingFileLocation, 'utf8');
-    const json = xmlParser.parse(curContents, {ignoreAttributes: false});
+
+    const parserOptions = {
+      ignoreAttributes: false
+    };
+    const parser = new XMLParser(parserOptions);
+    const json = parser.parse(curContents);
 
     if (typeof json.configuration === 'undefined') {
       throw new Error(`The provided NuGet.config seems invalid.`);
     }
-    if (typeof json.configuration.packageSources != 'undefined') {
-      if (typeof json.configuration.packageSources.add != 'undefined') {
-        // file has at least one <add>
-        if (typeof json.configuration.packageSources.add[0] === 'undefined') {
-          // file has only one <add>
-          if (
-            json.configuration.packageSources.add['@_value']
-              .toLowerCase()
-              .includes(feedUrl.toLowerCase())
-          ) {
-            const key = json.configuration.packageSources.add['@_key'];
+    if (json.configuration?.packageSources?.add) {
+      const packageSources = json.configuration.packageSources.add;
+
+      if (Array.isArray(packageSources)) {
+        packageSources.forEach(source => {
+          const value = source['@_value'];
+          core.debug(`source '${value}'`);
+          if (value.toLowerCase().includes(feedUrl.toLowerCase())) {
+            const key = source['@_key'];
             sourceKeys.push(key);
             core.debug(`Found a URL with key ${key}`);
           }
-        } else {
-          // file has 2+ <add>
-          for (
-            let i = 0;
-            i < json.configuration.packageSources.add.length;
-            i++
-          ) {
-            const source = json.configuration.packageSources.add[i];
-            const value = source['@_value'];
-            core.debug(`source '${value}'`);
-            if (value.toLowerCase().includes(feedUrl.toLowerCase())) {
-              const key = source['@_key'];
-              sourceKeys.push(key);
-              core.debug(`Found a URL with key ${key}`);
-            }
-          }
+        });
+      } else {
+        if (
+          packageSources['@_value']
+            .toLowerCase()
+            .includes(feedUrl.toLowerCase())
+        ) {
+          const key = packageSources['@_key'];
+          sourceKeys.push(key);
+          core.debug(`Found a URL with key ${key}`);
         }
       }
     }
   }
 
-  xml = xmlbuilder
-    .create('configuration')
-    .ele('config')
-    .ele('add', {key: 'defaultPushSource', value: sourceUrl})
-    .up()
-    .up();
+  const xmlSource: any[] = [
+    {
+      '?xml': [
+        {
+          '#text': ''
+        }
+      ],
+      ':@': {
+        '@_version': '1.0'
+      }
+    },
+    {
+      configuration: [
+        {
+          config: [
+            {
+              add: [],
+              ':@': {
+                '@_key': 'defaultPushSource',
+                '@_value': sourceUrl
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ];
 
   if (!sourceKeys.length) {
     let keystring = 'Source';
-    xml = xml
-      .ele('packageSources')
-      .ele('add', {key: keystring, value: sourceUrl})
-      .up()
-      .up();
+
+    xmlSource[1].configuration.push({
+      packageSources: [
+        {
+          add: [],
+          ':@': {
+            '@_key': keystring,
+            '@_value': sourceUrl
+          }
+        }
+      ]
+    });
+
     sourceKeys.push(keystring);
   }
-  xml = xml.ele('packageSourceCredentials');
 
+  const packageSourceCredentials: any[] = [];
   sourceKeys.forEach(key => {
     if (!isValidKey(key)) {
       throw new Error(
@@ -131,24 +155,42 @@ function writeFeedToFile(
       );
     }
 
-    xml = xml
-      .ele(key)
-      .ele('add', {key: 'Username', value: owner})
-      .up()
-      .ele('add', {
-        key: 'ClearTextPassword',
-        value: process.env.NUGET_AUTH_TOKEN
-      })
-      .up()
-      .up();
+    packageSourceCredentials.push({
+      [key]: [
+        {
+          add: [],
+          ':@': {
+            '@_key': 'Username',
+            '@_value': owner
+          }
+        },
+        {
+          add: [],
+          ':@': {
+            '@_key': 'ClearTextPassword',
+            '@_value': process.env.NUGET_AUTH_TOKEN
+          }
+        }
+      ]
+    });
   });
 
-  // If NuGet fixes itself such that on Linux it can look for environment variables in the config file (it doesn't seem to work today),
-  // use this for the value above
-  //           process.platform == 'win32'
-  //             ? '%NUGET_AUTH_TOKEN%'
-  //             : '$NUGET_AUTH_TOKEN'
+  xmlSource[1].configuration.push({
+    packageSourceCredentials
+  });
+
+  const xmlBuilderOptions = {
+    format: true,
+    ignoreAttributes: false,
+    preserveOrder: true,
+    allowBooleanAttributes: true,
+    suppressBooleanAttributes: true,
+    suppressEmptyNode: true
+  };
+
+  const builder = new XMLBuilder(xmlBuilderOptions);
+
+  const output = builder.build(xmlSource).trim();
 
-  const output = xml.end({pretty: true});
   fs.writeFileSync(tempFileLocation, output);
 }

src/installer.ts

@@ -6,8 +6,9 @@ import * as hc from '@actions/http-client';
 import {chmodSync} from 'fs';
 import {readdir} from 'fs/promises';
 import path from 'path';
+import os from 'os';
 import semver from 'semver';
-import {IS_LINUX, IS_WINDOWS, IS_MAC} from './utils';
+import {IS_LINUX, IS_WINDOWS} from './utils';
 import {QualityOptions} from './setup-dotnet';
 
 export interface DotnetVersion {
@@ -106,46 +107,35 @@ export class DotnetVersionResolver {
   }
 
   static DotNetCoreIndexUrl: string =
-    'https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/releases-index.json';
+    'https://dotnetcli.azureedge.net/dotnet/release-metadata/releases-index.json';
 }
 
 export class DotnetCoreInstaller {
   private version: string;
   private quality: QualityOptions;
-  private static readonly installationDirectoryWindows = path.join(
-    process.env['PROGRAMFILES'] + '',
-    'dotnet'
-  );
-  private static readonly installationDirectoryLinux = '/usr/share/dotnet';
-  private static readonly installationDirectoryMac = path.join(
-    process.env['HOME'] + '',
-    '.dotnet'
-  );
 
-  static addToPath() {
-    if (process.env['DOTNET_INSTALL_DIR']) {
-      core.addPath(process.env['DOTNET_INSTALL_DIR']);
-      core.exportVariable('DOTNET_ROOT', process.env['DOTNET_INSTALL_DIR']);
+  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) {
-        core.addPath(DotnetCoreInstaller.installationDirectoryWindows);
-        core.exportVariable(
-          'DOTNET_ROOT',
-          DotnetCoreInstaller.installationDirectoryWindows
-        );
-      } else if (IS_LINUX) {
-        core.addPath(DotnetCoreInstaller.installationDirectoryLinux);
-        core.exportVariable(
-          'DOTNET_ROOT',
-          DotnetCoreInstaller.installationDirectoryLinux
-        );
+        process.env['DOTNET_INSTALL_DIR'] = installationDirectoryWindows;
       } else {
-        // This is the default set in install-dotnet.sh
-        core.addPath(DotnetCoreInstaller.installationDirectoryMac);
-        core.exportVariable(
-          'DOTNET_ROOT',
-          DotnetCoreInstaller.installationDirectoryMac
-        );
+        process.env['DOTNET_INSTALL_DIR'] = IS_LINUX
+          ? installationDirectoryLinux
+          : installationDirectoryMac;
       }
     }
   }
@@ -155,6 +145,23 @@ export class DotnetCoreInstaller {
     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[]
@@ -208,11 +215,6 @@ export class DotnetCoreInstaller {
         scriptArguments.push(`-ProxyBypassList ${process.env['no_proxy']}`);
       }
 
-      scriptArguments.push(
-        '-InstallDir',
-        `'${DotnetCoreInstaller.installationDirectoryWindows}'`
-      );
-      // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
       scriptPath =
         (await io.which('pwsh', false)) || (await io.which('powershell', true));
       scriptArguments = windowsDefaultOptions.concat(scriptArguments);
@@ -228,40 +230,26 @@ export class DotnetCoreInstaller {
       if (this.quality) {
         this.setQuality(dotnetVersion, scriptArguments);
       }
-
-      if (IS_LINUX) {
-        scriptArguments.push(
-          '--install-dir',
-          DotnetCoreInstaller.installationDirectoryLinux
-        );
-      }
-
-      if (IS_MAC) {
-        scriptArguments.push(
-          '--install-dir',
-          DotnetCoreInstaller.installationDirectoryMac
-        );
-      }
     }
+    // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
+    const getExecOutputOptions = {
+      ignoreReturnCode: true,
+      env: process.env as {string: string}
+    };
     const {exitCode, stdout} = await exec.getExecOutput(
       `"${scriptPath}"`,
       scriptArguments,
-      {ignoreReturnCode: true}
+      getExecOutputOptions
     );
     if (exitCode) {
       throw new Error(`Failed to install dotnet ${exitCode}. ${stdout}`);
     }
 
-    return this.outputDotnetVersion(
-      dotnetVersion.value,
-      scriptArguments[scriptArguments.length - 1]
-    );
+    return this.outputDotnetVersion(dotnetVersion.value);
   }
 
-  private async outputDotnetVersion(
-    version,
-    installationPath
-  ): Promise<string> {
+  private async outputDotnetVersion(version): Promise<string> {
+    const installationPath = process.env['DOTNET_INSTALL_DIR']!;
     let versionsOnRunner: string[] = await readdir(
       path.join(installationPath.replace(/'/g, ''), 'sdk')
     );

src/utils.ts

@@ -1,3 +1,2 @@
 export const IS_WINDOWS = process.platform === 'win32';
 export const IS_LINUX = process.platform === 'linux';
-export const IS_MAC = process.platform === 'darwin';

tsconfig.json

@@ -35,6 +35,7 @@
     // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
 
     /* Additional Checks */
+    "useUnknownInCatchVariables": false,               /* Type catch clause variables as 'unknown' instead of 'any'. */
     // "noUnusedLocals": true,                /* Report errors on unused locals. */
     // "noUnusedParameters": true,            /* Report errors on unused parameters. */
     // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */