From 6b2364f5e240cf478679964c07d17d049434ecb7 Mon Sep 17 00:00:00 2001
From: Jacques Eloff <joeloff@users.noreply.github.com>
Date: Wed, 24 Jul 2024 11:32:01 -0700
Subject: [PATCH 1/3] Add RegistrySearch for Windows Installer

---
 .../build/wix/bundle/bundle.wxs               |  5 +++
 .../build/wix/bundle/upgradePolicies.wxs      | 40 +++++++++++++++++++
 .../build/wix/wix.targets                     |  3 ++
 3 files changed, 48 insertions(+)
 create mode 100644 src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/upgradePolicies.wxs

diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/bundle.wxs b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/bundle.wxs
index 978324e7598..65f35e08aea 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/bundle.wxs
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/bundle.wxs
@@ -24,6 +24,11 @@
       </bal:Condition>
     <?endif?>
 
+    <!-- Search references for upgrade policy keys -->
+    <util:RegistrySearchRef Id="RemovePreviousVersionRegistryKeySearch"/>
+    <util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeyExistsSearch"/>
+    <util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeySearch"/>
+
     <!--
       List of bundles that this bundle is an upgrade for. Used to support upgrade from bundles
       that were produced before UpdateCode was standardized per major-minor channel.
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/upgradePolicies.wxs b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/upgradePolicies.wxs
new file mode 100644
index 00000000000..6ac98e0cabd
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/upgradePolicies.wxs
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+  <?include "..\variables.wxi" ?>
+
+  <Fragment>
+    <!-- Bundle variables become unset if a search fails. The global key is retrieved first. If this fails,
+         RemoveUpgradeRelatedBundle becomes unset, allowing the version specific search to potentially set 
+         or override the bundle variable. -->
+    <util:RegistrySearch Id="RemovePreviousVersionRegistryKeySearch"
+                         Root="HKLM"
+                         Key="SOFTWARE\Microsoft\.NET"
+                         Value="RemovePreviousVersion"
+                         Result="value"
+                         Variable="RemoveUpgradeRelatedBundle"
+                         Win64="yes" />
+
+    <!-- The version specific key matching the major/minor of the .NET bundle takes precedence. The first search
+         checks whether the registry value exists and creates a variable that can be used as a condition
+         to executes the second part of the search to retrieve it. If the value doesn't exist, RemoveUpgradeRelatedBundle
+         retains its original value, or if it wasn't set, will be assigned a proper default through the BA (wixstdba). -->
+    <util:RegistrySearch Id="RemoveSpecificPreviousVersionRegistryKeyExistsSearch"
+                         After="RemovePreviousVersionRegistryKeySearch"
+                         Root="HKLM"
+                         Key="SOFTWARE\Microsoft\.NET\$(var.MajorVersion).$(var.MinorVersion)"
+                         Value="RemovePreviousVersion"
+                         Result="exists"
+                         Variable="RemoveSpecificPreviousVersionRegistryKeyExists"
+                         Win64="yes" />
+    <util:RegistrySearch Id="RemoveSpecificPreviousVersionRegistryKeySearch"
+                         After="RemoveSpecificPreviousVersionRegistryKeyExistsSearch"
+                         Condition="RemoveSpecificPreviousVersionRegistryKeyExists=1"
+                         Root="HKLM"
+                         Key="SOFTWARE\Microsoft\.NET\$(var.MajorVersion).$(var.MinorVersion)"
+                         Value="RemovePreviousVersion"
+                         Result="value"
+                         Variable="RemoveUpgradeRelatedBundle"
+                         Win64="yes" />
+  </Fragment>
+
+</Wix>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets
index 0b9f0202d96..ac5fe0e14a4 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets
@@ -125,6 +125,7 @@
       <WixExtensions Include="WixUtilExtension.dll" />
 
       <WixSrcFile Include="$(MSBuildThisFileDirectory)bundle/bundle.wxs" />
+      <WixSrcFile Include="$(MSBuildThisFileDirectory)bundle/upgradePolicies.wxs" />
     </ItemGroup>
   </Target>
 
@@ -185,6 +186,8 @@
       <LocFile Include="$(BundleThemeDirectory)\theme\**\bundle.wxl" />
       <LocDirName Include="$([System.String]::new('%(LocFile.RecursiveDir)').TrimEnd('\'))" />
 
+      <CandleVariables Include="MajorVersion" Value="$(MajorVersion)" />
+      <CandleVariables Include="MinorVersion" Value="$(MinorVersion)" />
       <CandleVariables Include="DisplayVersion" Value="$(MajorVersion).$(MinorVersion).$(PatchVersion).$(BuildNumberMajor)" />
       <CandleVariables Include="LcidList" Value="@(LocDirName)" />
       <CandleVariables Include="BundleThmDir" Value="$(BundleThemeDirectory)" />

From 74858cbb528c0e7fce0a7619d6f71ae71ea6aa95 Mon Sep 17 00:00:00 2001
From: Jacques Eloff <joeloff@users.noreply.github.com>
Date: Thu, 25 Jul 2024 12:11:13 -0700
Subject: [PATCH 2/3] Remove unnecessary include (breaks SDK)

---
 .../build/wix/bundle/upgradePolicies.wxs                       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/upgradePolicies.wxs b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/upgradePolicies.wxs
index 6ac98e0cabd..ffaa06038b7 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/upgradePolicies.wxs
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/upgradePolicies.wxs
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <?include "..\variables.wxi" ?>
-
   <Fragment>
     <!-- Bundle variables become unset if a search fails. The global key is retrieved first. If this fails,
          RemoveUpgradeRelatedBundle becomes unset, allowing the version specific search to potentially set 
@@ -36,5 +34,4 @@
                          Variable="RemoveUpgradeRelatedBundle"
                          Win64="yes" />
   </Fragment>
-
 </Wix>

From 9554f79ccec09997f90ec655632e26e66d023214 Mon Sep 17 00:00:00 2001
From: Jacques Eloff <joeloff@users.noreply.github.com>
Date: Thu, 3 Oct 2024 22:19:05 -0700
Subject: [PATCH 3/3] Update WiX version to 3.14.1-9323.2545153

---
 src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props     | 2 +-
 .../build/wix/wix.targets                                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
index 1b53b32c072..8e015fad629 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
@@ -107,7 +107,7 @@
     <MicrosoftVisualStudioEngMicroBuildCoreVersion Condition="'$(MicrosoftVisualStudioEngMicroBuildCoreVersion)' == ''">1.0.0</MicrosoftVisualStudioEngMicroBuildCoreVersion>
     <MicrosoftManifestToolCrossPlatformVersion Condition="'$(MicrosoftManifestToolCrossPlatformVersion)' == ''">2.1.3</MicrosoftManifestToolCrossPlatformVersion>
     <MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion Condition="'$(MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion)' == ''">1.1.286</MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion>
-    <MicrosoftSignedWixVersion Condition="'$(MicrosoftSignedWixVersion)' == ''">3.14.1-8722.20240403.1</MicrosoftSignedWixVersion>
+    <MicrosoftSignedWixVersion Condition="'$(MicrosoftSignedWixVersion)' == ''">3.14.1-9323.2545153</MicrosoftSignedWixVersion>
   </PropertyGroup>
 
   <!-- RestoreSources overrides - defines DotNetRestoreSources variable if available -->
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets
index ac5fe0e14a4..284c3e7b34d 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets
@@ -25,7 +25,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-      <WixVersion>3.14.1.8722</WixVersion>
+      <WixVersion>3.14.1-9323.2545153</WixVersion>
       <WixToolsDir>$(BaseIntermediateOutputPath)WixTools.$(WixVersion)/</WixToolsDir>
       <!-- Used in WiX targets to locate files. -->
       <WixInstallPath>$(WixToolsDir)</WixInstallPath>