Actions/setup-dotnet
1
Fork 0
mirror of https://github.com/actions/setup-dotnet.git synced 2025-08-18 14:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix review points

Browse Source
This commit is contained in:
IvanZosimov 2022-09-27 16:41:42 +02:00
parent f2b7c181be
commit 6eb9549b62
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/index.js vendored
View File

@ -363,7 +363,7 @@ class DotnetCoreInstaller {
let resolvedVersion = ''; let resolvedVersion = '';
const installedByScriptPattern = /Installed version is (?<version>\d+\.\d+\.\d.*)$/m; const installedByScriptPattern = /Installed version is (?<version>\d+\.\d+\.\d.*)$/m;
const preinstalledOnRunnerPattern = /.NET Core SDK with version '(?<version>\d+\.\d+\.\d.*)'/m; const preinstalledOnRunnerPattern = /.NET Core SDK with version '(?<version>\d+\.\d+\.\d.*)'/m;
let regExpressions = [ const regExpressions = [
installedByScriptPattern, installedByScriptPattern,
preinstalledOnRunnerPattern preinstalledOnRunnerPattern
]; ];
@ -447,7 +447,7 @@ function run() {
// Proxy, auth, (etc) are still set up, even if no version is identified // Proxy, auth, (etc) are still set up, even if no version is identified
// //
const versions = core.getMultilineInput('dotnet-version'); const versions = core.getMultilineInput('dotnet-version');
let installedDotnetVersions = []; const installedDotnetVersions = [];
const globalJsonFileInput = core.getInput('global-json-file'); const globalJsonFileInput = core.getInput('global-json-file');
if (globalJsonFileInput) { if (globalJsonFileInput) {
const globalJsonPath = path_1.default.join(process.cwd(), globalJsonFileInput); const globalJsonPath = path_1.default.join(process.cwd(), globalJsonFileInput);
@ -473,7 +473,7 @@ function run() {
const uniqueVersions = new Set(versions); const uniqueVersions = new Set(versions);
for (const version of uniqueVersions) { for (const version of uniqueVersions) {
dotnetInstaller = new installer_1.DotnetCoreInstaller(version, quality); dotnetInstaller = new installer_1.DotnetCoreInstaller(version, quality);
let installedVersion = yield dotnetInstaller.installDotnet(); const installedVersion = yield dotnetInstaller.installDotnet();
installedDotnetVersions.push(installedVersion); installedDotnetVersions.push(installedVersion);
} }
installer_1.DotnetCoreInstaller.addToPath(); installer_1.DotnetCoreInstaller.addToPath();

2
src/installer.ts
View File

@ -247,7 +247,7 @@ export class DotnetCoreInstaller {
const installedByScriptPattern = /Installed version is (?<version>\d+\.\d+\.\d.*)$/m; const installedByScriptPattern = /Installed version is (?<version>\d+\.\d+\.\d.*)$/m;
const preinstalledOnRunnerPattern = /.NET Core SDK with version '(?<version>\d+\.\d+\.\d.*)'/m; const preinstalledOnRunnerPattern = /.NET Core SDK with version '(?<version>\d+\.\d+\.\d.*)'/m;
let regExpressions: RegExp[] = [ const regExpressions: RegExp[] = [
installedByScriptPattern, installedByScriptPattern,
preinstalledOnRunnerPattern preinstalledOnRunnerPattern
]; ];

4
src/setup-dotnet.ts
View File

@ -27,7 +27,7 @@ export async function run() {
// Proxy, auth, (etc) are still set up, even if no version is identified // Proxy, auth, (etc) are still set up, even if no version is identified
// //
const versions = core.getMultilineInput('dotnet-version'); const versions = core.getMultilineInput('dotnet-version');
let installedDotnetVersions: string[] = []; const installedDotnetVersions: string[] = [];
const globalJsonFileInput = core.getInput('global-json-file'); const globalJsonFileInput = core.getInput('global-json-file');
if (globalJsonFileInput) { if (globalJsonFileInput) {
@ -62,7 +62,7 @@ export async function run() {
const uniqueVersions = new Set<string>(versions); const uniqueVersions = new Set<string>(versions);
for (const version of uniqueVersions) { for (const version of uniqueVersions) {
dotnetInstaller = new DotnetCoreInstaller(version, quality); dotnetInstaller = new DotnetCoreInstaller(version, quality);
let installedVersion = await dotnetInstaller.installDotnet(); const installedVersion = await dotnetInstaller.installDotnet();
installedDotnetVersions.push(installedVersion); installedDotnetVersions.push(installedVersion);
} }
DotnetCoreInstaller.addToPath(); DotnetCoreInstaller.addToPath();