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

Merge branch 'main' into ADRdotnet

Browse Source
This commit is contained in:
IvanZosimov 2022-09-26 10:42:13 +02:00
commit 890cbe1576
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dist/index.js vendored
View File

@ -335,7 +335,8 @@ class DotnetCoreInstaller {
} }
scriptArguments.push(`-InstallDir '${DotnetCoreInstaller.installationDirectoryWindows}'`); scriptArguments.push(`-InstallDir '${DotnetCoreInstaller.installationDirectoryWindows}'`);
// 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 = yield io.which('powershell', true); scriptPath =
(yield io.which('pwsh', false)) || (yield io.which('powershell', true));
scriptArguments = [...windowsDefaultOptions, scriptArguments.join(' ')]; scriptArguments = [...windowsDefaultOptions, scriptArguments.join(' ')];
} }
else { else {

3
src/installer.ts
View File

@ -209,7 +209,8 @@ export class DotnetCoreInstaller {
`-InstallDir '${DotnetCoreInstaller.installationDirectoryWindows}'` `-InstallDir '${DotnetCoreInstaller.installationDirectoryWindows}'`
); );
// 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 = await io.which('powershell', true); scriptPath =
(await io.which('pwsh', false)) || (await io.which('powershell', true));
scriptArguments = [...windowsDefaultOptions, scriptArguments.join(' ')]; scriptArguments = [...windowsDefaultOptions, scriptArguments.join(' ')];
} else { } else {
chmodSync(escapedScript, '777'); chmodSync(escapedScript, '777');