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/jgoshi/removeProj

Browse source
This commit is contained in:
Justin Goshi 2016-12-16 14:53:33 -08:00
commit 45264edcd7
300 changed files with 13201 additions and 15113 deletions
Download patch file Download diff file Expand all files Collapse all files

14
test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateBuildOptions.cs
View file

@ -60,7 +60,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
mockProj.Items.First(i => i.ItemType == "Compile").Include.Should().Be(@"**\*.cs");
mockProj.Items.First(i => i.ItemType == "Compile").Exclude.Should().BeEmpty();
mockProj.Items.First(i => i.ItemType == "EmbeddedResource").Include.Should().Be(@"compiler\resources\**\*;**\*.resx");
mockProj.Items.First(i => i.ItemType == "EmbeddedResource").Exclude.Should().BeEmpty();
mockProj.Items.First(i => i.ItemType == "EmbeddedResource").Exclude.Should().Be("@(EmbeddedResource)");
}
[Fact]
@ -555,8 +555,16 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
private static IEnumerable<string> GetDefaultExcludePatterns(string group)
{
return group == "copyToOutput" ? ProjectFilesCollection.DefaultPublishExcludePatterns
: ProjectFilesCollection.DefaultBuiltInExcludePatterns;
var defaultExcludePatterns = new List<string>(group == "copyToOutput" ?
ProjectFilesCollection.DefaultPublishExcludePatterns :
ProjectFilesCollection.DefaultBuiltInExcludePatterns);
if (group == "embed")
{
defaultExcludePatterns.Add("@(EmbeddedResource)");
}
return defaultExcludePatterns;
}
private static IEnumerable<string> GetDefaultIncludePatterns(string group)

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

@ -22,6 +22,7 @@ namespace Microsoft.DotNet.Migration.Tests
[InlineData("TestAppWithRuntimeOptions")]
[InlineData("TestAppWithContents")]
[InlineData("AppWithAssemblyInfo")]
[InlineData("TestAppWithEmbeddedResources")]
public void ItMigratesApps(string projectName)
{
var projectDirectory = TestAssetsManager.CreateTestInstance(projectName, identifier: projectName)