From f6dc226ae8143bbcabbaa1a88460e7607fcc80a5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Sep 2021 17:35:25 +0000
Subject: [PATCH 1/4] [release/6.0-rc2] Retarget DOTNETHOME when installing x64
 on ARM64 (#36695)

* Retarget DOTNETHOME when installing x64 on ARM64

* Make platform comparison case insenstive

* Address feedback

* Install x64 registry keys to different path on ARM64 machine

Co-authored-by: Eric StJohn <ericstj@microsoft.com>
---
 .../Windows/Common/dotnethome_x64.wxs         | 38 +++++++++++++++++++
 .../Windows/SharedFramework/Product.wxs       | 33 ++++++++++++++++
 .../SharedFramework/SharedFramework.wixproj   |  1 +
 .../Windows/TargetingPack/Product.wxs         | 33 ++++++++++++++++
 .../TargetingPack/TargetingPack.wixproj       |  1 +
 5 files changed, 106 insertions(+)
 create mode 100644 src/Installers/Windows/Common/dotnethome_x64.wxs

diff --git a/src/Installers/Windows/Common/dotnethome_x64.wxs b/src/Installers/Windows/Common/dotnethome_x64.wxs
new file mode 100644
index 000000000000..53e0bc4819e4
--- /dev/null
+++ b/src/Installers/Windows/Common/dotnethome_x64.wxs
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?ifndef Platform?>
+    <?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  -->
+  <?if $(var.Platform)~=x86?>
+    <?define InstallerArchitecture="X86"?>
+  <?elseif $(var.Platform)~=x64?>
+    <?define InstallerArchitecture="AMD64"?>
+  <?elseif $(var.Platform)~=arm64?>
+    <?define InstallerArchitecture="ARM64"?>
+  <?else?>
+    <?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 -->
+    <SetProperty Action="Set_NON_NATIVE_ARCHITECTURE" Id="NON_NATIVE_ARCHITECTURE" Value="true" Before="CostFinalize">
+      NOT %PROCESSOR_ARCHITECTURE="$(var.InstallerArchitecture)"
+    </SetProperty>
+  </Fragment>
+
+  <?if $(var.Platform)~=x64?>
+  <Fragment>
+    <!-- When running in a non-native architecture and user hasn't specified install directory,
+         install to an x64 subdirectory.
+         This is only define for x64, since x86 has redirection and no other native architecture can install ARM64 today -->
+    <SetProperty Action="Set_DOTNETHOME_NON_NATIVE_ARCHITECTURE" Id="DOTNETHOME" Value="[ProgramFiles64Folder]dotnet\x64\" After="Set_NON_NATIVE_ARCHITECTURE">
+      NON_NATIVE_ARCHITECTURE AND NOT DOTNETHOME
+    </SetProperty>
+  </Fragment>
+  <?endif?>
+</Wix>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFramework/Product.wxs b/src/Installers/Windows/SharedFramework/Product.wxs
index 3375094918c0..98b5756c69de 100644
--- a/src/Installers/Windows/SharedFramework/Product.wxs
+++ b/src/Installers/Windows/SharedFramework/Product.wxs
@@ -35,6 +35,10 @@
                 </Directory>
             </Directory>
         </Directory>
+
+        <?if $(var.Platform)=x64?>
+        <CustomActionRef Id="Set_DOTNETHOME_NON_NATIVE_ARCHITECTURE" />
+        <?endif?>
     </Fragment>
 
     <Fragment>
@@ -52,6 +56,10 @@
             <ComponentRef Id="C_eula.rtf" />
             <ComponentRef Id="C_ProductVersion"/>
             <ComponentRef Id="C_ProductInstallDir"/>
+            <?if $(var.Platform)=x64 ?>
+            <ComponentRef Id="C_ProductVersion_NonNative" />
+            <ComponentRef Id="C_ProductInstallDir_NonNative" />
+            <?endif?>
         </ComponentGroup>
 
         <DirectoryRef Id="SharedFolder">
@@ -66,16 +74,41 @@
             <?define ProductVersionKey=SOFTWARE\Microsoft\ASP.NET Core\Shared Framework\v$(var.MajorVersion).$(var.MinorVersion)\$(var.PackageVersion)?>
 
             <Component Id="C_ProductVersion">
+                <?if $(var.Platform)=x64 ?>
+                <!-- Only install when actually on native architecture -->
+                <Condition>NOT NON_NATIVE_ARCHITECTURE</Condition>
+                <?endif?>
                 <RegistryKey Key="$(var.ProductVersionKey)" Root="HKLM">
                     <RegistryValue Name="Version" Type="string" Value="$(var.Version)" />
                 </RegistryKey>
             </Component>
 
             <Component Id="C_ProductInstallDir">
+                <?if $(var.Platform)=x64 ?>
+                <!-- Only install when actually on native architecture -->
+                <Condition>NOT NON_NATIVE_ARCHITECTURE</Condition>
+                <?endif?>
                 <RegistryKey Key="SOFTWARE\Microsoft\ASP.NET Core\Shared Framework" Root="HKLM">
                     <RegistryValue Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
                 </RegistryKey>
             </Component>
+
+            <?if $(var.Platform)=x64 ?>
+            <!-- Install keys to a different path when not native architecture -->
+            <Component Id="C_ProductVersion_NonNative">
+                <Condition>NON_NATIVE_ARCHITECTURE</Condition>
+                <RegistryKey Key="$(var.ProductVersionKey)\$(var.Platform)" Root="HKLM">
+                    <RegistryValue Name="Version" Type="string" Value="$(var.Version)" />
+                </RegistryKey>
+            </Component>
+
+            <Component Id="C_ProductInstallDir_NonNative">
+                <Condition>NON_NATIVE_ARCHITECTURE</Condition>
+                <RegistryKey Key="SOFTWARE\Microsoft\ASP.NET Core\Shared Framework\$(var.Platform)" Root="HKLM">
+                    <RegistryValue Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
+                </RegistryKey>
+            </Component>
+            <?endif?>
         </DirectoryRef>
     </Fragment>
 </Wix>
diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
index 79659760fbd2..276338cbd7a8 100644
--- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
+++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
@@ -46,6 +46,7 @@
   <ItemGroup>
     <Compile Include="DependencyProvider.wxs" />
     <Compile Include="Product.wxs" />
+    <Compile Include="..\Common\dotnethome_x64.wxs" Link="dotnethome_x64.wxs" />
     <EmbeddedResource Include="Strings.wxl" />
   </ItemGroup>
 
diff --git a/src/Installers/Windows/TargetingPack/Product.wxs b/src/Installers/Windows/TargetingPack/Product.wxs
index a43f6ab4e172..8eb5a60b90d3 100644
--- a/src/Installers/Windows/TargetingPack/Product.wxs
+++ b/src/Installers/Windows/TargetingPack/Product.wxs
@@ -33,6 +33,10 @@
                 <Directory Id="DOTNETHOME" Name="dotnet" />
             </Directory>
         </Directory>
+
+        <?if $(var.Platform)=x64?>
+        <CustomActionRef Id="Set_DOTNETHOME_NON_NATIVE_ARCHITECTURE" />
+        <?endif?>
     </Fragment>
 
     <Fragment>
@@ -49,6 +53,10 @@
         <ComponentGroup Id="CG_ProductInfo">
             <ComponentRef Id="C_ProductVersion"/>
             <ComponentRef Id="C_ProductInstallDir"/>
+            <?if $(var.Platform)=x64 ?>
+            <ComponentRef Id="C_ProductVersion_NonNative"/>
+            <ComponentRef Id="C_ProductInstallDir_NonNative"/>
+            <?endif?>
         </ComponentGroup>
 
         <DirectoryRef Id="DOTNETHOME">
@@ -59,16 +67,41 @@
             <?define ProductVersionKey=SOFTWARE\Microsoft\ASP.NET Core\Targeting Pack\v$(var.MajorVersion).$(var.MinorVersion)\$(var.PackageVersion)?>
 
             <Component Id="C_ProductVersion">
+                <?if $(var.Platform)=x64 ?>
+                <!-- Only install when actually on native architecture -->
+                <Condition>NOT NON_NATIVE_ARCHITECTURE</Condition>
+                <?endif?>
                 <RegistryKey Key="$(var.ProductVersionKey)" Root="HKLM">
                     <RegistryValue Name="Version" Type="string" Value="$(var.Version)" />
                 </RegistryKey>
             </Component>
 
             <Component Id="C_ProductInstallDir">
+                <?if $(var.Platform)=x64 ?>
+                <!-- Only install when actually on native architecture -->
+                <Condition>NOT NON_NATIVE_ARCHITECTURE</Condition>
+                <?endif?>
                 <RegistryKey Key="SOFTWARE\Microsoft\ASP.NET Core\Targeting Pack" Root="HKLM">
                     <RegistryValue Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
                 </RegistryKey>
             </Component>
+
+
+            <?if $(var.Platform)=x64 ?>
+            <!-- Install keys to a different path when not native architecture -->
+            <Component Id="C_ProductVersion_NonNative">
+                <Condition>NON_NATIVE_ARCHITECTURE</Condition>
+                <RegistryKey Key="$(var.ProductVersionKey)\$(var.Platform)" Root="HKLM">
+                    <RegistryValue Name="Version" Type="string" Value="$(var.Version)" />
+                </RegistryKey>
+            </Component>
+            <Component Id="C_ProductInstallDir_NonNative">
+                <Condition>NON_NATIVE_ARCHITECTURE</Condition>
+                <RegistryKey Key="SOFTWARE\Microsoft\ASP.NET Core\Targeting Pack\$(var.Platform)" Root="HKLM">
+                    <RegistryValue Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
+                </RegistryKey>
+            </Component>
+            <?endif?>
         </DirectoryRef>
     </Fragment>
 </Wix>
diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj
index 759f7f80fd61..25afea8f69c2 100644
--- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj
+++ b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj
@@ -48,6 +48,7 @@
   <ItemGroup>
     <Compile Include="DependencyProvider.wxs" />
     <Compile Include="Product.wxs" />
+    <Compile Include="..\Common\dotnethome_x64.wxs" Link="dotnethome_x64.wxs" />
     <EmbeddedResource Include="Strings.wxl" />
   </ItemGroup>
 

From a394985ed353b33e5f434d4350d1d0fd86340edc Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Thu, 23 Sep 2021 09:29:02 -0700
Subject: [PATCH 2/4] Update WiX to signed build (#36865)

- #12078
---
 eng/targets/Wix.Common.props         | 4 ++--
 eng/tools/RepoTasks/RepoTasks.csproj | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props
index 9a29437eb2e5..d6095b8aa1b6 100644
--- a/eng/targets/Wix.Common.props
+++ b/eng/targets/Wix.Common.props
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
     <ProductVersion>3.14</ProductVersion>
-    <WixVersion>3.14.0-dotnet</WixVersion>
+    <WixVersion>1.0.0-v3.14.0.4118</WixVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -20,7 +20,7 @@
   <Import Project="$(MSBuildProjectExtensionsPath)$(MSBuildProjectFile).*.props" Condition="'$(_ProjectExtensionsWereImported)' != 'true'" />
 
   <ItemGroup>
-    <PackageReference Include="Wix" Version="$(WixVersion)" />
+    <PackageReference Include="Microsoft.Signed.Wix" Version="$(WixVersion)" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
index 68d4cd23fbf2..1d8c8e2e256d 100644
--- a/eng/tools/RepoTasks/RepoTasks.csproj
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
-    <PackageReference Include="Wix" Version="3.11.1" />
+    <PackageReference Include="Microsoft.Signed.Wix" Version="1.0.0-v3.14.0.4118" />
 
     <Reference Include="Microsoft.Build" />
     <Reference Include="Microsoft.Build.Framework" />

From c756a403a608fed6f68f426c2d2ac113b02d47bd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 6 Oct 2021 11:22:15 -0700
Subject: [PATCH 3/4] Update wix to 1.0.0-v3.14.0.5722 (#37329)

Co-authored-by: Eric StJohn <ericstj@microsoft.com>
---
 eng/targets/Wix.Common.props         | 2 +-
 eng/tools/RepoTasks/RepoTasks.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props
index d6095b8aa1b6..730df3c1c8dd 100644
--- a/eng/targets/Wix.Common.props
+++ b/eng/targets/Wix.Common.props
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
     <ProductVersion>3.14</ProductVersion>
-    <WixVersion>1.0.0-v3.14.0.4118</WixVersion>
+    <WixVersion>1.0.0-v3.14.0.5722</WixVersion>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
index 1d8c8e2e256d..92127b5ee340 100644
--- a/eng/tools/RepoTasks/RepoTasks.csproj
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
-    <PackageReference Include="Microsoft.Signed.Wix" Version="1.0.0-v3.14.0.4118" />
+    <PackageReference Include="Microsoft.Signed.Wix" Version="1.0.0-v3.14.0.5722" />
 
     <Reference Include="Microsoft.Build" />
     <Reference Include="Microsoft.Build.Framework" />

From d87d0d66902e46c76a85062012bc4517c96157ac Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 6 Oct 2021 22:57:50 +0000
Subject: [PATCH 4/4] [release/6.0] Use WIX_NATIVE_MACHINE to detect native
 architecture of target machine (#37335)

* Use WIX_NATIVE_MACHINE to detect native architecture of target machine
* Reference WIX_NATIVE_MACHINE property

Final bit to resolve what I'm tracking in #37290

Co-authored-by: Eric StJohn <ericstj@microsoft.com>
---
 .../Windows/Common/dotnethome_x64.wxs         | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/Installers/Windows/Common/dotnethome_x64.wxs b/src/Installers/Windows/Common/dotnethome_x64.wxs
index 53e0bc4819e4..5742d2a1e0a1 100644
--- a/src/Installers/Windows/Common/dotnethome_x64.wxs
+++ b/src/Installers/Windows/Common/dotnethome_x64.wxs
@@ -5,23 +5,28 @@
     <?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. -->
+    <PropertyRef Id="WIX_NATIVE_MACHINE" />
     <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>