From f92035b91414a74e8a8b7dfddfbd70fa0c8b7a68 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Wed, 28 Jan 2026 13:27:47 +0000
Subject: [PATCH] Headless: use HarfBuzz by default (#20561)

---
 src/Headless/Avalonia.Headless/Avalonia.Headless.csproj   | 1 +
 src/Headless/Avalonia.Headless/HeadlessUnitTestSession.cs | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Headless/Avalonia.Headless/Avalonia.Headless.csproj b/src/Headless/Avalonia.Headless/Avalonia.Headless.csproj
index bbd10677e9..edd5ed183b 100644
--- a/src/Headless/Avalonia.Headless/Avalonia.Headless.csproj
+++ b/src/Headless/Avalonia.Headless/Avalonia.Headless.csproj
@@ -6,6 +6,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
     <ProjectReference Include="..\..\Avalonia.Fonts.Inter\Avalonia.Fonts.Inter.csproj" />
+    <ProjectReference Include="..\..\HarfBuzz\Avalonia.HarfBuzz\Avalonia.HarfBuzz.csproj" />
   </ItemGroup>
 
   <Import Project="..\..\..\build\DevAnalyzers.props" />
diff --git a/src/Headless/Avalonia.Headless/HeadlessUnitTestSession.cs b/src/Headless/Avalonia.Headless/HeadlessUnitTestSession.cs
index 26c076c1e1..0e5a6b0c8b 100644
--- a/src/Headless/Avalonia.Headless/HeadlessUnitTestSession.cs
+++ b/src/Headless/Avalonia.Headless/HeadlessUnitTestSession.cs
@@ -236,7 +236,9 @@ public sealed class HeadlessUnitTestSession : IDisposable, IAsyncDisposable
                 // If windowing subsystem wasn't initialized by user, force headless with default parameters.
                 if (appBuilder.WindowingSubsystemName != "Headless")
                 {
-                    appBuilder = appBuilder.UseHeadless(new AvaloniaHeadlessPlatformOptions());
+                    appBuilder = appBuilder
+                        .UseHeadless(new AvaloniaHeadlessPlatformOptions())
+                        .UseHarfBuzz();
                 }
 
                 // ReSharper disable once AccessToModifiedClosure