mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #1192 from dotnet/brthor/dotnet-run-bug

Browse source 
coreclr path being set incorrectly when dotnet_home env var isn't present
This commit is contained in:
Bryan Thornbury 2016-02-03 16:41:27 -08:00
commit 7236a72917
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/dotnet/commands/dotnet-run/RunCommand.cs
View file

@ -133,21 +133,22 @@ namespace Microsoft.DotNet.Tools.Run
} }
// Locate the runtime // Locate the runtime
string runtime = Environment.GetEnvironmentVariable("DOTNET_HOME"); string dotnetHome = Environment.GetEnvironmentVariable("DOTNET_HOME");
if (string.IsNullOrEmpty(runtime)) if (string.IsNullOrEmpty(dotnetHome))
{ {
// Use the runtime deployed with the tools, if present // Use the runtime deployed with the tools, if present
var candidate = Path.Combine(AppContext.BaseDirectory, "..", "runtime"); var candidateBase = Path.Combine(AppContext.BaseDirectory, "..");
var candidate = Path.Combine(candidateBase, "runtime/coreclr");
if (File.Exists(Path.Combine(candidate, Constants.LibCoreClrName))) if (File.Exists(Path.Combine(candidate, Constants.LibCoreClrName)))
{ {
runtime = Path.GetFullPath(candidate); dotnetHome = Path.GetFullPath(candidateBase);
} }
} }
result = Command.Create(outputName, _args) result = Command.Create(outputName, _args)
.ForwardStdOut() .ForwardStdOut()
.ForwardStdErr() .ForwardStdErr()
.EnvironmentVariable("DOTNET_HOME", runtime) .EnvironmentVariable("DOTNET_HOME", dotnetHome)
.Execute(); .Execute();
// Clean up // Clean up