From 85263da2f1741d6bce25e0348eeb5fe1c1a4db75 Mon Sep 17 00:00:00 2001
From: Mike Goatly <4577868+mikegoatly@users.noreply.github.com>
Date: Fri, 15 May 2026 11:09:18 +0100
Subject: [PATCH] Fix xUnit headless tests losing TestContext on background
 thread (#21357)

* Fix xUnit headless tests losing TestContext on background thread

* Capture context on sync invocations as well

---------

Co-authored-by: Julien Lebosquain <julien@lebosquain.net>
---
 src/Headless/Avalonia.Headless/HeadlessUnitTestSession.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Headless/Avalonia.Headless/HeadlessUnitTestSession.cs b/src/Headless/Avalonia.Headless/HeadlessUnitTestSession.cs
index 0d48dd6919..645812cefb 100644
--- a/src/Headless/Avalonia.Headless/HeadlessUnitTestSession.cs
+++ b/src/Headless/Avalonia.Headless/HeadlessUnitTestSession.cs
@@ -54,19 +54,19 @@ public sealed class HeadlessUnitTestSession : IDisposable, IAsyncDisposable
         {
             action();
             return Task.FromResult(0);
-        }, false ,cancellationToken);
+        }, true ,cancellationToken);
     }
 
     /// <inheritdoc cref="DispatchCore{TResult}"/>
     public Task<TResult> Dispatch<TResult>(Func<TResult> action, CancellationToken cancellationToken)
     {
-        return DispatchCore(() => Task.FromResult(action()), false, cancellationToken);
+        return DispatchCore(() => Task.FromResult(action()), true, cancellationToken);
     }
 
     /// <inheritdoc cref="DispatchCore{TResult}"/>
     public Task<TResult> Dispatch<TResult>(Func<Task<TResult>> action, CancellationToken cancellationToken)
     {
-        return DispatchCore(action, false, cancellationToken);
+        return DispatchCore(action, true, cancellationToken);
     }
 
     /// <summary>