Align WiX3 patchable installer inputs with modernization

* Update WiX 3 bundles and framework sources for build-arch handling in BaseInstallerBuild.
* Adjust build scripts to pass BuildArch and resolve WiX tool discovery in setVars.
* Refresh common WiX includes (custom components/features/overrides/redistributables/fonts).
* Refresh installer resources (icons/license) to match current assets.

fix: Improve installer custom actions and add manifest files

Fix null reference errors in VerifyDataPath custom action and add
missing manifest files to installer packaging.

- Add null checks for REGISTRYDATAKEY/REGISTRYDATAVALUENAME properties
- Add null-safe registry value access to prevent NullReferenceException
- Move CloseApplications to InstallUISequence (UI-only, immediate mode)
- Add FieldWorks.exe.manifest, FwKernel.X.manifest, Views.X.manifest
- Set LaunchUnicodeCharEditor Return="check" to catch manifest errors
- Suppress light.exe ICE warnings 1055/1056 for cleaner builds

It's FieldWorks.exe, not Flex.exe.

Fix name

Author: johnml1135

BaseInstallerBuild/Bundle.wxs

@@ -22,7 +22,7 @@
 		<WixVariable Id="WixStdbaThemeXml" Value="BundleTheme.xml" />
 		<WixVariable Id="WixStdbaThemeWxl" Value="BundleTheme.wxl" />
 		<Chain>
-			<PackageGroupRef Id="NetFx48Web" />
+			<PackageGroupRef Id="FwNetFx48Web" />
 			<PackageGroupRef Id="vcredists" />
 			<RollbackBoundary />
 			<PackageGroupRef Id='AppPackageGroup'/>
@@ -53,8 +53,8 @@
 		<WixVariable Id="NetFx48WebInstallCondition" Value="" Overridable="yes" />
 		<WixVariable Id="NetFx48WebPackageDirectory" Value="redist\" Overridable="yes" />
 
-		<PackageGroup Id="NetFx48Web">
-		  <ExePackage Id="NetFx48Web"
+		<PackageGroup Id="FwNetFx48Web">
+		  <ExePackage Id="FwNetFx48Web"
 			  InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
 			  RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
 			  UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
@@ -78,7 +78,7 @@
 		</PackageGroup>
 	</Fragment>
 
-	<?if $(sys.BUILDARCH)="x86"?>
+	<?if $(var.BuildArch)="x86"?>
 	<!-- 32bit VC++ redistributable download section -->
 	<!-- When updating or adding a redistributable you can generate the RemotePayload with the WIX's heat tool -->
 	<!-- e.g. "%WIX%\bin\heat" payload C:\fwroot\fw\PatchableInstaller\libs\vcredist_2008_x64.exe -o c:\Repositories\fw\PatchableInstaller\VC2008Frag.wxs -->
@@ -200,7 +200,7 @@
 			</ExePackage>
 		</PackageGroup>
 	</Fragment>
-	<?elseif $(sys.BUILDARCH)="x64"?>
+	<?elseif $(var.BuildArch)="x64"?>
 	<!-- 64bit  VC++ redistributable download section -->
 	<!-- When updating or adding a redistributable you can generate the RemotePayload with the WIX's heat tool -->
 	<!-- e.g. "%WIX%\bin\heat" payload C:\fwroot\fw\PatchableInstaller\libs\vcredist_2008_x64.exe -o c:\Repositories\fw\PatchableInstaller\VC2008Frag.wxs -->
@@ -334,7 +334,7 @@
 					DownloadUrl="$(var.VC15to19RedistWebLink)"
 					InstallCommand="/quiet /norestart"
 					DetectCondition="!(wix.CPP14DetectCondition)">
-				<RemotePayload 
+				<RemotePayload
 					Size="25169400"
 					Version="14.29.30040.0"
 					ProductName="Microsoft Visual C++ 2015-2019 Redistributable (x64) - 14.28.29914"
@@ -345,7 +345,7 @@
 		</PackageGroup>
 	</Fragment>
 	<?else?>
-		<?error Unsupported value of sys.BUILDARCH=$(sys.BUILDARCH)?>
+		<?error Unsupported value of BuildArch=$(var.BuildArch)?>
 	<?endif?>
 	<?include ../Common/Redistributables.wxi?>
 </Wix>

BaseInstallerBuild/Framework.wxs

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<?if $(sys.BUILDARCH) = x64?>
+<?if $(var.BuildArch) = x64?>
 <?define PFDir = ProgramFiles64Folder?>
 <?define CFDir = CommonFiles64Folder?>
 <?else?>
@@ -68,6 +68,8 @@
 
 	<CustomAction Id="CloseApplications"
 		Return="check"
+		Execute="immediate"
+		Impersonate="yes"
 		BinaryKey="MyCustomActionsDll"
 		DllEntry="ClosePrompt"  />
 	<!-- The following two properties can be comma separted lists, but they must have the same number of items. -->
@@ -101,6 +103,8 @@
 	<SetProperty Id='APPFOLDERREGSZNAME' Value='Program_Files_Directory_$(var.SafeApplicationName)'  Before="AppSearch">not APPFOLDERREGSZNAME</SetProperty>
 	<SetProperty Id='DATAFOLDERREGSZNAME' Value='Settings_Directory'  Before="AppSearch">not DATAFOLDERREGSZNAME</SetProperty>
 	<SetProperty Id='HARVESTDATAFOLDERREGSZNAME' Value='Data_Directory'  Before="AppSearch">not HARVESTDATAFOLDERREGSZNAME</SetProperty>
+	<SetProperty Id='REGISTRYDATAKEY' Value='[REGISTRYKEY]' Before="AppSearch">not REGISTRYDATAKEY</SetProperty>
+	<SetProperty Id='REGISTRYDATAVALUENAME' Value='[DATAFOLDERREGSZNAME]' Before="AppSearch">not REGISTRYDATAVALUENAME</SetProperty>
 	<CustomAction Id='UseDefDataFolder' Property='DATAFOLDER' Value='[DEFDATAFOLDER]' />
 	<CustomAction Id='UseOvrDataFolder' Property='DATAFOLDER' Value='[OVRDATAFOLDER]' /> <!-- from Overrides.wxi -->
 	<CustomAction Id='UseRegDataFolder' Property='DATAFOLDER' Value='[REGDATAFOLDER]' />
@@ -115,7 +119,6 @@
 	<CustomAction Id='CheckPatchValue' Property='ISPATCH' Value='True' />
 
 	<InstallExecuteSequence>
-		<Custom Action="CloseApplications" Before="AppSearch"></Custom>
 		<!--<Custom Action="SetFontValues" After="AppSearch"></Custom>-->
 		<Custom Action="DeleteRegistryVersionNumber" Before="RemoveRegistryValues">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
 		<RemoveExistingProducts Before="InstallInitialize" />
@@ -127,8 +130,9 @@
 	</InstallExecuteSequence>
 
 	<InstallUISequence>
+		<Custom Action="CloseApplications" Before="AppSearch">UILevel &gt;= 3</Custom>
 		<Custom Action="SetDefDataFolder" After="FindRelatedProducts"></Custom>
-		<Custom Action="VerifyDataPath" After="SetDefDataFolder"></Custom>
+		<Custom Action="VerifyDataPath" After="AppSearch"></Custom>
 		<Custom Action="UseDefAppFolder" After="AppSearch">(NOT REGAPPFOLDER) and (NOT OVRAPPFOLDER)</Custom>
 		<Custom Action="UseOvrAppFolder" After="AppSearch">(NOT REGAPPFOLDER) and (OVRAPPFOLDER)</Custom>
 		<Custom Action="UseRegAppFolder" After="AppSearch">REGAPPFOLDER</Custom>

BaseInstallerBuild/OfflineBundle.wxs

@@ -22,7 +22,7 @@
 		<WixVariable Id="WixStdbaThemeXml" Value="BundleTheme.xml" />
 		<WixVariable Id="WixStdbaThemeWxl" Value="BundleTheme.wxl" />
 		<Chain>
-			<PackageGroupRef Id="NetFx48Redist" />
+			<PackageGroupRef Id="FwNetFx48Redist" />
 			<PackageGroupRef Id="vcredists" />
 			<RollbackBoundary />
 			<PackageGroupRef Id='AppPackageGroup'/>
@@ -50,8 +50,8 @@
 		  Value="(Netfx4FullRelease &gt;= $(var.NetFx48MinRelease)) AND (NOT VersionNT64 OR (Netfx4x64FullRelease &gt;= $(var.NetFx48MinRelease)))" />
 		<WixVariable Id="NetFx48RedistInstallCondition" Value="" Overridable="yes" />
 
-		<PackageGroup Id="NetFx48Redist">
-		  <ExePackage Id="NetFx48Redist"
+		<PackageGroup Id="FwNetFx48Redist">
+		  <ExePackage Id="FwNetFx48Redist"
 			  InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
 			  RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
 			  UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
@@ -72,7 +72,7 @@
 		  </ExePackage>
 		</PackageGroup>
 	</Fragment>
-	<?if $(sys.BUILDARCH)="x86"?>
+	<?if $(var.BuildArch)="x86"?>
 	<Fragment>
 	<Property Id="CRVSINSTALLED">
 	</Property>
@@ -160,7 +160,7 @@
 			</ExePackage>
 		</PackageGroup>
 	</Fragment>
-	<?elseif $(sys.BUILDARCH)="x64"?>
+	<?elseif $(var.BuildArch)="x64"?>
 	<!-- Some 64-bit runtimes register themselves in the 32-bit space.
 		Check for Runtimes\X64 or similar under each space; if either exists, the 64-bit redistributable is installed. -->
 	<Fragment>
@@ -278,7 +278,7 @@
 		</PackageGroup>
 	</Fragment>
 	<?else?>
-		<?error Unsupported value of sys.BUILDARCH=$(sys.BUILDARCH)?>
+		<?error Unsupported value of BuildArch=$(var.BuildArch)?>
 	<?endif?>
 	<?include ../Common/Redistributables.wxi?>
 </Wix>

BaseInstallerBuild/buildExe.bat

@@ -3,12 +3,12 @@ call setVars.bat %*
 
 REM build the ONLINE EXE bundle.
 (
-	candle.exe -v -arch %Arch% -dApplicationName=%AppName% -dSafeApplicationName=%SafeAppName% -dYear=%CopyrightYear% -dManufacturer=%Manufacturer% -dSafeManufacturer=%SafeManufacturer% -dVersionNumber=%Version% -dUpgradeCode=%UPGRADECODEGUID% -dTruncatedVersion=%TRUNCATEDVERSION% -ext WixFirewallExtension -ext WixUtilExtension -ext WixBalExtension -ext WixUIExtension -ext WixNetFxExtension -ext WixDependencyExtension Bundle.wxs
+	candle.exe -v -arch %Arch% -dBuildArch=%Arch% -dApplicationName=%AppName% -dSafeApplicationName=%SafeAppName% -dYear=%CopyrightYear% -dManufacturer=%Manufacturer% -dSafeManufacturer=%SafeManufacturer% -dVersionNumber=%Version% -dUpgradeCode=%UPGRADECODEGUID% -dTruncatedVersion=%TRUNCATEDVERSION% -ext WixFirewallExtension -ext WixUtilExtension -ext WixBalExtension -ext WixUIExtension -ext WixNetFxExtension -ext WixDependencyExtension Bundle.wxs
 ) && (
 	light.exe -v Bundle.wixobj -ext WixFirewallExtension -ext WixUIExtension -ext WixBalExtension -ext WixUtilExtension -ext WixNetFxExtension -ext WixDependencyExtension %SuppressICE% -out %SafeAppName%_%Version%_Online.exe
 ) && (
 	@REM build the OFFLINE EXE bundle.
-	candle.exe -v -arch %Arch% -dApplicationName=%AppName% -dSafeApplicationName=%SafeAppName% -dYear=%CopyrightYear% -dManufacturer=%Manufacturer% -dSafeManufacturer=%SafeManufacturer% -dVersionNumber=%Version% -dUpgradeCode=%UPGRADECODEGUID% -dTruncatedVersion=%TRUNCATEDVERSION% -ext WixFirewallExtension -ext WixUtilExtension -ext WixBalExtension -ext WixUIExtension -ext WixNetFxExtension -ext WixDependencyExtension OfflineBundle.wxs
+	candle.exe -v -arch %Arch% -dBuildArch=%Arch% -dApplicationName=%AppName% -dSafeApplicationName=%SafeAppName% -dYear=%CopyrightYear% -dManufacturer=%Manufacturer% -dSafeManufacturer=%SafeManufacturer% -dVersionNumber=%Version% -dUpgradeCode=%UPGRADECODEGUID% -dTruncatedVersion=%TRUNCATEDVERSION% -ext WixFirewallExtension -ext WixUtilExtension -ext WixBalExtension -ext WixUIExtension -ext WixNetFxExtension -ext WixDependencyExtension OfflineBundle.wxs
 ) && (
 	light.exe -v OfflineBundle.wixobj -ext WixFirewallExtension -ext WixUIExtension -ext WixBalExtension -ext WixUtilExtension -ext WixNetFxExtension -ext WixDependencyExtension %SuppressICE% -out %SafeAppName%_%Version%_Offline.exe
 ) && (

BaseInstallerBuild/buildMsi.bat

@@ -13,9 +13,9 @@ call setVars.bat %*
 	heat.exe dir %MASTERDATADIR% -cg HarvestedDataFiles -gg -scom -sreg -sfrag -srd -sw5150 -sw5151 -dr HARVESTDATAFOLDER -var var.MASTERDATADIR -t KeyPathFix.xsl -out DataHarvest.wxs
 ) && (
 	@REM Compile (candle) and Link (light) the MSI file.
-	candle.exe -arch %Arch% -dApplicationName=%AppName% -dSafeApplicationName=%SafeAppName% -dManufacturer=%Manufacturer% -dSafeManufacturer=%SafeManufacturer% -dVersionNumber=%Version% -dMajorVersion=%Major% -dMinorVersion=%Minor% -dMASTERBUILDDIR=%MASTERBUILDDIR% -dMASTERDATADIR=%MASTERDATADIR% -dUpgradeCode=%UPGRADECODEGUID% -dProductCode=%PRODUCTIDGUID% Framework.wxs AppHarvest.wxs DataHarvest.wxs WixUI_DialogFlow.wxs GIInstallDirDlg.wxs GIProgressDlg.wxs GIWelcomeDlg.wxs GICustomizeDlg.wxs GISetupTypeDlg.wxs -ext WixFirewallExtension -ext WixUtilExtension
+	candle.exe -arch %Arch% -dBuildArch=%Arch% -dApplicationName=%AppName% -dSafeApplicationName=%SafeAppName% -dManufacturer=%Manufacturer% -dSafeManufacturer=%SafeManufacturer% -dVersionNumber=%Version% -dMajorVersion=%Major% -dMinorVersion=%Minor% -dMASTERBUILDDIR=%MASTERBUILDDIR% -dMASTERDATADIR=%MASTERDATADIR% -dUpgradeCode=%UPGRADECODEGUID% -dProductCode=%PRODUCTIDGUID% Framework.wxs AppHarvest.wxs DataHarvest.wxs WixUI_DialogFlow.wxs GIInstallDirDlg.wxs GIProgressDlg.wxs GIWelcomeDlg.wxs GICustomizeDlg.wxs GISetupTypeDlg.wxs -ext WixFirewallExtension -ext WixUtilExtension
 ) && (
-	light.exe Framework.wixobj AppHarvest.wixobj DataHarvest.wixobj WixUI_DialogFlow.wixobj GIInstallDirDlg.wixobj GIProgressDlg.wixobj GIWelcomeDlg.wixobj GICustomizeDlg.wixobj GISetupTypeDlg.wixobj -ext WixFirewallExtension -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc WixUI_en-us.wxl %SuppressICE% -sw1076 -out %SafeAppName%_%Version%.msi
+	light.exe Framework.wixobj AppHarvest.wixobj DataHarvest.wixobj WixUI_DialogFlow.wixobj GIInstallDirDlg.wixobj GIProgressDlg.wixobj GIWelcomeDlg.wixobj GICustomizeDlg.wixobj GISetupTypeDlg.wixobj -ext WixFirewallExtension -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc WixUI_en-us.wxl %SuppressICE% -sw1076 -sw1055 -sw1056 -out %SafeAppName%_%Version%.msi
 ) && (
 	call signingProxy %CD%\%SafeAppName%_%Version%.msi
 )

BaseInstallerBuild/setVars.bat

@@ -39,9 +39,13 @@ REM For some reason, ICE08 works without admin, and the quickest way to suppress
 C:\Windows\System32\whoami /groups | find "BUILTIN\Administrators" > nul 2> nul
 if errorlevel 1 set SuppressICE=-ice:ICE08
 
+REM Default WIX if not already set
+if "%WIX%"=="" if exist "%LOCALAPPDATA%\FieldWorksTools\Wix314\heat.exe" set WIX=%LOCALAPPDATA%\FieldWorksTools\Wix314
+
 REM Ensure WiX tools are on the PATH
 where heat >nul 2>nul
-if not %errorlevel% == 0 set PATH=%WIX%/bin;%PATH%
+if not %errorlevel% == 0 if exist "%WIX%\bin\heat.exe" set PATH=%WIX%\bin;%PATH%
+if not %errorlevel% == 0 if not exist "%WIX%\bin\heat.exe" set PATH=%WIX%;%PATH%
 
 REM single quotes, since we expect %msbuild% is already double giquoted
 if  '%msbuild%' == '' set msbuild=msbuild

Common/CustomActionSteps.wxi

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-	<!-- Must be paired with an <CustomAction Id='LaunchFile'..> in Overrides.wxi -->
-	<!-- <Custom Action='LaunchFile' After='InstallFinalize'>NOT Installed</Custom> -->
+	<Custom Action='LaunchUnicodeCharEditor' After='InstallFinalize'>NOT Installed</Custom>
 </Include>