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

[Fixes #3856] Allow mapping of the same file to multiple target paths

Browse source
This commit is contained in:
Ajay Bhargav Baaskaran 2016-07-13 14:56:22 -07:00
parent 69eed12132
commit c748c81a4a
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TestAssets/TestProjects/EndToEndTestApp/project.json
View file

@ -20,7 +20,8 @@
"files": { "files": {
"includeFiles": "packfiles/pack1.txt", "includeFiles": "packfiles/pack1.txt",
"mappings": { "mappings": {
"newpath/": "packfiles/pack2.txt" "newpath/": "packfiles/pack2.txt",
"anotherpath/": "packfiles/pack2.txt"
} }
} }
}, },

2
src/Microsoft.DotNet.ProjectModel/Files/IncludeFilesResolver.cs
View file

@ -150,7 +150,7 @@ namespace Microsoft.DotNet.ProjectModel.Files
file.IsCustomTarget = true; file.IsCustomTarget = true;
// Prefer named targets over default ones // Prefer named targets over default ones
includeEntries.RemoveWhere(f => string.Equals(f.SourcePath, file.SourcePath)); includeEntries.RemoveWhere(f => string.Equals(f.SourcePath, file.SourcePath) && f.IsCustomTarget == false);
includeEntries.Add(file); includeEntries.Add(file);
} }
} }

1
test/dotnet-pack.Tests/PackTests.cs
View file

@ -113,6 +113,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
var zip = ZipFile.Open(outputPackage, ZipArchiveMode.Read); var zip = ZipFile.Open(outputPackage, ZipArchiveMode.Read);
zip.Entries.Should().Contain(e => e.FullName == "packfiles/pack1.txt"); zip.Entries.Should().Contain(e => e.FullName == "packfiles/pack1.txt");
zip.Entries.Should().Contain(e => e.FullName == "newpath/pack2.txt"); zip.Entries.Should().Contain(e => e.FullName == "newpath/pack2.txt");
zip.Entries.Should().Contain(e => e.FullName == "anotherpath/pack2.txt");
} }
[Fact] [Fact]