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

Fix projects and tests after merge of rel/1.0.0.

Browse source
This commit is contained in:
Eric Erhardt 2017-02-01 18:35:52 -06:00
parent 7543551602
commit a2c1a39d07
14 changed files with 94 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

26
test/dotnet.Tests/PackagedCommandTests.cs
View file

@ -59,15 +59,26 @@ namespace Microsoft.DotNet.Tests
}
[Theory]
[InlineData("AppWithDirectAndToolDep")]
[InlineData("AppWithToolDependency")]
public void TestProjectToolIsAvailableThroughDriver(string appName)
[InlineData("AppWithDirectAndToolDep", true)]
[InlineData("AppWithToolDependency", false)]
public void TestProjectToolIsAvailableThroughDriver(string appName, bool useCurrentFrameworkRuntimeVersion)
{
var testInstance = TestAssets.Get(appName)
.CreateInstance()
.WithSourceFiles()
.WithRestoreFiles();
if (useCurrentFrameworkRuntimeVersion)
{
testInstance = testInstance.UseCurrentRuntimeFrameworkVersion();
// restore again now that the project has changed
new RestoreCommand()
.WithWorkingDirectory(testInstance.Root)
.Execute()
.Should().Pass();
}
new BuildCommand()
.WithProjectDirectory(testInstance.Root)
.Execute()
@ -263,7 +274,14 @@ namespace Microsoft.DotNet.Tests
var testInstance = TestAssets.Get("AppWithDirectDep")
.CreateInstance()
.WithSourceFiles()
.WithRestoreFiles();
.WithRestoreFiles()
.UseCurrentRuntimeFrameworkVersion();
// restore again now that the project has changed
new RestoreCommand()
.WithWorkingDirectory(testInstance.Root)
.Execute()
.Should().Pass();
new BuildCommand()
.WithWorkingDirectory(testInstance.Root)