Merge branch 'release' into dev

This commit is contained in:
Suhas Joshi 2015-01-27 14:44:32 -08:00
commit bb3ac53833
1 changed files with 3 additions and 1 deletions

View File

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