Actions/setup-dotnet
1
Fork 0
mirror of https://github.com/actions/setup-dotnet.git synced 2025-11-04 15:13:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix install dir for Windows

Browse Source
This commit is contained in:
IvanZosimov 2022-08-18 11:25:58 +02:00
parent 973bdde015
commit 813933aedb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/index.js vendored
View File

@ -282,7 +282,7 @@ class DotnetCoreInstaller {
if (process.env['no_proxy'] != null) { if (process.env['no_proxy'] != null) {
command += ` -ProxyBypassList ${process.env['no_proxy']}`; command += ` -ProxyBypassList ${process.env['no_proxy']}`;
} }
command += ` -InstallDir ${DotnetCoreInstaller.installationDirectoryWindows}`; command += ` -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
const powershellPath = yield io.which('powershell', true); const powershellPath = yield io.which('powershell', true);
var options = { var options = {
@ -357,7 +357,7 @@ class DotnetCoreInstaller {
} }
} }
exports.DotnetCoreInstaller = DotnetCoreInstaller; exports.DotnetCoreInstaller = DotnetCoreInstaller;
DotnetCoreInstaller.installationDirectoryWindows = `'${path.join(process.env['PROGRAMFILES'] + '', "dotnet")}'`; DotnetCoreInstaller.installationDirectoryWindows = path.join(process.env['PROGRAMFILES'] + '', "dotnet");
DotnetCoreInstaller.installationDirectoryLinux = '/usr/share/dotnet'; DotnetCoreInstaller.installationDirectoryLinux = '/usr/share/dotnet';
function logWarning(message) { function logWarning(message) {
const warningPrefix = '[warning]'; const warningPrefix = '[warning]';

4
src/installer.ts
View File

@ -83,7 +83,7 @@ export class DotnetVersionResolver {
export class DotnetCoreInstaller { export class DotnetCoreInstaller {
private version: string; private version: string;
private quality: string; private quality: string;
static installationDirectoryWindows = `'${path.join(process.env['PROGRAMFILES'] + '', "dotnet")}'`; static installationDirectoryWindows = path.join(process.env['PROGRAMFILES'] + '', "dotnet");
static installationDirectoryLinux = '/usr/share/dotnet'; static installationDirectoryLinux = '/usr/share/dotnet';
constructor(version: string, quality: string) { constructor(version: string, quality: string) {
@ -130,7 +130,7 @@ export class DotnetCoreInstaller {
command += ` -ProxyBypassList ${process.env['no_proxy']}`; command += ` -ProxyBypassList ${process.env['no_proxy']}`;
} }
command += ` -InstallDir ${DotnetCoreInstaller.installationDirectoryWindows}`; command += ` -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
const powershellPath = await io.which('powershell', true); const powershellPath = await io.which('powershell', true);