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

Fix Binding Redirect Test and other fixes

Browse source
This commit is contained in:
Bryan 2016-01-29 17:37:08 -08:00
parent 07fbb3d967
commit b8d54e5a0f
13 changed files with 85 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

15
test/dotnet-compile.Tests/CompilerTests.cs
View file

@ -21,9 +21,7 @@ namespace Microsoft.DotNet.Tools.Publish.Tests
var testLibDir = root.CreateDirectory("TestLibrary");
// copy projects to the temp dir and restore them
CopyProjectToTempDir(Path.Combine(_testProjectsRoot, "TestLibrary"), testLibDir);
RunRestore(testLibDir.Path);
// run compile
var outputDir = Path.Combine(testLibDir.Path, "bin");
@ -46,7 +44,6 @@ namespace Microsoft.DotNet.Tools.Publish.Tests
var testLibDir = root.CreateDirectory("TestLibraryWithAnalyzer");
CopyProjectToTempDir(Path.Combine(_testProjectsRoot, "TestLibraryWithAnalyzer"), testLibDir);
RunRestore(testLibDir.Path);
// run compile
var outputDir = Path.Combine(testLibDir.Path, "bin");
@ -62,12 +59,6 @@ namespace Microsoft.DotNet.Tools.Publish.Tests
// copy all the files to temp dir
foreach (var file in Directory.EnumerateFiles(projectDir))
{
// never copy project.lock.json. All the tests are expected to call 'dotnet restore'
if (file.ToLower().EndsWith("project.lock.json"))
{
continue;
}
tempDir.CopyFile(file);
}
}
@ -76,11 +67,5 @@ namespace Microsoft.DotNet.Tools.Publish.Tests
{
return Path.Combine(projectDir.Path, "project.json");
}
private void RunRestore(string args)
{
var restoreCommand = new RestoreCommand();
restoreCommand.Execute($"--quiet {args}").Should().Pass();
}
}
}