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

Include context fixes to include the default files even when buildoptions is empty, so we have less custom logic in the migration library

Browse source
This commit is contained in:
Bryan Thornbury 2016-08-22 12:22:37 -07:00
parent 611e4ccfde
commit d8556d1ed7
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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