From b0d899b76d4eda61fd2889e5d073f93542070c3f Mon Sep 17 00:00:00 2001
From: rc-swag <58423624+rc-swag@users.noreply.github.com>
Date: Wed, 3 Dec 2025 11:25:33 +1000
Subject: [PATCH 1/2] feat(windows): as set native machine property firstvoices

Fixes: #15260
---
 oem/firstvoices/windows/src/inst/firstvoices.wxs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/oem/firstvoices/windows/src/inst/firstvoices.wxs b/oem/firstvoices/windows/src/inst/firstvoices.wxs
index ad5b02e15c..a23285383e 100644
--- a/oem/firstvoices/windows/src/inst/firstvoices.wxs
+++ b/oem/firstvoices/windows/src/inst/firstvoices.wxs
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <Product UpgradeCode="f212edf7-0bef-43bb-8fc2-2625ae7bbfca" Manufacturer="SIL International"
            Id="*" Name="$(var.PRODUCTNAME) $(var.RELEASE)" Version="$(var.KEYMAN_VERSION)" Language="1033">
     <Package Keywords="Keyman,$(var.PRODUCTNAME),Keyboard,Engine"
@@ -37,6 +37,11 @@
 
     <Property Id='OnlineProductID' Value='30' />
 
+
+    <!-- CE38CB16_4448_4432_851B_B3FCE3AF464F is the GUID for the keyman engine merge
+         module package; this makes the WIX_NATIVE_MACHINE property available to it -->
+    <SetProperty Id="WIX_NATIVE_MACHINE.CE38CB16_4448_4432_851B_B3FCE3AF464F" Value="[WIX_NATIVE_MACHINE]" Before="LaunchConditions"/>
+
     <Directory Id="TARGETDIR" Name="SourceDir" DiskId="1">
 
       <Merge Id="keymanengine" Language='1033' SourceFile='$(var.ROOT)\src\engine\inst\keymanengine.msm' />
@@ -179,6 +184,7 @@
     <Property Id="ALLUSERS">1</Property>
 
     <UIRef Id="WixUI_FeatureTree"/>
+    <PropertyRef Id="WIX_NATIVE_MACHINE" />
 
     <Icon Id="appicon.ico" SourceFile="..\branding\appicon.ico" />
     <Icon Id="KMSHELL.ico" SourceFile="..\branding\cfgicon.ico" />

From 7929345340620c2cb3c28041ad4e90b590fbedc3 Mon Sep 17 00:00:00 2001
From: rc-swag <58423624+rc-swag@users.noreply.github.com>
Date: Thu, 4 Dec 2025 10:33:24 +1000
Subject: [PATCH 2/2] feat(windows): add WixUtilExtension to light cmd

---
 oem/firstvoices/windows/src/inst/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oem/firstvoices/windows/src/inst/build.sh b/oem/firstvoices/windows/src/inst/build.sh
index cad414d39b..930779e082 100755
--- a/oem/firstvoices/windows/src/inst/build.sh
+++ b/oem/firstvoices/windows/src/inst/build.sh
@@ -74,7 +74,7 @@ function do_publish() {
     -sice:ICE82 -sice:ICE80 \
     -dWixUILicenseRtf=License.rtf \
     -out firstvoices.msi \
-    -ext WixUIExtension firstvoices.wixobj desktopui.wixobj
+    -ext WixUIExtension -ext WixUtilExtension firstvoices.wixobj desktopui.wixobj
 
   #
   # Sign the installation archive