huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up the framework detection logic in _k-test.shade

This commit is contained in:
Brice Lambson 2015-02-23 09:27:53 -08:00
parent 7ace9dece4
commit 7c2d4593de
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/_k-test.shade
View File

@ -30,21 +30,17 @@ projectFile=''
? (Dictionary<string, object>)configsObject ? (Dictionary<string, object>)configsObject
: new Dictionary<string, object> : new Dictionary<string, object>
{ {
{ "net45", new Dictionary<string, object>() } // Assume net45 only if none specified { "aspnet50", new Dictionary<string, object>() } // Assume aspnet50 only if none specified
}; };
// Currently only net* and k* targets are supported. See aspnet/Universe#53 // Currently only aspnet* targets are supported. See aspnet/Universe#53
var targetFrameworks = configs.Keys.Where(k => k.StartsWith("net", StringComparison.OrdinalIgnoreCase) var targetFrameworks = configs.Keys.Where(k => k.StartsWith("aspnet", StringComparison.OrdinalIgnoreCase));
|| k.StartsWith("k", StringComparison.OrdinalIgnoreCase)
|| k.StartsWith("aspnet", StringComparison.OrdinalIgnoreCase));
foreach (var framework in targetFrameworks) foreach (var framework in targetFrameworks)
{ {
var testArgs = IsMono ? " -parallel none" : ""; var testArgs = IsMono ? " -parallel none" : "";
if (framework.StartsWith("net", StringComparison.OrdinalIgnoreCase) if (!framework.StartsWith("aspnetcore", StringComparison.OrdinalIgnoreCase))
|| (framework.StartsWith("aspnet", StringComparison.OrdinalIgnoreCase)
&& !framework.StartsWith("aspnetcore", StringComparison.OrdinalIgnoreCase)))
{ {
K(("test" + testArgs), projectFolder, ""); K(("test" + testArgs), projectFolder, "");
} }