From dcb8881c02a6b39c30423e32a83cd8ca909ef9a4 Mon Sep 17 00:00:00 2001 From: Justin Goshi Date: Wed, 8 Mar 2017 11:33:27 -0800 Subject: [PATCH] Re-enable solution building tests --- .../GivenThatIWantToMigrateSolutions.cs | 18 ++++++++---------- test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs | 9 ++++----- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs index 7cd2205c7..30387fecc 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs @@ -229,11 +229,10 @@ namespace Microsoft.DotNet.Migration.Tests .Execute($"restore \"{solutionRelPath}\"") .Should().Pass(); - //ISSUE: https://github.com/dotnet/cli/issues/5205 - //new DotnetCommand() - // .WithWorkingDirectory(projectDirectory) - // .Execute($"build \"{solutionRelPath}\"") - // .Should().Pass(); + new DotnetCommand() + .WithWorkingDirectory(projectDirectory) + .Execute($"build \"{solutionRelPath}\"") + .Should().Pass(); } private void MigrateAndBuild(string groupName, string projectName, [CallerMemberName] string callingMethod = "", string identifier = "") @@ -257,11 +256,10 @@ namespace Microsoft.DotNet.Migration.Tests .Execute($"restore \"{solutionRelPath}\"") .Should().Pass(); - //ISSUE: https://github.com/dotnet/cli/issues/5205 - //new DotnetCommand() - // .WithWorkingDirectory(projectDirectory) - // .Execute($"build \"{solutionRelPath}\"") - // .Should().Pass(); + new DotnetCommand() + .WithWorkingDirectory(projectDirectory) + .Execute($"build \"{solutionRelPath}\"") + .Should().Pass(); SlnFile slnFile = SlnFile.Read(Path.Combine(projectDirectory.FullName, solutionRelPath)); diff --git a/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs b/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs index 78a11d09d..cd7b9c38a 100644 --- a/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs +++ b/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs @@ -465,11 +465,10 @@ EndGlobal cmd.StdErr.Should().BeEmpty(); } - //ISSUE: https://github.com/dotnet/cli/issues/5205 - //[Theory] - //[InlineData("TestAppWithSlnAndCsprojFiles")] - //[InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")] - //[InlineData("TestAppWithEmptySln")] + [Theory] + [InlineData("TestAppWithSlnAndCsprojFiles")] + [InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")] + [InlineData("TestAppWithEmptySln")] public void WhenValidProjectIsPassedTheSlnBuilds(string testAsset) { var projectDirectory = TestAssets