Skip to content

[release/6.0] Make scheduling of upgrade configurable #8029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

[release/6.0] Make scheduling of upgrade configurable #8029

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
2 changes: 2 additions & 0 deletions src/Microsoft.DotNet.Build.Tasks.Installers/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ If you have files that need to have a stabilized identity in the MSI file, you c

If you want to create MSIs for the target RID that target other architecture install locations, you can add `CrossArchSdkMsiInstallerArch` items for all of the target architecture install locations you want to generate installers of the current build for.

To control the order in which an older product is removed during an upgrade, set the `MajorUpgradeSchedule` property to a value defined [here](https://wixtoolset.org/documentation/manual/v3/xsd/wix/majorupgrade.html). The default is `afterInstallInitialize`.

### Linux package configuration

To add package dependencies for linux packages, add a `LinuxPackageDependency` item with the version in the `Version` metadata.
Expand Down
6 changes: 5 additions & 1 deletion src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/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/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@
<CandleVariables Include="NugetVersion" Value="$(Version)" />
<CandleVariables Include="TargetArchitectureDescription" Value="$(InstallerTargetArchitecture)$(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