actions/setup-dotnet
1
0
Fork 0
mirror of https://github.com/actions/setup-dotnet.git synced 2024-11-22 19:41:08 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34 from rojepp/fix_dotnet_root

Browse Source 
Include version/architecture in DOTNET_ROOT
Fixes #40 and #29.
This commit is contained in:
Zachary Eisinger 2019-10-18 13:55:47 -07:00 committed by GitHub
commit bb95ce727f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/installer.js
View File

@ -73,7 +73,7 @@ class DotnetCoreInstaller {
console.log('Using cached tool'); console.log('Using cached tool');
} }
// Need to set this so that .NET Core global tools find the right locations. // Need to set this so that .NET Core global tools find the right locations.
core.exportVariable('DOTNET_ROOT', path.join(toolPath, '../..')); core.exportVariable('DOTNET_ROOT', toolPath);
// Prepend the tools path. instructs the agent to prepend for future tasks // Prepend the tools path. instructs the agent to prepend for future tasks
core.addPath(toolPath); core.addPath(toolPath);
}); });

2
src/installer.ts
View File

@ -59,7 +59,7 @@ export class DotnetCoreInstaller {
} }
// Need to set this so that .NET Core global tools find the right locations. // Need to set this so that .NET Core global tools find the right locations.
core.exportVariable('DOTNET_ROOT', path.join(toolPath, '../..')); core.exportVariable('DOTNET_ROOT', toolPath);
// Prepend the tools path. instructs the agent to prepend for future tasks // Prepend the tools path. instructs the agent to prepend for future tasks
core.addPath(toolPath); core.addPath(toolPath);