From b21542e448f7df2eb2e163a35614005d7903f5be Mon Sep 17 00:00:00 2001
From: Jason Naylor <jason_naylor@sil.org>
Date: Mon, 18 May 2026 23:35:52 -0700
Subject: [PATCH] Fix the patching for Newtonsoft.Json

* The previous commit on this was done from an incomplete understanding
  of how the patch harvesting interacted with the base contents
---
 FLExInstaller/CustomComponents.wxi | 8 ++++----
 FLExInstaller/CustomFeatures.wxi   | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/FLExInstaller/CustomComponents.wxi b/FLExInstaller/CustomComponents.wxi
index ac6602b63d..e48406a4d3 100644
--- a/FLExInstaller/CustomComponents.wxi
+++ b/FLExInstaller/CustomComponents.wxi
@@ -8,8 +8,10 @@
 <Include>
 	<?ifdef MASTERBUILDDIR?>
 	<WixVariable Id="RootObjectsDir" Value="$(var.MASTERBUILDDIR)\.."/>
+	<WixVariable Id="BuildDir" Value="$(var.MASTERBUILDDIR)"/>
 	<?else?>
 	<WixVariable Id="RootObjectsDir" Value="$(var.UPDATEBUILDDIR)\.."/>
+	<WixVariable Id="BuildDir" Value="$(var.UPDATEBUILDDIR)"/>
 	<?endif?>
 
 	<DirectoryRef Id="$(var.CFDir)">
@@ -299,7 +301,6 @@
 	<?include $(var.HarvestWxiDir)\yoHarvest.wxi?>
 	<?include $(var.HarvestWxiDir)\zhHarvest.wxi?>
 	<?include $(var.HarvestWxiDir)\zlmHarvest.wxi?>
-	<?ifdef MASTERBUILDDIR?>
 	<!--
 		WiX 3 / PatchableInstaller: Newtonsoft.Json.dll is excluded from Heat (FLExInstaller/PatchableInstallerHeatExclude.xml
 		copied to BaseInstallerBuild/heat-exclude.xml; CopyFilesToInstall) and KeyPathFix.xsl. NewtonsoftJsonApp: private
@@ -309,17 +310,16 @@
 		<Component Id="NewtonsoftJsonApp" Guid="{B8A47C61-2E90-4D1A-9F4E-7C3B5A682D01}">
 			<File Id="NewtonsoftJsonFileApp"
 				Name="Newtonsoft.Json.dll"
-				Source="$(var.MASTERBUILDDIR)\Newtonsoft.Json.dll"
+				Source="!(wix.BuildDir)\Newtonsoft.Json.dll"
 				KeyPath="yes" />
 		</Component>
 		<Component Id="NewtonsoftJsonGac" Guid="*">
 			<File Id="NewtonsoftJsonFileGac"
 				Name="Newtonsoft.Json.dll"
-				Source="$(var.MASTERBUILDDIR)\Newtonsoft.Json.dll"
+				Source="!(wix.BuildDir)\Newtonsoft.Json.dll"
 				KeyPath="yes"
 				Assembly=".net" />
 		</Component>
 	</DirectoryRef>
-	<?endif?>
 	<?include Fonts.wxi?>
 </Include>
\ No newline at end of file
diff --git a/FLExInstaller/CustomFeatures.wxi b/FLExInstaller/CustomFeatures.wxi
index 4ae07481ce..1c22e3eeb4 100644
--- a/FLExInstaller/CustomFeatures.wxi
+++ b/FLExInstaller/CustomFeatures.wxi
@@ -10,11 +10,8 @@
 	<MergeRef Id="PerlEC"/>
 	<MergeRef Id="PythonEC"/>
 	<MergeRef Id="TECkit_DLLs"/>
-	<!-- Heat-excluded Newtonsoft.Json: components in CustomComponents.wxi are inside <?ifdef MASTERBUILDDIR?>; match that here so patch builds (UPDATEBUILDDIR only) do not emit dangling ComponentRefs (LGHT0094). -->
-	<?ifdef MASTERBUILDDIR?>
 	<ComponentRef Id="NewtonsoftJsonApp" />
 	<ComponentRef Id="NewtonsoftJsonGac" />
-	<?endif?>
 
 	<Feature Id='DesktopShortcut' Title='Desktop Shortcut' Description='Creates a shortcut on the desktop.' Level='1' ConfigurableDirectory='APPFOLDER' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
 		<ComponentRef Id='ApplicationShortcutDesktop'/>