mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Livar Cunha 2017-05-19 21:35:45 -07:00
parent fd953738f0
commit f67a72d9c4
8 changed files with 57 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/Microsoft.DotNet.Cli.Prepare.targets
View file

@ -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>

16
src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs
View file

@ -85,6 +85,16 @@ namespace Microsoft.DotNet.Configurer
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 @@ namespace Microsoft.DotNet.Configurer
if (succeeded)
{
succeeded &= RestoreTemporaryProject(extractedPackagesArchiveDirectory, workingDirectory);
succeeded &= RestoreTemporaryProject(nugetConfigPath, workingDirectory);
}
}
}
@ -118,11 +128,11 @@ namespace Microsoft.DotNet.Configurer
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);
}

5
src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs
View file

@ -40,5 +40,10 @@ namespace Microsoft.Extensions.EnvironmentAbstractions
{
}
}
public void WriteAllText(string path, string content)
{
File.WriteAllText(path, content);
}
}
}

2
src/Microsoft.DotNet.InternalAbstractions/IFile.cs
View file

@ -22,5 +22,7 @@ namespace Microsoft.Extensions.EnvironmentAbstractions
FileOptions fileOptions);
void CreateEmptyFile(string path);
void WriteAllText(string path, string content);
}
}

19
test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs
View file

@ -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 @@ namespace Microsoft.DotNet.Configurer.UnitTests
}
[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));

5
test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs
View file

@ -175,6 +175,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
{
throw new NotImplementedException();
}
public void WriteAllText(string path, string content)
{
throw new NotImplementedException();
}
}
private class MockStream : MemoryStream

6
test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs
View file

@ -60,6 +60,7 @@ namespace Microsoft.Extensions.DependencyModel.Tests
private class FileMock : IFile
{
private Dictionary<string, string> _files;
public FileMock(Dictionary<string, string> files)
{
_files = files;
@ -100,6 +101,11 @@ namespace Microsoft.Extensions.DependencyModel.Tests
{
_files.Add(path, string.Empty);
}
public void WriteAllText(string path, string content)
{
_files[path] = content;
}
}
private class DirectoryMock : IDirectory

8
test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs
View file

@ -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 @@ namespace Microsoft.DotNet.Restore.Tests
.Should()
.Pass();
string args = $"--packages \"{dir}\"";
string args = $"--configfile {RepoRootNuGetConfig} --packages \"{dir}\"";
new RestoreCommand()
.WithWorkingDirectory(rootPath)
.ExecuteWithCapturedOutput(args)
@ -56,7 +58,7 @@ namespace Microsoft.DotNet.Restore.Tests
.Should()
.Pass();
string args = $"--packages \"{dir}\"";
string args = $"--configfile {RepoRootNuGetConfig} --packages \"{dir}\"";
new RestoreCommand()
.WithWorkingDirectory(rootPath)
.ExecuteWithCapturedOutput(args)
@ -76,7 +78,7 @@ namespace Microsoft.DotNet.Restore.Tests
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)