diff --git a/README.md b/README.md
index a8656e06b..3e822b9d6 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,16 @@ steps:
     include-prerelease: true
 - run: dotnet build <my project>
 ```
+Specific architecture:
+```yml
+steps:
+- uses: actions/checkout@v3
+- uses: actions/setup-dotnet@v2
+  with:
+    dotnet-version: '6.0.x'
+    architecture: 'x86'
+- run: dotnet build <my project>
+```
 global.json in a subdirectory:
 ```yml
 steps:
diff --git a/__tests__/installer.test.ts b/__tests__/installer.test.ts
index 532da18a2..d8da8f08f 100644
--- a/__tests__/installer.test.ts
+++ b/__tests__/installer.test.ts
@@ -86,6 +86,24 @@ describe('installer tests', () => {
     expect(process.env.PATH?.startsWith(toolDir)).toBe(true);
   }, 600000); //This needs some time to download on "slower" internet connections
 
+  it('Acquires architecture-specific version of dotnet if no matching version is installed', async () => {
+    await getDotnet('3.1', 'x64');
+    var directory = fs
+      .readdirSync(path.join(toolDir, 'sdk'))
+      .filter(fn => fn.startsWith('3.1.'));
+    expect(directory.length > 0).toBe(true);
+    if (IS_WINDOWS) {
+      expect(fs.existsSync(path.join(toolDir, 'dotnet.exe'))).toBe(true);
+    } else {
+      expect(fs.existsSync(path.join(toolDir, 'dotnet'))).toBe(true);
+    }
+
+    expect(process.env.DOTNET_ROOT).toBeDefined;
+    expect(process.env.PATH).toBeDefined;
+    expect(process.env.DOTNET_ROOT).toBe(toolDir);
+    expect(process.env.PATH?.startsWith(toolDir)).toBe(true);
+  }, 600000); //This needs some time to download on "slower" internet connections
+
   it('Throws if no location contains correct dotnet version', async () => {
     let thrown = false;
     try {
@@ -144,8 +162,14 @@ function normalizeFileContents(contents: string): string {
     .replace(new RegExp('\r', 'g'), '\n');
 }
 
-async function getDotnet(version: string): Promise<void> {
-  const dotnetInstaller = new installer.DotnetCoreInstaller(version);
+async function getDotnet(
+  version: string,
+  architecture: string = ''
+): Promise<void> {
+  const dotnetInstaller = new installer.DotnetCoreInstaller(
+    version,
+    architecture
+  );
   await dotnetInstaller.installDotnet();
   installer.DotnetCoreInstaller.addToPath();
 }
diff --git a/action.yml b/action.yml
index 3c0ecb0b0..ee9c81cf5 100644
--- a/action.yml
+++ b/action.yml
@@ -18,6 +18,9 @@ inputs:
   include-prerelease:
     description: 'Whether prerelease versions should be matched with non-exact versions (for example 5.0.0-preview.6 being matched by 5, 5.0, 5.x or 5.0.x). Defaults to false if not provided.'
     required: False
+  architecture:
+    description: 'Optional architecture to use. If not provided, will default to the OS architecture.'
+    required: False
 runs:
   using: 'node16'
   main: 'dist/index.js'
diff --git a/dist/index.js b/dist/index.js
index 1ef7203b2..62fdd2fa3 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -5,142 +5,142 @@
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
-
-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]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-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);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.configAuthentication = void 0;
-const fs = __importStar(__nccwpck_require__(7147));
-const path = __importStar(__nccwpck_require__(1017));
-const core = __importStar(__nccwpck_require__(2186));
-const github = __importStar(__nccwpck_require__(5438));
-const xmlbuilder = __importStar(__nccwpck_require__(2958));
-const xmlParser = __importStar(__nccwpck_require__(7448));
-function configAuthentication(feedUrl, existingFileLocation = '', processRoot = process.cwd()) {
-    const existingNuGetConfig = path.resolve(processRoot, existingFileLocation === ''
-        ? getExistingNugetConfig(processRoot)
-        : existingFileLocation);
-    const tempNuGetConfig = path.resolve(processRoot, '../', 'nuget.config');
-    writeFeedToFile(feedUrl, existingNuGetConfig, tempNuGetConfig);
-}
-exports.configAuthentication = configAuthentication;
-function isValidKey(key) {
-    return /^[\w\-\.]+$/i.test(key);
-}
-function getExistingNugetConfig(processRoot) {
-    const defaultConfigName = 'nuget.config';
-    const configFileNames = fs
-        .readdirSync(processRoot)
-        .filter(filename => filename.toLowerCase() === defaultConfigName);
-    if (configFileNames.length) {
-        return configFileNames[0];
-    }
-    return defaultConfigName;
-}
-function writeFeedToFile(feedUrl, existingFileLocation, tempFileLocation) {
-    console.log(`dotnet-auth: Finding any source references in ${existingFileLocation}, writing a new temporary configuration file with credentials to ${tempFileLocation}`);
-    let xml;
-    let sourceKeys = [];
-    let owner = core.getInput('owner');
-    let sourceUrl = feedUrl;
-    if (!owner) {
-        owner = github.context.repo.owner;
-    }
-    if (!process.env.NUGET_AUTH_TOKEN || process.env.NUGET_AUTH_TOKEN == '') {
-        throw new Error('The NUGET_AUTH_TOKEN environment variable was not provided. In this step, add the following: \r\nenv:\r\n  NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}');
-    }
-    if (fs.existsSync(existingFileLocation)) {
-        // get key from existing NuGet.config so NuGet/dotnet can match credentials
-        const curContents = fs.readFileSync(existingFileLocation, 'utf8');
-        var json = xmlParser.parse(curContents, { ignoreAttributes: false });
-        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())) {
-                        let key = json.configuration.packageSources.add['@_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())) {
-                            let key = source['@_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();
-    if (sourceKeys.length == 0) {
-        let keystring = 'Source';
-        xml = xml
-            .ele('packageSources')
-            .ele('add', { key: keystring, value: sourceUrl })
-            .up()
-            .up();
-        sourceKeys.push(keystring);
-    }
-    xml = xml.ele('packageSourceCredentials');
-    sourceKeys.forEach(key => {
-        if (!isValidKey(key)) {
-            throw new Error("Source name can contain letters, numbers, and '-', '_', '.' symbols only. Please, fix source name in NuGet.config and try again.");
-        }
-        xml = xml
-            .ele(key)
-            .ele('add', { key: 'Username', value: owner })
-            .up()
-            .ele('add', {
-            key: 'ClearTextPassword',
-            value: process.env.NUGET_AUTH_TOKEN
-        })
-            .up()
-            .up();
-    });
-    // 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'
-    var output = xml.end({ pretty: true });
-    fs.writeFileSync(tempFileLocation, output);
-}
+
+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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.configAuthentication = void 0;
+const fs = __importStar(__nccwpck_require__(7147));
+const path = __importStar(__nccwpck_require__(1017));
+const core = __importStar(__nccwpck_require__(2186));
+const github = __importStar(__nccwpck_require__(5438));
+const xmlbuilder = __importStar(__nccwpck_require__(2958));
+const xmlParser = __importStar(__nccwpck_require__(7448));
+function configAuthentication(feedUrl, existingFileLocation = '', processRoot = process.cwd()) {
+    const existingNuGetConfig = path.resolve(processRoot, existingFileLocation === ''
+        ? getExistingNugetConfig(processRoot)
+        : existingFileLocation);
+    const tempNuGetConfig = path.resolve(processRoot, '../', 'nuget.config');
+    writeFeedToFile(feedUrl, existingNuGetConfig, tempNuGetConfig);
+}
+exports.configAuthentication = configAuthentication;
+function isValidKey(key) {
+    return /^[\w\-\.]+$/i.test(key);
+}
+function getExistingNugetConfig(processRoot) {
+    const defaultConfigName = 'nuget.config';
+    const configFileNames = fs
+        .readdirSync(processRoot)
+        .filter(filename => filename.toLowerCase() === defaultConfigName);
+    if (configFileNames.length) {
+        return configFileNames[0];
+    }
+    return defaultConfigName;
+}
+function writeFeedToFile(feedUrl, existingFileLocation, tempFileLocation) {
+    console.log(`dotnet-auth: Finding any source references in ${existingFileLocation}, writing a new temporary configuration file with credentials to ${tempFileLocation}`);
+    let xml;
+    let sourceKeys = [];
+    let owner = core.getInput('owner');
+    let sourceUrl = feedUrl;
+    if (!owner) {
+        owner = github.context.repo.owner;
+    }
+    if (!process.env.NUGET_AUTH_TOKEN || process.env.NUGET_AUTH_TOKEN == '') {
+        throw new Error('The NUGET_AUTH_TOKEN environment variable was not provided. In this step, add the following: \r\nenv:\r\n  NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}');
+    }
+    if (fs.existsSync(existingFileLocation)) {
+        // get key from existing NuGet.config so NuGet/dotnet can match credentials
+        const curContents = fs.readFileSync(existingFileLocation, 'utf8');
+        var json = xmlParser.parse(curContents, { ignoreAttributes: false });
+        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())) {
+                        let key = json.configuration.packageSources.add['@_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())) {
+                            let key = source['@_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();
+    if (sourceKeys.length == 0) {
+        let keystring = 'Source';
+        xml = xml
+            .ele('packageSources')
+            .ele('add', { key: keystring, value: sourceUrl })
+            .up()
+            .up();
+        sourceKeys.push(keystring);
+    }
+    xml = xml.ele('packageSourceCredentials');
+    sourceKeys.forEach(key => {
+        if (!isValidKey(key)) {
+            throw new Error("Source name can contain letters, numbers, and '-', '_', '.' symbols only. Please, fix source name in NuGet.config and try again.");
+        }
+        xml = xml
+            .ele(key)
+            .ele('add', { key: 'Username', value: owner })
+            .up()
+            .ele('add', {
+            key: 'ClearTextPassword',
+            value: process.env.NUGET_AUTH_TOKEN
+        })
+            .up()
+            .up();
+    });
+    // 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'
+    var output = xml.end({ pretty: true });
+    fs.writeFileSync(tempFileLocation, output);
+}
 
 
 /***/ }),
@@ -149,261 +149,268 @@ function writeFeedToFile(feedUrl, existingFileLocation, tempFileLocation) {
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
-
-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]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-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);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.DotnetCoreInstaller = exports.DotNetVersionInfo = void 0;
-// Load tempDirectory before it gets wiped by tool-cache
-const core = __importStar(__nccwpck_require__(2186));
-const exec = __importStar(__nccwpck_require__(1514));
-const io = __importStar(__nccwpck_require__(7436));
-const hc = __nccwpck_require__(9925);
-const fs_1 = __nccwpck_require__(7147);
-const path = __importStar(__nccwpck_require__(1017));
-const semver = __importStar(__nccwpck_require__(5911));
-const IS_WINDOWS = process.platform === 'win32';
-/**
- * Represents the inputted version information
- */
-class DotNetVersionInfo {
-    constructor(version) {
-        this.isExactVersionSet = false;
-        this.inputVersion = version;
-        // Check for exact match
-        if (semver.valid(semver.clean(version) || '') != null) {
-            this.fullversion = semver.clean(version);
-            this.isExactVersionSet = true;
-            return;
-        }
-        const parts = version.split('.');
-        if (parts.length < 2 || parts.length > 3)
-            this.throwInvalidVersionFormat();
-        if (parts.length == 3 && parts[2] !== 'x' && parts[2] !== '*') {
-            this.throwInvalidVersionFormat();
-        }
-        const major = this.getVersionNumberOrThrow(parts[0]);
-        const minor = ['x', '*'].includes(parts[1])
-            ? parts[1]
-            : this.getVersionNumberOrThrow(parts[1]);
-        this.fullversion = major + '.' + minor;
-    }
-    getVersionNumberOrThrow(input) {
-        try {
-            if (!input || input.trim() === '')
-                this.throwInvalidVersionFormat();
-            let number = Number(input);
-            if (Number.isNaN(number) || number < 0)
-                this.throwInvalidVersionFormat();
-            return number;
-        }
-        catch (_a) {
-            this.throwInvalidVersionFormat();
-            return -1;
-        }
-    }
-    throwInvalidVersionFormat() {
-        throw new Error('Invalid version format! Supported: 1.2.3, 1.2, 1.2.x, 1.2.*');
-    }
-    /**
-     * If true exacatly one version should be resolved
-     */
-    isExactVersion() {
-        return this.isExactVersionSet;
-    }
-    version() {
-        return this.fullversion;
-    }
-}
-exports.DotNetVersionInfo = DotNetVersionInfo;
-class DotnetCoreInstaller {
-    constructor(version, includePrerelease = false) {
-        this.version = version;
-        this.includePrerelease = includePrerelease;
-    }
-    installDotnet() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let output = '';
-            let resultCode = 0;
-            let calculatedVersion = yield this.resolveVersion(new DotNetVersionInfo(this.version));
-            var envVariables = {};
-            for (let key in process.env) {
-                if (process.env[key]) {
-                    let value = process.env[key];
-                    envVariables[key] = value;
-                }
-            }
-            if (IS_WINDOWS) {
-                let escapedScript = path
-                    .join(__dirname, '..', 'externals', 'install-dotnet.ps1')
-                    .replace(/'/g, "''");
-                let command = `& '${escapedScript}'`;
-                if (calculatedVersion) {
-                    command += ` -Version ${calculatedVersion}`;
-                }
-                if (process.env['https_proxy'] != null) {
-                    command += ` -ProxyAddress ${process.env['https_proxy']}`;
-                }
-                // This is not currently an option
-                if (process.env['no_proxy'] != null) {
-                    command += ` -ProxyBypassList ${process.env['no_proxy']}`;
-                }
-                // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
-                const powershellPath = yield io.which('powershell', true);
-                var options = {
-                    listeners: {
-                        stdout: (data) => {
-                            output += data.toString();
-                        }
-                    },
-                    env: envVariables
-                };
-                resultCode = yield exec.exec(`"${powershellPath}"`, [
-                    '-NoLogo',
-                    '-Sta',
-                    '-NoProfile',
-                    '-NonInteractive',
-                    '-ExecutionPolicy',
-                    'Unrestricted',
-                    '-Command',
-                    command
-                ], options);
-            }
-            else {
-                let escapedScript = path
-                    .join(__dirname, '..', 'externals', 'install-dotnet.sh')
-                    .replace(/'/g, "''");
-                fs_1.chmodSync(escapedScript, '777');
-                const scriptPath = yield io.which(escapedScript, true);
-                let scriptArguments = [];
-                if (calculatedVersion) {
-                    scriptArguments.push('--version', calculatedVersion);
-                }
-                // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
-                resultCode = yield exec.exec(`"${scriptPath}"`, scriptArguments, {
-                    listeners: {
-                        stdout: (data) => {
-                            output += data.toString();
-                        }
-                    },
-                    env: envVariables
-                });
-            }
-            if (resultCode != 0) {
-                throw new Error(`Failed to install dotnet ${resultCode}. ${output}`);
-            }
-        });
-    }
-    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 (IS_WINDOWS) {
-                // This is the default set in install-dotnet.ps1
-                core.addPath(path.join(process.env['LocalAppData'] + '', 'Microsoft', 'dotnet'));
-                core.exportVariable('DOTNET_ROOT', path.join(process.env['LocalAppData'] + '', 'Microsoft', 'dotnet'));
-            }
-            else {
-                // This is the default set in install-dotnet.sh
-                core.addPath(path.join(process.env['HOME'] + '', '.dotnet'));
-                core.exportVariable('DOTNET_ROOT', path.join(process.env['HOME'] + '', '.dotnet'));
-            }
-        }
-        console.log(process.env['PATH']);
-    }
-    // versionInfo - versionInfo of the SDK/Runtime
-    resolveVersion(versionInfo) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (versionInfo.isExactVersion()) {
-                return versionInfo.version();
-            }
-            const httpClient = new hc.HttpClient('actions/setup-dotnet', [], {
-                allowRetries: true,
-                maxRetries: 3
-            });
-            const releasesJsonUrl = yield this.getReleasesJsonUrl(httpClient, versionInfo.version().split('.'));
-            const releasesResponse = yield httpClient.getJson(releasesJsonUrl);
-            const releasesResult = releasesResponse.result || {};
-            let releasesInfo = releasesResult['releases'];
-            releasesInfo = releasesInfo.filter((releaseInfo) => {
-                return (semver.satisfies(releaseInfo['sdk']['version'], versionInfo.version(), {
-                    includePrerelease: this.includePrerelease
-                }) ||
-                    semver.satisfies(releaseInfo['sdk']['version-display'], versionInfo.version(), {
-                        includePrerelease: this.includePrerelease
-                    }));
-            });
-            // Exclude versions that are newer than the latest if using not exact
-            let latestSdk = releasesResult['latest-sdk'];
-            releasesInfo = releasesInfo.filter((releaseInfo) => semver.lte(releaseInfo['sdk']['version'], latestSdk, {
-                includePrerelease: this.includePrerelease
-            }));
-            // Sort for latest version
-            releasesInfo = releasesInfo.sort((a, b) => semver.rcompare(a['sdk']['version'], b['sdk']['version'], {
-                includePrerelease: this.includePrerelease
-            }));
-            if (releasesInfo.length == 0) {
-                throw new Error(`Could not find dotnet core version. Please ensure that specified version ${versionInfo.inputVersion} is valid.`);
-            }
-            let release = releasesInfo[0];
-            return release['sdk']['version'];
-        });
-    }
-    getReleasesJsonUrl(httpClient, versionParts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const response = yield httpClient.getJson(DotNetCoreIndexUrl);
-            const result = response.result || {};
-            let releasesInfo = result['releases-index'];
-            releasesInfo = releasesInfo.filter((info) => {
-                // channel-version is the first 2 elements of the version (e.g. 2.1), filter out versions that don't match 2.1.x.
-                const sdkParts = info['channel-version'].split('.');
-                if (versionParts.length >= 2 &&
-                    !(versionParts[1] == 'x' || versionParts[1] == '*')) {
-                    return versionParts[0] == sdkParts[0] && versionParts[1] == sdkParts[1];
-                }
-                return versionParts[0] == sdkParts[0];
-            });
-            if (releasesInfo.length === 0) {
-                throw new Error(`Could not find info for version ${versionParts.join('.')} at ${DotNetCoreIndexUrl}`);
-            }
-            const releaseInfo = releasesInfo[0];
-            if (releaseInfo['support-phase'] === 'eol') {
-                core.warning(`${releaseInfo['product']} ${releaseInfo['channel-version']} is no longer supported and will not receive security updates in the future. Please refer to https://aka.ms/dotnet-core-support for more information about the .NET support policy.`);
-            }
-            return releaseInfo['releases.json'];
-        });
-    }
-}
-exports.DotnetCoreInstaller = DotnetCoreInstaller;
-const DotNetCoreIndexUrl = 'https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/releases-index.json';
+
+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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.DotnetCoreInstaller = exports.DotNetVersionInfo = void 0;
+// Load tempDirectory before it gets wiped by tool-cache
+const core = __importStar(__nccwpck_require__(2186));
+const exec = __importStar(__nccwpck_require__(1514));
+const io = __importStar(__nccwpck_require__(7436));
+const hc = __nccwpck_require__(9925);
+const fs_1 = __nccwpck_require__(7147);
+const path = __importStar(__nccwpck_require__(1017));
+const semver = __importStar(__nccwpck_require__(5911));
+const IS_WINDOWS = process.platform === 'win32';
+/**
+ * Represents the inputted version information
+ */
+class DotNetVersionInfo {
+    constructor(version) {
+        this.isExactVersionSet = false;
+        this.inputVersion = version;
+        // Check for exact match
+        if (semver.valid(semver.clean(version) || '') != null) {
+            this.fullversion = semver.clean(version);
+            this.isExactVersionSet = true;
+            return;
+        }
+        const parts = version.split('.');
+        if (parts.length < 2 || parts.length > 3)
+            this.throwInvalidVersionFormat();
+        if (parts.length == 3 && parts[2] !== 'x' && parts[2] !== '*') {
+            this.throwInvalidVersionFormat();
+        }
+        const major = this.getVersionNumberOrThrow(parts[0]);
+        const minor = ['x', '*'].includes(parts[1])
+            ? parts[1]
+            : this.getVersionNumberOrThrow(parts[1]);
+        this.fullversion = major + '.' + minor;
+    }
+    getVersionNumberOrThrow(input) {
+        try {
+            if (!input || input.trim() === '')
+                this.throwInvalidVersionFormat();
+            let number = Number(input);
+            if (Number.isNaN(number) || number < 0)
+                this.throwInvalidVersionFormat();
+            return number;
+        }
+        catch (_a) {
+            this.throwInvalidVersionFormat();
+            return -1;
+        }
+    }
+    throwInvalidVersionFormat() {
+        throw new Error('Invalid version format! Supported: 1.2.3, 1.2, 1.2.x, 1.2.*');
+    }
+    /**
+     * If true exacatly one version should be resolved
+     */
+    isExactVersion() {
+        return this.isExactVersionSet;
+    }
+    version() {
+        return this.fullversion;
+    }
+}
+exports.DotNetVersionInfo = DotNetVersionInfo;
+class DotnetCoreInstaller {
+    constructor(version, architecture = '', includePrerelease = false) {
+        this.version = version;
+        this.architecture = architecture;
+        this.includePrerelease = includePrerelease;
+    }
+    installDotnet() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let output = '';
+            let resultCode = 0;
+            let calculatedVersion = yield this.resolveVersion(new DotNetVersionInfo(this.version));
+            var envVariables = {};
+            for (let key in process.env) {
+                if (process.env[key]) {
+                    let value = process.env[key];
+                    envVariables[key] = value;
+                }
+            }
+            if (IS_WINDOWS) {
+                let escapedScript = path
+                    .join(__dirname, '..', 'externals', 'install-dotnet.ps1')
+                    .replace(/'/g, "''");
+                let command = `& '${escapedScript}'`;
+                if (calculatedVersion) {
+                    command += ` -Version ${calculatedVersion}`;
+                }
+                if (process.env['https_proxy'] != null) {
+                    command += ` -ProxyAddress ${process.env['https_proxy']}`;
+                }
+                // This is not currently an option
+                if (process.env['no_proxy'] != null) {
+                    command += ` -ProxyBypassList ${process.env['no_proxy']}`;
+                }
+                if (this.architecture != '') {
+                    command += ` -Architecture ${this.architecture}`;
+                }
+                // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
+                const powershellPath = yield io.which('powershell', true);
+                var options = {
+                    listeners: {
+                        stdout: (data) => {
+                            output += data.toString();
+                        }
+                    },
+                    env: envVariables
+                };
+                resultCode = yield exec.exec(`"${powershellPath}"`, [
+                    '-NoLogo',
+                    '-Sta',
+                    '-NoProfile',
+                    '-NonInteractive',
+                    '-ExecutionPolicy',
+                    'Unrestricted',
+                    '-Command',
+                    command
+                ], options);
+            }
+            else {
+                let escapedScript = path
+                    .join(__dirname, '..', 'externals', 'install-dotnet.sh')
+                    .replace(/'/g, "''");
+                fs_1.chmodSync(escapedScript, '777');
+                const scriptPath = yield io.which(escapedScript, true);
+                let scriptArguments = [];
+                if (calculatedVersion) {
+                    scriptArguments.push('--version', calculatedVersion);
+                }
+                if (this.architecture != '') {
+                    scriptArguments.push('--architecture', this.architecture);
+                }
+                // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
+                resultCode = yield exec.exec(`"${scriptPath}"`, scriptArguments, {
+                    listeners: {
+                        stdout: (data) => {
+                            output += data.toString();
+                        }
+                    },
+                    env: envVariables
+                });
+            }
+            if (resultCode != 0) {
+                throw new Error(`Failed to install dotnet ${resultCode}. ${output}`);
+            }
+        });
+    }
+    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 (IS_WINDOWS) {
+                // This is the default set in install-dotnet.ps1
+                core.addPath(path.join(process.env['LocalAppData'] + '', 'Microsoft', 'dotnet'));
+                core.exportVariable('DOTNET_ROOT', path.join(process.env['LocalAppData'] + '', 'Microsoft', 'dotnet'));
+            }
+            else {
+                // This is the default set in install-dotnet.sh
+                core.addPath(path.join(process.env['HOME'] + '', '.dotnet'));
+                core.exportVariable('DOTNET_ROOT', path.join(process.env['HOME'] + '', '.dotnet'));
+            }
+        }
+        console.log(process.env['PATH']);
+    }
+    // versionInfo - versionInfo of the SDK/Runtime
+    resolveVersion(versionInfo) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (versionInfo.isExactVersion()) {
+                return versionInfo.version();
+            }
+            const httpClient = new hc.HttpClient('actions/setup-dotnet', [], {
+                allowRetries: true,
+                maxRetries: 3
+            });
+            const releasesJsonUrl = yield this.getReleasesJsonUrl(httpClient, versionInfo.version().split('.'));
+            const releasesResponse = yield httpClient.getJson(releasesJsonUrl);
+            const releasesResult = releasesResponse.result || {};
+            let releasesInfo = releasesResult['releases'];
+            releasesInfo = releasesInfo.filter((releaseInfo) => {
+                return (semver.satisfies(releaseInfo['sdk']['version'], versionInfo.version(), {
+                    includePrerelease: this.includePrerelease
+                }) ||
+                    semver.satisfies(releaseInfo['sdk']['version-display'], versionInfo.version(), {
+                        includePrerelease: this.includePrerelease
+                    }));
+            });
+            // Exclude versions that are newer than the latest if using not exact
+            let latestSdk = releasesResult['latest-sdk'];
+            releasesInfo = releasesInfo.filter((releaseInfo) => semver.lte(releaseInfo['sdk']['version'], latestSdk, {
+                includePrerelease: this.includePrerelease
+            }));
+            // Sort for latest version
+            releasesInfo = releasesInfo.sort((a, b) => semver.rcompare(a['sdk']['version'], b['sdk']['version'], {
+                includePrerelease: this.includePrerelease
+            }));
+            if (releasesInfo.length == 0) {
+                throw new Error(`Could not find dotnet core version. Please ensure that specified version ${versionInfo.inputVersion} is valid.`);
+            }
+            let release = releasesInfo[0];
+            return release['sdk']['version'];
+        });
+    }
+    getReleasesJsonUrl(httpClient, versionParts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield httpClient.getJson(DotNetCoreIndexUrl);
+            const result = response.result || {};
+            let releasesInfo = result['releases-index'];
+            releasesInfo = releasesInfo.filter((info) => {
+                // channel-version is the first 2 elements of the version (e.g. 2.1), filter out versions that don't match 2.1.x.
+                const sdkParts = info['channel-version'].split('.');
+                if (versionParts.length >= 2 &&
+                    !(versionParts[1] == 'x' || versionParts[1] == '*')) {
+                    return versionParts[0] == sdkParts[0] && versionParts[1] == sdkParts[1];
+                }
+                return versionParts[0] == sdkParts[0];
+            });
+            if (releasesInfo.length === 0) {
+                throw new Error(`Could not find info for version ${versionParts.join('.')} at ${DotNetCoreIndexUrl}`);
+            }
+            const releaseInfo = releasesInfo[0];
+            if (releaseInfo['support-phase'] === 'eol') {
+                core.warning(`${releaseInfo['product']} ${releaseInfo['channel-version']} is no longer supported and will not receive security updates in the future. Please refer to https://aka.ms/dotnet-core-support for more information about the .NET support policy.`);
+            }
+            return releaseInfo['releases.json'];
+        });
+    }
+}
+exports.DotnetCoreInstaller = DotnetCoreInstaller;
+const DotNetCoreIndexUrl = 'https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/releases-index.json';
 
 
 /***/ }),
@@ -412,111 +419,115 @@ const DotNetCoreIndexUrl = 'https://dotnetcli.blob.core.windows.net/dotnet/relea
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
-
-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]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-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);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.run = void 0;
-const core = __importStar(__nccwpck_require__(2186));
-const installer = __importStar(__nccwpck_require__(1480));
-const fs = __importStar(__nccwpck_require__(7147));
-const path = __importStar(__nccwpck_require__(1017));
-const auth = __importStar(__nccwpck_require__(8527));
-function run() {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            //
-            // dotnet-version is optional, but needs to be provided for most use cases.
-            // If supplied, install / use from the tool cache.
-            // global-version-file may be specified to point to a specific global.json
-            // and will be used to install an additional version.
-            // If not supplied, look for version in ./global.json.
-            // If a valid version still can't be identified, nothing will be installed.
-            // Proxy, auth, (etc) are still set up, even if no version is identified
-            //
-            let versions = core.getMultilineInput('dotnet-version');
-            const globalJsonFileInput = core.getInput('global-json-file');
-            if (globalJsonFileInput) {
-                const globalJsonPath = path.join(process.cwd(), globalJsonFileInput);
-                if (!fs.existsSync(globalJsonPath)) {
-                    throw new Error(`The specified global.json file '${globalJsonFileInput}' does not exist`);
-                }
-                versions.push(getVersionFromGlobalJson(globalJsonPath));
-            }
-            if (!versions.length) {
-                // Try to fall back to global.json
-                core.debug('No version found, trying to find version from global.json');
-                const globalJsonPath = path.join(process.cwd(), 'global.json');
-                if (fs.existsSync(globalJsonPath)) {
-                    versions.push(getVersionFromGlobalJson(globalJsonPath));
-                }
-            }
-            if (versions.length) {
-                const includePrerelease = (core.getInput('include-prerelease') || 'false').toLowerCase() ===
-                    'true';
-                let dotnetInstaller;
-                for (const version of new Set(versions)) {
-                    dotnetInstaller = new installer.DotnetCoreInstaller(version, includePrerelease);
-                    yield dotnetInstaller.installDotnet();
-                }
-                installer.DotnetCoreInstaller.addToPath();
-            }
-            const sourceUrl = core.getInput('source-url');
-            const configFile = core.getInput('config-file');
-            if (sourceUrl) {
-                auth.configAuthentication(sourceUrl, configFile);
-            }
-            const matchersPath = path.join(__dirname, '..', '.github');
-            console.log(`##[add-matcher]${path.join(matchersPath, 'csc.json')}`);
-        }
-        catch (error) {
-            core.setFailed(error.message);
-        }
-    });
-}
-exports.run = run;
-function getVersionFromGlobalJson(globalJsonPath) {
-    let version = '';
-    const globalJson = JSON.parse(
-    // .trim() is necessary to strip BOM https://github.com/nodejs/node/issues/20649
-    fs.readFileSync(globalJsonPath, { encoding: 'utf8' }).trim());
-    if (globalJson.sdk && globalJson.sdk.version) {
-        version = globalJson.sdk.version;
-        const rollForward = globalJson.sdk.rollForward;
-        if (rollForward && rollForward === 'latestFeature') {
-            const [major, minor] = version.split('.');
-            version = `${major}.${minor}`;
-        }
-    }
-    return version;
-}
-run();
+
+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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.run = void 0;
+const core = __importStar(__nccwpck_require__(2186));
+const installer = __importStar(__nccwpck_require__(1480));
+const fs = __importStar(__nccwpck_require__(7147));
+const path = __importStar(__nccwpck_require__(1017));
+const auth = __importStar(__nccwpck_require__(8527));
+function run() {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            //
+            // dotnet-version is optional, but needs to be provided for most use cases.
+            // If supplied, install / use from the tool cache.
+            // global-version-file may be specified to point to a specific global.json
+            // and will be used to install an additional version.
+            // If not supplied, look for version in ./global.json.
+            // If a valid version still can't be identified, nothing will be installed.
+            // Proxy, auth, (etc) are still set up, even if no version is identified
+            //
+            let versions = core.getMultilineInput('dotnet-version');
+            let architecture = core.getInput('architecture');
+            if (!architecture) {
+                architecture = '';
+            }
+            const globalJsonFileInput = core.getInput('global-json-file');
+            if (globalJsonFileInput) {
+                const globalJsonPath = path.join(process.cwd(), globalJsonFileInput);
+                if (!fs.existsSync(globalJsonPath)) {
+                    throw new Error(`The specified global.json file '${globalJsonFileInput}' does not exist`);
+                }
+                versions.push(getVersionFromGlobalJson(globalJsonPath));
+            }
+            if (!versions.length) {
+                // Try to fall back to global.json
+                core.debug('No version found, trying to find version from global.json');
+                const globalJsonPath = path.join(process.cwd(), 'global.json');
+                if (fs.existsSync(globalJsonPath)) {
+                    versions.push(getVersionFromGlobalJson(globalJsonPath));
+                }
+            }
+            if (versions.length) {
+                const includePrerelease = (core.getInput('include-prerelease') || 'false').toLowerCase() ===
+                    'true';
+                let dotnetInstaller;
+                for (const version of new Set(versions)) {
+                    dotnetInstaller = new installer.DotnetCoreInstaller(version, architecture, includePrerelease);
+                    yield dotnetInstaller.installDotnet();
+                }
+                installer.DotnetCoreInstaller.addToPath();
+            }
+            const sourceUrl = core.getInput('source-url');
+            const configFile = core.getInput('config-file');
+            if (sourceUrl) {
+                auth.configAuthentication(sourceUrl, configFile);
+            }
+            const matchersPath = path.join(__dirname, '..', '.github');
+            console.log(`##[add-matcher]${path.join(matchersPath, 'csc.json')}`);
+        }
+        catch (error) {
+            core.setFailed(error.message);
+        }
+    });
+}
+exports.run = run;
+function getVersionFromGlobalJson(globalJsonPath) {
+    let version = '';
+    const globalJson = JSON.parse(
+    // .trim() is necessary to strip BOM https://github.com/nodejs/node/issues/20649
+    fs.readFileSync(globalJsonPath, { encoding: 'utf8' }).trim());
+    if (globalJson.sdk && globalJson.sdk.version) {
+        version = globalJson.sdk.version;
+        const rollForward = globalJson.sdk.rollForward;
+        if (rollForward && rollForward === 'latestFeature') {
+            const [major, minor] = version.split('.');
+            version = `${major}.${minor}`;
+        }
+    }
+    return version;
+}
+run();
 
 
 /***/ }),
diff --git a/externals/install-dotnet.ps1 b/externals/install-dotnet.ps1
index 2b5904675..71319c75e 100644
--- a/externals/install-dotnet.ps1
+++ b/externals/install-dotnet.ps1
@@ -29,7 +29,7 @@
 .PARAMETER Version
     Default: latest
     Represents a build version on specific channel. Possible values:
-    - latest - most latest build on specific channel
+    - latest - the latest build on specific channel
     - 3-part version in a format A.B.C - represents specific version of build
           examples: 2.0.0-preview2-006120, 1.1.0
 .PARAMETER Internal
@@ -171,6 +171,7 @@ function Say-Invocation($Invocation) {
 
 function Invoke-With-Retry([ScriptBlock]$ScriptBlock, [System.Threading.CancellationToken]$cancellationToken = [System.Threading.CancellationToken]::None, [int]$MaxAttempts = 3, [int]$SecondsBetweenAttempts = 1) {
     $Attempts = 0
+    $local:startTime = $(get-date)
 
     while ($true) {
         try {
@@ -182,7 +183,11 @@ function Invoke-With-Retry([ScriptBlock]$ScriptBlock, [System.Threading.Cancella
                 Start-Sleep $SecondsBetweenAttempts
             }
             else {
-                throw
+                $local:elapsedTime = $(get-date) - $local:startTime
+                if (($local:elapsedTime.TotalSeconds - $DownloadTimeout) -gt 0 -and -not $cancellationToken.IsCancellationRequested) {
+                    throw New-Object System.TimeoutException("Failed to reach the server: connection timeout: default timeout is $DownloadTimeout second(s)");
+                }
+                throw;
             }
         }
     }
@@ -1103,6 +1108,10 @@ $ScriptName = $MyInvocation.MyCommand.Name
 $feeds = Get-Feeds-To-Use
 $DownloadLinks = @()
 
+if ($Version.ToLowerInvariant() -ne "latest" -and -not [string]::IsNullOrEmpty($Quality)) {
+    throw "Either Quality or Version option has to be specified. See https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script#options for details."
+}
+
 # aka.ms links can only be used if the user did not request a specific version via the command line or a global.json file.
 if ([string]::IsNullOrEmpty($JSonFile) -and ($Version -eq "latest")) {
     ($DownloadLink, $SpecificVersion, $EffectiveVersion) = Get-AkaMsLink-And-Version $NormalizedChannel $NormalizedQuality $Internal $NormalizedProduct $CLIArchitecture
@@ -1248,13 +1257,14 @@ Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot
 
 Say "Note that the script does not resolve dependencies during installation."
 Say "To check the list of dependencies, go to https://docs.microsoft.com/dotnet/core/install/windows#dependencies"
+Say "Installed version is $($DownloadedLink.effectiveVersion)"
 Say "Installation finished"
 
 # SIG # Begin signature block
-# MIInoQYJKoZIhvcNAQcCoIInkjCCJ44CAQExDzANBglghkgBZQMEAgEFADB5Bgor
+# MIInugYJKoZIhvcNAQcCoIInqzCCJ6cCAQExDzANBglghkgBZQMEAgEFADB5Bgor
 # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
-# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAuo3sRWvfrJ+Bd
-# sIQ2zLeO20Ij33Vb5ljtEhxAYYSEc6CCDYEwggX/MIID56ADAgECAhMzAAACUosz
+# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCDTYtw1Or1qr9ot
+# VfMRma6Tu2Eucp1+G58Kd56HEyVQHqCCDYEwggX/MIID56ADAgECAhMzAAACUosz
 # qviV8znbAAAAAAJSMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD
 # VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy
 # b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p
@@ -1326,141 +1336,141 @@ Say "Installation finished"
 # xw4o7t5lL+yX9qFcltgA1qFGvVnzl6UJS0gQmYAf0AApxbGbpT9Fdx41xtKiop96
 # eiL6SJUfq/tHI4D1nvi/a7dLl+LrdXga7Oo3mXkYS//WsyNodeav+vyL6wuA6mk7
 # r/ww7QRMjt/fdW1jkT3RnVZOT7+AVyKheBEyIXrvQQqxP/uozKRdwaGIm1dxVk5I
-# RcBCyZt2WwqASGv9eZ/BvW1taslScxMNelDNMYIZdjCCGXICAQEwgZUwfjELMAkG
+# RcBCyZt2WwqASGv9eZ/BvW1taslScxMNelDNMYIZjzCCGYsCAQEwgZUwfjELMAkG
 # A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx
 # HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEoMCYGA1UEAxMfTWljcm9z
 # b2Z0IENvZGUgU2lnbmluZyBQQ0EgMjAxMQITMwAAAlKLM6r4lfM52wAAAAACUjAN
 # BglghkgBZQMEAgEFAKCBrjAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgor
-# BgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG9w0BCQQxIgQgBzhh8wf+
-# /kA/CamFNwS1K9Nt0wsjATKS8Y66iHQTKrIwQgYKKwYBBAGCNwIBDDE0MDKgFIAS
+# BgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG9w0BCQQxIgQgYvRfael0
+# uL5RV3fPPB91nSBZIesbd278Hd8ffmMdxOUwQgYKKwYBBAGCNwIBDDE0MDKgFIAS
 # AE0AaQBjAHIAbwBzAG8AZgB0oRqAGGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbTAN
-# BgkqhkiG9w0BAQEFAASCAQAruzFwahFXWsJ9eny7iY/KyWolnqJ9+cvDD1QaJ0qJ
-# tHlTLP8pr0GPPtitwuk+3JME7wkx80+AZXl/ocO39tdhy1Ucd6yiyV3M1Ub/Eo4D
-# 37L1saazNomWeeMD6oX3FboVe1Ql17MX1SscTW5QRx8ytYgUOUIbrxFybODcdVn9
-# YG7mlkgsJr2lhUhTnHtq7jV/jEu6Sk9o+g15Pbu90VncsCoNerg9aEziui6/W3/g
-# Wvt4WhfCPanppzWVmsvTUp5MAt5cpdNBr9b8CV/alI3TGnNwC8RuWMCK6CS4963l
-# f4AiLZW/fgD8UQYtl+tAyYfSerpX0sDB039jymj1FkqHoYIXADCCFvwGCisGAQQB
-# gjcDAwExghbsMIIW6AYJKoZIhvcNAQcCoIIW2TCCFtUCAQMxDzANBglghkgBZQME
-# AgEFADCCAVEGCyqGSIb3DQEJEAEEoIIBQASCATwwggE4AgEBBgorBgEEAYRZCgMB
-# MDEwDQYJYIZIAWUDBAIBBQAEIEcy5EvHdubbPngOS1BSZ6xt9xSMrt3OLtUyfQaT
-# IyRBAgZh+unPYkgYEzIwMjIwMjA4MTAyMjE5LjM1OVowBIACAfSggdCkgc0wgcox
+# BgkqhkiG9w0BAQEFAASCAQBwP2PaZlVHxryeYiQ5+EN1Mh/hC/xZrvvCcz2bSjKr
+# dbghTO3KQAuzj9GyzbQWV7n6fFQkPifoZPm/WNqpy9oD1vx2Uo5vZUoFYwOrMy49
+# BpRUzxI7aFbabtjKdQvwq7CM3rOovufvUh7Ls33cbkO540PyoGmXtikyAQVlrnQ6
+# pDrfAJCEogFLO8Yx/cgp/6ZvyoI6eQuy2sY88gljBN4C6U5QaGqANoB3ThDhKFna
+# FU/wSxK7ME52iCoBniEmAffNiB/Ll+NGCZIFLXcys0pVzi1V7OqjILigcC7Togyz
+# qkMeCWzCO8dYN5gjQ9ejpscFZAJ2BPx/6kTLDCCkem2BoYIXGTCCFxUGCisGAQQB
+# gjcDAwExghcFMIIXAQYJKoZIhvcNAQcCoIIW8jCCFu4CAQMxDzANBglghkgBZQME
+# AgEFADCCAVkGCyqGSIb3DQEJEAEEoIIBSASCAUQwggFAAgEBBgorBgEEAYRZCgMB
+# MDEwDQYJYIZIAWUDBAIBBQAEIJPh2o4dfS0MiB55NQV7I66zDdJ6UrT7BxbmV63R
+# q0IrAgZihjgPzRIYEzIwMjIwNjE1MTEwNzQxLjc2OVowBIACAfSggdikgdUwgdIx
 # CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRt
-# b25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJTAjBgNVBAsTHE1p
-# Y3Jvc29mdCBBbWVyaWNhIE9wZXJhdGlvbnMxJjAkBgNVBAsTHVRoYWxlcyBUU1Mg
-# RVNOOkREOEMtRTMzNy0yRkFFMSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFt
-# cCBTZXJ2aWNloIIRVzCCBwwwggT0oAMCAQICEzMAAAGcD6ZNYdKeSygAAQAAAZww
-# DQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0
-# b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3Jh
-# dGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwHhcN
-# MjExMjAyMTkwNTE5WhcNMjMwMjI4MTkwNTE5WjCByjELMAkGA1UEBhMCVVMxEzAR
-# BgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1p
-# Y3Jvc29mdCBDb3Jwb3JhdGlvbjElMCMGA1UECxMcTWljcm9zb2Z0IEFtZXJpY2Eg
-# T3BlcmF0aW9uczEmMCQGA1UECxMdVGhhbGVzIFRTUyBFU046REQ4Qy1FMzM3LTJG
-# QUUxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2UwggIiMA0G
-# CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDbUioMGV1JFj+s612s02mKu23KPUNs
-# 71OjDeJGtxkTF9rSWTiuA8XgYkAAi/5+2Ff7Ck7JcKQ9H/XD1OKwg1/bH3E1qO1z
-# 8XRy0PlpGhmyilgE7KsOvW8PIZCf243KdldgOrxrL8HKiQodOwStyT5lLWYpMsuT
-# 2fH8k8oihje4TlpWiFPaCKLnFDaAB0Ccy6vIdtHjYB1Ie3iOZPisquL+vNdCx7gO
-# hB8iiTmTdsU8OSUpC8tBTeTIYPzmhaxQZd4moNk6qeCJyi7fiW4fyXdHrZ3otmgx
-# xa5pXz5pUUr+cEjV+cwIYBMkaY5kHM9c6dEGkgHn0ZDJvdt/54FOdSG61WwHh4+e
-# vUhwvXaB4LCMZIdCt5acOfNvtDjV3CHyFOp5AU/qgAwGftHU9brv4EUwcuteEAKH
-# 46NufE20l/WjlNUh7gAvt2zKMjO4zXRxCUTh/prBQwXJiUZeFSrEXiOfkuvSlBni
-# yAYYZp5kOnaxfCKdGYjvr4QLA93vQJ6p2Ox3IHvOdCPaCr8LsKVcFpyp8MEhhJTM
-# +1LwqHJqFDF5O1Z9mjbYvm3R9vPhkG+RDLKoTpr7mTgkaTljd9xvm94Obp8BD9Hk
-# 4mPi51mtgLiuN8/6aZVESVZXtvSuNkD5DnIJQerIy5jaRKW/W2rCe9ngNDJadS7R
-# 96GGRl7IIE37lwIDAQABo4IBNjCCATIwHQYDVR0OBBYEFLtpCWdTXY5dtddkspy+
-# oxjCA/qyMB8GA1UdIwQYMBaAFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMF8GA1UdHwRY
-# MFYwVKBSoFCGTmh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01p
-# Y3Jvc29mdCUyMFRpbWUtU3RhbXAlMjBQQ0ElMjAyMDEwKDEpLmNybDBsBggrBgEF
-# BQcBAQRgMF4wXAYIKwYBBQUHMAKGUGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9w
-# a2lvcHMvY2VydHMvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUyMDIwMTAo
-# MSkuY3J0MAwGA1UdEwEB/wQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwgwDQYJKoZI
-# hvcNAQELBQADggIBAKcAKqYjGEczTWMs9z0m7Yo23sgqVF3LyK6gOMz7TCHAJN+F
-# vbvZkQ53VkvrZUd1sE6a9ToGldcJnOmBc6iuhBlpvdN1BLBRO8QSTD1433VTj4XC
-# Qd737wND1+eqKG3BdjrzbDksEwfG4v57PgrN/T7s7PkEjUGXfIgFQQkr8TQi+/HZ
-# Z9kRlNccgeACqlfb4uGPxn5sdhQPoxdMvmC3qG9DONJ5UsS9KtO+bey+ohUTDa9L
-# vEToc4Qzy5fuHj2H1JsmCaKG78nXpfWpwBLBxZYSpfml29onN8jcG7KD8nGSS/76
-# PDlb2GMQsvv+Ra0JgL6FtGRGgYmHCpM6zVrf4V/a+SoHcC+tcdGYk2aKU5KOlv+f
-# FE3n024V+z54tDAKR9z78rejdCBWqfvy5cBUQ9c5+3unHD08BEp7qP2rgpoD856v
-# NDgEwO77n7EWT76nl/IyrbK2kjbHLzUMphFpXKnV1fYWJI2+E/0LHvXFGGqF4OvM
-# BRxbrJVn03T2Dy5db6s5TzJzSaQvCrXYqA4HKvstQWkqkpvBHTX8M09+/vyRbVXN
-# xrPdeXw6oD2Q4DksykCFfn8N2j2LdixE9wG5iilv69dzsvHIN/g9A9+thkAQCVb9
-# DUSOTaMIGgsOqDYFjhT6ze9lkhHHGv/EEIkxj9l6S4hqUQyWerFkaUWDXcnZMIIH
-# cTCCBVmgAwIBAgITMwAAABXF52ueAptJmQAAAAAAFTANBgkqhkiG9w0BAQsFADCB
-# iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1Jl
-# ZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMp
-# TWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTAwHhcNMjEw
-# OTMwMTgyMjI1WhcNMzAwOTMwMTgzMjI1WjB8MQswCQYDVQQGEwJVUzETMBEGA1UE
-# CBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9z
-# b2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQ
-# Q0EgMjAxMDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOThpkzntHIh
-# C3miy9ckeb0O1YLT/e6cBwfSqWxOdcjKNVf2AX9sSuDivbk+F2Az/1xPx2b3lVNx
-# WuJ+Slr+uDZnhUYjDLWNE893MsAQGOhgfWpSg0S3po5GawcU88V29YZQ3MFEyHFc
-# UTE3oAo4bo3t1w/YJlN8OWECesSq/XJprx2rrPY2vjUmZNqYO7oaezOtgFt+jBAc
-# nVL+tuhiJdxqD89d9P6OU8/W7IVWTe/dvI2k45GPsjksUZzpcGkNyjYtcI4xyDUo
-# veO0hyTD4MmPfrVUj9z6BVWYbWg7mka97aSueik3rMvrg0XnRm7KMtXAhjBcTyzi
-# YrLNueKNiOSWrAFKu75xqRdbZ2De+JKRHh09/SDPc31BmkZ1zcRfNN0Sidb9pSB9
-# fvzZnkXftnIv231fgLrbqn427DZM9ituqBJR6L8FA6PRc6ZNN3SUHDSCD/AQ8rdH
-# GO2n6Jl8P0zbr17C89XYcz1DTsEzOUyOArxCaC4Q6oRRRuLRvWoYWmEBc8pnol7X
-# KHYC4jMYctenIPDC+hIK12NvDMk2ZItboKaDIV1fMHSRlJTYuVD5C4lh8zYGNRiE
-# R9vcG9H9stQcxWv2XFJRXRLbJbqvUAV6bMURHXLvjflSxIUXk8A8FdsaN8cIFRg/
-# eKtFtvUeh17aj54WcmnGrnu3tz5q4i6tAgMBAAGjggHdMIIB2TASBgkrBgEEAYI3
-# FQEEBQIDAQABMCMGCSsGAQQBgjcVAgQWBBQqp1L+ZMSavoKRPEY1Kc8Q/y8E7jAd
-# BgNVHQ4EFgQUn6cVXQBeYl2D9OXSZacbUzUZ6XIwXAYDVR0gBFUwUzBRBgwrBgEE
-# AYI3TIN9AQEwQTA/BggrBgEFBQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29t
-# L3BraW9wcy9Eb2NzL1JlcG9zaXRvcnkuaHRtMBMGA1UdJQQMMAoGCCsGAQUFBwMI
-# MBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1UdDwQEAwIBhjAPBgNVHRMB
-# Af8EBTADAQH/MB8GA1UdIwQYMBaAFNX2VsuP6KJcYmjRPZSQW9fOmhjEMFYGA1Ud
-# HwRPME0wS6BJoEeGRWh0dHA6Ly9jcmwubWljcm9zb2Z0LmNvbS9wa2kvY3JsL3By
-# b2R1Y3RzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNybDBaBggrBgEFBQcBAQRO
-# MEwwSgYIKwYBBQUHMAKGPmh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2kvY2Vy
-# dHMvTWljUm9vQ2VyQXV0XzIwMTAtMDYtMjMuY3J0MA0GCSqGSIb3DQEBCwUAA4IC
-# AQCdVX38Kq3hLB9nATEkW+Geckv8qW/qXBS2Pk5HZHixBpOXPTEztTnXwnE2P9pk
-# bHzQdTltuw8x5MKP+2zRoZQYIu7pZmc6U03dmLq2HnjYNi6cqYJWAAOwBb6J6Gng
-# ugnue99qb74py27YP0h1AdkY3m2CDPVtI1TkeFN1JFe53Z/zjj3G82jfZfakVqr3
-# lbYoVSfQJL1AoL8ZthISEV09J+BAljis9/kpicO8F7BUhUKz/AyeixmJ5/ALaoHC
-# gRlCGVJ1ijbCHcNhcy4sa3tuPywJeBTpkbKpW99Jo3QMvOyRgNI95ko+ZjtPu4b6
-# MhrZlvSP9pEB9s7GdP32THJvEKt1MMU0sHrYUP4KWN1APMdUbZ1jdEgssU5HLcEU
-# BHG/ZPkkvnNtyo4JvbMBV0lUZNlz138eW0QBjloZkWsNn6Qo3GcZKCS6OEuabvsh
-# VGtqRRFHqfG3rsjoiV5PndLQTHa1V1QJsWkBRH58oWFsc/4Ku+xBZj1p/cvBQUl+
-# fpO+y/g75LcVv7TOPqUxUYS8vwLBgqJ7Fx0ViY1w/ue10CgaiQuPNtq6TPmb/wrp
-# NPgkNWcr4A245oyZ1uEi6vAnQj0llOZ0dFtq0Z4+7X6gMTN9vMvpe784cETRkPHI
-# qzqKOghif9lwY1NNje6CbaUFEMFxBmoQtB1VM1izoXBm8qGCAs4wggI3AgEBMIH4
-# oYHQpIHNMIHKMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4G
-# A1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSUw
-# IwYDVQQLExxNaWNyb3NvZnQgQW1lcmljYSBPcGVyYXRpb25zMSYwJAYDVQQLEx1U
-# aGFsZXMgVFNTIEVTTjpERDhDLUUzMzctMkZBRTElMCMGA1UEAxMcTWljcm9zb2Z0
-# IFRpbWUtU3RhbXAgU2VydmljZaIjCgEBMAcGBSsOAwIaAxUAzdlp6t3ws/bnErbm
-# 9c0M+9dvU0CggYMwgYCkfjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGlu
-# Z3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBv
-# cmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDAN
-# BgkqhkiG9w0BAQUFAAIFAOWsqGYwIhgPMjAyMjAyMDgxNjI5MjZaGA8yMDIyMDIw
-# OTE2MjkyNlowdzA9BgorBgEEAYRZCgQBMS8wLTAKAgUA5ayoZgIBADAKAgEAAgIi
-# 7QIB/zAHAgEAAgITmjAKAgUA5a355gIBADA2BgorBgEEAYRZCgQCMSgwJjAMBgor
-# BgEEAYRZCgMCoAowCAIBAAIDB6EgoQowCAIBAAIDAYagMA0GCSqGSIb3DQEBBQUA
-# A4GBAKFiWA9Ov0L2rGOdPitNu60BAeztCagpqKBsGnKaaSmjA/XcSXrtIvcUBBsw
-# WlflwqnKvPDv3ihqUXsxY84IZZaMecGWzN1mXLh00VftiZuzoLMDlSEtvzmxeWYg
-# 4nFHTR5oMqxy06auAM08mVl3P4MywHz4Yp21OIs2KSWQg3DSMYIEDTCCBAkCAQEw
-# gZMwfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcT
-# B1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UE
-# AxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTACEzMAAAGcD6ZNYdKeSygA
-# AQAAAZwwDQYJYIZIAWUDBAIBBQCgggFKMBoGCSqGSIb3DQEJAzENBgsqhkiG9w0B
-# CRABBDAvBgkqhkiG9w0BCQQxIgQg8oNFH9aqIpzxu29p4VzI2Hh6Hzv2T5HQOlhP
-# W5ksqHkwgfoGCyqGSIb3DQEJEAIvMYHqMIHnMIHkMIG9BCA3D0WFII0syjoRd/Xe
-# EIG0WUIKzzuy6P6hORrb0nqmvDCBmDCBgKR+MHwxCzAJBgNVBAYTAlVTMRMwEQYD
+# b25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1p
+# Y3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhh
+# bGVzIFRTUyBFU046RkM0MS00QkQ0LUQyMjAxJTAjBgNVBAMTHE1pY3Jvc29mdCBU
+# aW1lLVN0YW1wIFNlcnZpY2WgghFoMIIHFDCCBPygAwIBAgITMwAAAY5Z20YAqBCU
+# zAABAAABjjANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK
+# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0
+# IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0Eg
+# MjAxMDAeFw0yMTEwMjgxOTI3NDVaFw0yMzAxMjYxOTI3NDVaMIHSMQswCQYDVQQG
+# EwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG
+# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQg
+# SXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJjAkBgNVBAsTHVRoYWxlcyBUU1Mg
+# RVNOOkZDNDEtNEJENC1EMjIwMSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFt
+# cCBTZXJ2aWNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqiMCq6OM
+# zLa5wrtcf7Bf9f1WXW9kpqbOBzgPJvaGLrZG7twgwqTRWf1FkjpJKBOG5QPIRy7a
+# 6IFVAy0W+tBaFX4In4DbBf2tGubyY9+hRU+hRewPJH5CYOvpPh77FfGM63+OlwRX
+# p5YER6tC0WRKn3mryWpt4CwADuGv0LD2QjnhhgtRVidsiDnn9+aLjMuNapUhstGq
+# Cr7JcQZt0ZrPUHW/TqTJymeU1eqgNorEbTed6UQyLaTVAmhXNQXDChfa526nW7RQ
+# 7L4tXX9Lc0oguiCSkPlu5drNA6NM8z+UXQOAHxVfIQXmi+Y3SV2hr2dcxby9nlTz
+# Yvf4ZDr5Wpcwt7tTdRIJibXHsXWMKrmOziliGDToLx34a/ctZE4NOLnlrKQWN9ZG
+# +Ox5zRarK1EhShahM0uQNhb6BJjp3+c0eNzMFJ2qLZqDp2/3Yl5Q+4k+MDHLTipP
+# 6VBdxcdVfd4mgrVTx3afO5KNfgMngGGfhSawGraRW28EhrLOspmIxii92E7vjncJ
+# 2tcjhLCjBArVpPh3cZG5g3ZVy5iiAaoDaswpNgnMFAK5Un1reK+MFhPi9iMnvUPw
+# tTDDJt5YED5DAT3mBUxp5QH3t7RhZwAJNLWLtpTeGF7ub81sSKYv2ardazAe9XLS
+# 10tV2oOPrcniGJzlXW7VPvxqQNxe8lCDA20CAwEAAaOCATYwggEyMB0GA1UdDgQW
+# BBTsQfkz9gT44N/5G8vNHayep+aV5DAfBgNVHSMEGDAWgBSfpxVdAF5iXYP05dJl
+# pxtTNRnpcjBfBgNVHR8EWDBWMFSgUqBQhk5odHRwOi8vd3d3Lm1pY3Jvc29mdC5j
+# b20vcGtpb3BzL2NybC9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAx
+# MCgxKS5jcmwwbAYIKwYBBQUHAQEEYDBeMFwGCCsGAQUFBzAChlBodHRwOi8vd3d3
+# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY3Jvc29mdCUyMFRpbWUtU3Rh
+# bXAlMjBQQ0ElMjAyMDEwKDEpLmNydDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoG
+# CCsGAQUFBwMIMA0GCSqGSIb3DQEBCwUAA4ICAQA1UK9xzIeTlKhSbLn0bekR5gYh
+# 6bB1XQpluCqCA15skZ37UilaFJw8+GklDLzlNhSP2mOiOzVyCq8kkpqnfUc01ZaB
+# ezQxg77qevj2iMyg39YJfeiCIhxYOFugwepYrPO8MlB/oue/VhIiDb1eNYTlPSmv
+# 3palsgtkrb0oo0F0uWmX4EQVGKRo0UENtZetVIxa0J9DpUdjQWPeEh9cEM+RgE26
+# 5w5WAVb+WNx0iWiF4iTbCmrWaVEOX92dNqBm9bT1U7nGwN5CygpNAgEaYnrTMx1N
+# 4AjxObACDN5DdvGlu/O0DfMWVc6qk6iKDFC6WpXQSkMlrlXII/Nhp+0+noU6tfEp
+# HKLt7fYm9of5i/QomcCwo/ekiOCjYktp393ovoC1O2uLtbLnMVlE5raBLBNSbINZ
+# 6QLxiA41lXnVVLIzDihUL8MU9CMvG4sdbhk2FX8zvrsP5PeBIw1faenMZuz0V3UX
+# CtU5Okx5fmioWiiLZSCi1ljaxX+BEwQiinCi+vE59bTYI5FbuR8tDuGLiVu/JSpV
+# FXrzWMP2Kn11sCLAGEjqJYUmO1tRY29Kd7HcIj2niSB0PQOCjYlnCnywnDinqS1C
+# XvRsisjVlS1Rp4Tmuks+pGxiMGzF58zcb+hoFKyONuL3b+tgxTAz3sF3BVX9uk9M
+# 5F+OEoeyLyGfLekNAjCCB3EwggVZoAMCAQICEzMAAAAVxedrngKbSZkAAAAAABUw
+# DQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5n
+# dG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9y
+# YXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmljYXRlIEF1dGhv
+# cml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIyNVowfDELMAkG
+# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx
+# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z
+# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+# ggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXIyjVX9gF/bErg
+# 4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjoYH1qUoNEt6aO
+# RmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1yaa8dq6z2Nr41
+# JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v3byNpOORj7I5
+# LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pGve2krnopN6zL
+# 64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viSkR4dPf0gz3N9
+# QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYrbqgSUei/BQOj
+# 0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlMjgK8QmguEOqE
+# UUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSLW6CmgyFdXzB0
+# kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AFemzFER1y7435
+# UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIurQIDAQABo4IB
+# 3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIEFgQUKqdS/mTE
+# mr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMFwG
+# A1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93
+# d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTATBgNV
+# HSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNV
+# HQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV9lbLj+iiXGJo
+# 0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLm1pY3Jvc29m
+# dC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5j
+# cmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8vd3d3Lm1pY3Jv
+# c29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNydDAN
+# BgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv6lwUtj5OR2R4
+# sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZnOlNN3Zi6th54
+# 2DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1bSNU5HhTdSRX
+# ud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4rPf5KYnDvBew
+# VIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU6ZGyqVvfSaN0
+# DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDFNLB62FD+Cljd
+# QDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/HltEAY5aGZFr
+# DZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdUCbFpAUR+fKFh
+# bHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKiexcdFYmNcP7n
+# tdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTmdHRbatGePu1+
+# oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZqELQdVTNYs6Fw
+# ZvKhggLXMIICQAIBATCCAQChgdikgdUwgdIxCzAJBgNVBAYTAlVTMRMwEQYDVQQI
+# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv
+# ZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJh
+# dGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhhbGVzIFRTUyBFU046RkM0MS00QkQ0
+# LUQyMjAxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2WiIwoB
+# ATAHBgUrDgMCGgMVAD1iK+pPThHqgpa5xsPmiYruWVuMoIGDMIGApH4wfDELMAkG
+# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx
+# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z
+# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwDQYJKoZIhvcNAQEFBQACBQDmU6UXMCIY
+# DzIwMjIwNjE1MDgyMzUxWhgPMjAyMjA2MTYwODIzNTFaMHcwPQYKKwYBBAGEWQoE
+# ATEvMC0wCgIFAOZTpRcCAQAwCgIBAAICDfkCAf8wBwIBAAICEUYwCgIFAOZU9pcC
+# AQAwNgYKKwYBBAGEWQoEAjEoMCYwDAYKKwYBBAGEWQoDAqAKMAgCAQACAwehIKEK
+# MAgCAQACAwGGoDANBgkqhkiG9w0BAQUFAAOBgQDN/0gXV2ryG6xuDtnJxm5VbRo1
+# Yqu/XUxuRbFjUPoMN8PgM96ioZQ01JwEmefdXUBnGgiGzuhhyHhK/gLh2aVQtIHv
+# ubxig/3shp0tPa4LA0EusBRmSmGT70uV3ojk9USW0nx8SKMeOy9Wa2JynUvDaj2X
+# Ew5qTsm310NMYONiAjGCBA0wggQJAgEBMIGTMHwxCzAJBgNVBAYTAlVTMRMwEQYD
 # VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy
 # b3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1w
-# IFBDQSAyMDEwAhMzAAABnA+mTWHSnksoAAEAAAGcMCIEIOSl7GUcmDL8AU+F0I3A
-# iZQESHSkml1QPlOc3M8uqdF0MA0GCSqGSIb3DQEBCwUABIICAHV226l2xxnkjTdh
-# Q6wi7u8betBvFNfYYn5cXwy+NoU30JjQ3ynnmNSB+TQVlmcthi8duP8dud+NU5xc
-# +1jBTcJTHjWk/TDZUYpB/xNqsgUTJ8fnebVZhioPJhmFJMeQztT4NTD1ZbeJWO4O
-# EABDpRqyns2eQptCrKcPIypjvdDeYfkwjgnUEyyaTZRHPZ2kNOLY6kO9feKfntFW
-# 8YUIaas2IzI5GcGm+kw1efHveG0WvUpeGuFKsTUA6Jb18mOyamafu32ftD5t5LXV
-# +GMgnaJLgdogAAGwK0GiB47YNIvPlKD6bGnyTR3KNYheI1GI38w0knOecCC4NW0k
-# 21qROWJdnkKLKTtBX344yTnJbbKoIPzGgyWCzSINS2SD4JHzgTu8dsmMMJWwcEZh
-# BLyrzmd/vWrjUFQFXVf6RZmJJVvF28s7LWrpXPVTR8Al75j8KqyZKou4fZvyaHtx
-# S6K0jIqavLWqWd4wvx9seCtA0Pz1GWrBZADIRHG8d8cFoY95Z99z84NM81qXB246
-# IsxU2iW+96zMJriMNEKaLHzlgFoWsoXLDQhuQItjwIvzwmwygwx0MxqoFYm+lDWG
-# 8/KtSh47aZicAlwqNVGy3MZHDnX69kysQsrWoe2wDhJ3eHJ4zRL2WHVagz26L7xF
-# oSkLphLv0GiFseJhPvXGQPypnyN8
+# IFBDQSAyMDEwAhMzAAABjlnbRgCoEJTMAAEAAAGOMA0GCWCGSAFlAwQCAQUAoIIB
+# SjAaBgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwLwYJKoZIhvcNAQkEMSIEIOt1
+# xqDGNa4CMNqMjUcV58sEspqDg5BHhRG+7xrucal1MIH6BgsqhkiG9w0BCRACLzGB
+# 6jCB5zCB5DCBvQQgvQWPITvigaUuV5+f/lWs3BXZwJ/l1mf+yelu5nXmxCUwgZgw
+# gYCkfjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UE
+# BxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYD
+# VQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAY5Z20YAqBCU
+# zAABAAABjjAiBCC97cfb69v28hHpcGOUJva0NzUqb0M9evkduYvneCHmoTANBgkq
+# hkiG9w0BAQsFAASCAgCc25eR8tgyo9L/uL+9i1Yi0FyNy2qS46VtVoSFaFiI/HUe
+# 28NssAjB4Vr/Vf4HcYZ9SOHWIZaZCKFFS9ey6r4EOF9m4vnp4t9Z+tzOijom0rMm
+# H5UPKlwugDpSKOiKSFPGqpw5d5SMzCrGkea94zyVvvqAgWna3+WuWTbSm34PGfjM
+# 9mKBEsLF8jMXnAMLaqsw7tmGfTyqSL2hAP1IkUQlX5pTgoTw7NSxkGrS6zgXFLZg
+# zSi9+cPzX6yt1nm1i8HZWyZtbhcJeu0gToN3nRwZuRNt/A92z2OQ9wbtuej2R1pA
+# JrySld9ObQo6W3HtbSOcg3bO7hL6FRfkF7XOPEfnVJrZK9HWmyia6QR09JvcuTuP
+# e+o8OT9813vpeCeBeq6I3JfDLDtww9o9Wl4kcqRjjevN4GiV6n8tWVbYQPeV9V+b
+# QiZHYMGfDbDoFWCuSn/Gde0dWkEUtXxTDXqmIZVKNKGugGWFk3fIIhj6p686jLnq
+# G10mp0r6hgzf83xsya2mQ6iA8N9hHJc3d3L8nfLIu1UYyWx+F2OMRVDPu9UQ+ms9
+# jy32ScR6UEY71XJuS+v1JE2O2bePGzzMaxHVoNTxDi2Evp63cG870mzTrtXpVeRV
+# quINvifnjBl1F2iyStUdpE4pzDNDCagbkK1XlZdbfl6TfR14yAgLnwTzVRroZQ==
 # SIG # End signature block
diff --git a/externals/install-dotnet.sh b/externals/install-dotnet.sh
index 975737a02..93332182a 100755
--- a/externals/install-dotnet.sh
+++ b/externals/install-dotnet.sh
@@ -1000,19 +1000,27 @@ downloadcurl() {
     # Avoid passing URI with credentials to functions: note, most of them echoing parameters of invocation in verbose output.
     local remote_path_with_credential="${remote_path}${feed_credential}"
     local curl_options="--retry 20 --retry-delay 2 --connect-timeout 15 -sSL -f --create-dirs "
-    local failed=false
+    local curl_exit_code=0;
     if [ -z "$out_path" ]; then
-        curl $curl_options "$remote_path_with_credential" 2>&1 || failed=true
+        curl $curl_options "$remote_path_with_credential" 2>&1
+        curl_exit_code=$?
     else
-        curl $curl_options -o "$out_path" "$remote_path_with_credential" 2>&1 || failed=true
+        curl $curl_options -o "$out_path" "$remote_path_with_credential" 2>&1
+        curl_exit_code=$?
     fi
-    if [ "$failed" = true ]; then
-        local disable_feed_credential=false
-        local response=$(get_http_header_curl $remote_path $disable_feed_credential)
-        http_code=$( echo "$response" | awk '/^HTTP/{print $2}' | tail -1 )
+    
+    if [ $curl_exit_code -gt 0 ]; then
         download_error_msg="Unable to download $remote_path."
-        if  [[ $http_code != 2* ]]; then
-            download_error_msg+=" Returned HTTP status code: $http_code."
+        # Check for curl timeout codes
+        if [[ $curl_exit_code == 7 || $curl_exit_code == 28 ]]; then
+            download_error_msg+=" Failed to reach the server: connection timeout."
+        else
+            local disable_feed_credential=false
+            local response=$(get_http_header_curl $remote_path $disable_feed_credential)
+            http_code=$( echo "$response" | awk '/^HTTP/{print $2}' | tail -1 )
+            if  [[ ! -z $http_code && $http_code != 2* ]]; then
+                download_error_msg+=" Returned HTTP status code: $http_code."
+            fi
         fi
         say_verbose "$download_error_msg"
         return 1
@@ -1055,8 +1063,11 @@ downloadwget() {
         local response=$(get_http_header_wget $remote_path $disable_feed_credential)
         http_code=$( echo "$response" | awk '/^  HTTP/{print $2}' | tail -1 )
         download_error_msg="Unable to download $remote_path."
-        if  [[ $http_code != 2* ]]; then
+        if  [[ ! -z $http_code && $http_code != 2* ]]; then
             download_error_msg+=" Returned HTTP status code: $http_code."
+        # wget exit code 4 stands for network-issue
+        elif [[ $wget_result == 4 ]]; then
+            download_error_msg+=" Failed to reach the server: connection timeout."
         fi
         say_verbose "$download_error_msg"
         return 1
@@ -1179,6 +1190,11 @@ generate_akams_links() {
     local valid_aka_ms_link=true;
 
     normalized_version="$(to_lowercase "$version")"
+    if [[ "$normalized_version" != "latest" ]] && [ -n "$normalized_quality" ]; then
+        say_err "Either Quality or Version option has to be specified. See https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script#options for details."
+        return 1
+    fi
+
     if [[ -n "$json_file" || "$normalized_version" != "latest" ]]; then
         # aka.ms links are not needed when exact version is specified via command or json file
         return
@@ -1392,6 +1408,7 @@ install_dotnet() {
         unset IFS;
         say_verbose "Checking installation: version = $release_version"
         if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$release_version"; then
+            say "Installed version is $effective_version"
             return 0
         fi
     fi
@@ -1399,6 +1416,7 @@ install_dotnet() {
     #  Check if the standard SDK version is installed.
     say_verbose "Checking installation: version = $effective_version"
     if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$effective_version"; then
+        say "Installed version is $effective_version"
         return 0
     fi
 
@@ -1552,7 +1570,7 @@ do
             echo "  -v,--version <VERSION>         Use specific VERSION, Defaults to \`$version\`."
             echo "      -Version"
             echo "          Possible values:"
-            echo "          - latest - most latest build on specific channel"
+            echo "          - latest - the latest build on specific channel"
             echo "          - 3-part version in a format A.B.C - represents specific version of build"
             echo "              examples: 2.0.0-preview2-006120; 1.1.0"
             echo "  -q,--quality <quality>         Download the latest build of specified quality in the channel."
diff --git a/src/installer.ts b/src/installer.ts
index c25d23a0a..68996bd22 100644
--- a/src/installer.ts
+++ b/src/installer.ts
@@ -79,8 +79,13 @@ export class DotNetVersionInfo {
 }
 
 export class DotnetCoreInstaller {
-  constructor(version: string, includePrerelease: boolean = false) {
+  constructor(
+    version: string,
+    architecture: string = '',
+    includePrerelease: boolean = false
+  ) {
     this.version = version;
+    this.architecture = architecture;
     this.includePrerelease = includePrerelease;
   }
 
@@ -115,6 +120,10 @@ export class DotnetCoreInstaller {
         command += ` -ProxyBypassList ${process.env['no_proxy']}`;
       }
 
+      if (this.architecture != '') {
+        command += ` -Architecture ${this.architecture}`;
+      }
+
       // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
       const powershellPath = await io.which('powershell', true);
 
@@ -154,6 +163,10 @@ export class DotnetCoreInstaller {
         scriptArguments.push('--version', calculatedVersion);
       }
 
+      if (this.architecture != '') {
+        scriptArguments.push('--architecture', this.architecture);
+      }
+
       // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
       resultCode = await exec.exec(`"${scriptPath}"`, scriptArguments, {
         listeners: {
@@ -296,6 +309,7 @@ export class DotnetCoreInstaller {
   }
 
   private version: string;
+  private architecture: string;
   private includePrerelease: boolean;
 }
 
diff --git a/src/setup-dotnet.ts b/src/setup-dotnet.ts
index 64f314911..f7fa2ebff 100644
--- a/src/setup-dotnet.ts
+++ b/src/setup-dotnet.ts
@@ -16,6 +16,11 @@ export async function run() {
     // Proxy, auth, (etc) are still set up, even if no version is identified
     //
     let versions = core.getMultilineInput('dotnet-version');
+    let architecture = core.getInput('architecture');
+
+    if (!architecture) {
+      architecture = '';
+    }
 
     const globalJsonFileInput = core.getInput('global-json-file');
     if (globalJsonFileInput) {
@@ -45,6 +50,7 @@ export async function run() {
       for (const version of new Set<string>(versions)) {
         dotnetInstaller = new installer.DotnetCoreInstaller(
           version,
+          architecture,
           includePrerelease
         );
         await dotnetInstaller.installDotnet();