From dad4407de35fcfe946ae019c541a0538efd629df Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Tue, 5 Oct 2021 22:35:57 -0700
Subject: [PATCH 1/3] Use WIX_NATIVE_MACHINE to detect native architecture of
 target machine

---
 .../packaging/windows/clisdk/bundle.wxs       | 19 +++++-----------
 .../windows/clisdk/dotnethome_x64.wxs         | 22 +++++++++++--------
 .../packaging/windows/clisdk/variables.wxi    |  7 ++++++
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
index 40b118b73..926929aa6 100644
--- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
@@ -20,7 +20,7 @@
 
     <!-- Permit same path on non-ARM64 machines since past SDKs always wrote this value -->
     <bal:Condition Message="The installation path for ARM64 SDK installations: &quot;[DOTNETHOME_ARM64]&quot; cannot be the same as for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot;">
-        WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X64) OR (NOT NativeProcessorArchitecture=&quot;ARM64&quot;) OR DOTNETHOMESIMILARITYCHECKOVERRIDE
+        WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X64) OR (NOT NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) OR DOTNETHOMESIMILARITYCHECKOVERRIDE
     </bal:Condition>
 
     <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.Foundation">
@@ -76,21 +76,12 @@
               Root="HKLM"
               Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64"
               Value="InstallLocation" />
-    
-    <!-- Determine native OS architecture -->
-    <util:RegistrySearch Id="CheckProcessorArchitecture_x64"
-              After="DotnetInstallLocation_x64"
-              Variable="NativeProcessorArchitecture"
-              Result="value"
-              Root="HKLM"
-              Key="SYSTEM\CurrentControlSet\Control\Session Manager\Environment"
-              Value="PROCESSOR_ARCHITECTURE" />
 
     <!-- Check default location when on x64 OS-->
     <util:FileSearch Id="DotnetExeSearch_x64"
-              After="CheckProcessorArchitecture_x64"
+              After="DotnetInstallLocation_x64"
               Variable="DotnetExeExists_x64"
-              Condition="NOT DotnetInstallLocationExists_x64 AND NativeProcessorArchitecture=&quot;AMD64&quot;"
+              Condition="NOT DotnetInstallLocationExists_x64 AND (NOT NativeMachine OR NativeMachine=&quot;$(var.NativeMachine_x64)&quot;)"
               Result="exists"
               Path="[ProgramFiles64Folder]dotnet\dotnet.exe"/>
     <util:DirectorySearch Id="DotnetExeLocation_x64"
@@ -101,9 +92,9 @@
 
     <!-- Check alternate location on non-x64 OS -->
     <util:FileSearch Id="DotnetExeSearch_alt_x64"
-              After="CheckProcessorArchitecture_x64"
+              After="DotnetInstallLocation_x64"
               Variable="DotnetExeExists_alt_x64"
-              Condition="NOT DotnetInstallLocationExists_x64 AND NOT NativeProcessorArchitecture=&quot;AMD64&quot;"
+              Condition="NOT DotnetInstallLocationExists_x64 AND NOT NativeMachine=&quot;$(var.NativeMachine_x64)&quot;"
               Result="exists"
               Path="[ProgramFiles64Folder]dotnet\x64\dotnet.exe"/>
     <util:DirectorySearch Id="DotnetExeLocation_alt_x64"
diff --git a/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs b/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs
index 5e30f9871..a2e9aab9c 100644
--- a/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs
@@ -5,23 +5,27 @@
     <?define Platform = "$(sys.BUILDARCH)"?>
   <?endif?>
 
-  <!-- InstallerArchitecture matches the expected values for PROCESSOR_ARCHITECTURE 
-       https://docs.microsoft.com/en-us/windows/win32/winprog64/wow64-implementation-details  -->
+  <!-- InstallerNativeMachine matches the expected values for image file machine constants
+       https://docs.microsoft.com/en-us/windows/win32/sysinfo/image-file-machine-constants -->
   <?if $(var.Platform)~=x86?>
-    <?define InstallerArchitecture="X86"?>
+    <?define InstallerNativeMachine=332?>
   <?elseif $(var.Platform)~=x64?>
-    <?define InstallerArchitecture="AMD64"?>
+    <?define InstallerNativeMachine=34404?>
   <?elseif $(var.Platform)~=arm64?>
-    <?define InstallerArchitecture="ARM64"?>
+    <?define InstallerNativeMachine=43620?>
   <?else?>
-    <?error Unknown platform, $(var.Platform) ?>?
+    <?error Unknown platform, $(var.Platform) ?>
   <?endif?>
 
   <Fragment>
-    <!-- Identify when installing in emulation as when PROCESSOR_ARCHITECTURE does not match the installer architecture
-          https://docs.microsoft.com/en-us/windows/win32/winprog64/wow64-implementation-details -->
+    <!-- Identify when installing in emulation as when WIX_NATIVE_MACHINE does not match the installer
+         native machine (where supported).  Also detect running under WOW on x86 using VersionNT64,
+         since WIX_NATIVE_MACHINE cannot be retrieved on older Windows builds. -->
     <SetProperty Action="Set_NON_NATIVE_ARCHITECTURE" Id="NON_NATIVE_ARCHITECTURE" Value="true" Before="CostFinalize">
-      NOT %PROCESSOR_ARCHITECTURE="$(var.InstallerArchitecture)"
+     <?if $(var.Platform)~=x86?>
+      VersionNT64 OR
+     <?endif?>
+      WIX_NATIVE_MACHINE AND NOT WIX_NATIVE_MACHINE="$(var.InstallerNativeMachine)"
     </SetProperty>
   </Fragment>
 
diff --git a/src/redist/targets/packaging/windows/clisdk/variables.wxi b/src/redist/targets/packaging/windows/clisdk/variables.wxi
index bad1ff7ef..aa574750b 100644
--- a/src/redist/targets/packaging/windows/clisdk/variables.wxi
+++ b/src/redist/targets/packaging/windows/clisdk/variables.wxi
@@ -15,7 +15,14 @@
   <?define LCID  = "$(var.ProductLanguage)"?>
   <?define DowngradeErrorMessage  = "A newer version is already installed; please uninstall it and re-run setup."?>
 
+  <!-- NativeMachine values match the expected values for image file machine constants
+       https://docs.microsoft.com/en-us/windows/win32/sysinfo/image-file-machine-constants -->
+  <?define NativeMachine_x86=332?>
+  <?define NativeMachine_x64=34404?>
+  <?define NativeMachine_arm64=43620?>
+  
   <?define Platform   =   "$(sys.BUILDARCH)" ?>
+  
   <?if $(var.Platform)=x86?>
   <?define PlatformToken="X86"?>
   <?define WixQuietExec="WixQuietExec"?>

From 95a827266872e2e58b0b5741d162f02a438fbab9 Mon Sep 17 00:00:00 2001
From: Jacques Eloff <joeloff@users.noreply.github.com>
Date: Tue, 5 Oct 2021 15:50:59 -0700
Subject: [PATCH 2/3] Update WiX to 3.14.0.5722 (#12252)

---
 eng/Versions.props                      | 2 +-
 src/redist/targets/GenerateMSIs.targets | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 6d9de8dd3..8af72c3c0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -108,7 +108,7 @@
     <SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <WixPackageVersion>1.0.0-v3.14.0.4118</WixPackageVersion>
+    <WixPackageVersion>1.0.0-v3.14.0.5722</WixPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- 6.0 Template versions -->
diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index c4d4b28ba..3014fcfbd 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -13,7 +13,7 @@
   <Target Name="SetupWixProperties" DependsOnTargets="GetCurrentRuntimeInformation">
     <!-- AcquireWix Properties -->
     <PropertyGroup>
-      <WixVersion>1.0.0-v3.14.0.4118</WixVersion>
+      <WixVersion>$(WixPackageVersion)</WixVersion>
       <WixDownloadUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip</WixDownloadUrl>
       <WixRoot>$(ArtifactsDir)Tools/WixTools/$(WixVersion)</WixRoot>
       <WixDestinationPath>$(WixRoot)/WixTools.$(WixVersion).zip</WixDestinationPath>

From 9230a610cc47e1e11c0b429a6e9a0583de030361 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Wed, 6 Oct 2021 07:06:48 -0700
Subject: [PATCH 3/3] Ensure we reference WIX_NATIVE_MACHINE property

---
 .../targets/packaging/windows/clisdk/dotnethome_x64.wxs      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs b/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs
index a2e9aab9c..d62c71b0e 100644
--- a/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs
@@ -18,9 +18,10 @@
   <?endif?>
 
   <Fragment>
-    <!-- Identify when installing in emulation as when WIX_NATIVE_MACHINE does not match the installer
-         native machine (where supported).  Also detect running under WOW on x86 using VersionNT64,
+    <!-- Identify when installing in emulation as when WIX_NATIVE_MACHINE does not match the installer 
+         native machine (where supported).  Also detect running under WOW on x86 using VersionNT64, 
          since WIX_NATIVE_MACHINE cannot be retrieved on older Windows builds. -->
+    <PropertyRef Id="WIX_NATIVE_MACHINE" />
     <SetProperty Action="Set_NON_NATIVE_ARCHITECTURE" Id="NON_NATIVE_ARCHITECTURE" Value="true" Before="CostFinalize">
      <?if $(var.Platform)~=x86?>
       VersionNT64 OR