From 6b01f1a644f77ae23a2bc723cdbd87304f7a3243 Mon Sep 17 00:00:00 2001 From: Sridhar Periyasamy Date: Wed, 20 Jan 2016 14:50:06 -0800 Subject: [PATCH 1/2] Create the temp folder for 'tools' restoration in the project directory. This is a fix for regression caused by #877. It is required to create the temp folder in the project directory so that same nuget.config resolution happens for both 'dependencies' and 'tools'. See #844. --- src/dotnet-restore/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnet-restore/Program.cs b/src/dotnet-restore/Program.cs index 565deaddb..cf20bbf39 100644 --- a/src/dotnet-restore/Program.cs +++ b/src/dotnet-restore/Program.cs @@ -124,7 +124,7 @@ namespace Microsoft.DotNet.Tools.Restore private static void RestoreTool(LibraryRange tooldep, RestoreTask restoreTask, bool quiet) { - var tempRoot = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); + var tempRoot = Path.Combine(restoreTask.ProjectDirectory, Guid.NewGuid().ToString()); try { var tempPath = Path.Combine(tempRoot, "bin"); From 6a249f65eacbb9e10548acdc5d5ca3dcd83d6a26 Mon Sep 17 00:00:00 2001 From: Sridhar Periyasamy Date: Wed, 20 Jan 2016 17:20:38 -0800 Subject: [PATCH 2/2] Address PR feedback. Restore the 'tools' into obj folder. --- src/dotnet-restore/Program.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dotnet-restore/Program.cs b/src/dotnet-restore/Program.cs index cf20bbf39..72a0725ea 100644 --- a/src/dotnet-restore/Program.cs +++ b/src/dotnet-restore/Program.cs @@ -124,10 +124,10 @@ namespace Microsoft.DotNet.Tools.Restore private static void RestoreTool(LibraryRange tooldep, RestoreTask restoreTask, bool quiet) { - var tempRoot = Path.Combine(restoreTask.ProjectDirectory, Guid.NewGuid().ToString()); + var tempRoot = Path.Combine(restoreTask.ProjectDirectory, "obj"); try { - var tempPath = Path.Combine(tempRoot, "bin"); + var tempPath = Path.Combine(tempRoot, Guid.NewGuid().ToString(), "bin"); RestoreToolToPath(tooldep, restoreTask.Arguments, tempPath, quiet);