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

Merge pull request #2822 from dotnet/ajbaaska/default-builtin-fix

Browse source 
Fix: builtIn defaults are not used when builtIn is not specified
This commit is contained in:
Piotr Puszkiewicz 2016-05-03 13:46:38 -07:00
commit a2139324f0
4 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TestAssets/TestProjects/EndToEndTestApp/defaultresource.resx Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
Some content
</root>

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

@ -62,18 +62,8 @@ namespace Microsoft.DotNet.ProjectModel.Files
BuiltInsInclude = CreateCollection(
sourceBasePath, "include", ExtractValues(builtIns.Value<JToken>("include")), literalPath: false);
if (defaultBuiltInInclude != null && !BuiltInsInclude.Any())
{
BuiltInsInclude = defaultBuiltInInclude.ToList();
}
BuiltInsExclude = CreateCollection(
sourceBasePath, "exclude", ExtractValues(builtIns.Value<JToken>("exclude")), literalPath: false);
if (defaultBuiltInExclude != null && !BuiltInsExclude.Any())
{
BuiltInsExclude = defaultBuiltInExclude.ToList();
}
}
var mappings = token.Value<JToken>("mappings") as JObject;
@ -94,6 +84,18 @@ namespace Microsoft.DotNet.ProjectModel.Files
}
}
}
if (defaultBuiltInInclude != null &&
(BuiltInsInclude == null || !BuiltInsInclude.Any()))
{
BuiltInsInclude = defaultBuiltInInclude.ToList();
}
if (defaultBuiltInExclude != null &&
(BuiltInsExclude == null || !BuiltInsExclude.Any()))
{
BuiltInsExclude = defaultBuiltInExclude.ToList();
}
}
public string SourceBasePath { get; }

2
test/Microsoft.DotNet.ProjectModel.Tests/GivenThatIWantToCreateIncludeEntriesFromJson.cs
View file

@ -62,7 +62,7 @@ namespace Microsoft.DotNet.ProjectModel.Tests
'buildOptions': {
'compile': {
'includeFiles': [ 'files/file1.cs', 'files/file2.cs' ],
'exclude': 'files/*ex.cs'
'exclude': '**/*.cs'
}
}}");

1
test/dotnet-compile.Tests/CompilerTests.cs
View file

@ -166,6 +166,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
var objDirInfo = new DirectoryInfo(Path.Combine(root, "obj", "Debug", DefaultFramework));
objDirInfo.Should().HaveFile("EndToEndTestApp.resource1.resources");
objDirInfo.Should().HaveFile("myresource.resources");
objDirInfo.Should().HaveFile("EndToEndTestApp.defaultresource.resources");
}
[Fact]