From 7a77a0733fef9395828dcf065a0b487804433656 Mon Sep 17 00:00:00 2001
From: Jakub Majocha <1760221+majocha@users.noreply.github.com>
Date: Tue, 17 Dec 2024 09:25:55 +0100
Subject: [PATCH 1/2] exempt FileSystemTests from parallelization

---
 tests/FSharp.Compiler.Service.Tests/FileSystemTests.fs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/FSharp.Compiler.Service.Tests/FileSystemTests.fs b/tests/FSharp.Compiler.Service.Tests/FileSystemTests.fs
index 4d191dcc7cb..0e2a4adf4ae 100644
--- a/tests/FSharp.Compiler.Service.Tests/FileSystemTests.fs
+++ b/tests/FSharp.Compiler.Service.Tests/FileSystemTests.fs
@@ -1,4 +1,6 @@
-module FSharp.Compiler.Service.Tests.FileSystemTests
+// FileSystem is a global shared resource.
+[<Xunit.Collection(nameof FSharp.Test.NotThreadSafeResourceCollection)>]
+module FSharp.Compiler.Service.Tests.FileSystemTests
 
 open Xunit
 open FSharp.Test.Assert
@@ -25,8 +27,6 @@ let file2 = """
 module File2
 let B = File1.A + File1.A"""
 
-// FileSystem is a global shared resource.
-[<Collection(nameof NotThreadSafeResourceCollection)>]
 type internal MyFileSystem() =
     inherit DefaultFileSystem()
         static member FilesCache = dict [(fileName1, file1); (fileName2, file2)]

From 37be9c1f0d0ebbcac12d43e099d106e7d09494fd Mon Sep 17 00:00:00 2001
From: Jakub Majocha <1760221+majocha@users.noreply.github.com>
Date: Tue, 17 Dec 2024 11:53:52 +0100
Subject: [PATCH 2/2] tune down linux test parallelism

---
 eng/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/build.sh b/eng/build.sh
index b377904e2a6..43016b9b621 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -220,7 +220,7 @@ function Test() {
   projectname="${projectname%.*}"
   testlogpath="$artifacts_dir/TestResults/$configuration/${projectname}_$targetframework.xml"
   args="test \"$testproject\" --no-restore --no-build -c $configuration -f $targetframework --test-adapter-path . --logger \"xunit;LogFilePath=$testlogpath\" --blame-hang-timeout 5minutes --results-directory $artifacts_dir/TestResults/$configuration -p:vstestusemsbuildoutput=false"
-  args+=" -- xUnit.MaxParallelThreads=3"
+  args+=" -- xUnit.MaxParallelThreads=2"
   "$DOTNET_INSTALL_DIR/dotnet" $args || exit $?
 }