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

[Fixes #3502] Fix: publishOptions: [...] not respected

Browse source
This commit is contained in:
Ajay Bhargav Baaskaran 2016-07-13 15:09:22 -07:00
parent c748c81a4a
commit dbf7435c3c
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,7 @@
}
}
},
"publishOptions": "testpublishfile.txt",
"publishOptions": [ "testpublishfile.txt", "publishfiles" ],
"frameworks": {
"netcoreapp1.0": {}
},

0
TestAssets/TestProjects/EndToEndTestApp/publishfiles/anotherpublishfile.txt Normal file
View file

3
src/Microsoft.DotNet.ProjectModel/Files/IncludeContext.cs
View file

@ -40,7 +40,8 @@ namespace Microsoft.DotNet.ProjectModel.Files
var token = rawObject.Value<JToken>(option);
if (token.Type != JTokenType.Object)
{
IncludePatterns = new List<string>(ExtractValues(token));
IncludePatterns = CreateCollection(
sourceBasePath, option, ExtractValues(token), literalPath: false);
}
else
{

1
test/dotnet-publish.Tests/PublishTests.cs
View file

@ -128,6 +128,7 @@ namespace Microsoft.DotNet.Tools.Publish.Tests
publishCommand.Execute().Should().Pass();
publishCommand.GetOutputDirectory().Should().HaveFile("testpublishfile.txt");
publishCommand.GetOutputDirectory().Should().HaveFile("publishfiles/anotherpublishfile.txt");
}
[Fact]