From 5db01984185360809009c32782bb2ba14cae3dea Mon Sep 17 00:00:00 2001
From: Bryan Thornbury <brthor@microsoft.com>
Date: Tue, 2 Feb 2016 15:26:23 -0800
Subject: [PATCH] fix bug in dotnet-run

---
 src/dotnet/commands/dotnet-run/RunCommand.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/dotnet/commands/dotnet-run/RunCommand.cs b/src/dotnet/commands/dotnet-run/RunCommand.cs
index fcdd743d1..30c819712 100644
--- a/src/dotnet/commands/dotnet-run/RunCommand.cs
+++ b/src/dotnet/commands/dotnet-run/RunCommand.cs
@@ -133,21 +133,22 @@ namespace Microsoft.DotNet.Tools.Run
             }
 
             // Locate the runtime
-            string runtime = Environment.GetEnvironmentVariable("DOTNET_HOME");
-            if (string.IsNullOrEmpty(runtime))
+            string dotnetHome = Environment.GetEnvironmentVariable("DOTNET_HOME");
+            if (string.IsNullOrEmpty(dotnetHome))
             {
                 // 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)))
                 {
-                    runtime = Path.GetFullPath(candidate);
+                    dotnetHome = Path.GetFullPath(candidateBase);
                 }
             }
 
             result = Command.Create(outputName, _args)
                 .ForwardStdOut()
                 .ForwardStdErr()
-                .EnvironmentVariable("DOTNET_HOME", runtime)
+                .EnvironmentVariable("DOTNET_HOME", dotnetHome)
                 .Execute();
 
             // Clean up