Making restore use a config file so that it does not use fallback folders that may exist in the machine.

livarcocc · livarcocc · commit f67a72d9c4d7 · 2017-05-22T09:42:40.000-07:00
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -281,7 +281,8 @@
     <CallTarget Targets="CleanSrcLockFiles" />
 
     <DotNetRestore ToolPath="$(DotNetPath)"
-                   ProjectPath="&quot;%(RestoreSrcPackagesInput.FullPath)&quot;" />
+                   ProjectPath="&quot;%(RestoreSrcPackagesInput.FullPath)&quot;"
+                   ConfigFile="$(RepoRoot)\NuGet.Config" />
 
   </Target>
 
@@ -306,7 +307,8 @@
     <CallTarget Targets="CleanToolsLockFiles" />
 
     <DotNetRestore ToolPath="$(DotNetPath)"
-                   ProjectPath="&quot;%(RestoreToolsPackagesInput.FullPath)&quot;" />
+                   ProjectPath="&quot;%(RestoreToolsPackagesInput.FullPath)&quot;"
+                   ConfigFile="$(RepoRoot)\NuGet.Config" />
 
   </Target>
 
diff --git a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs
@@ -85,6 +85,16 @@ private void PrimeCacheUsingArchive(string extractedPackagesArchiveDirectory)
                     using (var temporaryDotnetNewDirectory = _directory.CreateTemporaryDirectory())
                     {
                         var workingDirectory = temporaryDotnetNewDirectory.DirectoryPath;
+                        var nugetConfigPath = Path.Combine(workingDirectory, "NuGet.Config");
+
+                        _file.WriteAllText(
+                            nugetConfigPath,
+                            $@"<?xml version=""1.0"" encoding=""utf-8""?>
+<configuration>
+  <packageSources>
+    <add key=""extractedArchive"" value=""{extractedPackagesArchiveDirectory}"" />
+  </packageSources>
+</configuration>");
 
                         File.WriteAllText(
                             Path.Combine(workingDirectory, "global.json"),
@@ -98,7 +108,7 @@ private void PrimeCacheUsingArchive(string extractedPackagesArchiveDirectory)
 
                         if (succeeded)
                         {
-                            succeeded &= RestoreTemporaryProject(extractedPackagesArchiveDirectory, workingDirectory);
+                            succeeded &= RestoreTemporaryProject(nugetConfigPath, workingDirectory);
                         }
                     }
                 }
@@ -118,11 +128,11 @@ private bool CreateTemporaryProject(string workingDirectory, IReadOnlyList<strin
                 workingDirectory);
         }
 
-        private bool RestoreTemporaryProject(string extractedPackagesArchiveDirectory, string workingDirectory)
+        private bool RestoreTemporaryProject(string nugetConfigPath, string workingDirectory)
         {
             return RunCommand(
                 "restore",
-                new[] { "-s", extractedPackagesArchiveDirectory },
+                new[] { "--configfile", nugetConfigPath },
                 workingDirectory);
         }
 
diff --git a/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs b/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs
@@ -40,5 +40,10 @@ public void CreateEmptyFile(string path)
             {
             }
         }
+
+        public void WriteAllText(string path, string content)
+        {
+            File.WriteAllText(path, content);
+        }
     }
 }
diff --git a/src/Microsoft.DotNet.InternalAbstractions/IFile.cs b/src/Microsoft.DotNet.InternalAbstractions/IFile.cs
@@ -22,5 +22,7 @@ Stream OpenFile(
             FileOptions fileOptions);
 
         void CreateEmptyFile(string path);
+
+        void WriteAllText(string path, string content);
     }
 }
diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.IO;
 using FluentAssertions;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Tools.Test.Utilities.Mock;
@@ -150,12 +151,26 @@ public void It_actually_runs_dotnet_new()
         }
 
         [Fact]
-        public void It_uses_the_packages_archive_with_dotnet_restore()
+        public void It_writes_a_config_file_with_the_extracted_archive_as_a_package_source()
         {
+            var nugetConfigPath = Path.Combine(_temporaryDirectoryMock.DirectoryPath, "NuGet.Config");
+            _fileSystemMock.File.ReadAllText(nugetConfigPath).Should().Be(
+                $@"<?xml version=""1.0"" encoding=""utf-8""?>
+<configuration>
+  <packageSources>
+    <add key=""extractedArchive"" value=""{PACKAGES_ARCHIVE_PATH}"" />
+  </packageSources>
+</configuration>");
+        }
+
+        [Fact]
+        public void It_uses_a_config_file_with_dotnet_restore()
+        {
+            var nugetConfigPath = Path.Combine(_temporaryDirectoryMock.DirectoryPath, "NuGet.Config");
             _commandFactoryMock.Verify(
                 c => c.Create(
                     "restore",
-                    new[] { "-s", $"{PACKAGES_ARCHIVE_PATH}" },
+                    new[] { "--configfile", nugetConfigPath },
                     null,
                     Constants.DefaultConfiguration),
                 Times.Exactly(2));
diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs
@@ -175,6 +175,11 @@ public void CreateEmptyFile(string path)
             {
                 throw new NotImplementedException();
             }
+
+            public void WriteAllText(string path, string content)
+            {
+                throw new NotImplementedException();
+            }
         }
 
         private class MockStream : MemoryStream
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs
@@ -60,6 +60,7 @@ public FileSystemMock(Dictionary<string, string> files, string temporaryFolder)
         private class FileMock : IFile
         {
             private Dictionary<string, string> _files;
+            
             public FileMock(Dictionary<string, string> files)
             {
                 _files = files;
@@ -100,6 +101,11 @@ public void CreateEmptyFile(string path)
             {
                 _files.Add(path, string.Empty);
             }
+
+            public void WriteAllText(string path, string content)
+            {
+                _files[path] = content;
+            }
         }
 
         private class DirectoryMock : IDirectory
diff --git a/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs b/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs
@@ -14,6 +14,8 @@ namespace Microsoft.DotNet.Restore.Tests
 {
     public class GivenThatIWantToRestoreApp : TestBase
     {
+        private static string RepoRootNuGetConfig = Path.Combine(RepoDirectoriesProvider.RepoRoot, "NuGet.Config");
+
         [Fact]
         public void ItRestoresAppToSpecificDirectory()
         {
@@ -29,7 +31,7 @@ public void ItRestoresAppToSpecificDirectory()
                 .Should()
                 .Pass();
 
-            string args = $"--packages \"{dir}\"";
+            string args = $"--configfile {RepoRootNuGetConfig} --packages \"{dir}\"";
             new RestoreCommand()
                  .WithWorkingDirectory(rootPath)
                  .ExecuteWithCapturedOutput(args)
@@ -56,7 +58,7 @@ public void ItRestoresLibToSpecificDirectory()
                 .Should()
                 .Pass();
 
-            string args = $"--packages \"{dir}\"";
+            string args = $"--configfile {RepoRootNuGetConfig} --packages \"{dir}\"";
             new RestoreCommand()
                 .WithWorkingDirectory(rootPath)
                 .ExecuteWithCapturedOutput(args)
@@ -76,7 +78,7 @@ public void ItRestoresTestAppToSpecificDirectory()
             string dir = "pkgs";
             string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir));
 
-            string args = $"--packages \"{dir}\"";
+            string args = $"--configfile {RepoRootNuGetConfig} --packages \"{dir}\"";
             new RestoreCommand()
                 .WithWorkingDirectory(rootPath)
                 .ExecuteWithCapturedOutput(args)

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,16 @@ private void PrimeCacheUsingArchive(string extractedPackagesArchiveDirectory)`
`85`	`85`	`using (var temporaryDotnetNewDirectory = _directory.CreateTemporaryDirectory())`
`86`	`86`	`{`
`87`	`87`	`var workingDirectory = temporaryDotnetNewDirectory.DirectoryPath;`
	`88`	`+ var nugetConfigPath = Path.Combine(workingDirectory, "NuGet.Config");`
	`89`	`+`
	`90`	`+ _file.WriteAllText(`
	`91`	`+ nugetConfigPath,`
	`92`	`+ $@"<?xml version=""1.0"" encoding=""utf-8""?>`
	`93`	`+<configuration>`
	`94`	`+ <packageSources>`
	`95`	`+ <add key=""extractedArchive"" value=""{extractedPackagesArchiveDirectory}"" />`
	`96`	`+ </packageSources>`
	`97`	`+</configuration>");`
`88`	`98`
`89`	`99`	`File.WriteAllText(`
`90`	`100`	`Path.Combine(workingDirectory, "global.json"),`
`@@ -98,7 +108,7 @@ private void PrimeCacheUsingArchive(string extractedPackagesArchiveDirectory)`
`98`	`108`
`99`	`109`	`if (succeeded)`
`100`	`110`	`{`
`101`		`- succeeded &= RestoreTemporaryProject(extractedPackagesArchiveDirectory, workingDirectory);`
	`111`	`+ succeeded &= RestoreTemporaryProject(nugetConfigPath, workingDirectory);`
`102`	`112`	`}`
`103`	`113`	`}`
`104`	`114`	`}`
`@@ -118,11 +128,11 @@ private bool CreateTemporaryProject(string workingDirectory, IReadOnlyList<strin`
`118`	`128`	`workingDirectory);`
`119`	`129`	`}`
`120`	`130`
`121`		`- private bool RestoreTemporaryProject(string extractedPackagesArchiveDirectory, string workingDirectory)`
	`131`	`+ private bool RestoreTemporaryProject(string nugetConfigPath, string workingDirectory)`
`122`	`132`	`{`
`123`	`133`	`return RunCommand(`
`124`	`134`	`"restore",`
`125`		`- new[] { "-s", extractedPackagesArchiveDirectory },`
	`135`	`+ new[] { "--configfile", nugetConfigPath },`
`126`	`136`	`workingDirectory);`
`127`	`137`	`}`
`128`	`138`
Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,10 @@ public void CreateEmptyFile(string path)`
`40`	`40`	`{`
`41`	`41`	`}`
`42`	`42`	`}`
	`43`	`+`
	`44`	`+ public void WriteAllText(string path, string content)`
	`45`	`+ {`
	`46`	`+ File.WriteAllText(path, content);`
	`47`	`+ }`
`43`	`48`	`}`
`44`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,7 @@ Stream OpenFile(`
`22`	`22`	`FileOptions fileOptions);`
`23`	`23`
`24`	`24`	`void CreateEmptyFile(string path);`
	`25`	`+`
	`26`	`+ void WriteAllText(string path, string content);`
`25`	`27`	`}`
`26`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,11 @@ public void CreateEmptyFile(string path)`
`175`	`175`	`{`
`176`	`176`	`throw new NotImplementedException();`
`177`	`177`	`}`
	`178`	`+`
	`179`	`+ public void WriteAllText(string path, string content)`
	`180`	`+ {`
	`181`	`+ throw new NotImplementedException();`
	`182`	`+ }`
`178`	`183`	`}`
`179`	`184`
`180`	`185`	`private class MockStream : MemoryStream`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ public FileSystemMock(Dictionary<string, string> files, string temporaryFolder)`
`60`	`60`	`private class FileMock : IFile`
`61`	`61`	`{`
`62`	`62`	`private Dictionary<string, string> _files;`
	`63`	`+`
`63`	`64`	`public FileMock(Dictionary<string, string> files)`
`64`	`65`	`{`
`65`	`66`	`_files = files;`
`@@ -100,6 +101,11 @@ public void CreateEmptyFile(string path)`
`100`	`101`	`{`
`101`	`102`	`_files.Add(path, string.Empty);`
`102`	`103`	`}`
	`104`	`+`
	`105`	`+ public void WriteAllText(string path, string content)`
	`106`	`+ {`
	`107`	`+ _files[path] = content;`
	`108`	`+ }`
`103`	`109`	`}`
`104`	`110`
`105`	`111`	`private class DirectoryMock : IDirectory`