Don't swallow stacktrace from adapter exception when running in thread (

#2746)
microsoft · Feb 12, 2021 · 6b625d4 · 6b625d4
1 parent 35d6bf5
commit 6b625d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformThread.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformThread.cs
@@ -6,6 +6,7 @@
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System;
+    using System.Runtime.ExceptionServices;
     using System.Threading;
 
     using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
@@ -42,7 +43,8 @@ public void Run(Action action, PlatformApartmentState apartmentState, bool waitF
                 thread.Join();
                 if (exThrown != null)
                 {
-                    throw exThrown;
+                    // Preserve the stacktrace when re-throwing the exception.
+                    ExceptionDispatchInfo.Capture(exThrown).Throw();
                 }
             }
         }

diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformThread.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformThread.cs
@@ -6,6 +6,7 @@
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System;
+    using System.Runtime.ExceptionServices;
     using System.Threading;
     using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
 
@@ -45,7 +46,8 @@ public void Run(Action action, PlatformApartmentState apartmentState, bool waitF
                 thread.Join();
                 if (exThrown != null)
                 {
-                    throw exThrown;
+                    // Preserve the stacktrace when re-throwing the exception.
+                    ExceptionDispatchInfo.Capture(exThrown).Throw();
                 }
             }
         }