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

Merge pull request #4134 from eerhardt/NewSDK

Browse source 
Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160831-1
This commit is contained in:
Eric Erhardt 2016-09-01 16:13:38 -05:00 • committed by GitHub
commit bb130ce71f
6 changed files with 78 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

19
test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs
View file

@ -56,19 +56,18 @@ namespace Microsoft.DotNet.Migration.Tests
}
[Fact]
// Outputs Not Identical: https://github.com/dotnet/sdk/issues/97
public void It_migrates_dotnet_new_web_with_outputs_containing_project_json_outputs()
{
var projectDirectory = Temp.CreateDirectory().Path;
var outputComparisonData = GetDotnetNewComparisonData(projectDirectory, "web");
var projectJsonOutputIsSubsetOfMSBuildOutput =
outputComparisonData.ProjectJsonBuildOutputs.IsProperSubsetOf(outputComparisonData.MSBuildBuildOutputs);
if (!projectJsonOutputIsSubsetOfMSBuildOutput)
var outputsIdentical =
outputComparisonData.ProjectJsonBuildOutputs.SetEquals(outputComparisonData.MSBuildBuildOutputs);
if (!outputsIdentical)
{
OutputDiagnostics(outputComparisonData);
}
projectJsonOutputIsSubsetOfMSBuildOutput.Should().BeTrue();
outputsIdentical.Should().BeTrue();
}
[Theory]
@ -81,15 +80,15 @@ namespace Microsoft.DotNet.Migration.Tests
TestAssetsManager.CreateTestInstance(projectName, callingMethod: "i").WithLockFiles().Path;
var outputComparisonData = BuildProjectJsonMigrateBuildMSBuild(projectDirectory);
var msBuildHasAdditionalOutputsButIncludesProjectJsonOutputs =
outputComparisonData.ProjectJsonBuildOutputs.IsProperSubsetOf(outputComparisonData.MSBuildBuildOutputs);
var outputsIdentical =
outputComparisonData.ProjectJsonBuildOutputs.SetEquals(outputComparisonData.MSBuildBuildOutputs);
if (!msBuildHasAdditionalOutputsButIncludesProjectJsonOutputs)
if (!outputsIdentical)
{
OutputDiagnostics(outputComparisonData);
}
msBuildHasAdditionalOutputsButIncludesProjectJsonOutputs.Should().BeTrue();
outputsIdentical.Should().BeTrue();
}
[Fact]

2
test/dotnet-migrate.Tests/dotnet-migrate.Tests.xproj
View file

@ -6,7 +6,7 @@
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>1F2EF070-AC5F-4078-AFB0-65745AC691B9</ProjectGuid>
<ProjectGuid>a62edfbd-9e6d-458f-983e-1a86da52ae1e</ProjectGuid>
<RootNamespace>Microsoft.DotNet.ProjectJsonMigration.Tests</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>