Merge pull request #34 from rojepp/fix_dotnet_root

Include version/architecture in DOTNET_ROOT Fixes #40 and #29.
actions · Oct 18, 2019 · bb95ce7 · bb95ce7
2 parents cc372bb + a668ade
commit bb95ce7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/installer.js b/lib/installer.js
@@ -73,7 +73,7 @@ class DotnetCoreInstaller {
                 console.log('Using cached tool');
             }
             // 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
             core.addPath(toolPath);
         });

diff --git a/src/installer.ts b/src/installer.ts
@@ -59,7 +59,7 @@ export class DotnetCoreInstaller {
     }
 
     // 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
     core.addPath(toolPath);