Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

[release/3.1] Make upgrade install new host first, then uninstall old #9184

Merged
ericstj merged 1 commit into from
Oct 13, 2021
Merged

[release/3.1] Make upgrade install new host first, then uninstall old #9184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/pkg/packaging-tools/windows/product/product.common.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

Expand Down
1 change: 1 addition & 0 deletions src/pkg/packaging-tools/windows/wix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('-', '_'))" />
Expand Down
1 change: 1 addition & 0 deletions src/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down