Merge pull request #34 from rojepp/fix_dotnet_root

Zachary Eisinger · web-flow · commit bb95ce727fd4 · 2019-10-18T13:55:47.000-07:00
Include version/architecture in DOTNET_ROOT Fixes #40 and #29.
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);

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ class DotnetCoreInstaller {`
`73`	`73`	`console.log('Using cached tool');`
`74`	`74`	`}`
`75`	`75`	`// Need to set this so that .NET Core global tools find the right locations.`
`76`		`- core.exportVariable('DOTNET_ROOT', path.join(toolPath, '../..'));`
	`76`	`+ core.exportVariable('DOTNET_ROOT', toolPath);`
`77`	`77`	`// Prepend the tools path. instructs the agent to prepend for future tasks`
`78`	`78`	`core.addPath(toolPath);`
`79`	`79`	`});`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ export class DotnetCoreInstaller {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`// Need to set this so that .NET Core global tools find the right locations.`
`62`		`- core.exportVariable('DOTNET_ROOT', path.join(toolPath, '../..'));`
	`62`	`+ core.exportVariable('DOTNET_ROOT', toolPath);`
`63`	`63`
`64`	`64`	`// Prepend the tools path. instructs the agent to prepend for future tasks`
`65`	`65`	`core.addPath(toolPath);`