From 3b261afb47fe31360e328dc2e649f57bb29d60d4 Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Tue, 19 Jan 2016 15:04:03 -0800 Subject: [PATCH] workaround #901 by using corerun instead of corehost --- src/dotnet-restore/NuGet3.cs | 5 ++++- src/dotnet-restore/project.json | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/dotnet-restore/NuGet3.cs b/src/dotnet-restore/NuGet3.cs index 54767bb17..1458040e3 100644 --- a/src/dotnet-restore/NuGet3.cs +++ b/src/dotnet-restore/NuGet3.cs @@ -30,7 +30,10 @@ namespace Microsoft.DotNet.Tools.Restore private static Command Run(IEnumerable nugetArgs) { - return Command.Create(CoreHost.LocalHostExePath, Enumerable.Concat( + var corerun = Path.Combine( + AppContext.BaseDirectory, + "corerun" + Constants.ExeSuffix); + return Command.Create(corerun, Enumerable.Concat( new[] { Path.Combine(AppContext.BaseDirectory, "NuGet.CommandLine.XPlat.dll") }, nugetArgs)); } diff --git a/src/dotnet-restore/project.json b/src/dotnet-restore/project.json index e97943d2a..9cc11e5e6 100644 --- a/src/dotnet-restore/project.json +++ b/src/dotnet-restore/project.json @@ -13,6 +13,7 @@ "dependencies": { "NuGet.CommandLine.XPlat": "3.4.0-*", "Microsoft.NETCore.Platforms": "1.0.1-rc2-23608", + "Microsoft.NETCore.TestHost": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23608", "System.Linq": "4.0.1-beta-23504", "System.Collections": "4.0.11-beta-23504", @@ -34,4 +35,4 @@ }, "scripts": { } -} \ No newline at end of file +}