From e7a9f3d5e3cbff40d53b4145a81bf031d0e8d6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Tue, 14 Jul 2026 17:03:44 -0700
Subject: [PATCH] Add testConfig.json that sets captureTrace=false

---
 test/Directory.Build.targets | 19 +++++++++++++++++++
 test/testconfig.json         |  7 +++++++
 2 files changed, 26 insertions(+)
 create mode 100644 test/testconfig.json

diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
index 8efa853c656c..a8175acc79c1 100644
--- a/test/Directory.Build.targets
+++ b/test/Directory.Build.targets
@@ -30,6 +30,25 @@
     <PackageReference Include="AwesomeAssertions" />
   </ItemGroup>
 
+  <!-- Turn off MSTest trace/console output capturing (captureTrace = false) for every MSTest.Sdk
+       test project. With capturing on (the default) messages from Console/Trace/Debug are buffered
+       and attached to the test result only once the test finishes; disabling it lets that output
+       flush continually while the test is still running, which makes hangs and long-running tests
+       easier to diagnose.
+
+       CaptureTraceOutput has no dedicated MSBuild property (unlike MSTestParallelizeScope), so it is
+       configured through the Microsoft.Testing.Platform testconfig.json file. Copying the single
+       shared test\testconfig.json into each test app's output as "<AssemblyName>.testconfig.json"
+       opts every project in from one place; MTP auto-discovers that file next to the test host.
+       Microsoft.Testing.Platform.MSBuild treats a CopyToOutputDirectory item whose TargetPath matches
+       "<AssemblyName>.testconfig.json" as user-owned, so its stale-cleanup targets leave ours in place. -->
+  <ItemGroup Condition="'$(UsingMSTestSdk)' == 'true'">
+    <None Include="$(MSBuildThisFileDirectory)testconfig.json"
+          CopyToOutputDirectory="PreserveNewest"
+          TargetPath="$(AssemblyName).testconfig.json"
+          Visible="false" />
+  </ItemGroup>
+
   <Import Project="..\Directory.Build.targets" />
 
 </Project>
diff --git a/test/testconfig.json b/test/testconfig.json
new file mode 100644
index 000000000000..90a7c6104701
--- /dev/null
+++ b/test/testconfig.json
@@ -0,0 +1,7 @@
+{
+  "mstest": {
+    "output": {
+      "captureTrace": false
+    }
+  }
+}