From 09e7f3a982b6066782f33f082a85e8bcee8220e9 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Tue, 12 Oct 2021 18:28:14 -0700
Subject: [PATCH] Make upgrade install new host first, then uninstall old

This should preserve the ordering of PATH, since the old MSI will never
remove its entry.
---
 src/pkg/packaging-tools/windows/product/product.common.wxi  | 6 +++++-
 src/pkg/packaging-tools/windows/wix.targets                 | 1 +
 .../Microsoft.NETCore.DotNetHost.pkgproj                    | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pkg/packaging-tools/windows/product/product.common.wxi b/src/pkg/packaging-tools/windows/product/product.common.wxi
index 833f564c88..8929aaddfc 100644
--- a/src/pkg/packaging-tools/windows/product/product.common.wxi
+++ b/src/pkg/packaging-tools/windows/product/product.common.wxi
@@ -3,7 +3,11 @@
 
   <Package Compressed="yes" InstallScope="perMachine" InstallerVersion="$(var.InstallerVersion)" />
 
-  <MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="afterInstallInitialize"/>
+  <?ifndef MajorUpgradeSchedule?>
+    <?define MajorUpgradeSchedule = afterInstallInitialize?>
+  <?endif?>
+
+  <MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="$(var.MajorUpgradeSchedule)"/>
 
   <MediaTemplate CompressionLevel="high" EmbedCab="yes"/>
 
diff --git a/src/pkg/packaging-tools/windows/wix.targets b/src/pkg/packaging-tools/windows/wix.targets
index 1129fa4635..1b004d1536 100644
--- a/src/pkg/packaging-tools/windows/wix.targets
+++ b/src/pkg/packaging-tools/windows/wix.targets
@@ -247,6 +247,7 @@
       <CandleVariables Include="NugetVersion" Value="$(ProductVersion)" />
       <CandleVariables Include="TargetArchitectureDescription" Value="$(TargetArchitecture)$(CrossArchContentsBuildPart)" />
       <CandleVariables Include="UpgradeCode" Value="$(UpgradeCode)" />
+      <CandleVariables Include="MajorUpgradeSchedule" Value="$(MajorUpgradeSchedule)" Condition="'$(MajorUpgradeSchedule)' != ''" />
 
       <!-- If this is a cross-arch MSI, add target arch to the dependency key for uniqueness. -->
       <CandleVariables Include="CrossArchContentsPlatformPart" Value="$(CrossArchContentsBuildPart.Replace('-', '_'))" />
diff --git a/src/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj b/src/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj
index d4c5824f7b..910b547447 100644
--- a/src/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj
+++ b/src/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj
@@ -14,6 +14,7 @@
       <WixProductMoniker>$(SharedHostBrandName)</WixProductMoniker>
       <RegKeyProductName>sharedhost</RegKeyProductName>
       <WixDependencyKeyName>Dotnet_CLI_SharedHost</WixDependencyKeyName>
+      <MajorUpgradeSchedule>afterInstallExecute</MajorUpgradeSchedule>
       <VSInsertionShortComponentName>SharedHost</VSInsertionShortComponentName>
 
       <PublishRootDir>$(IntermediateOutputPath)publishRoot/</PublishRootDir>