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

Merge branch 'rel/1.0.0' into dev/mlorbe/UpdateTemplatePackages

Browse source
This commit is contained in:
Piotr Puszkiewicz 2017-02-22 13:23:16 -08:00 • committed by GitHub
commit cb98421950
11 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

0
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/Program.cs → TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/Program.cs
View file

0
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/TestApp.sln → TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.sln
View file

0
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/TestApp.xproj → TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.xproj
View file

0
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/project.json → TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json
View file

0
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/Helper.cs → TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/Helper.cs
View file

0
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj → TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj
View file

0
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/Helper.cs → TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/Helper.cs
View file

0
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/TestLibrary.xproj → TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/TestLibrary.xproj
View file

0
TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/project.json → TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/project.json
View file

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

@ -95,7 +95,7 @@ namespace Microsoft.DotNet.Migration.Tests
{ {
MigrateAndBuild( MigrateAndBuild(
"NonRestoredTestProjects", "NonRestoredTestProjects",
"PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj"); "PJAppWithSlnThatDoesNotRefCsproj");
} }
[Fact] [Fact]
@ -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

@ -452,11 +452,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