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

type build, suppress parent, include, exclude working

Browse source
This commit is contained in:
Bryan Thornbury 2016-10-10 16:19:57 -07:00
parent c44e50dfc4
commit 0bdd3bd59f
3 changed files with 78 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs
View file

@ -128,7 +128,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
itemGroup.Condition = condition; itemGroup.Condition = condition;
foreach (var packageDependency in packageDependencies) foreach (var packageDependency in packageDependencies)
{ {
MigrationTrace.Instance.WriteLine(packageDependency.Name); MigrationTrace.Instance.WriteLine(packageDependency.Name);
AddItemTransform<ProjectLibraryDependency> transform; AddItemTransform<ProjectLibraryDependency> transform;
@ -139,7 +139,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
else else
{ {
transform = PackageDependencyTransform(); transform = PackageDependencyTransform();
if (packageDependency.Type == LibraryDependencyType.Build) if (packageDependency.Type.Equals(LibraryDependencyType.Build))
{ {
transform = transform.WithMetadata("PrivateAssets", "All"); transform = transform.WithMetadata("PrivateAssets", "All");
} }
@ -162,11 +162,16 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
private string ReadLibraryIncludeFlags(LibraryIncludeFlags includeFlags) private string ReadLibraryIncludeFlags(LibraryIncludeFlags includeFlags)
{ {
if ((includeFlags & LibraryIncludeFlags.All) == LibraryIncludeFlags.All) if ((includeFlags ^ LibraryIncludeFlags.All) == 0)
{ {
return "All"; return "All";
} }
if ((includeFlags ^ LibraryIncludeFlags.None) == 0)
{
return "None";
}
var flagString = ""; var flagString = "";
var allFlagsAndNames = new List<Tuple<string, LibraryIncludeFlags>> var allFlagsAndNames = new List<Tuple<string, LibraryIncludeFlags>>
{ {

2
src/Microsoft.DotNet.ProjectModel/ProjectReader.cs
View file

@ -885,7 +885,7 @@ namespace Microsoft.DotNet.ProjectModel
} }
else else
{ {
values = token.Value<string[]>(); values = token.Values<string>();
} }
result = values result = values
.SelectMany(value => value.Split(new[] { ' ', ',' }, StringSplitOptions.RemoveEmptyEntries)); .SelectMany(value => value.Split(new[] { ' ', ',' }, StringSplitOptions.RemoveEmptyEntries));

76
test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs
View file

@ -41,14 +41,16 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
} }
}"); }");
var packageRef = mockProj.Items.First(i => i.Include == "APackage" && i.ItemType == "PackageReference"); var packageRef = mockProj.Items.First(i => i.Include == "APackage" && i.ItemType == "PackageReference");
var privateAssetsMetadata = packageRef.GetMetadataWithName("PrivateAssets"); var privateAssetsMetadata = packageRef.GetMetadataWithName("PrivateAssets");
privateAssetsMetadata.Value.Should().NotBeNull();
privateAssetsMetadata.Value.Should().Be("All"); privateAssetsMetadata.Value.Should().Be("All");
} }
[Fact] [Fact]
public void It_migrates_suppress_parent_to_PrivateAssets() public void It_migrates_suppress_parent_array_to_PrivateAssets()
{ {
var mockProj = RunPackageDependenciesRuleOnPj(@" var mockProj = RunPackageDependenciesRuleOnPj(@"
{ {
@ -59,15 +61,34 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
} }
} }
}"); }");
var packageRef = mockProj.Items.First(i => i.Include == "APackage" && i.ItemType == "PackageReference"); var packageRef = mockProj.Items.First(i => i.Include == "APackage" && i.ItemType == "PackageReference");
var privateAssetsMetadata = packageRef.GetMetadataWithName("PrivateAssets"); var privateAssetsMetadata = packageRef.GetMetadataWithName("PrivateAssets");
privateAssetsMetadata.Value.Should().Be("runtime;native"); privateAssetsMetadata.Value.Should().NotBeNull();
privateAssetsMetadata.Value.Should().Be("Native;Runtime");
} }
[Fact] [Fact]
public void It_migrates_include_exclude_to_IncludeAssets() public void It_migrates_suppress_parent_string_to_PrivateAssets()
{
var mockProj = RunPackageDependenciesRuleOnPj(@"
{
""dependencies"": {
""APackage"" : {
""version"": ""1.0.0-preview"",
""suppressParent"":""runtime""
}
}
}");
var packageRef = mockProj.Items.First(i => i.Include == "APackage" && i.ItemType == "PackageReference");
var privateAssetsMetadata = packageRef.GetMetadataWithName("PrivateAssets");
privateAssetsMetadata.Value.Should().NotBeNull();
privateAssetsMetadata.Value.Should().Be("Runtime");
}
[Fact]
public void It_migrates_include_exclude_arrays_to_IncludeAssets()
{ {
var mockProj = RunPackageDependenciesRuleOnPj(@" var mockProj = RunPackageDependenciesRuleOnPj(@"
{ {
@ -79,13 +100,54 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
} }
} }
}"); }");
var packageRef = mockProj.Items.First(i => i.Include == "APackage" && i.ItemType == "PackageReference"); var packageRef = mockProj.Items.First(i => i.Include == "APackage" && i.ItemType == "PackageReference");
var privateAssetsMetadata = packageRef.GetMetadataWithName("IncludeAssets"); var includeAssetsMetadata = packageRef.GetMetadataWithName("IncludeAssets");
privateAssetsMetadata.Value.Should().Be("compile;runtime"); includeAssetsMetadata.Value.Should().NotBeNull();
includeAssetsMetadata.Value.Should().Be("Compile;Runtime");
} }
[Fact]
public void It_migrates_include_string_to_IncludeAssets()
{
var mockProj = RunPackageDependenciesRuleOnPj(@"
{
""dependencies"": {
""APackage"" : {
""version"": ""1.0.0-preview"",
""include"": ""compile"",
""exclude"": ""runtime""
}
}
}");
var packageRef = mockProj.Items.First(i => i.Include == "APackage" && i.ItemType == "PackageReference");
var includeAssetsMetadata = packageRef.GetMetadataWithName("IncludeAssets");
includeAssetsMetadata.Value.Should().NotBeNull();
includeAssetsMetadata.Value.Should().Be("Compile");
}
[Fact]
public void It_migrates_include_exclude_overlapping_strings_to_IncludeAssets()
{
var mockProj = RunPackageDependenciesRuleOnPj(@"
{
""dependencies"": {
""APackage"" : {
""version"": ""1.0.0-preview"",
""include"": ""compile"",
""exclude"": ""compile"",
}
}
}");
var packageRef = mockProj.Items.First(i => i.Include == "APackage" && i.ItemType == "PackageReference");
var includeAssetsMetadata = packageRef.GetMetadataWithName("IncludeAssets");
includeAssetsMetadata.Value.Should().NotBeNull();
includeAssetsMetadata.Value.Should().Be("None");
}
[Fact] [Fact]
public void It_migrates_Tools() public void It_migrates_Tools()
{ {