From 5f18fcc2eada6ce2b17eeda833986154d032235e Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Thu, 2 Sep 2021 10:03:19 -0700
Subject: [PATCH 1/4] Retarget DOTNETHOME when installing x64 on ARM64

---
 .../Windows/Common/dotnethome_x64.wxs         | 34 +++++++++++++++++++
 .../Windows/SharedFramework/Product.wxs       |  8 +++++
 .../SharedFramework/SharedFramework.wixproj   |  1 +
 .../Windows/TargetingPack/Product.wxs         |  8 +++++
 .../TargetingPack/TargetingPack.wixproj       |  1 +
 5 files changed, 52 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..4cb6b51380ed
--- /dev/null
+++ b/src/Installers/Windows/Common/dotnethome_x64.wxs
@@ -0,0 +1,34 @@
+<?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 ?>
+
+  <!-- The following match 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"?>
+  <?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_INSTALLING_IN_EMULATION" Id="INSTALLING_IN_EMULATION" Value="true" Before="CostFinalize">
+      NOT %PROCESSOR_ARCHITECTURE="$(var.InstallerArchitecture)"
+    </SetProperty>
+  </Fragment>
+    
+  <?if $(var.Platform)=x64?>
+  <Fragment>
+    <!-- When running in x64 emulation and user hasn't specified install directory, install to an x64 subdirectory-->
+    <SetProperty Action="Set_DOTNETHOME_x64" Id="DOTNETHOME" Value="[ProgramFiles64Folder]dotnet\x64\" After="Set_INSTALLING_IN_EMULATION">
+      INSTALLING_IN_EMULATION 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..c63f1ba0b817 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_x64" />
+        <?endif?>
     </Fragment>
 
     <Fragment>
@@ -63,6 +67,10 @@
             <?undef ProductVersionKey?>
             <?endif?>
 
+            <!-- TODO: the following keys will collde between x64 and ARM64.
+                 They are actually *already* colliding between x86 and x64 since these will be writing to the x86 registry hive.
+                 Any interest in fixing this? -->
+
             <?define ProductVersionKey=SOFTWARE\Microsoft\ASP.NET Core\Shared Framework\v$(var.MajorVersion).$(var.MinorVersion)\$(var.PackageVersion)?>
 
             <Component Id="C_ProductVersion">
diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
index 9b9e4c6f0a7e..becd904b5ea6 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 33b6173a7a5b..30994db78c41 100644
--- a/src/Installers/Windows/TargetingPack/Product.wxs
+++ b/src/Installers/Windows/TargetingPack/Product.wxs
@@ -39,6 +39,10 @@
                 <Directory Id="DOTNETHOME" Name="dotnet" />
             </Directory>
         </Directory>
+
+        <?if $(var.Platform) = x64 ?>
+        <CustomActionRef Id="Set_DOTNETHOME_x64" />
+        <?endif?>
     </Fragment>
 
     <Fragment>
@@ -62,6 +66,10 @@
             <?undef ProductVersionKey?>
             <?endif?>
 
+            <!-- TODO: the following keys will collde between x64 and ARM64.
+                 They are actually *already* colliding between x86 and x64 since these will be writing to the x86 registry hive.
+                 Any interest in fixing this? -->
+
             <?define ProductVersionKey=SOFTWARE\Microsoft\ASP.NET Core\Targeting Pack\v$(var.MajorVersion).$(var.MinorVersion)\$(var.PackageVersion)?>
 
             <Component Id="C_ProductVersion">
diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj
index 61f24ee3b14a..610d68da3d43 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 dbfe1de77c3fd2033da746228ae075e526d5334a Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Thu, 2 Sep 2021 15:57:54 -0700
Subject: [PATCH 2/4] Make platform comparison case insenstive

---
 src/Installers/Windows/Common/dotnethome_x64.wxs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Installers/Windows/Common/dotnethome_x64.wxs b/src/Installers/Windows/Common/dotnethome_x64.wxs
index 4cb6b51380ed..21e3b213e785 100644
--- a/src/Installers/Windows/Common/dotnethome_x64.wxs
+++ b/src/Installers/Windows/Common/dotnethome_x64.wxs
@@ -7,11 +7,11 @@
 
   <!-- The following match the expected values for PROCESSOR_ARCHITECTURE
           https://docs.microsoft.com/en-us/windows/win32/winprog64/wow64-implementation-details -->
-  <?if $(var.Platform)=x86?>
+  <?if $(var.Platform)~=x86?>
     <?define InstallerArchitecture="X86"?>
-  <?elseif $(var.Platform)=x64?>
+  <?elseif $(var.Platform)~=x64?>
     <?define InstallerArchitecture="AMD64"?>
-  <?elseif $(var.Platform)=ARM64?>
+  <?elseif $(var.Platform)~=arm64?>
     <?define InstallerArchitecture="ARM64"?>
   <?endif?>
 
@@ -22,7 +22,7 @@
       NOT %PROCESSOR_ARCHITECTURE="$(var.InstallerArchitecture)"
     </SetProperty>
   </Fragment>
-    
+
   <?if $(var.Platform)=x64?>
   <Fragment>
     <!-- When running in x64 emulation and user hasn't specified install directory, install to an x64 subdirectory-->

From 0dbeb660ead422af8545f2d1050a15ec57a21b00 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Fri, 3 Sep 2021 15:49:29 -0700
Subject: [PATCH 3/4] Address feedback

---
 .../Windows/Common/dotnethome_x64.wxs         | 24 +++++++++++--------
 .../Windows/SharedFramework/Product.wxs       |  6 ++---
 .../Windows/TargetingPack/Product.wxs         |  6 ++---
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/Installers/Windows/Common/dotnethome_x64.wxs b/src/Installers/Windows/Common/dotnethome_x64.wxs
index 21e3b213e785..53e0bc4819e4 100644
--- a/src/Installers/Windows/Common/dotnethome_x64.wxs
+++ b/src/Installers/Windows/Common/dotnethome_x64.wxs
@@ -1,33 +1,37 @@
 <?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 ?>
+  <?ifndef Platform?>
+    <?define Platform = "$(sys.BUILDARCH)"?>
+  <?endif?>
 
-  <!-- The following match the expected values for PROCESSOR_ARCHITECTURE
-          https://docs.microsoft.com/en-us/windows/win32/winprog64/wow64-implementation-details -->
+  <!-- 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_INSTALLING_IN_EMULATION" Id="INSTALLING_IN_EMULATION" Value="true" Before="CostFinalize">
+    <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?>
+  <?if $(var.Platform)~=x64?>
   <Fragment>
-    <!-- When running in x64 emulation and user hasn't specified install directory, install to an x64 subdirectory-->
-    <SetProperty Action="Set_DOTNETHOME_x64" Id="DOTNETHOME" Value="[ProgramFiles64Folder]dotnet\x64\" After="Set_INSTALLING_IN_EMULATION">
-      INSTALLING_IN_EMULATION AND NOT DOTNETHOME
+    <!-- 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?>
diff --git a/src/Installers/Windows/SharedFramework/Product.wxs b/src/Installers/Windows/SharedFramework/Product.wxs
index c63f1ba0b817..d57ce48b8ef0 100644
--- a/src/Installers/Windows/SharedFramework/Product.wxs
+++ b/src/Installers/Windows/SharedFramework/Product.wxs
@@ -36,8 +36,8 @@
             </Directory>
         </Directory>
 
-        <?if $(var.Platform) = x64 ?>
-        <CustomActionRef Id="Set_DOTNETHOME_x64" />
+        <?if $(var.Platform)=x64?>
+        <CustomActionRef Id="Set_DOTNETHOME_NON_NATIVE_ARCHITECTURE" />
         <?endif?>
     </Fragment>
 
@@ -67,7 +67,7 @@
             <?undef ProductVersionKey?>
             <?endif?>
 
-            <!-- TODO: the following keys will collde between x64 and ARM64.
+            <!-- TODO: the following keys will collide between x64 and ARM64.
                  They are actually *already* colliding between x86 and x64 since these will be writing to the x86 registry hive.
                  Any interest in fixing this? -->
 
diff --git a/src/Installers/Windows/TargetingPack/Product.wxs b/src/Installers/Windows/TargetingPack/Product.wxs
index 30994db78c41..fe67005c1f01 100644
--- a/src/Installers/Windows/TargetingPack/Product.wxs
+++ b/src/Installers/Windows/TargetingPack/Product.wxs
@@ -40,8 +40,8 @@
             </Directory>
         </Directory>
 
-        <?if $(var.Platform) = x64 ?>
-        <CustomActionRef Id="Set_DOTNETHOME_x64" />
+        <?if $(var.Platform)=x64?>
+        <CustomActionRef Id="Set_DOTNETHOME_NON_NATIVE_ARCHITECTURE" />
         <?endif?>
     </Fragment>
 
@@ -66,7 +66,7 @@
             <?undef ProductVersionKey?>
             <?endif?>
 
-            <!-- TODO: the following keys will collde between x64 and ARM64.
+            <!-- TODO: the following keys will collide between x64 and ARM64.
                  They are actually *already* colliding between x86 and x64 since these will be writing to the x86 registry hive.
                  Any interest in fixing this? -->
 

From 4f4423610f8d568ff6f0d68d115e41c40a162eb4 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Mon, 13 Sep 2021 11:11:49 -0700
Subject: [PATCH 4/4] Install x64 registry keys to different path on ARM64
 machine

---
 .../Windows/SharedFramework/Product.wxs       | 33 ++++++++++++++++---
 .../Windows/TargetingPack/Product.wxs         | 33 ++++++++++++++++---
 2 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/src/Installers/Windows/SharedFramework/Product.wxs b/src/Installers/Windows/SharedFramework/Product.wxs
index d57ce48b8ef0..98b5756c69de 100644
--- a/src/Installers/Windows/SharedFramework/Product.wxs
+++ b/src/Installers/Windows/SharedFramework/Product.wxs
@@ -56,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">
@@ -67,23 +71,44 @@
             <?undef ProductVersionKey?>
             <?endif?>
 
-            <!-- TODO: the following keys will collide between x64 and ARM64.
-                 They are actually *already* colliding between x86 and x64 since these will be writing to the x86 registry hive.
-                 Any interest in fixing this? -->
-
             <?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/TargetingPack/Product.wxs b/src/Installers/Windows/TargetingPack/Product.wxs
index fe67005c1f01..6317450b2670 100644
--- a/src/Installers/Windows/TargetingPack/Product.wxs
+++ b/src/Installers/Windows/TargetingPack/Product.wxs
@@ -59,6 +59,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">
@@ -66,23 +70,44 @@
             <?undef ProductVersionKey?>
             <?endif?>
 
-            <!-- TODO: the following keys will collide between x64 and ARM64.
-                 They are actually *already* colliding between x86 and x64 since these will be writing to the x86 registry hive.
-                 Any interest in fixing this? -->
-
             <?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>