Installer: Newtonsoft refs in CustomFeatures.wxi only

Change-Id: I8255b5a9f413d76bb053a9a552ba6b08ad74b2fa

Author: jasonleenaylor

FLExInstaller/AGENTS.md

@@ -12,7 +12,7 @@ Minimal installer guidance for agents.
 
 - Heat exclusions: **`PatchableInstallerHeatExclude.xml`** is copied to **`PatchableInstaller/BaseInstallerBuild/heat-exclude.xml`** before Heat (see **`Build/Installer.legacy.targets`** `CopyFilesToInstall`).
 - **`buildMsi.bat`** passes **`-fv`** to **`light.exe`** so **`MsiAssemblyName`** includes **fileVersion** (same intent as MSBuild **`SetMsiAssemblyNameFileVersion=true`**), which helps GAC servicing when **`AssemblyVersion`** is unchanged but the binary’s **file version** increases.
-- Newtonsoft.Json and similar authored components live in **`CustomComponents.wxi`** (overlays **`PatchableInstaller/Common`**), not in the generic PatchableInstaller tree. Wire them into **`Feature Complete`** with **`ComponentRef`** entries in **`PatchableInstaller/BaseInstallerBuild/Framework.wxs`** (FieldWorks Newtonsoft) and/or **`PatchableInstaller/Common/CustomFeatures.wxi`**; do not use **`FeatureRef Id="Complete"`** from an include that appears before **`Framework.wxs`** defines `Complete` (Light **LGHT0095**). Prefer **`Framework.wxs`** for wiring that must survive **`git checkout`** on **`PatchableInstaller/Common`** (LGHT0139 for GAC assemblies if refs are missing).
+- Newtonsoft.Json and similar authored components live in **`CustomComponents.wxi`** (overlays **`PatchableInstaller/Common`**), with definitions guarded by **`<?ifdef MASTERBUILDDIR?>`** so patch/update authoring omits them when only **`UPDATEBUILDDIR`** is set. Add matching **`ComponentRef`** entries in **`FLExInstaller/CustomFeatures.wxi`** inside the **same** **`<?ifdef MASTERBUILDDIR?>...<?endif?>`** so patch builds do not emit dangling refs (**LGHT0094**). WiX 6 **`Framework.wxs`** uses the same pattern for **`Feature Complete`**. Do not use **`FeatureRef Id="Complete"`** from an include that appears before **`Framework.wxs`** defines `Complete` (Light **LGHT0095**).
 
 ## Constraints
 

FLExInstaller/CustomFeatures.wxi

@@ -10,6 +10,11 @@
 	<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'/>