diff --git a/Build/Installer.legacy.targets b/Build/Installer.legacy.targets
index 52afd1e5bb..fc0f808e07 100644
--- a/Build/Installer.legacy.targets
+++ b/Build/Installer.legacy.targets
@@ -156,7 +156,15 @@
 		<!-- copy in new stuff -->
 		<PropertyGroup>
 			<OutputDirForConfig>$(fwrt)\Output\$(Configuration)</OutputDirForConfig>
+			<_FieldWorksPatchableInstallerHeatExclude>$([MSBuild]::NormalizePath('$(fwrt)', 'FLExInstaller', 'PatchableInstallerHeatExclude.xml'))</_FieldWorksPatchableInstallerHeatExclude>
+			<_PatchableInstallerHeatExcludeDest>$([MSBuild]::NormalizePath('$(fwrt)', 'PatchableInstaller', 'BaseInstallerBuild', 'heat-exclude.xml'))</_PatchableInstallerHeatExcludeDest>
 		</PropertyGroup>
+		<Copy
+			SourceFiles="$(_FieldWorksPatchableInstallerHeatExclude)"
+			DestinationFiles="$(_PatchableInstallerHeatExcludeDest)"
+			SkipUnchangedFiles="false"
+			Condition="Exists('$(_FieldWorksPatchableInstallerHeatExclude)')"
+		/>
 		<ItemGroup>
 			<DeveloperFiles Include="$(fwrt)\**\.gitignore" />
 			<DeveloperFiles Include="$(fwrt)\**\*~" />
diff --git a/Build/Installer.targets b/Build/Installer.targets
index e787d15cdb..b77d361ec8 100644
--- a/Build/Installer.targets
+++ b/Build/Installer.targets
@@ -145,7 +145,7 @@
 	<Copy SourceFiles="@(IcuDataFiles)" OverwriteReadOnlyFiles="true" DestinationFolder="$(StagedDataDir)\Icu$(IcuVersion)\%(RecursiveDir)" />
 	<Copy SourceFiles="@(L10nFilesWithRecursiveDirs)" OverwriteReadOnlyFiles="true" DestinationFolder="$(StagedL10nDir)\%(RecursiveDir)" />
 	<Copy SourceFiles="@(BinFiles)" OverwriteReadOnlyFiles="true" DestinationFolder="$(StagedBinDir)\%(RecursiveDir)" />
-  </Target>
+	</Target>
 
   <Target Name="ValidateInstallerAddons" Condition="'$(BuildAdditionalApps)'=='true'">
 	<ItemGroup>
diff --git a/FLExInstaller/AGENTS.md b/FLExInstaller/AGENTS.md
index 00b8b04317..55fc166094 100644
--- a/FLExInstaller/AGENTS.md
+++ b/FLExInstaller/AGENTS.md
@@ -8,6 +8,12 @@ Minimal installer guidance for agents.
 - Validate prerequisites with `.\Build\Agent\Setup-InstallerBuild.ps1 -ValidateOnly`.
 - Follow `.github/instructions/installer.instructions.md` for packaging and evidence rules.
 
+## WiX 3 (PatchableInstaller) notes
+
+- 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`**), 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
 
 - Keep existing WiX 3 and WiX 6 flows intact.
diff --git a/FLExInstaller/CustomComponents.wxi b/FLExInstaller/CustomComponents.wxi
index 3e21099d2c..ac6602b63d 100644
--- a/FLExInstaller/CustomComponents.wxi
+++ b/FLExInstaller/CustomComponents.wxi
@@ -299,5 +299,27 @@
 	<?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
+		copy next to the app. NewtonsoftJsonGac: GAC (Assembly=.net). GAC file-version servicing: buildMsi.bat passes light -fv.
+	-->
+	<DirectoryRef Id="APPFOLDER">
+		<Component Id="NewtonsoftJsonApp" Guid="{B8A47C61-2E90-4D1A-9F4E-7C3B5A682D01}">
+			<File Id="NewtonsoftJsonFileApp"
+				Name="Newtonsoft.Json.dll"
+				Source="$(var.MASTERBUILDDIR)\Newtonsoft.Json.dll"
+				KeyPath="yes" />
+		</Component>
+		<Component Id="NewtonsoftJsonGac" Guid="*">
+			<File Id="NewtonsoftJsonFileGac"
+				Name="Newtonsoft.Json.dll"
+				Source="$(var.MASTERBUILDDIR)\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 4ba9e91287..4ae07481ce 100644
--- a/FLExInstaller/CustomFeatures.wxi
+++ b/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'/>
diff --git a/FLExInstaller/PatchableInstallerHeatExclude.xml b/FLExInstaller/PatchableInstallerHeatExclude.xml
new file mode 100644
index 0000000000..cdf0687f6a
--- /dev/null
+++ b/FLExInstaller/PatchableInstallerHeatExclude.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  FieldWorks: Heat harvest exclusions for PatchableInstaller (WiX 3 / BaseInstallerBuild).
+  Copied to PatchableInstaller/BaseInstallerBuild/heat-exclude.xml before buildBaseInstaller.bat (see Build/Installer.legacy.targets).
+-->
+<HeatHarvestExcludes xmlns="http://fieldworks.sil.org/heat-harvest-excludes/1">
+	<Exclude Name="Newtonsoft.Json.dll" />
+</HeatHarvestExcludes>
diff --git a/FLExInstaller/wix6/FieldWorks.Installer.wixproj b/FLExInstaller/wix6/FieldWorks.Installer.wixproj
index 681c791c3c..b5d6255559 100644
--- a/FLExInstaller/wix6/FieldWorks.Installer.wixproj
+++ b/FLExInstaller/wix6/FieldWorks.Installer.wixproj
@@ -1,166 +1,167 @@
 <Project Sdk="WixToolset.Sdk/6.0.2">
   <PropertyGroup>
-    <OutputName>FieldWorks</OutputName>
-    <OutputType>Package</OutputType>
-    <TargetFramework>net48</TargetFramework>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-
-    <!-- Prefer explicit package paths when resolving WixExtension items; otherwise MSBuild's ReferencePaths can
-         accidentally bind to older extension DLLs if multiple versions exist under ./packages. -->
-    <WixExtensionSearchPaths>{RawFileName};{HintPathFromItem};$(ReferencePaths)</WixExtensionSearchPaths>
-
-    <!--
-      Installer validation:
-      - Harvested inputs include many versionless resource/data files that trigger ICE60.
-      - We intentionally allow downgrades (single-instance policy), which triggers ICE61.
-    -->
-    <SuppressIces>ICE60;ICE61</SuppressIces>
+	<OutputName>FieldWorks</OutputName>
+	<OutputType>Package</OutputType>
+	<TargetFramework>net48</TargetFramework>
+	<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+
+	<!-- Prefer explicit package paths when resolving WixExtension items; otherwise MSBuild's ReferencePaths can
+		 accidentally bind to older extension DLLs if multiple versions exist under ./packages. -->
+	<WixExtensionSearchPaths>{RawFileName};{HintPathFromItem};$(ReferencePaths)</WixExtensionSearchPaths>
+
+	<!--
+	  Installer validation:
+	  - Harvested inputs include many versionless resource/data files that trigger ICE60.
+	  - We intentionally allow downgrades (single-instance policy), which triggers ICE61.
+	-->
+	<SuppressIces>ICE60;ICE61</SuppressIces>
   </PropertyGroup>
 
   <!--
-    Faster Debug builds:
-    - Disable MSI validation (wix msi validate) which can be expensive.
-    - Disable cabinet compression for fast iterative rebuilds.
-    - Enable cabinet caching across builds.
+	Faster Debug builds:
+	- Disable MSI validation (wix msi validate) which can be expensive.
+	- Disable cabinet compression for fast iterative rebuilds.
+	- Enable cabinet caching across builds.
   -->
   <PropertyGroup>
-    <FastInstallerBuild Condition="'$(FastInstallerBuild)' == '' and '$(Configuration)' == 'Debug'">1</FastInstallerBuild>
-    <FastInstallerBuild Condition="'$(FastInstallerBuild)' == ''">0</FastInstallerBuild>
+	<FastInstallerBuild Condition="'$(FastInstallerBuild)' == '' and '$(Configuration)' == 'Debug'">1</FastInstallerBuild>
+	<FastInstallerBuild Condition="'$(FastInstallerBuild)' == ''">0</FastInstallerBuild>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(FastInstallerBuild)' == '1'">
-    <DefaultCompressionLevel>none</DefaultCompressionLevel>
-    <SuppressValidation>true</SuppressValidation>
-    <LinkerAdditionalOptions>$(LinkerAdditionalOptions) -cc "$(IntermediateOutputPath)cabcache"</LinkerAdditionalOptions>
+	<DefaultCompressionLevel>none</DefaultCompressionLevel>
+	<SuppressValidation>true</SuppressValidation>
+	<LinkerAdditionalOptions>$(LinkerAdditionalOptions) -cc "$(IntermediateOutputPath)cabcache"</LinkerAdditionalOptions>
   </PropertyGroup>
 
   <PropertyGroup>
-    <!--
-      AppBuildDir MUST be provided by the caller (Installer.targets or command line).
-      Do NOT add a fallback default here - it causes stale DLL version mismatches.
-      Use: msbuild Build/InstallerBuild.proj /t:BuildInstaller
-      See FieldWorks-lij for the root cause of LT-22382 (Newtonsoft.Json mismatch).
-    -->
-    <BinDirSuffix Condition="'$(BinDirSuffix)' == ''">objects\FieldWorks</BinDirSuffix>
-    <DataDirSuffix Condition="'$(DataDirSuffix)' == ''">objects\FieldWorks_Data</DataDirSuffix>
-    <L10nDirSuffix Condition="'$(L10nDirSuffix)' == ''">objects\FieldWorks_L10n</L10nDirSuffix>
-
-    <!-- WiX preprocessor defaults (can be overridden by MSBuild properties) -->
-    <ApplicationName Condition="'$(ApplicationName)' == ''">FieldWorks</ApplicationName>
-    <SafeApplicationName Condition="'$(SafeApplicationName)' == ''">FieldWorks</SafeApplicationName>
-    <Manufacturer Condition="'$(Manufacturer)' == ''">SIL International</Manufacturer>
-    <SafeManufacturer Condition="'$(SafeManufacturer)' == ''">SIL</SafeManufacturer>
-    <MajorVersion Condition="'$(MajorVersion)' == ''">9</MajorVersion>
-    <MinorVersion Condition="'$(MinorVersion)' == ''">3</MinorVersion>
-    <VersionNumber Condition="'$(VersionNumber)' == ''">9.3.0.1</VersionNumber>
-    <UpgradeCode Condition="'$(UpgradeCode)' == ''">1092269F-9EA1-419B-8685-90203F83E254</UpgradeCode>
-    <ProductCode Condition="'$(ProductCode)' == ''">*</ProductCode>
-
-    <!-- StandardDirectory IDs depend on platform; installers are x64-only. -->
-    <PFDir Condition="'$(PFDir)' == '' and '$(Platform)' == 'x64'">ProgramFiles64Folder</PFDir>
-    <PFDir Condition="'$(PFDir)' == ''">ProgramFilesFolder</PFDir>
-    <CFDir Condition="'$(CFDir)' == '' and '$(Platform)' == 'x64'">CommonFiles64Folder</CFDir>
-    <CFDir Condition="'$(CFDir)' == ''">CommonFilesFolder</CFDir>
-
-    <MasterBuildDir>$(AppBuildDir)\$(BinDirSuffix)</MasterBuildDir>
-    <MasterDataDir>$(AppBuildDir)\$(DataDirSuffix)</MasterDataDir>
-    <MasterL10nDir>$(AppBuildDir)\$(L10nDirSuffix)</MasterL10nDir>
-
-    <DefineConstants>ApplicationName=$(ApplicationName);SafeApplicationName=$(SafeApplicationName);Manufacturer=$(Manufacturer);SafeManufacturer=$(SafeManufacturer);MajorVersion=$(MajorVersion);MinorVersion=$(MinorVersion);VersionNumber=$(VersionNumber);ProductCode=$(ProductCode);UpgradeCode=$(UpgradeCode);PFDir=$(PFDir);CFDir=$(CFDir);MASTERBUILDDIR=$(MasterBuildDir);MASTERDATADIR=$(MasterDataDir);MASTERL10NDIR=$(MasterL10nDir);FastInstallerBuild=$(FastInstallerBuild);$(DefineConstants)</DefineConstants>
-
-    <_MasterBuildDirFull>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(MasterBuildDir)))</_MasterBuildDirFull>
-    <_MasterDataDirFull>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(MasterDataDir)))</_MasterDataDirFull>
-    <_MasterL10nDirFull>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(MasterL10nDir)))</_MasterL10nDirFull>
+	<!--
+	  AppBuildDir MUST be provided by the caller (Installer.targets or command line).
+	  Do NOT add a fallback default here - it causes stale DLL version mismatches.
+	  Use: msbuild Build/InstallerBuild.proj /t:BuildInstaller
+	  See FieldWorks-lij for the root cause of LT-22382 (Newtonsoft.Json mismatch).
+	-->
+	<BinDirSuffix Condition="'$(BinDirSuffix)' == ''">objects\FieldWorks</BinDirSuffix>
+	<DataDirSuffix Condition="'$(DataDirSuffix)' == ''">objects\FieldWorks_Data</DataDirSuffix>
+	<L10nDirSuffix Condition="'$(L10nDirSuffix)' == ''">objects\FieldWorks_L10n</L10nDirSuffix>
+
+	<!-- WiX preprocessor defaults (can be overridden by MSBuild properties) -->
+	<ApplicationName Condition="'$(ApplicationName)' == ''">FieldWorks</ApplicationName>
+	<SafeApplicationName Condition="'$(SafeApplicationName)' == ''">FieldWorks</SafeApplicationName>
+	<Manufacturer Condition="'$(Manufacturer)' == ''">SIL International</Manufacturer>
+	<SafeManufacturer Condition="'$(SafeManufacturer)' == ''">SIL</SafeManufacturer>
+	<MajorVersion Condition="'$(MajorVersion)' == ''">9</MajorVersion>
+	<MinorVersion Condition="'$(MinorVersion)' == ''">3</MinorVersion>
+	<VersionNumber Condition="'$(VersionNumber)' == ''">9.3.0.1</VersionNumber>
+	<UpgradeCode Condition="'$(UpgradeCode)' == ''">1092269F-9EA1-419B-8685-90203F83E254</UpgradeCode>
+	<ProductCode Condition="'$(ProductCode)' == ''">*</ProductCode>
+
+	<!-- StandardDirectory IDs depend on platform; installers are x64-only. -->
+	<PFDir Condition="'$(PFDir)' == '' and '$(Platform)' == 'x64'">ProgramFiles64Folder</PFDir>
+	<PFDir Condition="'$(PFDir)' == ''">ProgramFilesFolder</PFDir>
+	<CFDir Condition="'$(CFDir)' == '' and '$(Platform)' == 'x64'">CommonFiles64Folder</CFDir>
+	<CFDir Condition="'$(CFDir)' == ''">CommonFilesFolder</CFDir>
+
+	<MasterBuildDir>$(AppBuildDir)\$(BinDirSuffix)</MasterBuildDir>
+	<MasterDataDir>$(AppBuildDir)\$(DataDirSuffix)</MasterDataDir>
+	<MasterL10nDir>$(AppBuildDir)\$(L10nDirSuffix)</MasterL10nDir>
+
+	<DefineConstants>ApplicationName=$(ApplicationName);SafeApplicationName=$(SafeApplicationName);Manufacturer=$(Manufacturer);SafeManufacturer=$(SafeManufacturer);MajorVersion=$(MajorVersion);MinorVersion=$(MinorVersion);VersionNumber=$(VersionNumber);ProductCode=$(ProductCode);UpgradeCode=$(UpgradeCode);PFDir=$(PFDir);CFDir=$(CFDir);MASTERBUILDDIR=$(MasterBuildDir);MASTERDATADIR=$(MasterDataDir);MASTERL10NDIR=$(MasterL10nDir);FastInstallerBuild=$(FastInstallerBuild);$(DefineConstants)</DefineConstants>
+
+	<_MasterBuildDirFull>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(MasterBuildDir)))</_MasterBuildDirFull>
+	<_MasterDataDirFull>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(MasterDataDir)))</_MasterDataDirFull>
+	<_MasterL10nDirFull>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(MasterL10nDir)))</_MasterL10nDirFull>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.UI.wixext" Version="6.0.2" />
-    <PackageReference Include="WixToolset.Util.wixext" Version="6.0.2" />
-    <PackageReference Include="WixToolset.NetFx.wixext" Version="6.0.2" />
-    <PackageReference Include="WixToolset.Heat" Version="6.0.2" />
+	<PackageReference Include="WixToolset.UI.wixext" Version="6.0.2" />
+	<PackageReference Include="WixToolset.Util.wixext" Version="6.0.2" />
+	<PackageReference Include="WixToolset.NetFx.wixext" Version="6.0.2" />
+	<PackageReference Include="WixToolset.Heat" Version="6.0.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="Shared\Base\Framework.wxs" />
-    <Compile Include="Shared\Base\WixUI_DialogFlow.wxs" />
-    <Compile Include="Shared\Base\GIInstallDirDlg.wxs" />
-    <Compile Include="Shared\Base\GIProgressDlg.wxs" />
-    <Compile Include="Shared\Base\GIWelcomeDlg.wxs" />
-    <Compile Include="Shared\Base\GICustomizeDlg.wxs" />
-    <Compile Include="Shared\Base\GISetupTypeDlg.wxs" />
-    <EmbeddedResource Include="Shared\Base\WixUI_en-us.wxl" />
+	<Compile Include="Shared\Base\Framework.wxs" />
+	<Compile Include="Shared\Base\WixUI_DialogFlow.wxs" />
+	<Compile Include="Shared\Base\GIInstallDirDlg.wxs" />
+	<Compile Include="Shared\Base\GIProgressDlg.wxs" />
+	<Compile Include="Shared\Base\GIWelcomeDlg.wxs" />
+	<Compile Include="Shared\Base\GICustomizeDlg.wxs" />
+	<Compile Include="Shared\Base\GISetupTypeDlg.wxs" />
+	<EmbeddedResource Include="Shared\Base\WixUI_en-us.wxl" />
   </ItemGroup>
 
   <ItemGroup>
   </ItemGroup>
 
   <!--
-    ValidateInstallerInputs: Ensures AppBuildDir is explicitly provided.
-    Building without proper staging causes stale DLL version mismatches.
-    The correct workflow stages fresh files from Output/ to a versioned AppBuildDir.
+	ValidateInstallerInputs: Ensures AppBuildDir is explicitly provided.
+	Building without proper staging causes stale DLL version mismatches.
+	The correct workflow stages fresh files from Output/ to a versioned AppBuildDir.
   -->
   <Target Name="ValidateInstallerInputs" BeforeTargets="HarvestAppAndData">
-    <Error
-      Condition="'$(AppBuildDir)' == ''"
-      Text="AppBuildDir must be specified. Do not build this project directly. Use: msbuild Build/InstallerBuild.proj /t:BuildInstaller"
-    />
-    <Error
-      Condition="!Exists('$(AppBuildDir)')"
-      Text="AppBuildDir '$(AppBuildDir)' does not exist. Run the full installer build to stage files: msbuild Build/InstallerBuild.proj /t:BuildInstaller"
-    />
+	<Error
+	  Condition="'$(AppBuildDir)' == ''"
+	  Text="AppBuildDir must be specified. Do not build this project directly. Use: msbuild Build/InstallerBuild.proj /t:BuildInstaller"
+	/>
+	<Error
+	  Condition="!Exists('$(AppBuildDir)')"
+	  Text="AppBuildDir '$(AppBuildDir)' does not exist. Run the full installer build to stage files: msbuild Build/InstallerBuild.proj /t:BuildInstaller"
+	/>
   </Target>
 
   <Target Name="HarvestAppAndData" BeforeTargets="CoreCompile">
-    <PropertyGroup>
-      <_HarvestDir>$(IntermediateOutputPath)Harvest\</_HarvestDir>
-      <_BaseDir>$(MSBuildProjectDirectory)\Shared\Base</_BaseDir>
-      <!--
-        WiX v6 SDK dependencies are restored into the repo-local ./packages folder in this repo.
-        Use that first so we don't depend on the global NuGet cache layout.
-      -->
-      <_HeatExeFromRepo>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), ..\..\packages\wixtoolset.heat\6.0.2\tools\net472\x64\heat.exe))</_HeatExeFromRepo>
-      <_HeatExeFromNuGetRoot>$([MSBuild]::NormalizePath($(NuGetPackageRoot), wixtoolset.heat\6.0.2\tools\net472\x64\heat.exe))</_HeatExeFromNuGetRoot>
-      <_HeatExe Condition="Exists('$(_HeatExeFromRepo)')">$(_HeatExeFromRepo)</_HeatExe>
-      <_HeatExe Condition="'$(_HeatExe)' == '' and Exists('$(_HeatExeFromNuGetRoot)')">$(_HeatExeFromNuGetRoot)</_HeatExe>
-    </PropertyGroup>
-
-    <MakeDir Directories="$(_HarvestDir)" />
-
-    <Error
-      Condition="!Exists('$(_HeatExe)')"
-      Text="Heat tool not found. Expected either '$(_HeatExeFromRepo)' or '$(_HeatExeFromNuGetRoot)'. Ensure restore succeeded (WixToolset.Heat 6.0.2)." />
-
-    <!-- Harvest using WiX Toolset Heat from the WiX v6 toolchain (WixToolset.Heat package). -->
-    <Exec
-      WorkingDirectory="$(_BaseDir)"
-      Command="&quot;$(_HeatExe)&quot; dir &quot;$(_MasterBuildDirFull)&quot; -cg HarvestedAppFiles -gg -scom -sreg -sfrag -srd -sw5150 -sw5151 -dr APPFOLDER -var var.MASTERBUILDDIR -t KeyPathFix.xsl -out &quot;$(_HarvestDir)AppHarvest.wxs&quot;"
-    />
-    <Exec
-      WorkingDirectory="$(_BaseDir)"
-      Command="&quot;$(_HeatExe)&quot; dir &quot;$(_MasterDataDirFull)&quot; -cg HarvestedDataFiles -gg -scom -sreg -sfrag -srd -sw5150 -sw5151 -dr HARVESTDATAFOLDER -var var.MASTERDATADIR -t KeyPathFix.xsl -out &quot;$(_HarvestDir)DataHarvest.wxs&quot;"
-    />
-    <Exec
-      Condition="Exists('$(_MasterL10nDirFull)')"
-      WorkingDirectory="$(_BaseDir)"
-      Command="&quot;$(_HeatExe)&quot; dir &quot;$(_MasterL10nDirFull)&quot; -cg HarvestedL10nFiles -gg -scom -sreg -sfrag -srd -sw5150 -sw5151 -dr APPFOLDER -var var.MASTERL10NDIR -t KeyPathFix.xsl -out &quot;$(_HarvestDir)L10nHarvest.wxs&quot;"
-    />
-
-    <ItemGroup>
-      <Compile Include="$(_HarvestDir)AppHarvest.wxs" />
-      <Compile Include="$(_HarvestDir)DataHarvest.wxs" />
-    </ItemGroup>
-
-    <ItemGroup Condition="Exists('$(_HarvestDir)L10nHarvest.wxs')">
-      <Compile Include="$(_HarvestDir)L10nHarvest.wxs" />
-    </ItemGroup>
+	<PropertyGroup>
+	  <_HarvestDir>$(IntermediateOutputPath)Harvest\</_HarvestDir>
+	  <_BaseDir>$(MSBuildProjectDirectory)\Shared\Base</_BaseDir>
+	  <!--
+		WiX v6 SDK dependencies are restored into the repo-local ./packages folder in this repo.
+		Use that first so we don't depend on the global NuGet cache layout.
+	  -->
+	  <_HeatExeFromRepo>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), ..\..\packages\wixtoolset.heat\6.0.2\tools\net472\x64\heat.exe))</_HeatExeFromRepo>
+	  <_HeatExeFromNuGetRoot>$([MSBuild]::NormalizePath($(NuGetPackageRoot), wixtoolset.heat\6.0.2\tools\net472\x64\heat.exe))</_HeatExeFromNuGetRoot>
+	  <_HeatExe Condition="Exists('$(_HeatExeFromRepo)')">$(_HeatExeFromRepo)</_HeatExe>
+	  <_HeatExe Condition="'$(_HeatExe)' == '' and Exists('$(_HeatExeFromNuGetRoot)')">$(_HeatExeFromNuGetRoot)</_HeatExe>
+	</PropertyGroup>
+
+	<MakeDir Directories="$(_HarvestDir)" />
+
+	<Error
+	  Condition="!Exists('$(_HeatExe)')"
+	  Text="Heat tool not found. Expected either '$(_HeatExeFromRepo)' or '$(_HeatExeFromNuGetRoot)'. Ensure restore succeeded (WixToolset.Heat 6.0.2)." />
+
+	<!-- Harvest using WiX Toolset Heat from the WiX v6 toolchain (WixToolset.Heat package). -->
+	<!-- KeyPathFix.xsl: KeyPath=no for harvested files; heat-exclude.xml (FieldWorks list in this tree) drops listed basenames via document(). -->
+	<Exec
+	  WorkingDirectory="$(_BaseDir)"
+	  Command="&quot;$(_HeatExe)&quot; dir &quot;$(_MasterBuildDirFull)&quot; -cg HarvestedAppFiles -gg -scom -sreg -sfrag -srd -sw5150 -sw5151 -dr APPFOLDER -var var.MASTERBUILDDIR -t KeyPathFix.xsl -out &quot;$(_HarvestDir)AppHarvest.wxs&quot;"
+	/>
+	<Exec
+	  WorkingDirectory="$(_BaseDir)"
+	  Command="&quot;$(_HeatExe)&quot; dir &quot;$(_MasterDataDirFull)&quot; -cg HarvestedDataFiles -gg -scom -sreg -sfrag -srd -sw5150 -sw5151 -dr HARVESTDATAFOLDER -var var.MASTERDATADIR -t KeyPathFix.xsl -out &quot;$(_HarvestDir)DataHarvest.wxs&quot;"
+	/>
+	<Exec
+	  Condition="Exists('$(_MasterL10nDirFull)')"
+	  WorkingDirectory="$(_BaseDir)"
+	  Command="&quot;$(_HeatExe)&quot; dir &quot;$(_MasterL10nDirFull)&quot; -cg HarvestedL10nFiles -gg -scom -sreg -sfrag -srd -sw5150 -sw5151 -dr APPFOLDER -var var.MASTERL10NDIR -t KeyPathFix.xsl -out &quot;$(_HarvestDir)L10nHarvest.wxs&quot;"
+	/>
+
+	<ItemGroup>
+	  <Compile Include="$(_HarvestDir)AppHarvest.wxs" />
+	  <Compile Include="$(_HarvestDir)DataHarvest.wxs" />
+	</ItemGroup>
+
+	<ItemGroup Condition="Exists('$(_HarvestDir)L10nHarvest.wxs')">
+	  <Compile Include="$(_HarvestDir)L10nHarvest.wxs" />
+	</ItemGroup>
   </Target>
 
   <ItemGroup>
-    <ProjectReference Include="Shared\CustomActions\CustomActions\CustomActions.csproj" />
-    <ProjectReference Include="Shared\ProcRunner\ProcRunner\ProcRunner.csproj" />
+	<ProjectReference Include="Shared\CustomActions\CustomActions\CustomActions.csproj" />
+	<ProjectReference Include="Shared\ProcRunner\ProcRunner\ProcRunner.csproj" />
   </ItemGroup>
 
   <Target Name="SignInstaller" AfterTargets="Build" Condition="'$(SignOutput)'=='true'">
-    <Exec Command="call Shared\Base\signingProxy.bat &quot;$(OutputPath)$(OutputName).msi&quot;" />
+	<Exec Command="call Shared\Base\signingProxy.bat &quot;$(OutputPath)$(OutputName).msi&quot;" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/FLExInstaller/wix6/Shared/Base/Framework.wxs b/FLExInstaller/wix6/Shared/Base/Framework.wxs
index 602a952af6..848b5bcadf 100644
--- a/FLExInstaller/wix6/Shared/Base/Framework.wxs
+++ b/FLExInstaller/wix6/Shared/Base/Framework.wxs
@@ -1,212 +1,216 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+	 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
 
   <Package Name="$(var.SafeApplicationName)"
-           ProductCode="$(var.ProductCode)"
-           UpgradeCode="$(var.UpgradeCode)"
-           Language="1033"
-           Version="$(var.VersionNumber)"
-           Manufacturer="$(var.Manufacturer)"
-           InstallerVersion="300"
-           Compressed="yes"
-           Scope="perMachine">
-
-    <SummaryInformation Keywords="Installer"
-              Description="$(var.SafeApplicationName) Installer"
-                        Codepage="1252" />
-
-    <MajorUpgrade AllowSameVersionUpgrades="yes"
-            DowngradeErrorMessage="A newer version of $(var.SafeApplicationName) is already installed. Uninstall it first (or run the bundle to replace the existing installation)."
-            Schedule="afterInstallInitialize" />
-
-    <Icon Id="Application_Icon.ico" SourceFile="$(var.ProjectDir)..\..\resources\App.ico" />
-
-    <Property Id="BUNDLE_ID_GUID" Value="DefaultValue"/>
-    <Property Id="FULL_VERSION_NUMBER" Value="$(var.VersionNumber)"/>
-    <Property Id="ARPPRODUCTICON" Value="Application_Icon.ico" />
-    <Property Id="ARPSYSTEMCOMPONENT" Value="1" />
-    <Property Id="DISPLAYNAME" Value="$(var.SafeApplicationName)" />
-
-    <?include ../../Overrides.wxi?>
-    <?include ../../Fonts.wxi?>
-
-    <Binary Id="MyCustomActionsDll" SourceFile="$(var.CustomActions.TargetDir)CustomActions.CA.dll" />
-
-    <CustomAction Id="CheckApplicationPath" Return="check" Execute="immediate" BinaryRef="MyCustomActionsDll" DllEntry="CheckAppPath" />
-    <CustomAction Id="DeleteRegistryVersionNumber" Return="check" Execute="immediate" BinaryRef="MyCustomActionsDll" DllEntry="DeleteVersionNumberFromRegistry" />
-    <Property Id="REGISTRYVERSIONKEY" Value="$(var.SafeApplicationName)\Version" />
-
-    <CustomAction Id="CloseApplications" Return="check" BinaryRef="MyCustomActionsDll" DllEntry="ClosePrompt" />
-    <Property Id="PromptToCloseProcesses" Value="$(var.SafeApplicationName)" />
-    <Property Id="PromptToCloseDisplayNames" Value="$(var.ApplicationName)" />
-
-    <Property Id="DATAFOLDER" Secure="yes">
-      <RegistrySearch Id="RegSearchDataFolder" Root="HKLM" Key="SOFTWARE\[REGISTRYKEY]" Name="[DATAFOLDERREGSZNAME]" Type="raw" />
-    </Property>
-
-    <CustomAction Id="SetDefDataFolder" Property="DEFDATAFOLDER" Value="[CommonAppDataFolder]SIL\$(var.SafeApplicationName)\Projects" />
-    <Property Id="DATAFOLDERFOUND" Value="unset" />
-    <CustomAction Id="VerifyDataPath" Return="check" Execute="immediate" BinaryRef="MyCustomActionsDll" DllEntry="VerifyDataDirPath" />
-
-    <SetProperty Id="REGISTRYKEY" Value="$(var.SafeApplicationName)\$(var.MajorVersion)" Before="AppSearch" Condition="not REGISTRYKEY" />
-    <SetProperty Id="APPFOLDERREGSZNAME" Value="Program_Files_Directory_$(var.SafeApplicationName)" Before="AppSearch" Condition="not APPFOLDERREGSZNAME" />
-    <SetProperty Id="DATAFOLDERREGSZNAME" Value="Settings_Directory" Before="AppSearch" Condition="not DATAFOLDERREGSZNAME" />
-    <SetProperty Id="HARVESTDATAFOLDERREGSZNAME" Value="Data_Directory" Before="AppSearch" Condition="not HARVESTDATAFOLDERREGSZNAME" />
-
-    <CustomAction Id="UseDefDataFolder" Property="DATAFOLDER" Value="[DEFDATAFOLDER]" />
-    <CustomAction Id="UseOvrDataFolder" Property="DATAFOLDER" Value="[OVRDATAFOLDER]" />
-    <CustomAction Id="UseRegDataFolder" Property="DATAFOLDER" Value="[REGDATAFOLDER]" />
-    <CustomAction Id="UseDefHarvestDataFolder" Property="HARVESTDATAFOLDER" Value="[DATAFOLDER]" />
-    <CustomAction Id="UseOvrHarvestDataFolder" Property="HARVESTDATAFOLDER" Value="[OVRHARVESTDATAFOLDER]" />
-
-    <CustomAction Id="CheckUpgradeValue" Property="ISUPGRADE" Value="True" />
-    <CustomAction Id="CheckPatchValue" Property="ISPATCH" Value="True" />
-
-    <InstallExecuteSequence>
-      <Custom Action="CloseApplications" Before="AppSearch" Condition="NOT (REMOVE=&quot;ALL&quot;)" />
-      <Custom Action="DeleteRegistryVersionNumber" Before="RemoveRegistryValues" Condition="(NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
-      <Custom Action="CheckPatchValue" Before="CheckUpgradeValue" Condition="PATCHNEWSUMMARYSUBJECT=&quot;Small Update Patch&quot;" />
-      <Custom Action="CheckUpgradeValue" After="InstallFinalize" Condition="WIX_UPGRADE_DETECTED" />
-      <?include ../Common/CustomActionSteps.wxi?>
-    </InstallExecuteSequence>
-
-    <InstallUISequence>
-      <Custom Action="SetDefDataFolder" After="FindRelatedProducts" />
-      <Custom Action="VerifyDataPath" After="SetDefDataFolder" />
-      <Custom Action="UseDefAppFolder" After="AppSearch" Condition="(NOT REGAPPFOLDER) and (NOT OVRAPPFOLDER)" />
-      <Custom Action="UseOvrAppFolder" After="AppSearch" Condition="(NOT REGAPPFOLDER) and (OVRAPPFOLDER)" />
-      <Custom Action="UseRegAppFolder" After="AppSearch" Condition="REGAPPFOLDER" />
-      <Custom Action="UseDefDataFolder" After="AppSearch" Condition="(NOT REGDATAFOLDER) and (NOT OVRDATAFOLDER)" />
-      <Custom Action="UseOvrDataFolder" After="AppSearch" Condition="(NOT REGDATAFOLDER) and (OVRDATAFOLDER)" />
-      <Custom Action="UseRegDataFolder" After="AppSearch" Condition="REGDATAFOLDER" />
-      <Custom Action="UseDefHarvestDataFolder" After="AppSearch" Condition="NOT OVRHARVESTDATAFOLDER" />
-      <Custom Action="UseOvrHarvestDataFolder" After="AppSearch" Condition="OVRHARVESTDATAFOLDER" />
-    </InstallUISequence>
-
-    <?if $(var.FastInstallerBuild) = 1 ?>
-    <MediaTemplate EmbedCab="yes" MaximumUncompressedMediaSize="2" />
-    <?else?>
-    <MediaTemplate EmbedCab="yes" />
-    <?endif?>
-    <Property Id="DiskPrompt" Value="$(var.ApplicationName) $(var.MajorVersion).$(var.MinorVersion) Installation [1]" />
-
-    <WixVariable Id="WixUIBannerBmp" Value="$(var.ProjectDir)Shared\resources\bannrbmp.bmp" />
-    <WixVariable Id="WixUIDialogBmp" Value="$(var.ProjectDir)Shared\resources\MsiBackground.bmp" />
-
-    <SetProperty Id="DEFAPPFOLDER" Value="[$(var.PFDir)]$(var.SafeApplicationName)$(var.MajorVersion)\" Before="AppSearch" Condition="not DEFAPPFOLDER" />
-    <CustomAction Id="UseDefAppFolder" Property="APPFOLDER" Value="[DEFAPPFOLDER]" />
-    <CustomAction Id="UseOvrAppFolder" Property="APPFOLDER" Value="[OVRAPPFOLDER]" />
-    <CustomAction Id="UseRegAppFolder" Property="APPFOLDER" Value="[REGAPPFOLDER]" />
-
-    <Property Id="REGAPPFOLDER">
-      <RegistrySearch Id="RegistryAppFolder" Root="HKLM" Key="SOFTWARE\[REGISTRYKEY]" Name="[APPFOLDERREGSZNAME]" Type="directory" />
-    </Property>
-    <Property Id="APPFOLDERFOUND" Value="NotFound">
-      <RegistrySearch Id="RegistryAppBool" Root="HKLM" Key="SOFTWARE\[REGISTRYKEY]" Name="[APPFOLDERREGSZNAME]" Type="raw" />
-    </Property>
-
-    <SetProperty Id="EXPLANATIONTEXT" After="AppSearch" Value="Since this is an upgrade of an existing $(var.ApplicationName) $(var.MajorVersion) installation, you can't change the location of the data folder." Condition="DATAFOLDERFOUND = &quot;AlreadyExisting&quot;" />
-
-    <Property Id="WIXUI_INSTALLDIR" Value="APPFOLDER" />
-    <Property Id="WIXUI_PROJECTSDIR" Value="DATAFOLDER" />
-
-    <UI>
-      <UIRef Id="WixUI_DialogFlow" />
-      <UIRef Id="WixUI_ErrorProgressText" />
-    </UI>
-
-    <StandardDirectory Id="TARGETDIR">
-      <Directory Id="DATAFOLDER" Name="[DATAFOLDER]">
-        <Component Id="RegKeySettingsDir" Permanent="yes" Guid="*">
-          <CreateFolder>
-            <util:PermissionEx User="AuthenticatedUser" GenericAll="yes" />
-          </CreateFolder>
-          <RegistryKey Root="HKLM" Key="SOFTWARE\[REGISTRYKEY]" ForceDeleteOnUninstall="yes">
-            <RegistryValue Name="[DATAFOLDERREGSZNAME]" Type="string" Value="[DATAFOLDER]" KeyPath="yes" />
-          </RegistryKey>
-        </Component>
-      </Directory>
-      <Directory Id="HARVESTDATAFOLDER" Name=".">
-        <Component Id="HarvestDataDir" Guid="*">
-          <CreateFolder>
-            <util:PermissionEx User="AuthenticatedUser" GenericAll="yes" />
-          </CreateFolder>
-          <RegistryKey Root="HKLM" Key="SOFTWARE\[REGISTRYKEY]" ForceDeleteOnUninstall="yes">
-            <RegistryValue Name="[HARVESTDATAFOLDERREGSZNAME]" Type="string" Value="[OVRHARVESTDATAFOLDER]" KeyPath="yes" />
-          </RegistryKey>
-        </Component>
-      </Directory>
-    </StandardDirectory>
-
-    <StandardDirectory Id="FontsFolder" />
-
-    <StandardDirectory Id="DesktopFolder">
-      <Component Id="ApplicationShortcutDesktop" Guid="*">
-        <Shortcut Id="ApplicationDesktopShortcut"
-                  Name="$(var.ApplicationName) $(var.MajorVersion)"
-                  Description="$(var.ApplicationName) $(var.MajorVersion)"
-                  Target="[APPFOLDER]$(var.SafeApplicationName).exe"
-                  WorkingDirectory="APPFOLDER"
-                  Icon="Application_Icon.ico" />
-        <RemoveFolder Id="DesktopFolder" On="uninstall" />
-        <RegistryValue Root="HKCU" Key="Software\$(var.SafeApplicationName)$(var.MajorVersion)" Name="installed" Type="integer" Value="1" KeyPath="yes" />
-      </Component>
-    </StandardDirectory>
-
-    <StandardDirectory Id="$(var.PFDir)">
-      <Directory Id="SILFolder" Name="SIL">
-        <Directory Id="APPFOLDER" Name="$(var.ApplicationName) $(var.MajorVersion)">
-          <Component Id="RegKeyValues" Guid="*">
-            <RegistryKey Root="HKLM" Key="SOFTWARE\[REGISTRYKEY]" ForceDeleteOnUninstall="yes">
-              <RegistryValue Name="[APPFOLDERREGSZNAME]" Type="string" Value="[APPFOLDER]" />
-              <RegistryValue Name="$(var.SafeApplicationName)Version" Type="string" Value="$(var.VersionNumber)" />
-            </RegistryKey>
-          </Component>
-          <Component Id="Vapor" Guid="3C4B8E68-6147-482F-B7ED-17C485024AEF" KeyPath="yes" />
-        </Directory>
-      </Directory>
-    </StandardDirectory>
-
-    <StandardDirectory Id="$(var.CFDir)">
-      <Directory Id="CompanyCommonFilesFolder" Name="$(var.SafeManufacturer)">
-        <Component Id="ProcRunner" Guid="*" Permanent="yes" NeverOverwrite="no">
-          <File Id="ProcRunnerFile" Name="ProcRunner_5.0.exe" Source="$(var.ProjectDir)Shared\ProcRunner\ProcRunner\bin\x64\$(var.Configuration)\net48\ProcRunner_5.0.exe" KeyPath="yes" />
-        </Component>
-      </Directory>
-    </StandardDirectory>
-
-    <StandardDirectory Id="ProgramMenuFolder">
-      <Component Id="ApplicationShortcutMenu" Guid="*">
-        <Shortcut Id="ApplicationStartMenuShortcut"
-                  Name="$(var.ApplicationName) $(var.MajorVersion)"
-                  Description="$(var.ApplicationName) $(var.MajorVersion)"
-                  Target="[APPFOLDER]$(var.SafeApplicationName).exe"
-                  WorkingDirectory="APPFOLDER"
-                  Icon="Application_Icon.ico" />
-        <Shortcut Id="UninstallProduct"
-                  Name="Uninstall $(var.ApplicationName)"
-                  Target="[SystemFolder]msiexec.exe"
-                  Arguments="/x [ProductCode]"
-                  Description="Uninstalls $(var.ApplicationName)" />
-        <RegistryValue Root="HKCU" Key="Software\Microsoft\$(var.SafeApplicationName)$(var.MajorVersion)" Name="installed" Type="integer" Value="1" KeyPath="yes" />
-      </Component>
-    </StandardDirectory>
-
-    <?include ../Common/CustomComponents.wxi?>
-
-    <Feature Id="Complete" Title="$(var.ApplicationName) $(var.MajorVersion).$(var.MinorVersion)" Description="The complete package."
-             Display="expand" Level="1" AllowAdvertise="no" InstallDefault="source">
-      <ComponentRef Id="Vapor" />
-      <ComponentGroupRef Id="HarvestedAppFiles" />
-      <ComponentGroupRef Id="HarvestedL10nFiles" />
-      <ComponentGroupRef Id="Fonts" />
-      <ComponentRef Id="RegKeyValues" />
-      <ComponentRef Id="RegKeySettingsDir" />
-      <ComponentRef Id="HarvestDataDir" />
-      <ComponentRef Id="ProcRunner" />
-      <ComponentRef Id="ApplicationShortcutDesktop" />
-      <ComponentRef Id="ApplicationShortcutMenu" />
-      <?include ../Common/CustomFeatures.wxi?>
-    </Feature>
+		   ProductCode="$(var.ProductCode)"
+		   UpgradeCode="$(var.UpgradeCode)"
+		   Language="1033"
+		   Version="$(var.VersionNumber)"
+		   Manufacturer="$(var.Manufacturer)"
+		   InstallerVersion="300"
+		   Compressed="yes"
+		   Scope="perMachine">
+
+	<SummaryInformation Keywords="Installer"
+			  Description="$(var.SafeApplicationName) Installer"
+						Codepage="1252" />
+
+	<MajorUpgrade AllowSameVersionUpgrades="yes"
+			DowngradeErrorMessage="A newer version of $(var.SafeApplicationName) is already installed. Uninstall it first (or run the bundle to replace the existing installation)."
+			Schedule="afterInstallInitialize" />
+
+	<Icon Id="Application_Icon.ico" SourceFile="$(var.ProjectDir)..\..\resources\App.ico" />
+
+	<Property Id="BUNDLE_ID_GUID" Value="DefaultValue"/>
+	<Property Id="FULL_VERSION_NUMBER" Value="$(var.VersionNumber)"/>
+	<Property Id="ARPPRODUCTICON" Value="Application_Icon.ico" />
+	<Property Id="ARPSYSTEMCOMPONENT" Value="1" />
+	<Property Id="DISPLAYNAME" Value="$(var.SafeApplicationName)" />
+
+	<?include ../../Overrides.wxi?>
+	<?include ../../Fonts.wxi?>
+
+	<Binary Id="MyCustomActionsDll" SourceFile="$(var.CustomActions.TargetDir)CustomActions.CA.dll" />
+
+	<CustomAction Id="CheckApplicationPath" Return="check" Execute="immediate" BinaryRef="MyCustomActionsDll" DllEntry="CheckAppPath" />
+	<CustomAction Id="DeleteRegistryVersionNumber" Return="check" Execute="immediate" BinaryRef="MyCustomActionsDll" DllEntry="DeleteVersionNumberFromRegistry" />
+	<Property Id="REGISTRYVERSIONKEY" Value="$(var.SafeApplicationName)\Version" />
+
+	<CustomAction Id="CloseApplications" Return="check" BinaryRef="MyCustomActionsDll" DllEntry="ClosePrompt" />
+	<Property Id="PromptToCloseProcesses" Value="$(var.SafeApplicationName)" />
+	<Property Id="PromptToCloseDisplayNames" Value="$(var.ApplicationName)" />
+
+	<Property Id="DATAFOLDER" Secure="yes">
+	  <RegistrySearch Id="RegSearchDataFolder" Root="HKLM" Key="SOFTWARE\[REGISTRYKEY]" Name="[DATAFOLDERREGSZNAME]" Type="raw" />
+	</Property>
+
+	<CustomAction Id="SetDefDataFolder" Property="DEFDATAFOLDER" Value="[CommonAppDataFolder]SIL\$(var.SafeApplicationName)\Projects" />
+	<Property Id="DATAFOLDERFOUND" Value="unset" />
+	<CustomAction Id="VerifyDataPath" Return="check" Execute="immediate" BinaryRef="MyCustomActionsDll" DllEntry="VerifyDataDirPath" />
+
+	<SetProperty Id="REGISTRYKEY" Value="$(var.SafeApplicationName)\$(var.MajorVersion)" Before="AppSearch" Condition="not REGISTRYKEY" />
+	<SetProperty Id="APPFOLDERREGSZNAME" Value="Program_Files_Directory_$(var.SafeApplicationName)" Before="AppSearch" Condition="not APPFOLDERREGSZNAME" />
+	<SetProperty Id="DATAFOLDERREGSZNAME" Value="Settings_Directory" Before="AppSearch" Condition="not DATAFOLDERREGSZNAME" />
+	<SetProperty Id="HARVESTDATAFOLDERREGSZNAME" Value="Data_Directory" Before="AppSearch" Condition="not HARVESTDATAFOLDERREGSZNAME" />
+
+	<CustomAction Id="UseDefDataFolder" Property="DATAFOLDER" Value="[DEFDATAFOLDER]" />
+	<CustomAction Id="UseOvrDataFolder" Property="DATAFOLDER" Value="[OVRDATAFOLDER]" />
+	<CustomAction Id="UseRegDataFolder" Property="DATAFOLDER" Value="[REGDATAFOLDER]" />
+	<CustomAction Id="UseDefHarvestDataFolder" Property="HARVESTDATAFOLDER" Value="[DATAFOLDER]" />
+	<CustomAction Id="UseOvrHarvestDataFolder" Property="HARVESTDATAFOLDER" Value="[OVRHARVESTDATAFOLDER]" />
+
+	<CustomAction Id="CheckUpgradeValue" Property="ISUPGRADE" Value="True" />
+	<CustomAction Id="CheckPatchValue" Property="ISPATCH" Value="True" />
+
+	<InstallExecuteSequence>
+	  <Custom Action="CloseApplications" Before="AppSearch" Condition="NOT (REMOVE=&quot;ALL&quot;)" />
+	  <Custom Action="DeleteRegistryVersionNumber" Before="RemoveRegistryValues" Condition="(NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
+	  <Custom Action="CheckPatchValue" Before="CheckUpgradeValue" Condition="PATCHNEWSUMMARYSUBJECT=&quot;Small Update Patch&quot;" />
+	  <Custom Action="CheckUpgradeValue" After="InstallFinalize" Condition="WIX_UPGRADE_DETECTED" />
+	  <?include ../Common/CustomActionSteps.wxi?>
+	</InstallExecuteSequence>
+
+	<InstallUISequence>
+	  <Custom Action="SetDefDataFolder" After="FindRelatedProducts" />
+	  <Custom Action="VerifyDataPath" After="SetDefDataFolder" />
+	  <Custom Action="UseDefAppFolder" After="AppSearch" Condition="(NOT REGAPPFOLDER) and (NOT OVRAPPFOLDER)" />
+	  <Custom Action="UseOvrAppFolder" After="AppSearch" Condition="(NOT REGAPPFOLDER) and (OVRAPPFOLDER)" />
+	  <Custom Action="UseRegAppFolder" After="AppSearch" Condition="REGAPPFOLDER" />
+	  <Custom Action="UseDefDataFolder" After="AppSearch" Condition="(NOT REGDATAFOLDER) and (NOT OVRDATAFOLDER)" />
+	  <Custom Action="UseOvrDataFolder" After="AppSearch" Condition="(NOT REGDATAFOLDER) and (OVRDATAFOLDER)" />
+	  <Custom Action="UseRegDataFolder" After="AppSearch" Condition="REGDATAFOLDER" />
+	  <Custom Action="UseDefHarvestDataFolder" After="AppSearch" Condition="NOT OVRHARVESTDATAFOLDER" />
+	  <Custom Action="UseOvrHarvestDataFolder" After="AppSearch" Condition="OVRHARVESTDATAFOLDER" />
+	</InstallUISequence>
+
+	<?if $(var.FastInstallerBuild) = 1 ?>
+	<MediaTemplate EmbedCab="yes" MaximumUncompressedMediaSize="2" />
+	<?else?>
+	<MediaTemplate EmbedCab="yes" />
+	<?endif?>
+	<Property Id="DiskPrompt" Value="$(var.ApplicationName) $(var.MajorVersion).$(var.MinorVersion) Installation [1]" />
+
+	<WixVariable Id="WixUIBannerBmp" Value="$(var.ProjectDir)Shared\resources\bannrbmp.bmp" />
+	<WixVariable Id="WixUIDialogBmp" Value="$(var.ProjectDir)Shared\resources\MsiBackground.bmp" />
+
+	<SetProperty Id="DEFAPPFOLDER" Value="[$(var.PFDir)]$(var.SafeApplicationName)$(var.MajorVersion)\" Before="AppSearch" Condition="not DEFAPPFOLDER" />
+	<CustomAction Id="UseDefAppFolder" Property="APPFOLDER" Value="[DEFAPPFOLDER]" />
+	<CustomAction Id="UseOvrAppFolder" Property="APPFOLDER" Value="[OVRAPPFOLDER]" />
+	<CustomAction Id="UseRegAppFolder" Property="APPFOLDER" Value="[REGAPPFOLDER]" />
+
+	<Property Id="REGAPPFOLDER">
+	  <RegistrySearch Id="RegistryAppFolder" Root="HKLM" Key="SOFTWARE\[REGISTRYKEY]" Name="[APPFOLDERREGSZNAME]" Type="directory" />
+	</Property>
+	<Property Id="APPFOLDERFOUND" Value="NotFound">
+	  <RegistrySearch Id="RegistryAppBool" Root="HKLM" Key="SOFTWARE\[REGISTRYKEY]" Name="[APPFOLDERREGSZNAME]" Type="raw" />
+	</Property>
+
+	<SetProperty Id="EXPLANATIONTEXT" After="AppSearch" Value="Since this is an upgrade of an existing $(var.ApplicationName) $(var.MajorVersion) installation, you can't change the location of the data folder." Condition="DATAFOLDERFOUND = &quot;AlreadyExisting&quot;" />
+
+	<Property Id="WIXUI_INSTALLDIR" Value="APPFOLDER" />
+	<Property Id="WIXUI_PROJECTSDIR" Value="DATAFOLDER" />
+
+	<UI>
+	  <UIRef Id="WixUI_DialogFlow" />
+	  <UIRef Id="WixUI_ErrorProgressText" />
+	</UI>
+
+	<StandardDirectory Id="TARGETDIR">
+	  <Directory Id="DATAFOLDER" Name="[DATAFOLDER]">
+		<Component Id="RegKeySettingsDir" Permanent="yes" Guid="*">
+		  <CreateFolder>
+			<util:PermissionEx User="AuthenticatedUser" GenericAll="yes" />
+		  </CreateFolder>
+		  <RegistryKey Root="HKLM" Key="SOFTWARE\[REGISTRYKEY]" ForceDeleteOnUninstall="yes">
+			<RegistryValue Name="[DATAFOLDERREGSZNAME]" Type="string" Value="[DATAFOLDER]" KeyPath="yes" />
+		  </RegistryKey>
+		</Component>
+	  </Directory>
+	  <Directory Id="HARVESTDATAFOLDER" Name=".">
+		<Component Id="HarvestDataDir" Guid="*">
+		  <CreateFolder>
+			<util:PermissionEx User="AuthenticatedUser" GenericAll="yes" />
+		  </CreateFolder>
+		  <RegistryKey Root="HKLM" Key="SOFTWARE\[REGISTRYKEY]" ForceDeleteOnUninstall="yes">
+			<RegistryValue Name="[HARVESTDATAFOLDERREGSZNAME]" Type="string" Value="[OVRHARVESTDATAFOLDER]" KeyPath="yes" />
+		  </RegistryKey>
+		</Component>
+	  </Directory>
+	</StandardDirectory>
+
+	<StandardDirectory Id="FontsFolder" />
+
+	<StandardDirectory Id="DesktopFolder">
+	  <Component Id="ApplicationShortcutDesktop" Guid="*">
+		<Shortcut Id="ApplicationDesktopShortcut"
+				  Name="$(var.ApplicationName) $(var.MajorVersion)"
+				  Description="$(var.ApplicationName) $(var.MajorVersion)"
+				  Target="[APPFOLDER]$(var.SafeApplicationName).exe"
+				  WorkingDirectory="APPFOLDER"
+				  Icon="Application_Icon.ico" />
+		<RemoveFolder Id="DesktopFolder" On="uninstall" />
+		<RegistryValue Root="HKCU" Key="Software\$(var.SafeApplicationName)$(var.MajorVersion)" Name="installed" Type="integer" Value="1" KeyPath="yes" />
+	  </Component>
+	</StandardDirectory>
+
+	<StandardDirectory Id="$(var.PFDir)">
+	  <Directory Id="SILFolder" Name="SIL">
+		<Directory Id="APPFOLDER" Name="$(var.ApplicationName) $(var.MajorVersion)">
+		  <Component Id="RegKeyValues" Guid="*">
+			<RegistryKey Root="HKLM" Key="SOFTWARE\[REGISTRYKEY]" ForceDeleteOnUninstall="yes">
+			  <RegistryValue Name="[APPFOLDERREGSZNAME]" Type="string" Value="[APPFOLDER]" />
+			  <RegistryValue Name="$(var.SafeApplicationName)Version" Type="string" Value="$(var.VersionNumber)" />
+			</RegistryKey>
+		  </Component>
+		  <Component Id="Vapor" Guid="3C4B8E68-6147-482F-B7ED-17C485024AEF" KeyPath="yes" />
+		</Directory>
+	  </Directory>
+	</StandardDirectory>
+
+	<StandardDirectory Id="$(var.CFDir)">
+	  <Directory Id="CompanyCommonFilesFolder" Name="$(var.SafeManufacturer)">
+		<Component Id="ProcRunner" Guid="*" Permanent="yes" NeverOverwrite="no">
+		  <File Id="ProcRunnerFile" Name="ProcRunner_5.0.exe" Source="$(var.ProjectDir)Shared\ProcRunner\ProcRunner\bin\x64\$(var.Configuration)\net48\ProcRunner_5.0.exe" KeyPath="yes" />
+		</Component>
+	  </Directory>
+	</StandardDirectory>
+
+	<StandardDirectory Id="ProgramMenuFolder">
+	  <Component Id="ApplicationShortcutMenu" Guid="*">
+		<Shortcut Id="ApplicationStartMenuShortcut"
+				  Name="$(var.ApplicationName) $(var.MajorVersion)"
+				  Description="$(var.ApplicationName) $(var.MajorVersion)"
+				  Target="[APPFOLDER]$(var.SafeApplicationName).exe"
+				  WorkingDirectory="APPFOLDER"
+				  Icon="Application_Icon.ico" />
+		<Shortcut Id="UninstallProduct"
+				  Name="Uninstall $(var.ApplicationName)"
+				  Target="[SystemFolder]msiexec.exe"
+				  Arguments="/x [ProductCode]"
+				  Description="Uninstalls $(var.ApplicationName)" />
+		<RegistryValue Root="HKCU" Key="Software\Microsoft\$(var.SafeApplicationName)$(var.MajorVersion)" Name="installed" Type="integer" Value="1" KeyPath="yes" />
+	  </Component>
+	</StandardDirectory>
+
+	<?include ../Common/CustomComponents.wxi?>
+
+	<Feature Id="Complete" Title="$(var.ApplicationName) $(var.MajorVersion).$(var.MinorVersion)" Description="The complete package."
+			 Display="expand" Level="1" AllowAdvertise="no" InstallDefault="source">
+	  <ComponentRef Id="Vapor" />
+	  <?ifdef MASTERBUILDDIR?>
+	  <ComponentRef Id="NewtonsoftJsonApp" />
+	  <ComponentRef Id="NewtonsoftJsonGac" />
+	  <?endif?>
+	  <ComponentGroupRef Id="HarvestedAppFiles" />
+	  <ComponentGroupRef Id="HarvestedL10nFiles" />
+	  <ComponentGroupRef Id="Fonts" />
+	  <ComponentRef Id="RegKeyValues" />
+	  <ComponentRef Id="RegKeySettingsDir" />
+	  <ComponentRef Id="HarvestDataDir" />
+	  <ComponentRef Id="ProcRunner" />
+	  <ComponentRef Id="ApplicationShortcutDesktop" />
+	  <ComponentRef Id="ApplicationShortcutMenu" />
+	  <?include ../Common/CustomFeatures.wxi?>
+	</Feature>
   </Package>
 </Wix>
diff --git a/FLExInstaller/wix6/Shared/Base/KeyPathFix.xsl b/FLExInstaller/wix6/Shared/Base/KeyPathFix.xsl
index f2b577a02c..7e646c9bc2 100644
--- a/FLExInstaller/wix6/Shared/Base/KeyPathFix.xsl
+++ b/FLExInstaller/wix6/Shared/Base/KeyPathFix.xsl
@@ -1,7 +1,7 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:my="http://schema.infor.com/InforOAGIS/2">
 	<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" />
 
-	<xsl:template match="@*|node()">
+	<xsl:template match="@*|node()" priority="-1">
 		<xsl:copy>
 			<xsl:apply-templates select="@*|node()"/>
 		</xsl:copy>
@@ -15,4 +15,80 @@
 			<xsl:value-of select="'no'"/>
 		</xsl:attribute>
 	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+
+	<xsl:template name="HeatHarvestBaseFileName">
+		<xsl:param name="path"/>
+		<xsl:choose>
+			<xsl:when test="contains($path, '\')">
+				<xsl:call-template name="HeatHarvestBaseFileName">
+					<xsl:with-param name="path" select="substring-after($path, '\')"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="$path"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<!--
+		Remove single-File Heat components whose file basename is listed in heat-exclude.xml (same directory
+		as this XSL). FieldWorks uses this for Newtonsoft.Json.dll + authored NewtonsoftJsonApp / NewtonsoftJsonGac
+		in Shared/Common/CustomComponents.wxi.
+		Also drop ComponentRef rows that point at removed components (Heat -gg leaves refs in HarvestedAppFiles).
+	-->
+	<xsl:template match="*[local-name()='ComponentRef']" priority="2">
+		<xsl:variable name="rid" select="@Id"/>
+		<xsl:variable name="comp" select="//*[local-name()='Component'][@Id = $rid]"/>
+		<xsl:choose>
+			<xsl:when test="count($comp) = 0"/>
+			<xsl:when test="count($comp/*[local-name()='File']) = 1">
+				<xsl:variable name="src" select="string($comp/*[local-name()='File']/@Source)"/>
+				<xsl:variable name="base">
+					<xsl:call-template name="HeatHarvestBaseFileName">
+						<xsl:with-param name="path" select="translate($src, '/', '\')"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:variable name="isExcluded">
+					<xsl:for-each select="document('heat-exclude.xml')">
+						<xsl:value-of select="count(/*[local-name()='HeatHarvestExcludes']/*[local-name()='Exclude'][@Name and translate(@Name, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz') = translate($base, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')])"/>
+					</xsl:for-each>
+				</xsl:variable>
+				<xsl:choose>
+					<xsl:when test="$isExcluded &gt; 0"/>
+					<xsl:otherwise>
+						<xsl:copy>
+							<xsl:apply-templates select="@*|node()"/>
+						</xsl:copy>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:copy>
+					<xsl:apply-templates select="@*|node()"/>
+				</xsl:copy>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template match="*[local-name()='Component'][count(*[local-name()='File'])=1]" priority="1">
+		<xsl:variable name="src" select="string(*[local-name()='File']/@Source)"/>
+		<xsl:variable name="base">
+			<xsl:call-template name="HeatHarvestBaseFileName">
+				<xsl:with-param name="path" select="translate($src, '/', '\')"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="isExcluded">
+			<xsl:for-each select="document('heat-exclude.xml')">
+				<xsl:value-of select="count(/*[local-name()='HeatHarvestExcludes']/*[local-name()='Exclude'][@Name and translate(@Name, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz') = translate($base, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')])"/>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$isExcluded &gt; 0"/>
+			<xsl:otherwise>
+				<xsl:copy>
+					<xsl:apply-templates select="@*|node()"/>
+				</xsl:copy>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/FLExInstaller/wix6/Shared/Base/heat-exclude.xml b/FLExInstaller/wix6/Shared/Base/heat-exclude.xml
new file mode 100644
index 0000000000..7629b0dd49
--- /dev/null
+++ b/FLExInstaller/wix6/Shared/Base/heat-exclude.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Heat directory harvest: basenames listed here drop single-File Heat components (-gg) so authored WiX
+  can own those files. Loaded by KeyPathFix.xsl via document('heat-exclude.xml') (same folder as the XSL).
+  Optional entries: add more <Exclude Name="SomeAssembly.dll" /> lines as needed.
+-->
+<HeatHarvestExcludes xmlns="http://fieldworks.sil.org/heat-harvest-excludes/1">
+	<Exclude Name="Newtonsoft.Json.dll" />
+</HeatHarvestExcludes>
diff --git a/FLExInstaller/wix6/Shared/Common/CustomComponents.wxi b/FLExInstaller/wix6/Shared/Common/CustomComponents.wxi
index 2be9cd20db..46c5736c40 100644
--- a/FLExInstaller/wix6/Shared/Common/CustomComponents.wxi
+++ b/FLExInstaller/wix6/Shared/Common/CustomComponents.wxi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Include>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 	<!--<DirectoryRef Id='FontsFolder'>
 	  <Component Id='Font1' Guid='*' Permanent='yes'>
 		<Condition>DOULOS_INSTALLED="False"</Condition>
@@ -58,4 +58,25 @@
 		<File Id='SILEzraOTSR' Source='..\resources\SILEOTSR.ttf' TrueType='yes'/>
 	  </Component>
 	</DirectoryRef>-->
+<?ifdef MASTERBUILDDIR?>
+	<!--
+	Newtonsoft.Json.dll: WiX 3 heat-exclude + KeyPathFix; WiX 6 wix6/Shared/Base/heat-exclude.xml + KeyPathFix.
+	NewtonsoftJsonApp: private copy. NewtonsoftJsonGac: GAC (Assembly=.net). Patch both components when the DLL changes.
+	-->
+	<DirectoryRef Id="APPFOLDER">
+		<Component Id="NewtonsoftJsonApp" Guid="{B8A47C61-2E90-4D1A-9F4E-7C3B5A682D01}">
+			<File Id="NewtonsoftJsonFileApp"
+				Name="Newtonsoft.Json.dll"
+				Source="$(var.MASTERBUILDDIR)\Newtonsoft.Json.dll"
+				KeyPath="yes" />
+		</Component>
+		<Component Id="NewtonsoftJsonGac" Guid="*">
+			<File Id="NewtonsoftJsonFileGac"
+				Name="Newtonsoft.Json.dll"
+				Source="$(var.MASTERBUILDDIR)\Newtonsoft.Json.dll"
+				KeyPath="yes"
+				Assembly=".net" />
+		</Component>
+	</DirectoryRef>
+<?endif?>
 </Include>
\ No newline at end of file