From 47f610abf32c29c90679b6c4eeb79f973641d4b8 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Thu, 27 Apr 2023 00:59:15 -0400
Subject: [PATCH] Fix inconsistent async/non-async methods

---
 src/Headless/Avalonia.Headless/HeadlessUnitTestSession.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Headless/Avalonia.Headless/HeadlessUnitTestSession.cs b/src/Headless/Avalonia.Headless/HeadlessUnitTestSession.cs
index 3339d9a48c..382cbbdee5 100644
--- a/src/Headless/Avalonia.Headless/HeadlessUnitTestSession.cs
+++ b/src/Headless/Avalonia.Headless/HeadlessUnitTestSession.cs
@@ -55,7 +55,7 @@ public sealed class HeadlessUnitTestSession : IDisposable
     /// Parameter from which <see cref="AppBuilder"/> should be created.
     /// It either needs to have BuildAvaloniaApp -> AppBuilder method or inherit Application.
     /// </typeparam>
-    public static Task<HeadlessUnitTestSession> StartNew<
+    public static HeadlessUnitTestSession StartNew<
         [DynamicallyAccessedMembers(DynamicallyAccessed)] TEntryPointType>()
     {
         return StartNew(typeof(TEntryPointType));
@@ -68,7 +68,7 @@ public sealed class HeadlessUnitTestSession : IDisposable
     /// Parameter from which <see cref="AppBuilder"/> should be created.
     /// It either needs to have BuildAvaloniaApp -> AppBuilder method or inherit Application.
     /// </param>
-    public static Task<HeadlessUnitTestSession> StartNew(
+    public static HeadlessUnitTestSession StartNew(
         [DynamicallyAccessedMembers(DynamicallyAccessed)] Type entryPointType)
     {
         var tcs = new TaskCompletionSource<HeadlessUnitTestSession>();
@@ -96,13 +96,14 @@ public sealed class HeadlessUnitTestSession : IDisposable
             catch (Exception e)
             {
                 tcs.SetException(e);
+                return;
             }
 
             Dispatcher.UIThread.MainLoop(cancellationTokenSource.Token);
         }) { IsBackground = true };
         thread.Start();
 
-        return tcs.Task;
+        return tcs.Task.GetAwaiter().GetResult();
     }
     
     /// <summary>