diff --git a/action.yml b/action.yml index f0701f2..2e5c1bc 100644 --- a/action.yml +++ b/action.yml @@ -4,10 +4,6 @@ author: 'GitHub' inputs: dotnet-version: description: 'SDK version to use. E.g. 2.2.104' -# Deprecated option, do not use. Will not be supported after October 1, 2019 - version: - description: 'Deprecated. Use dotnet-version instead. Will not be supported after October 1, 2019' - deprecationMessage: 'The version property will not be supported after October 1, 2019. Use dotnet-version instead' runs: using: 'node12' main: 'lib/setup-dotnet.js' diff --git a/lib/setup-dotnet.js b/lib/setup-dotnet.js index 1c4cdae..8822872 100644 --- a/lib/setup-dotnet.js +++ b/lib/setup-dotnet.js @@ -1,10 +1,9 @@ "use strict"; 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); } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; @@ -27,10 +26,7 @@ function run() { // If not supplied then task is still used to setup proxy, auth, etc... // console.log(`::warning::Use the v1 tag to get the last version, master may contain breaking changes and will not contain any required packages in the future. i.e. actions/setup-dotnet@v1`); - let version = core.getInput('version'); - if (!version) { - version = core.getInput('dotnet-version'); - } + let version = core.getInput('dotnet-version'); if (version) { const dotnetInstaller = new installer.DotnetCoreInstaller(version); yield dotnetInstaller.installDotnet(); diff --git a/src/setup-dotnet.ts b/src/setup-dotnet.ts index eee984d..08c817f 100644 --- a/src/setup-dotnet.ts +++ b/src/setup-dotnet.ts @@ -12,10 +12,8 @@ async function run() { `::warning::Use the v1 tag to get the last version, master may contain breaking changes and will not contain any required packages in the future. i.e. actions/setup-dotnet@v1` ); - let version = core.getInput('version'); - if (!version) { - version = core.getInput('dotnet-version'); - } + let version = core.getInput('dotnet-version'); + if (version) { const dotnetInstaller = new installer.DotnetCoreInstaller(version); await dotnetInstaller.installDotnet();