From efcf8a5eddf1ddb562a01b709a918493d5de0255 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Thu, 2 Sep 2021 09:33:59 -0700
Subject: [PATCH 1/7] Retarget DOTNETHOME when installing x64 on ARM64

---
 .../packaging/windows/clisdk/bundle.wxs       | 37 +++++++++++++++----
 .../packaging/windows/clisdk/dotnet.wxs       | 10 ++---
 .../windows/clisdk/dotnethome_x64.wxs         | 34 +++++++++++++++++
 .../windows/clisdk/generatemanifestsmsi.ps1   |  2 +
 .../packaging/windows/clisdk/generatemsi.ps1  |  2 +
 .../windows/clisdk/generatetemplatesmsi.ps1   |  2 +
 .../packaging/windows/clisdk/manifests.wxs    |  4 ++
 .../packaging/windows/clisdk/registrykeys.wxs |  3 ++
 .../packaging/windows/clisdk/templates.wxs    |  4 ++
 9 files changed, 84 insertions(+), 14 deletions(-)
 create mode 100644 src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs

diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
index b433f6444..a2dfa73ee 100644
--- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
@@ -56,7 +56,7 @@
               Variable="DOTNETHOME_X86"
               Path="[ProgramFilesFolder]dotnet"/>
 
-    <?if $(var.Platform)=x64?>
+    <?if $(var.Platform)!=x86?>
     <util:RegistrySearch Id="CheckDotnetInstallLocation_x64"
               Variable="DotnetInstallLocationExists_x64"
               Result="exists"
@@ -71,11 +71,22 @@
               Root="HKLM"
               Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64"
               Value="InstallLocation" />
-
-    <util:FileSearch Id="DotnetExeSearch_x64"
+    
+    <!-- Determine native OS architecture -->
+    <util:RegistrySearch Id="CheckProcessorArchitecture_x64"
               After="DotnetInstallLocation_x64"
-              Variable="DotnetExeExists_x64"
               Condition="NOT DotnetInstallLocationExists_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"
+              Variable="DotnetExeExists_x64"
+              Condition="NOT DotnetInstallLocationExists_x64 AND NativeProcessorArchitecture=&quot;AMD64&quot;"
               Result="exists"
               Path="[ProgramFiles64Folder]dotnet\dotnet.exe"/>
     <util:DirectorySearch Id="DotnetExeLocation_x64"
@@ -84,7 +95,20 @@
               Variable="DOTNETHOME_X64"
               Path="[ProgramFiles64Folder]dotnet"/>
 
-    <?elseif $(var.Platform)=arm64?>
+    <!-- Check alternate location on non-x64 OS -->
+    <util:FileSearch Id="DotnetExeSearch_alt_x64"
+              After="CheckProcessorArchitecture_x64"
+              Variable="DotnetExeExists_alt_x64"
+              Condition="NOT DotnetInstallLocationExists_x64 AND NOT NativeProcessorArchitecture=&quot;AMD64&quot;"
+              Result="exists"
+              Path="[ProgramFiles64Folder]dotnet\x64\dotnet.exe"/>
+    <util:DirectorySearch Id="DotnetExeLocation_alt_x64"
+              After="DotnetExeSearch_alt_x64"
+              Condition="DotnetExeExists_alt_x64"
+              Variable="DOTNETHOME_X64"
+              Path="[ProgramFiles64Folder]dotnet\x64"/>
+    <?endif?>
+    <?if $(var.Platform)=arm64?>
     <util:RegistrySearch Id="CheckDotnetInstallLocation_arm64"
               Variable="DotnetInstallLocationExists_arm64"
               Result="exists"
@@ -121,9 +145,6 @@
         Example:
             dotnet-sdk-3.0.100-alpha1-009719-win-x64.exe /install DOTNETHOME_X64="D:\dotnet\x64" DOTNETHOME_X86="D:\dotnet\x86" /log "installation.log" /quiet /norestart
     -->
-    <Variable Name="DOTNETHOME_X86" Type="string" Value="[ProgramFilesFolder]dotnet" bal:Overridable="yes" />
-    <Variable Name="DOTNETHOME_X64" Type="string" Value="[ProgramFiles64Folder]dotnet" bal:Overridable="yes" />
-    <Variable Name="DOTNETHOME_ARM64" Type="string" Value="[ProgramFiles64Folder]dotnet" bal:Overridable="yes" />
     <Variable Name="DOTNETHOME" Type="string" Value="[DOTNETHOME_$(var.PlatformToken)]" bal:Overridable="no" />
     <Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="no" />
     <Variable Name="DOTNETSDKVERSION" Type="string" Value="$(var.NugetVersion)" bal:Overridable="no" />
diff --git a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
index 4c4c9fcc8..257b00329 100644
--- a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
@@ -29,12 +29,6 @@
     <Property Id="NUGETVERSION" Value="$(var.NugetVersion)" />
     <WixVariable Id="WixUILicenseRtf" Value="$(var.MicrosoftEula)" />
 
-    <Property Id="DOTNETEXE">
-      <DirectorySearch Id="DOTNETPATH" Path="[#DOTNETHOME]">
-        <FileSearch Id="DOTNETEXESEARCH" Name="dotnet.exe" />
-      </DirectorySearch>
-    </Property>
-
     <CustomActionRef Id="WixBroadcastEnvironmentChange" />
 
     <CustomAction Id="PropertyAssignPrimeCacheAndTelemetry"
@@ -59,6 +53,10 @@
         <Directory Id="DOTNETHOME" Name="dotnet"/>
       </Directory>
     </Directory>
+    
+    <?if $(var.Platform) = x64 ?>
+    <CustomActionRef Id="Set_DOTNETHOME_x64" />
+    <?endif?>
   </Fragment>
   <Fragment>
     <ComponentGroup Id="DotnetToolSetup">
diff --git a/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs b/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs
new file mode 100644
index 000000000..4cb6b5138
--- /dev/null
+++ b/src/redist/targets/packaging/windows/clisdk/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/redist/targets/packaging/windows/clisdk/generatemanifestsmsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatemanifestsmsi.ps1
index 4ef97e1dc..bef841dc2 100644
--- a/src/redist/targets/packaging/windows/clisdk/generatemanifestsmsi.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatemanifestsmsi.ps1
@@ -65,6 +65,7 @@ function RunCandle
         -ext WixDependencyExtension.dll `
         "$PSScriptRoot\manifests.wxs" `
         "$PSScriptRoot\provider.wxs" `
+        "$PSScriptRoot\dotnethome_x64.wxs" `
         $InstallFileswsx
 
     Write-Information "Candle output: $candleOutput"
@@ -91,6 +92,7 @@ function RunLight
         -cultures:en-us `
         manifests.wixobj `
         provider.wixobj `
+        dotnethome_x64.wixobj `
         $InstallFilesWixobj `
         -b "$inputDir" `
         -b "$PSScriptRoot" `
diff --git a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1
index bfddd68a8..c3c98a52f 100644
--- a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1
@@ -71,6 +71,7 @@ function RunCandle
         -arch "$Architecture" `
         -ext WixDependencyExtension.dll `
         "$PSScriptRoot\dotnet.wxs" `
+        "$PSScriptRoot\dotnethome_x64.wxs" `
         "$PSScriptRoot\provider.wxs" `
         "$PSScriptRoot\registrykeys.wxs" `
         $InstallFileswsx
@@ -98,6 +99,7 @@ function RunLight
     $lightOutput = .\light.exe -nologo -ext WixUIExtension -ext WixDependencyExtension -ext WixUtilExtension `
         -cultures:en-us `
         dotnet.wixobj `
+        dotnethome_x64.wixobj `
         provider.wixobj `
         registrykeys.wixobj `
         $InstallFilesWixobj `
diff --git a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1
index 151767c7e..ecbb68ba6 100644
--- a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1
@@ -63,6 +63,7 @@ function RunCandle
         -dDependencyKeyName="$DependencyKeyName" `
         -arch "$Architecture" `
         -ext WixDependencyExtension.dll `
+        "$PSScriptRoot\dotnethome_x64.wxs" `
         "$PSScriptRoot\templates.wxs" `
         "$PSScriptRoot\provider.wxs" `
         $InstallFileswsx
@@ -89,6 +90,7 @@ function RunLight
 
     $lightOutput = .\light.exe -nologo -ext WixUIExtension -ext WixDependencyExtension -ext WixUtilExtension `
         -cultures:en-us `
+        dotnethome_x64.wixobj `
         templates.wixobj `
         provider.wixobj `
         $InstallFilesWixobj `
diff --git a/src/redist/targets/packaging/windows/clisdk/manifests.wxs b/src/redist/targets/packaging/windows/clisdk/manifests.wxs
index a2ef49c4b..e2b89dd86 100644
--- a/src/redist/targets/packaging/windows/clisdk/manifests.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/manifests.wxs
@@ -32,5 +32,9 @@
         <Directory Id="DOTNETHOME" Name="dotnet"/>
       </Directory>
     </Directory>
+    
+    <?if $(var.Platform) = x64 ?>
+    <CustomActionRef Id="Set_DOTNETHOME_x64" />
+    <?endif?>
   </Fragment>
 </Wix>
diff --git a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs
index a84391c81..2a189786f 100644
--- a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs
@@ -15,6 +15,9 @@
           <RegistryValue Action="write" Name="WpfWinformsTemplates" Type="integer" Value="1" KeyPath="yes"/>
         </RegistryKey>
       </Component>
+      <!-- TODO: Determine the importance of setting these when they point to default path.
+                 Previously the bundle would set all of DOTNETHOME_* regardless of those being
+                 installed or not-->
       <Component Id="DotnetInstallLocation_arm64" Directory="TARGETDIR" Win64="no">
         <Condition>VersionNT64 AND DOTNETHOME_ARM64</Condition>
         <RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\arm64">
diff --git a/src/redist/targets/packaging/windows/clisdk/templates.wxs b/src/redist/targets/packaging/windows/clisdk/templates.wxs
index a2ef49c4b..e2b89dd86 100644
--- a/src/redist/targets/packaging/windows/clisdk/templates.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/templates.wxs
@@ -32,5 +32,9 @@
         <Directory Id="DOTNETHOME" Name="dotnet"/>
       </Directory>
     </Directory>
+    
+    <?if $(var.Platform) = x64 ?>
+    <CustomActionRef Id="Set_DOTNETHOME_x64" />
+    <?endif?>
   </Fragment>
 </Wix>

From cf2914d14a967cece7b8259a26984ba7371a2917 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Thu, 2 Sep 2021 11:18:34 -0700
Subject: [PATCH 2/7] Ensure case insensitive comparisons against Platform

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

diff --git a/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs b/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs
index 4cb6b5138..ab939cdc4 100644
--- a/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs
@@ -8,10 +8,10 @@
   <!-- 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"?>
+    <?define InstallerArchitecture~="X86"?>
   <?elseif $(var.Platform)=x64?>
-    <?define InstallerArchitecture="AMD64"?>
-  <?elseif $(var.Platform)=ARM64?>
+    <?define InstallerArchitecture~="AMD64"?>
+  <?elseif $(var.Platform)~=ARM64?>
     <?define InstallerArchitecture="ARM64"?>
   <?endif?>
 

From 771924914b90546e39fb7086f49b889afced892a Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Thu, 2 Sep 2021 15:58:25 -0700
Subject: [PATCH 3/7] Make platform comparison case insensitive

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

diff --git a/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs b/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs
index ab939cdc4..ab3a6bab0 100644
--- a/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/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?>
-    <?define InstallerArchitecture~="X86"?>
-  <?elseif $(var.Platform)=x64?>
-    <?define InstallerArchitecture~="AMD64"?>
-  <?elseif $(var.Platform)~=ARM64?>
+  <?if $(var.Platform)~=x86?>
+    <?define InstallerArchitecture="X86"?>
+  <?elseif $(var.Platform)~=x64?>
+    <?define InstallerArchitecture="AMD64"?>
+  <?elseif $(var.Platform)~=arm64?>
     <?define InstallerArchitecture="ARM64"?>
   <?endif?>
 

From 2fa338adf00ec285c20c05f1c804be0db3668913 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Fri, 3 Sep 2021 15:41:34 -0700
Subject: [PATCH 4/7] Address feedback

---
 .../packaging/windows/clisdk/bundle.wxs       |  3 +++
 .../packaging/windows/clisdk/dotnet.wxs       |  4 +--
 .../windows/clisdk/dotnethome_x64.wxs         | 26 +++++++++++--------
 .../packaging/windows/clisdk/manifests.wxs    |  4 +--
 .../packaging/windows/clisdk/templates.wxs    |  4 +--
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
index a2dfa73ee..ec6be155f 100644
--- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
@@ -145,6 +145,9 @@
         Example:
             dotnet-sdk-3.0.100-alpha1-009719-win-x64.exe /install DOTNETHOME_X64="D:\dotnet\x64" DOTNETHOME_X86="D:\dotnet\x86" /log "installation.log" /quiet /norestart
     -->
+    <Variable Name="DOTNETHOME_X86" bal:Overridable="yes" />
+    <Variable Name="DOTNETHOME_X64" bal:Overridable="yes" />
+    <Variable Name="DOTNETHOME_ARM64" bal:Overridable="yes" />
     <Variable Name="DOTNETHOME" Type="string" Value="[DOTNETHOME_$(var.PlatformToken)]" bal:Overridable="no" />
     <Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="no" />
     <Variable Name="DOTNETSDKVERSION" Type="string" Value="$(var.NugetVersion)" bal:Overridable="no" />
diff --git a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
index 257b00329..d178b967b 100644
--- a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
@@ -54,8 +54,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>
   <Fragment>
diff --git a/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs b/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs
index ab3a6bab0..5e30f9871 100644
--- a/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/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/redist/targets/packaging/windows/clisdk/manifests.wxs b/src/redist/targets/packaging/windows/clisdk/manifests.wxs
index e2b89dd86..27a3017d0 100644
--- a/src/redist/targets/packaging/windows/clisdk/manifests.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/manifests.wxs
@@ -33,8 +33,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>
 </Wix>
diff --git a/src/redist/targets/packaging/windows/clisdk/templates.wxs b/src/redist/targets/packaging/windows/clisdk/templates.wxs
index e2b89dd86..27a3017d0 100644
--- a/src/redist/targets/packaging/windows/clisdk/templates.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/templates.wxs
@@ -33,8 +33,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>
 </Wix>

From 18e37593613cedbc7de447cc406454b989922d72 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Mon, 13 Sep 2021 15:26:02 -0700
Subject: [PATCH 5/7] Ensure Tag is installed

DOTNETHOME may not always be set, be sure to install the tag to a
predictable location.
---
 src/redist/targets/packaging/windows/clisdk/bundle.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
index ec6be155f..9536b46ec 100644
--- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
@@ -27,7 +27,7 @@
       <PayloadGroupRef Id="DotnetCoreBAPayloads" />
     </BootstrapperApplicationRef>
 
-    <swid:Tag Regid="microsoft.com" InstallPath="[DOTNETHOME]" />
+    <swid:Tag Regid="microsoft.com" InstallPath="[$(var.Program_Files)]dotnet" />
 
     <util:RegistrySearch Id="CheckDotnetInstallLocation_x86"
               Variable="DotnetInstallLocationExists_x86"

From 58615fc731a21e64173f20de9f397de6ac9b2288 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Tue, 14 Sep 2021 12:08:43 -0700
Subject: [PATCH 6/7] Remove TODO

---
 src/redist/targets/packaging/windows/clisdk/registrykeys.wxs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs
index 2a189786f..a84391c81 100644
--- a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs
@@ -15,9 +15,6 @@
           <RegistryValue Action="write" Name="WpfWinformsTemplates" Type="integer" Value="1" KeyPath="yes"/>
         </RegistryKey>
       </Component>
-      <!-- TODO: Determine the importance of setting these when they point to default path.
-                 Previously the bundle would set all of DOTNETHOME_* regardless of those being
-                 installed or not-->
       <Component Id="DotnetInstallLocation_arm64" Directory="TARGETDIR" Win64="no">
         <Condition>VersionNT64 AND DOTNETHOME_ARM64</Condition>
         <RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\arm64">

From 4ce025c05ce79832fb91011f8e0558904c4c3bbb Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Wed, 15 Sep 2021 14:19:41 -0700
Subject: [PATCH 7/7] Make CLISDK MSI set the InstallLocation when bundle does
 not

We changed the bundle to not pass in default values for DOTNETHOME
because it cannot calculate them in all cases: there is no way to
conditionally set a path which does not exist.  As a result, the MSI
needs to calculate them so that it can write the appropriate defaults.
---
 .../packaging/windows/clisdk/bundle.wxs       | 10 +++--
 .../packaging/windows/clisdk/registrykeys.wxs | 42 +++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
index 9536b46ec..a8271d4e6 100644
--- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
@@ -11,11 +11,16 @@
           Compressed="yes">
 
     <bal:Condition Message="The installation path for x64 SDK installations: &quot;[DOTNETHOME_X64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;">
-        WixBundleInstalled OR ((NOT (DOTNETHOME_X64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE)
+        WixBundleInstalled OR (NOT DOTNETHOME_X64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE
     </bal:Condition>
 
     <bal:Condition Message="The installation path for ARM64 SDK installations: &quot;[DOTNETHOME_ARM64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;">
-        WixBundleInstalled OR ((NOT (DOTNETHOME_ARM64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE)
+        WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE
+    </bal:Condition>
+
+    <!-- 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
     </bal:Condition>
 
     <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.Foundation">
@@ -75,7 +80,6 @@
     <!-- Determine native OS architecture -->
     <util:RegistrySearch Id="CheckProcessorArchitecture_x64"
               After="DotnetInstallLocation_x64"
-              Condition="NOT DotnetInstallLocationExists_x64"
               Variable="NativeProcessorArchitecture"
               Result="value"
               Root="HKLM"
diff --git a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs
index a84391c81..02d94f810 100644
--- a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs
@@ -34,5 +34,47 @@
         </RegistryKey>
       </Component>
     </ComponentGroup>
+
+    <!-- Set values for DOTNETHOME if not passed in.  
+         These searches prefer the existing registry key and fallback to probing the default location if registry key isn't present -->
+    <Property Id="DOTNETHOME_X86_SEARCH">
+      <DirectorySearch Id="dirDOTNETHOME_X86_search" Path="[ProgramFilesFolder]dotnet" AssignToProperty="yes">
+        <FileSearch Id="fileDOTNETHOME_X86_search" Name="dotnet.exe" />
+      </DirectorySearch>
+      <RegistrySearch Id="regDOTNETHOME_X86_search" Root="HKLM"  Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86" Name="InstallLocation" Win64="no" Type="raw" />
+    </Property>
+    <Property Id="DOTNETHOME_X64_SEARCH">
+      <DirectorySearch Id="dirDOTNETHOME_X64_search" Path="[ProgramFiles64Folder]dotnet" AssignToProperty="yes">
+        <FileSearch Id="fileDOTNETHOME_X64_search" Name="dotnet.exe" />
+      </DirectorySearch>
+      <RegistrySearch Id="regDOTNETHOME_X64_search" Root="HKLM"  Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64" Name="InstallLocation" Win64="no" Type="raw" />
+    </Property>
+    <Property Id="DOTNETHOME_X64_ALT_SEARCH">
+      <DirectorySearch Id="dirDOTNETHOME_X64_ALT_search" Path="[ProgramFiles64Folder]dotnet\x64" AssignToProperty="yes">
+        <FileSearch Id="fileDOTNETHOME_X64_ALT_search" Name="dotnet.exe" />
+      </DirectorySearch>
+      <RegistrySearch Id="regDOTNETHOME_X64_ALT_search" Root="HKLM"  Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64" Name="InstallLocation" Win64="no" Type="raw" />
+    </Property>
+    <Property Id="DOTNETHOME_ARM64_SEARCH">
+      <DirectorySearch Id="dirDOTNETHOME_ARM64_search" Path="[ProgramFiles64Folder]dotnet" AssignToProperty="yes">
+        <FileSearch Id="fileDOTNETHOME_ARM64_search" Name="dotnet.exe" />
+      </DirectorySearch>
+      <RegistrySearch Id="regDOTNETHOME_ARM64_search" Root="HKLM"  Key="SOFTWARE\dotnet\Setup\InstalledVersions\arm64" Name="InstallLocation" Win64="no" Type="raw" />
+    </Property>
+
+    <!-- Set the DOTNETHOME property if not passed in and we found a path -->
+    <SetProperty Id="DOTNETHOME_X86" Value="[DOTNETHOME_X86_SEARCH]" Before="CostFinalize">
+      NOT DOTNETHOME_X86 AND DOTNETHOME_X86_SEARCH
+    </SetProperty>
+    <SetProperty Id="DOTNETHOME_X64" Value="[DOTNETHOME_X64_SEARCH]" Before="CostFinalize">
+      NOT DOTNETHOME_X64 AND DOTNETHOME_X64_SEARCH AND %PROCESSOR_ARCHITECTURE="AMD64"
+    </SetProperty>
+    <SetProperty Action="Set_DOTNETHOME_X64_alt" Id="DOTNETHOME_X64" Value="[DOTNETHOME_X64_ALT_SEARCH]" Before="CostFinalize">
+      NOT DOTNETHOME_X64 AND DOTNETHOME_X64_ALT_SEARCH AND NOT %PROCESSOR_ARCHITECTURE="AMD64"
+    </SetProperty>
+    <SetProperty Id="DOTNETHOME_ARM64" Value="[DOTNETHOME_ARM64_SEARCH]" Before="CostFinalize">
+      NOT DOTNETHOME_ARM64 AND DOTNETHOME_ARM64_SEARCH
+    </SetProperty>
+
   </Fragment>
 </Wix>