From aaa9fe2c1dcc226170037b31ffeaa21778dd1fd9 Mon Sep 17 00:00:00 2001 From: Justin Goshi Date: Fri, 17 Feb 2017 11:13:33 -0800 Subject: [PATCH 1/2] 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 330baa6e0..622f0b27f 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 740fd6d76..ecf64be5b 100644 --- a/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs +++ b/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs @@ -452,11 +452,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 From aefdb22ae4cb60c41b9ca967ed42375954411e6e Mon Sep 17 00:00:00 2001 From: Justin Goshi Date: Fri, 17 Feb 2017 17:02:15 -0800 Subject: [PATCH 2/2] Shorten test folder name --- .../TestApp/Program.cs | 0 .../TestApp/TestApp.sln | 0 .../TestApp/TestApp.xproj | 0 .../TestApp/project.json | 0 .../TestApp/src/subdir/Helper.cs | 0 .../TestApp/src/subdir/subdir.csproj | 0 .../TestLibrary/Helper.cs | 0 .../TestLibrary/TestLibrary.xproj | 0 .../TestLibrary/project.json | 0 test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs | 2 +- 10 files changed, 1 insertion(+), 1 deletion(-) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestApp/Program.cs (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestApp/TestApp.sln (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestApp/TestApp.xproj (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestApp/project.json (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestApp/src/subdir/Helper.cs (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestApp/src/subdir/subdir.csproj (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestLibrary/Helper.cs (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestLibrary/TestLibrary.xproj (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestLibrary/project.json (100%) diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/Program.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/Program.cs similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/Program.cs rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/Program.cs diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/TestApp.sln b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.sln similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/TestApp.sln rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.sln diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/TestApp.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.xproj similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/TestApp.xproj rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.xproj diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/project.json rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/Helper.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/Helper.cs similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/Helper.cs rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/Helper.cs diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/Helper.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/Helper.cs similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/Helper.cs rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/Helper.cs diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/TestLibrary.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/TestLibrary.xproj similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/TestLibrary.xproj rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/TestLibrary.xproj diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/project.json similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/project.json rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/project.json diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs index 622f0b27f..30387fecc 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs @@ -95,7 +95,7 @@ namespace Microsoft.DotNet.Migration.Tests { MigrateAndBuild( "NonRestoredTestProjects", - "PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj"); + "PJAppWithSlnThatDoesNotRefCsproj"); } [Fact]