From e71c58c15617fd58f153d0b0782241e5d4239063 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Tue, 10 Jan 2017 10:43:05 -0800
Subject: [PATCH] Fixing nuget API calls and fixing the nuget test package
 directory creation, so that nuget can restore using it.

---
 build/Microsoft.DotNet.Cli.Test.targets            |  7 +++++--
 build_projects/dotnet-cli-build/DotNetRestore.cs   | 14 +++++++++++++-
 .../CommandResolution/DepsJsonBuilder.cs           |  2 +-
 .../Resolution/PackageDependencyProvider.cs        |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Microsoft.DotNet.Cli.Test.targets
index d38407ea4..10d426160 100644
--- a/build/Microsoft.DotNet.Cli.Test.targets
+++ b/build/Microsoft.DotNet.Cli.Test.targets
@@ -70,6 +70,8 @@
       <TestDirectory>$(RepoRoot)/test/</TestDirectory>
       <DotnetUnderTest>$(Stage2Directory)</DotnetUnderTest>
     </PropertyGroup>
+
+    <MakeDir Directories="$(TestPackagesDir)" Condition="!Exists('$(TestPackagesDir)')"/>
   </Target>
 
   <Target Name="BuildTests"
@@ -213,9 +215,10 @@
       <DotNetPackMsbuildArgs Condition=" '$(IsDesktopAvailable)' == 'True' And '%(TestPackageProject.PackRuntime)' != '' ">/p:RuntimeIdentifier=%(TestPackageProject.PackRuntime)</DotNetPackMsbuildArgs>
     </PropertyGroup>
 
-    <DotNetRestore ToolPath="$(Stage2Directory)"
+    <DotNetRestore ToolPath="$(Stage0Directory)"
                    Source="$(TestPackagesDir)"
-                   WorkingDirectory="%(TestPackageProject.FullPath)" />
+                   ConfigFile="$(RepoRoot)\NuGet.Config"
+                   ProjectPath="%(TestPackageProject.ProjectPath)" />
 
     <DotNetBuild Framework="%(TestPackageProject.Framework)"
                  Runtime="%(TestPackageProject.Runtime)"
diff --git a/build_projects/dotnet-cli-build/DotNetRestore.cs b/build_projects/dotnet-cli-build/DotNetRestore.cs
index c074d4fba..d3f1a2b4d 100644
--- a/build_projects/dotnet-cli-build/DotNetRestore.cs
+++ b/build_projects/dotnet-cli-build/DotNetRestore.cs
@@ -12,9 +12,11 @@ namespace Microsoft.DotNet.Cli.Build
 
         protected override string Args
         {
-            get { return $"{GetProjectPath()} {GetSource()} {GetPackages()} {GetSkipInvalidConfigurations()} {GetRuntime()} {GetAdditionalParameters()}"; }
+            get { return $"{GetProjectPath()} {GetConfigFile()} {GetSource()} {GetPackages()} {GetSkipInvalidConfigurations()} {GetRuntime()} {GetAdditionalParameters()}"; }
         }
 
+        public string ConfigFile { get; set; }
+
         public string AdditionalParameters { get; set; }
 
         public string ProjectPath { get; set; }
@@ -27,6 +29,16 @@ namespace Microsoft.DotNet.Cli.Build
         
         public string Runtime { get; set; }
 
+        private string GetConfigFile()
+        {
+            if (!string.IsNullOrEmpty(ConfigFile))
+            {
+                return $"--configfile {ConfigFile}";
+            }
+
+            return null;
+        }
+
         private string GetSource()
         {
             if (!string.IsNullOrEmpty(Source))
diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonBuilder.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonBuilder.cs
index 4de9841d5..b682bb5af 100644
--- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonBuilder.cs
+++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonBuilder.cs
@@ -21,7 +21,7 @@ namespace Microsoft.DotNet.Cli.Utils
         public DepsJsonBuilder()
         {
             // This resolver is only used for building file names, so that base path is not required.
-            _versionFolderPathResolver = new VersionFolderPathResolver(path: null);
+            _versionFolderPathResolver = new VersionFolderPathResolver(rootPath: null);
         }
 
         public DependencyContext Build(
diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resolution/PackageDependencyProvider.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resolution/PackageDependencyProvider.cs
index c1661fd49..b554fb29f 100644
--- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resolution/PackageDependencyProvider.cs
+++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resolution/PackageDependencyProvider.cs
@@ -28,7 +28,7 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Resolution
                 _packagePathResolver = new FallbackPackagePathResolver(nugetPathContext);
 
                 // This resolver is only used for building file names, so that base path is not required.
-                _versionFolderPathResolver = new VersionFolderPathResolver(path: null);
+                _versionFolderPathResolver = new VersionFolderPathResolver(rootPath: null);
             }
 
             _frameworkReferenceResolver = frameworkReferenceResolver;