From ca9861ab16d645a5076fdef345f8df1e34d10a5b Mon Sep 17 00:00:00 2001
From: Adam Sitnik <adam.sitnik@gmail.com>
Date: Mon, 29 Nov 2021 13:14:57 +0100
Subject: [PATCH 1/2] don't run the System.IO.FileSystem.DriveInfo in parallel,
 fixes #62119

---
 .../tests/System.IO.FileSystem.DriveInfo.Tests.csproj            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
index 3d282e1aea7cd3..861dba07ba2d8f 100644
--- a/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+    <TestDisableParallelization>true</TestDisableParallelization>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DriveInfo.Unix.Tests.cs" Condition="'$(TargetsUnix)' == 'true' or '$(TargetsBrowser)' == 'true'" />

From 92ec2b561bd954e515eef8cf5fa9166c3d0726b3 Mon Sep 17 00:00:00 2001
From: Adam Sitnik <adam.sitnik@gmail.com>
Date: Tue, 30 Nov 2021 16:11:47 +0100
Subject: [PATCH 2/2] unify disabling test parallelization per assembly

---
 .../System/DisableParallelizationPerAssembly.cs}             | 3 +--
 .../tests/System.IO.FileSystem.DriveInfo.Tests.csproj        | 2 +-
 .../System.Xml.RW.CharCheckingReader.Tests.csproj            | 2 +-
 .../CustomReader/System.Xml.RW.CustomReader.Tests.csproj     | 2 +-
 .../FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj   | 2 +-
 .../Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj   | 2 +-
 .../ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj | 2 +-
 .../SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj   | 2 +-
 .../WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj   | 2 +-
 .../Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj   | 2 +-
 .../tests/Writers/XmlWriterApi/DisableParallelization.cs     | 5 -----
 .../XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj     | 2 +-
 .../tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj   | 2 +-
 13 files changed, 12 insertions(+), 18 deletions(-)
 rename src/libraries/Common/tests/{System/Xml/DisableParallelization.cs => TestUtilities/System/DisableParallelizationPerAssembly.cs} (78%)
 delete mode 100644 src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/DisableParallelization.cs

diff --git a/src/libraries/Common/tests/System/Xml/DisableParallelization.cs b/src/libraries/Common/tests/TestUtilities/System/DisableParallelizationPerAssembly.cs
similarity index 78%
rename from src/libraries/Common/tests/System/Xml/DisableParallelization.cs
rename to src/libraries/Common/tests/TestUtilities/System/DisableParallelizationPerAssembly.cs
index e6fb8acae3b287..62b4f0e3730da2 100644
--- a/src/libraries/Common/tests/System/Xml/DisableParallelization.cs
+++ b/src/libraries/Common/tests/TestUtilities/System/DisableParallelizationPerAssembly.cs
@@ -1,5 +1,4 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-// Tests are old and depend on the static state
-[assembly: Xunit.CollectionBehavior(DisableTestParallelization = true)]
+[assembly: Xunit.CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
index 861dba07ba2d8f..fa6aaa94a54c85 100644
--- a/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
-    <TestDisableParallelization>true</TestDisableParallelization>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DriveInfo.Unix.Tests.cs" Condition="'$(TargetsUnix)' == 'true' or '$(TargetsBrowser)' == 'true'" />
     <Compile Include="DriveInfo.Windows.Tests.cs" Condition="'$(TargetsWindows)' == 'true'" />
     <Compile Include="VirtualDrives.Windows.Tests.cs" Condition="'$(TargetsWindows)' == 'true'" />
     <Compile Include="$(CommonTestPath)System\IO\VirtualDriveHelper.Windows.cs" Link="Common\System\IO\VirtualDriveHelper.Windows.cs" Condition="'$(TargetsWindows)' == 'true'" />
+    <Compile Include="$(CommonTestPath)TestUtilities\System\DisableParallelizationPerAssembly.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj
index 8f07f99a4bfd72..500733518dd79d 100644
--- a/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj
@@ -5,7 +5,7 @@
   <ItemGroup>
     <Compile Include="CharReaderTests.cs" />
     <Compile Include="InheritedCases.cs" />
-    <Compile Include="$(CommonTestPath)System\Xml\DisableParallelization.cs" />
+    <Compile Include="$(CommonTestPath)TestUtilities\System\DisableParallelizationPerAssembly.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
diff --git a/src/libraries/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj
index 0a9332d12904d8..c9f5d55f4dba5e 100644
--- a/src/libraries/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj
@@ -5,7 +5,7 @@
   <ItemGroup>
     <Compile Include="CReaderTestModule.cs" />
     <Compile Include="InheritedCases.cs" />
-    <Compile Include="$(CommonTestPath)System\Xml\DisableParallelization.cs" />
+    <Compile Include="$(CommonTestPath)TestUtilities\System\DisableParallelizationPerAssembly.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
diff --git a/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj
index 8a6101b86831ed..5544c95e815aff 100644
--- a/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj
@@ -7,7 +7,7 @@
     <Compile Include="InheritedCases.cs" />
     <Compile Include="Normalization.cs" />
     <Compile Include="TCNormalization.cs" />
-    <Compile Include="$(CommonTestPath)System\Xml\DisableParallelization.cs" />
+    <Compile Include="$(CommonTestPath)TestUtilities\System\DisableParallelizationPerAssembly.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
diff --git a/src/libraries/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj
index b2052d0678d789..22491163aa29b2 100644
--- a/src/libraries/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj
@@ -10,7 +10,7 @@
     <Compile Include="TCUserNameTable.cs" />
     <Compile Include="TestFiles.cs" />
     <Compile Include="XmlNameTable.cs" />
-    <Compile Include="$(CommonTestPath)System\Xml\DisableParallelization.cs" />
+    <Compile Include="$(CommonTestPath)TestUtilities\System\DisableParallelizationPerAssembly.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
diff --git a/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj
index 644a9f6b4d928e..606537f058d292 100644
--- a/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj
@@ -21,7 +21,7 @@
     <Compile Include="TCOneByteStream.cs" />
     <Compile Include="TCReaderSettings.cs" />
     <Compile Include="TCRSGeneric.cs" />
-    <Compile Include="$(CommonTestPath)System\Xml\DisableParallelization.cs" />
+    <Compile Include="$(CommonTestPath)TestUtilities\System\DisableParallelizationPerAssembly.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(CommonTestPath)System\Xml\BaseLibManaged\BaseLibManaged.csproj" />
diff --git a/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj
index 6a642e0ef32850..1a332e08e5c1b7 100644
--- a/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj
@@ -5,7 +5,7 @@
   <ItemGroup>
     <Compile Include="InheritedCases.cs" />
     <Compile Include="SubtreeReaderTests.cs" />
-    <Compile Include="$(CommonTestPath)System\Xml\DisableParallelization.cs" />
+    <Compile Include="$(CommonTestPath)TestUtilities\System\DisableParallelizationPerAssembly.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
diff --git a/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj
index ffcaad0d1e75c3..f93aee359a72b4 100644
--- a/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj
@@ -5,7 +5,7 @@
   <ItemGroup>
     <Compile Include="InheritedCases.cs" />
     <Compile Include="WrappedReaderTests.cs" />
-    <Compile Include="$(CommonTestPath)System\Xml\DisableParallelization.cs" />
+    <Compile Include="$(CommonTestPath)TestUtilities\System\DisableParallelizationPerAssembly.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
diff --git a/src/libraries/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj b/src/libraries/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj
index 91358a3a30f5e8..7b797907e05fc5 100644
--- a/src/libraries/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj
@@ -14,7 +14,7 @@
     <Compile Include="CXmlDriverVariation.cs" />
     <Compile Include="ReaderFactory.cs" />
     <Compile Include="WriterFactory.cs" />
-    <Compile Include="$(CommonTestPath)System\Xml\DisableParallelization.cs" />
+    <Compile Include="$(CommonTestPath)TestUtilities\System\DisableParallelizationPerAssembly.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />
diff --git a/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/DisableParallelization.cs b/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/DisableParallelization.cs
deleted file mode 100644
index e6fb8acae3b287..00000000000000
--- a/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/DisableParallelization.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-// Tests are old and depend on the static state
-[assembly: Xunit.CollectionBehavior(DisableTestParallelization = true)]
diff --git a/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj b/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj
index 66a1626bfe18c7..9569073b4185ab 100644
--- a/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj
@@ -25,7 +25,7 @@
     <Compile Include="TCNewLineChars.cs" />
     <Compile Include="TCNewLineHandling.cs" />
     <Compile Include="TCNewLineOnAttributes.cs" />
-    <Compile Include="DisableParallelization.cs" />
+    <Compile Include="$(CommonTestPath)TestUtilities\System\DisableParallelizationPerAssembly.cs" />
     <Compile Include="TCOmitXmlDecl.cs" />
     <Compile Include="TCStandAlone.cs" />
     <Compile Include="TCWriteAttributes.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj
index 2104845a322cb2..69106ffa4dd5af 100644
--- a/src/libraries/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj
@@ -37,7 +37,7 @@
     <Compile Include="XmlIdeographicCharConvertTests1.cs" />
     <Compile Include="XmlIdeographicCharConvertTests2.cs" />
     <Compile Include="XmlIdeographicCharConvertTests3.cs" />
-    <Compile Include="$(CommonTestPath)System\Xml\DisableParallelization.cs" />
+    <Compile Include="$(CommonTestPath)TestUtilities\System\DisableParallelizationPerAssembly.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" />