Add logic for processing DOTNET_INSTALL_DIR environment variable (#332)

Update @actions/core to 1.10.0

.licenses/npm/@actions/core.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@actions/core"
-version: 1.9.1
+version: 1.10.0
 type: npm
 summary: Actions core lib
 homepage: https://github.com/actions/toolkit/tree/main/packages/core

.prettierrc.json

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

README.md

@@ -195,11 +195,18 @@ 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|*isn't set*|
+| 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:

__tests__/authutil.test.ts

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

dist/index.js

@@ -8,7 +8,11 @@
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -21,7 +25,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -152,7 +156,11 @@ function writeFeedToFile(feedUrl, existingFileLocation, tempFileLocation) {
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -165,7 +173,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -181,6 +189,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _a;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DotnetCoreInstaller = exports.DotnetVersionResolver = void 0;
 // Load tempDirectory before it gets wiped by tool-cache
@@ -191,6 +200,7 @@ const hc = __importStar(__nccwpck_require__(6255));
 const fs_1 = __nccwpck_require__(7147);
 const promises_1 = __nccwpck_require__(3292);
 const path_1 = __importDefault(__nccwpck_require__(1017));
+const os_1 = __importDefault(__nccwpck_require__(2037));
 const semver_1 = __importDefault(__nccwpck_require__(5911));
 const utils_1 = __nccwpck_require__(918);
 class DotnetVersionResolver {
@@ -269,27 +279,22 @@ class DotnetCoreInstaller {
         this.version = version;
         this.quality = quality;
     }
+    static convertInstallPathToAbsolute(installDir) {
+        let transformedPath;
+        if (path_1.default.isAbsolute(installDir)) {
+            transformedPath = installDir;
+        }
+        else {
+            transformedPath = installDir.startsWith('~')
+                ? path_1.default.join(os_1.default.homedir(), installDir.slice(1))
+                : (transformedPath = path_1.default.join(process.cwd(), installDir));
+        }
+        return path_1.default.normalize(transformedPath);
+    }
     static addToPath() {
-        if (process.env['DOTNET_INSTALL_DIR']) {
         core.addPath(process.env['DOTNET_INSTALL_DIR']);
         core.exportVariable('DOTNET_ROOT', process.env['DOTNET_INSTALL_DIR']);
     }
-        else {
-            if (utils_1.IS_WINDOWS) {
-                core.addPath(DotnetCoreInstaller.installationDirectoryWindows);
-                core.exportVariable('DOTNET_ROOT', DotnetCoreInstaller.installationDirectoryWindows);
-            }
-            else if (utils_1.IS_LINUX) {
-                core.addPath(DotnetCoreInstaller.installationDirectoryLinux);
-                core.exportVariable('DOTNET_ROOT', DotnetCoreInstaller.installationDirectoryLinux);
-            }
-            else {
-                // This is the default set in install-dotnet.sh
-                core.addPath(DotnetCoreInstaller.installationDirectoryMac);
-                core.exportVariable('DOTNET_ROOT', DotnetCoreInstaller.installationDirectoryMac);
-            }
-        }
-    }
     setQuality(dotnetVersion, scriptArguments) {
         const option = utils_1.IS_WINDOWS ? '-Quality' : '--quality';
         if (dotnetVersion.qualityFlag) {
@@ -333,16 +338,12 @@ class DotnetCoreInstaller {
                 if (process.env['no_proxy'] != null) {
                     scriptArguments.push(`-ProxyBypassList ${process.env['no_proxy']}`);
                 }
-                if (!process.env['DOTNET_INSTALL_DIR']) {
-                    process.env['DOTNET_INSTALL_DIR'] =
-                        DotnetCoreInstaller.installationDirectoryWindows;
-                }
                 scriptPath =
                     (yield io.which('pwsh', false)) || (yield io.which('powershell', true));
                 scriptArguments = windowsDefaultOptions.concat(scriptArguments);
             }
             else {
-                fs_1.chmodSync(escapedScript, '777');
+                (0, fs_1.chmodSync)(escapedScript, '777');
                 scriptPath = yield io.which(escapedScript, true);
                 scriptArguments = [];
                 if (dotnetVersion.type) {
@@ -351,11 +352,6 @@ class DotnetCoreInstaller {
                 if (this.quality) {
                     this.setQuality(dotnetVersion, scriptArguments);
                 }
-                if (!process.env['DOTNET_INSTALL_DIR']) {
-                    process.env['DOTNET_INSTALL_DIR'] = utils_1.IS_LINUX
-                        ? DotnetCoreInstaller.installationDirectoryLinux
-                        : DotnetCoreInstaller.installationDirectoryMac;
-                }
             }
             // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
             const getExecOutputOptions = {
@@ -366,12 +362,13 @@ class DotnetCoreInstaller {
             if (exitCode) {
                 throw new Error(`Failed to install dotnet ${exitCode}. ${stdout}`);
             }
-            return this.outputDotnetVersion(dotnetVersion.value, process.env['DOTNET_INSTALL_DIR']);
+            return this.outputDotnetVersion(dotnetVersion.value);
         });
     }
-    outputDotnetVersion(version, installationPath) {
+    outputDotnetVersion(version) {
         return __awaiter(this, void 0, void 0, function* () {
-            let versionsOnRunner = yield promises_1.readdir(path_1.default.join(installationPath.replace(/'/g, ''), 'sdk'));
+            const installationPath = process.env['DOTNET_INSTALL_DIR'];
+            let versionsOnRunner = yield (0, promises_1.readdir)(path_1.default.join(installationPath.replace(/'/g, ''), 'sdk'));
             let installedVersion = semver_1.default.maxSatisfying(versionsOnRunner, version, {
                 includePrerelease: true
             });
@@ -380,9 +377,27 @@ class DotnetCoreInstaller {
     }
 }
 exports.DotnetCoreInstaller = DotnetCoreInstaller;
-DotnetCoreInstaller.installationDirectoryWindows = path_1.default.join(process.env['PROGRAMFILES'] + '', 'dotnet');
+_a = DotnetCoreInstaller;
-DotnetCoreInstaller.installationDirectoryLinux = '/usr/share/dotnet';
+(() => {
-DotnetCoreInstaller.installationDirectoryMac = path_1.default.join(process.env['HOME'] + '', '.dotnet');
+    const installationDirectoryWindows = path_1.default.join(process.env['PROGRAMFILES'] + '', 'dotnet');
+    const installationDirectoryLinux = '/usr/share/dotnet';
+    const installationDirectoryMac = path_1.default.join(process.env['HOME'] + '', '.dotnet');
+    const dotnetInstallDir = process.env['DOTNET_INSTALL_DIR'];
+    if (dotnetInstallDir) {
+        process.env['DOTNET_INSTALL_DIR'] =
+            _a.convertInstallPathToAbsolute(dotnetInstallDir);
+    }
+    else {
+        if (utils_1.IS_WINDOWS) {
+            process.env['DOTNET_INSTALL_DIR'] = installationDirectoryWindows;
+        }
+        else {
+            process.env['DOTNET_INSTALL_DIR'] = utils_1.IS_LINUX
+                ? installationDirectoryLinux
+                : installationDirectoryMac;
+        }
+    }
+})();
 
 
 /***/ }),
@@ -394,7 +409,11 @@ DotnetCoreInstaller.installationDirectoryMac = path_1.default.join(process.env['
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -407,7 +426,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -675,7 +694,6 @@ const file_command_1 = __nccwpck_require__(717);
 const utils_1 = __nccwpck_require__(5278);
 const os = __importStar(__nccwpck_require__(2037));
 const path = __importStar(__nccwpck_require__(1017));
-const uuid_1 = __nccwpck_require__(5840);
 const oidc_utils_1 = __nccwpck_require__(8041);
 /**
  * The code to exit an action
@@ -705,20 +723,9 @@ function exportVariable(name, val) {
     process.env[name] = convertedVal;
     const filePath = process.env['GITHUB_ENV'] || '';
     if (filePath) {
-        const delimiter = `ghadelimiter_${uuid_1.v4()}`;
+        return file_command_1.issueFileCommand('ENV', file_command_1.prepareKeyValueMessage(name, val));
-        // These should realistically never happen, but just in case someone finds a way to exploit uuid generation let's not allow keys or values that contain the delimiter.
-        if (name.includes(delimiter)) {
-            throw new Error(`Unexpected input: name should not contain the delimiter "${delimiter}"`);
     }
-        if (convertedVal.includes(delimiter)) {
-            throw new Error(`Unexpected input: value should not contain the delimiter "${delimiter}"`);
-        }
-        const commandValue = `${name}<<${delimiter}${os.EOL}${convertedVal}${os.EOL}${delimiter}`;
-        file_command_1.issueCommand('ENV', commandValue);
-    }
-    else {
     command_1.issueCommand('set-env', { name }, convertedVal);
-    }
 }
 exports.exportVariable = exportVariable;
 /**
@@ -736,7 +743,7 @@ exports.setSecret = setSecret;
 function addPath(inputPath) {
     const filePath = process.env['GITHUB_PATH'] || '';
     if (filePath) {
-        file_command_1.issueCommand('PATH', inputPath);
+        file_command_1.issueFileCommand('PATH', inputPath);
     }
     else {
         command_1.issueCommand('add-path', {}, inputPath);
@@ -776,7 +783,10 @@ function getMultilineInput(name, options) {
     const inputs = getInput(name, options)
         .split('\n')
         .filter(x => x !== '');
+    if (options && options.trimWhitespace === false) {
         return inputs;
+    }
+    return inputs.map(input => input.trim());
 }
 exports.getMultilineInput = getMultilineInput;
 /**
@@ -809,8 +819,12 @@ exports.getBooleanInput = getBooleanInput;
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function setOutput(name, value) {
+    const filePath = process.env['GITHUB_OUTPUT'] || '';
+    if (filePath) {
+        return file_command_1.issueFileCommand('OUTPUT', file_command_1.prepareKeyValueMessage(name, value));
+    }
     process.stdout.write(os.EOL);
-    command_1.issueCommand('set-output', { name }, value);
+    command_1.issueCommand('set-output', { name }, utils_1.toCommandValue(value));
 }
 exports.setOutput = setOutput;
 /**
@@ -939,7 +953,11 @@ exports.group = group;
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function saveState(name, value) {
-    command_1.issueCommand('save-state', { name }, value);
+    const filePath = process.env['GITHUB_STATE'] || '';
+    if (filePath) {
+        return file_command_1.issueFileCommand('STATE', file_command_1.prepareKeyValueMessage(name, value));
+    }
+    command_1.issueCommand('save-state', { name }, utils_1.toCommandValue(value));
 }
 exports.saveState = saveState;
 /**
@@ -1005,13 +1023,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.issueCommand = void 0;
+exports.prepareKeyValueMessage = exports.issueFileCommand = void 0;
 // We use any as a valid input type
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const fs = __importStar(__nccwpck_require__(7147));
 const os = __importStar(__nccwpck_require__(2037));
+const uuid_1 = __nccwpck_require__(5840);
 const utils_1 = __nccwpck_require__(5278);
-function issueCommand(command, message) {
+function issueFileCommand(command, message) {
     const filePath = process.env[`GITHUB_${command}`];
     if (!filePath) {
         throw new Error(`Unable to find environment variable for file command ${command}`);
@@ -1023,7 +1042,22 @@ function issueCommand(command, message) {
         encoding: 'utf8'
     });
 }
-exports.issueCommand = issueCommand;
+exports.issueFileCommand = issueFileCommand;
+function prepareKeyValueMessage(key, value) {
+    const delimiter = `ghadelimiter_${uuid_1.v4()}`;
+    const convertedValue = utils_1.toCommandValue(value);
+    // These should realistically never happen, but just in case someone finds a
+    // way to exploit uuid generation let's not allow keys or values that contain
+    // the delimiter.
+    if (key.includes(delimiter)) {
+        throw new Error(`Unexpected input: name should not contain the delimiter "${delimiter}"`);
+    }
+    if (convertedValue.includes(delimiter)) {
+        throw new Error(`Unexpected input: value should not contain the delimiter "${delimiter}"`);
+    }
+    return `${key}<<${delimiter}${os.EOL}${convertedValue}${os.EOL}${delimiter}`;
+}
+exports.prepareKeyValueMessage = prepareKeyValueMessage;
 //# sourceMappingURL=file-command.js.map
 
 /***/ }),

package-lock.json

@@ -1,15 +1,15 @@
 {
   "name": "setup-dotnet",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "setup-dotnet",
-      "version": "3.0.1",
+      "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",
@@ -26,16 +26,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",
+      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
-      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
+      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
       "dependencies": {
         "@actions/http-client": "^2.0.1",
         "uuid": "^8.3.2"
@@ -3883,15 +3883,18 @@
       }
     },
     "node_modules/prettier": {
-      "version": "1.19.1",
+      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-      "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
+      "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": {
@@ -4430,9 +4433,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "3.9.7",
+      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -4725,9 +4728,9 @@
   },
   "dependencies": {
     "@actions/core": {
-      "version": "1.9.1",
+      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
-      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
+      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
       "requires": {
         "@actions/http-client": "^2.0.1",
         "uuid": "^8.3.2"
@@ -7723,9 +7726,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "1.19.1",
+      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-      "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
+      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
       "dev": true
     },
     "pretty-format": {
@@ -8123,9 +8126,9 @@
       }
     },
     "typescript": {
-      "version": "3.9.7",
+      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
       "dev": true
     },
     "universal-user-agent": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-dotnet",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "private": true,
   "description": "setup dotnet action",
   "main": "lib/setup-dotnet.js",
@@ -24,7 +24,7 @@
   "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",
@@ -41,9 +41,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/installer.ts

@@ -6,6 +6,7 @@ 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} from './utils';
 import {QualityOptions} from './setup-dotnet';
@@ -112,40 +113,29 @@ export class DotnetVersionResolver {
 export class DotnetCoreInstaller {
   private version: string;
   private quality: QualityOptions;
-  private static readonly installationDirectoryWindows = path.join(
+
+  static {
+    const installationDirectoryWindows = path.join(
       process.env['PROGRAMFILES'] + '',
       'dotnet'
     );
-  private static readonly installationDirectoryLinux = '/usr/share/dotnet';
+    const installationDirectoryLinux = '/usr/share/dotnet';
-  private static readonly installationDirectoryMac = path.join(
+    const installationDirectoryMac = path.join(
       process.env['HOME'] + '',
       '.dotnet'
     );
-
+    const dotnetInstallDir: string | undefined =
-  static addToPath() {
+      process.env['DOTNET_INSTALL_DIR'];
-    if (process.env['DOTNET_INSTALL_DIR']) {
+    if (dotnetInstallDir) {
-      core.addPath(process.env['DOTNET_INSTALL_DIR']);
+      process.env['DOTNET_INSTALL_DIR'] =
-      core.exportVariable('DOTNET_ROOT', process.env['DOTNET_INSTALL_DIR']);
+        this.convertInstallPathToAbsolute(dotnetInstallDir);
     } else {
       if (IS_WINDOWS) {
-        core.addPath(DotnetCoreInstaller.installationDirectoryWindows);
+        process.env['DOTNET_INSTALL_DIR'] = installationDirectoryWindows;
-        core.exportVariable(
-          'DOTNET_ROOT',
-          DotnetCoreInstaller.installationDirectoryWindows
-        );
-      } else if (IS_LINUX) {
-        core.addPath(DotnetCoreInstaller.installationDirectoryLinux);
-        core.exportVariable(
-          'DOTNET_ROOT',
-          DotnetCoreInstaller.installationDirectoryLinux
-        );
       } else {
-        // This is the default set in install-dotnet.sh
+        process.env['DOTNET_INSTALL_DIR'] = IS_LINUX
-        core.addPath(DotnetCoreInstaller.installationDirectoryMac);
+          ? installationDirectoryLinux
-        core.exportVariable(
+          : installationDirectoryMac;
-          'DOTNET_ROOT',
-          DotnetCoreInstaller.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']}`);
       }
 
-      if (!process.env['DOTNET_INSTALL_DIR']) {
-        process.env['DOTNET_INSTALL_DIR'] =
-          DotnetCoreInstaller.installationDirectoryWindows;
-      }
-
       scriptPath =
         (await io.which('pwsh', false)) || (await io.which('powershell', true));
       scriptArguments = windowsDefaultOptions.concat(scriptArguments);
@@ -228,12 +230,6 @@ export class DotnetCoreInstaller {
       if (this.quality) {
         this.setQuality(dotnetVersion, scriptArguments);
       }
-
-      if (!process.env['DOTNET_INSTALL_DIR']) {
-        process.env['DOTNET_INSTALL_DIR'] = IS_LINUX
-          ? DotnetCoreInstaller.installationDirectoryLinux
-          : DotnetCoreInstaller.installationDirectoryMac;
-      }
     }
     // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
     const getExecOutputOptions = {
@@ -249,16 +245,11 @@ export class DotnetCoreInstaller {
       throw new Error(`Failed to install dotnet ${exitCode}. ${stdout}`);
     }
 
-    return this.outputDotnetVersion(
+    return this.outputDotnetVersion(dotnetVersion.value);
-      dotnetVersion.value,
-      process.env['DOTNET_INSTALL_DIR']
-    );
   }
 
-  private async outputDotnetVersion(
+  private async outputDotnetVersion(version): Promise<string> {
-    version,
+    const installationPath = process.env['DOTNET_INSTALL_DIR']!;
-    installationPath
-  ): Promise<string> {
     let versionsOnRunner: string[] = await readdir(
       path.join(installationPath.replace(/'/g, ''), 'sdk')
     );

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. */