From b13f164ba3624e0e8577cc90768d8249a452e5ea Mon Sep 17 00:00:00 2001
From: Tomas <trylek@microsoft.com>
Date: Sat, 16 Nov 2019 13:14:56 +0100
Subject: [PATCH] Execute tests serially

---
 src/coreclr/tests/src/helixpublishwitharcade.proj | 4 +---
 src/coreclr/tests/tests.targets                   | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/coreclr/tests/src/helixpublishwitharcade.proj b/src/coreclr/tests/src/helixpublishwitharcade.proj
index 753977d38bed25..c2d6cace02b6ab 100644
--- a/src/coreclr/tests/src/helixpublishwitharcade.proj
+++ b/src/coreclr/tests/src/helixpublishwitharcade.proj
@@ -182,9 +182,7 @@
     <TestRunNamePrefix Condition=" '$(Scenario)' != 'normal' ">$(TestRunNamePrefix)$(BuildOS) $(BuildArch) $(BuildType) $(Scenario) @ </TestRunNamePrefix>
     <TimeoutPerTestInMilliseconds Condition=" '$(TimeoutPerTestInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(TimeoutPerTestInMinutes)).TotalMilliseconds)</TimeoutPerTestInMilliseconds>
     <WaitForWorkItemCompletion>true</WaitForWorkItemCompletion>
-    <_XUnitParallelMode>collections</_XUnitParallelMode>
-    <_XUnitParallelMode Condition=" '$(LongRunningGCTests)' == 'true' ">none</_XUnitParallelMode>
-    <_XUnitParallelMode Condition=" '$(GcSimulatorTests)' == 'true' ">none</_XUnitParallelMode>
+    <_XUnitParallelMode>none</_XUnitParallelMode>
     <XUnitRunnerArgs>-parallel $(_XUnitParallelMode) -nocolor -noshadow -xml testResults.xml</XUnitRunnerArgs>
   </PropertyGroup>
 
diff --git a/src/coreclr/tests/tests.targets b/src/coreclr/tests/tests.targets
index e8d0192f3540e6..96cf18c442a751 100644
--- a/src/coreclr/tests/tests.targets
+++ b/src/coreclr/tests/tests.targets
@@ -43,7 +43,8 @@
     <PropertyGroup>
       <XunitConsoleRunner>$(CORE_ROOT)\xunit.console.dll</XunitConsoleRunner>
 
-      <XunitArgs>-parallel $(ParallelRun)</XunitArgs>
+      <!-- Xunit has a concurrency bug manifesting as COR_E_INVALIDOPERATION on random Xunit wrapper assemblies -->
+      <XunitArgs>-parallel none</XunitArgs>
       <XunitArgs>$(XunitArgs) -html $(__TestRunHtmlLog)</XunitArgs>
       <XunitArgs>$(XunitArgs) -xml $(__TestRunXmlLog)</XunitArgs>
       <XunitArgs>$(XunitArgs) @(IncludeTraitsItems->'-trait %(Identity)', ' ')</XunitArgs>