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 logic

Browse Source
This commit is contained in:
IvanZosimov 2022-09-29 13:51:12 +02:00
parent eb389a2699
commit 57ce9fed6b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/index.js vendored
View File

@ -337,7 +337,7 @@ class DotnetCoreInstaller {
// process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
scriptPath = scriptPath =
(yield io.which('pwsh', false)) || (yield io.which('powershell', true)); (yield io.which('pwsh', false)) || (yield io.which('powershell', true));
scriptArguments = [...windowsDefaultOptions, scriptArguments.join(' ')]; scriptArguments = windowsDefaultOptions.concat(scriptArguments);
} }
else { else {
fs_1.chmodSync(escapedScript, '777'); fs_1.chmodSync(escapedScript, '777');

2
src/installer.ts
View File

@ -214,7 +214,7 @@ export class DotnetCoreInstaller {
// process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
scriptPath = scriptPath =
(await io.which('pwsh', false)) || (await io.which('powershell', true)); (await io.which('pwsh', false)) || (await io.which('powershell', true));
scriptArguments = [...windowsDefaultOptions, scriptArguments.join(' ')]; scriptArguments = windowsDefaultOptions.concat(scriptArguments);
} else { } else {
chmodSync(escapedScript, '777'); chmodSync(escapedScript, '777');
scriptPath = await io.which(escapedScript, true); scriptPath = await io.which(escapedScript, true);