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

Merge pull request #5960 from dotnet/dev/jgoshi/enableSlnBuildingTests

Browse source 
Re-enable solution building tests
This commit is contained in:
Eric Erhardt 2017-03-08 14:51:46 -06:00 • committed by GitHub
commit 2a382c9997
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs
View file

@ -229,11 +229,10 @@ namespace Microsoft.DotNet.Migration.Tests
.Execute($"restore \"{solutionRelPath}\"") .Execute($"restore \"{solutionRelPath}\"")
.Should().Pass(); .Should().Pass();
//ISSUE: https://github.com/dotnet/cli/issues/5205 new DotnetCommand()
//new DotnetCommand() .WithWorkingDirectory(projectDirectory)
// .WithWorkingDirectory(projectDirectory) .Execute($"build \"{solutionRelPath}\"")
// .Execute($"build \"{solutionRelPath}\"") .Should().Pass();
// .Should().Pass();
} }
private void MigrateAndBuild(string groupName, string projectName, [CallerMemberName] string callingMethod = "", string identifier = "") private void MigrateAndBuild(string groupName, string projectName, [CallerMemberName] string callingMethod = "", string identifier = "")
@ -257,11 +256,10 @@ namespace Microsoft.DotNet.Migration.Tests
.Execute($"restore \"{solutionRelPath}\"") .Execute($"restore \"{solutionRelPath}\"")
.Should().Pass(); .Should().Pass();
//ISSUE: https://github.com/dotnet/cli/issues/5205 new DotnetCommand()
//new DotnetCommand() .WithWorkingDirectory(projectDirectory)
// .WithWorkingDirectory(projectDirectory) .Execute($"build \"{solutionRelPath}\"")
// .Execute($"build \"{solutionRelPath}\"") .Should().Pass();
// .Should().Pass();
SlnFile slnFile = SlnFile.Read(Path.Combine(projectDirectory.FullName, solutionRelPath)); SlnFile slnFile = SlnFile.Read(Path.Combine(projectDirectory.FullName, solutionRelPath));

9
test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs
View file

@ -465,11 +465,10 @@ EndGlobal
cmd.StdErr.Should().BeEmpty(); cmd.StdErr.Should().BeEmpty();
} }
//ISSUE: https://github.com/dotnet/cli/issues/5205 [Theory]
//[Theory] [InlineData("TestAppWithSlnAndCsprojFiles")]
//[InlineData("TestAppWithSlnAndCsprojFiles")] [InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")]
//[InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")] [InlineData("TestAppWithEmptySln")]
//[InlineData("TestAppWithEmptySln")]
public void WhenValidProjectIsPassedTheSlnBuilds(string testAsset) public void WhenValidProjectIsPassedTheSlnBuilds(string testAsset)
{ {
var projectDirectory = TestAssets var projectDirectory = TestAssets