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

Merge branch 'release' into dev

This commit is contained in:
Suhas Joshi 2015-01-27 14:44:32 -08:00
parent 308de9260f 19de5f1be1
commit bb3ac53833
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/_k-test.shade
View File

@ -40,11 +40,13 @@ projectFile=''
foreach (var framework in targetFrameworks) foreach (var framework in targetFrameworks)
{ {
var testArgs = IsMono ? " -parallel none" : "";
if (framework.StartsWith("net", StringComparison.OrdinalIgnoreCase) if (framework.StartsWith("net", StringComparison.OrdinalIgnoreCase)
|| (framework.StartsWith("aspnet", StringComparison.OrdinalIgnoreCase) || (framework.StartsWith("aspnet", StringComparison.OrdinalIgnoreCase)
&& !framework.StartsWith("aspnetcore", StringComparison.OrdinalIgnoreCase))) && !framework.StartsWith("aspnetcore", StringComparison.OrdinalIgnoreCase)))
{ {
K("test", projectFolder, ""); K(("test" + testArgs), projectFolder, "");
} }
else if (!IsMono) else if (!IsMono)
{ {