From a7aef8f1473a99d9abcdf5e8f2f45551e6f61335 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 12 Jan 2022 19:06:34 -0600
Subject: [PATCH] Use new WiX 3.14 variable instead of BuildLabEx hack for
 ARM64 detection

---
 README.md                     |  2 +-
 wix/MoonlightSetup/Bundle.wxs | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 36a43056..88b638e2 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Hosting for Moonlight's Raspberry Pi and L4T package repositories is graciously
 * [Visual Studio 2019](https://visualstudio.microsoft.com/downloads/) (Community edition is fine)
 * Select **MSVC 2019** option during Qt installation. MinGW is not supported.
 * [7-Zip](https://www.7-zip.org/) (only if building installers for non-development PCs)
-* [WiX Toolset](https://wixtoolset.org/releases/) v3.11 or later (only if building installers for non-development PCs)
+* [WiX Toolset](https://wixtoolset.org/releases/v3-14-0-5722/) v3.14.0.5722 or later (only if building installers for non-development PCs)
 
 ### macOS Build Requirements
 * Qt 6.2 SDK or later
diff --git a/wix/MoonlightSetup/Bundle.wxs b/wix/MoonlightSetup/Bundle.wxs
index f87bbdaa..8841ac58 100644
--- a/wix/MoonlightSetup/Bundle.wxs
+++ b/wix/MoonlightSetup/Bundle.wxs
@@ -54,12 +54,6 @@
                          Value="DesktopShortcutInstallState"
                          Condition="HasDesktopShortcutInstallStateRegKey" />
 
-    <util:RegistrySearch Variable="NT_BUILD_STRING"
-                         Root="HKLM"
-                         Key="Software\Microsoft\Windows NT\CurrentVersion"
-                         Value="BuildLabEx"
-                         Win64="yes" />
-
     <util:ProductSearch Id="VCREDIST_142_x86"
                         UpgradeCode="$(var.VCREDIST_X86_UPGRADE_CODE)"
                         Result="version"
@@ -94,7 +88,7 @@
                   Vital="yes"
                   InstallCommand="/install /quiet /norestart"
                   DownloadUrl="$(var.VCREDIST_X86_URL)"
-                  InstallCondition="NT_BUILD_STRING &gt;&lt; &quot;x86&quot;"
+                  InstallCondition="(NOT VersionNT64 AND NOT NativeMachine) OR (NativeMachine = 332)"
                   DetectCondition="VCREDIST_142_x86 &gt;= v$(var.VCREDIST_VER)">
         
         <RemotePayload Description="Microsoft Visual C++ 2015-2019 Redistributable - x86"
@@ -115,7 +109,7 @@
                   Vital="yes"
                   InstallCommand="/install /quiet /norestart"
                   DownloadUrl="$(var.VCREDIST_X64_URL)"
-                  InstallCondition="NT_BUILD_STRING &gt;&lt; &quot;amd64&quot;"
+                  InstallCondition="(VersionNT64 AND NOT NativeMachine) OR (NativeMachine = 34404)"
                   DetectCondition="VCREDIST_142_x64 &gt;= v$(var.VCREDIST_VER)">
         
         <RemotePayload Description="Microsoft Visual C++ 2015-2019 Redistributable - x64"
@@ -137,7 +131,7 @@
                     Vital="yes"
                     InstallCommand="/install /quiet /norestart"
                     DownloadUrl="$(var.VCREDIST_ARM64_URL)"
-                    InstallCondition="NT_BUILD_STRING &gt;&lt; &quot;arm64&quot;"
+                    InstallCondition="NativeMachine = 43620"
                     DetectCondition="VCREDIST_142_ARM64 &gt;= v$(var.VCREDIST_VER)">
           
           <RemotePayload Description="Microsoft Visual C++ 2015-2019 Redistributable - ARM64"
@@ -153,7 +147,7 @@
 
       <MsiPackage Id="Moonlight_x86"
                   SourceFile="$(env.BUILD_ROOT)\build-x86-$(env.BUILD_CONFIG)\Moonlight.msi"
-                  InstallCondition="NT_BUILD_STRING &gt;&lt; &quot;x86&quot;"
+                  InstallCondition="(NOT VersionNT64 AND NOT NativeMachine) OR (NativeMachine = 332)"
                   Vital="yes">
         <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
         <MsiProperty Name="REINSTALLMODE" Value="[REINSTALLMODE]" />
@@ -162,7 +156,7 @@
 
       <MsiPackage Id="Moonlight_x64"
                   SourceFile="$(env.BUILD_ROOT)\build-x64-$(env.BUILD_CONFIG)\Moonlight.msi"
-                  InstallCondition="NT_BUILD_STRING &gt;&lt; &quot;amd64&quot;"
+                  InstallCondition="(VersionNT64 AND NOT NativeMachine) OR (NativeMachine = 34404)"
                   Vital="yes">
         <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
         <MsiProperty Name="REINSTALLMODE" Value="[REINSTALLMODE]" />
@@ -172,7 +166,7 @@
       <?if $(var.INCLUDE_ARM64) != 0 ?>
         <MsiPackage Id="Moonlight_arm64"
                     SourceFile="$(env.BUILD_ROOT)\build-arm64-$(env.BUILD_CONFIG)\Moonlight.msi"
-                    InstallCondition="NT_BUILD_STRING &gt;&lt; &quot;arm64&quot;"
+                    InstallCondition="NativeMachine = 43620"
                     Vital="yes">
           <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
           <MsiProperty Name="REINSTALLMODE" Value="[REINSTALLMODE]" />