From a668ade667b3edbafe8068d6b408a5a8c9997361 Mon Sep 17 00:00:00 2001
From: Robert Jeppesen <robert.jeppesen@durius.se>
Date: Wed, 11 Sep 2019 20:22:37 +0200
Subject: [PATCH] Include version/architecture in DOTNET_ROOT Fixes #29

---
 lib/installer.js | 2 +-
 src/installer.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/installer.js b/lib/installer.js
index 73bded0..41c3b2c 100644
--- 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
index 4e620e1..1979227 100644
--- 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);