From 03ff695a674787c99ee80a84c3421d2c8ed6c4c0 Mon Sep 17 00:00:00 2001
From: miterosan <miterosan@gmail.com>
Date: Sun, 16 Sep 2018 16:25:19 +0200
Subject: [PATCH] Use Dotnet core VSTest

This allows only running one testrun.
---
 build.cake | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/build.cake b/build.cake
index 7e1f1bdda7..6808bb3dfc 100644
--- a/build.cake
+++ b/build.cake
@@ -12,7 +12,6 @@ var configuration = Argument("configuration", "Release");
 
 var osuDesktop = new FilePath("./osu.Desktop/osu.Desktop.csproj");
 var osuSolution = new FilePath("./osu.sln");
-var testProjects = GetFiles("**/*.Tests.csproj");
 
 ///////////////////////////////////////////////////////////////////////////////
 // TASKS
@@ -27,13 +26,13 @@ Task("Compile")
 });
 
 Task("Test")
-.ContinueOnError()
-.DoesForEach(testProjects, testProject => {
-    DotNetCoreTest(testProject.FullPath, new DotNetCoreTestSettings {
-        Framework = framework,
-        Configuration = configuration,
-        Logger = AppVeyor.IsRunningOnAppVeyor ? "Appveyor" : $"trx;LogFileName={testProject.GetFilename()}.trx",
-        ResultsDirectory = "./TestResults/"
+.Does(() => {
+    var testAssemblies = GetFiles("**/*.Tests/bin/**/*.Tests.dll");
+
+    DotNetCoreVSTest(testAssemblies, new DotNetCoreVSTestSettings {
+        Logger = AppVeyor.IsRunningOnAppVeyor ? "Appveyor" : $"trx",
+        Parallel = true,
+        ToolTimeout = TimeSpan.FromMinutes(10),
     });
 });