From 44c8ecce4720ed9808c98f7293f1b1f837d002ef Mon Sep 17 00:00:00 2001
From: Zachary Burnham <zachary_burnham@sil.org>
Date: Mon, 26 Oct 2026 15:48:58 -0400
Subject: [PATCH 1/2] Keep UIAdapterInterfaces files in patches until the next
 base

Base build 1452 installs UIAdapterInterfaces.dll, its .dll.config and
.pdb, a UIAdapterInterfaces.resources.dll in each of 29 culture folders,
and FwTMDefinition.xml. #1202 deleted the project and the XML file, so
the patch build dropped those 33 components and pyro failed with
PYRO0305 for each one.

List them in RemovedSinceLastBase so RescuePatching writes zero-byte
stand-ins and the patch keeps every base component.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 Build/Installer.legacy.targets | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Build/Installer.legacy.targets b/Build/Installer.legacy.targets
index 12a45c4bdd..c8ee7339ae 100644
--- a/Build/Installer.legacy.targets
+++ b/Build/Installer.legacy.targets
@@ -115,6 +115,16 @@
 				in SIL.LCModel 11.0.0-beta0176, so nothing copies StructureMap.dll to the output any more. -->
 			<RemovedSinceLastBase Include="$(dir-outputBase)/StructureMap.dll" />
 			<RemovedSinceLastBase Include="$(dir-outputBase)/Avalonia.Themes.Fluent.dll" />
+			<!--
+				The base ships UIAdapterInterfaces, one satellite per UI culture, and
+				FwTMDefinition.xml; the build makes none of them.
+			-->
+			<_UIAdapterInterfacesCulture Include="ar;az;bn;de;es;fa;fr;hi;hu;id;km;ko;ml;ms;my;ne;pt;ru;rw;sw;ta;te;th;tr;ur;vi;yo;zh-CN;zlm" />
+			<RemovedSinceLastBase Include="$(dir-outputBase)/UIAdapterInterfaces.dll" />
+			<RemovedSinceLastBase Include="$(dir-outputBase)/UIAdapterInterfaces.dll.config" />
+			<RemovedSinceLastBase Include="$(dir-outputBase)/UIAdapterInterfaces.pdb" />
+			<RemovedSinceLastBase Include="@(_UIAdapterInterfacesCulture-&gt;'$(dir-outputBase)/%(Identity)/UIAdapterInterfaces.resources.dll')" />
+			<RemovedSinceLastBase Include="$(dir-outputBase)/FwTMDefinition.xml" />
 		</ItemGroup>
 		<WriteLinesToFile
 			File="%(RemovedSinceLastBase.FullPath)"

From 5099af1640e5abf3fad3cda4d657324628b57a9f Mon Sep 17 00:00:00 2001
From: Zachary Burnham <zachary_burnham@sil.org>
Date: Mon, 26 Oct 2026 22:29:02 -0400
Subject: [PATCH 2/2] Run ApplyWS_ToSelectedString only on a desktop

The test asserts that the Find box holds Windows keyboard focus after
ApplyWS. In the Patch Installer workflow it failed that check on two
runs of the same commit, while the Base Installer and Debug CI runs of
that code passed it. A test host on a shared runner desktop cannot rely
on keeping focus, which is why LastTextBoxInFocus in this fixture is
already DesktopRequired.

Tag it DesktopRequired so CI skips it and desktop runs keep the check.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 Src/FwCoreDlgs/FwCoreDlgsTests/FwFindReplaceDlgTests.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Src/FwCoreDlgs/FwCoreDlgsTests/FwFindReplaceDlgTests.cs b/Src/FwCoreDlgs/FwCoreDlgsTests/FwFindReplaceDlgTests.cs
index ddd8d3f94f..3a3f672acc 100644
--- a/Src/FwCoreDlgs/FwCoreDlgsTests/FwFindReplaceDlgTests.cs
+++ b/Src/FwCoreDlgs/FwCoreDlgsTests/FwFindReplaceDlgTests.cs
@@ -993,6 +993,7 @@ public void ApplyStyle_ToEmptyTextBox()
 		/// </summary>
 		/// ------------------------------------------------------------------------------------
 		[Test]
+		[Category("DesktopRequired")]
 		public void ApplyWS_ToSelectedString()
 		{
 			SelectionHelper helper = SelectionHelper.Create(m_vwRootsite);