diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b8b2e88810..57a35f637ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,25 +11,25 @@ - + https://github.com/dotnet/arcade - 3fed9305d79d351fefc2c60e6bc7ed0fcff6b50a + b686d59a23d4801463328db9c2e550ca7e85b283 - + https://github.com/dotnet/arcade - 3fed9305d79d351fefc2c60e6bc7ed0fcff6b50a + b686d59a23d4801463328db9c2e550ca7e85b283 - + https://github.com/dotnet/arcade - 3fed9305d79d351fefc2c60e6bc7ed0fcff6b50a + b686d59a23d4801463328db9c2e550ca7e85b283 - + https://github.com/dotnet/arcade - 3fed9305d79d351fefc2c60e6bc7ed0fcff6b50a + b686d59a23d4801463328db9c2e550ca7e85b283 - + https://github.com/dotnet/arcade - 3fed9305d79d351fefc2c60e6bc7ed0fcff6b50a + b686d59a23d4801463328db9c2e550ca7e85b283 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index b81ff640ac9..0c4a54eac27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,8 +65,8 @@ 2.4.2-pre.9 2.0.3 2.4.1 - 6.0.0-beta.21511.3 - 6.0.0-beta.21511.3 + 6.0.0-beta.21512.4 + 6.0.0-beta.21512.4 1.22.0 1.1.2 2.0.0 @@ -77,7 +77,7 @@ 1.1.0-beta.20258.6 1.1.0-beta-21423-02 1.1.0-beta-21423-02 - 6.0.0-beta.21511.3 + 6.0.0-beta.21512.4 1.0.0-beta.21431.1 1.1.0-beta.21378.2 1.0.0-prerelease.21427.1 diff --git a/global.json b/global.json index 628b3b0f662..1f19a88605f 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "6.0.100-rc.1.21430.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21511.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21511.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21512.4", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21512.4" } } diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/README.md b/src/Microsoft.DotNet.Build.Tasks.Installers/README.md index ae1147bacaf..0ba6e2fad1a 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/README.md +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/README.md @@ -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. diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/product/product.common.wxi b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/product/product.common.wxi index 833f564c880..8929aaddfc1 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/product/product.common.wxi +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/product/product.common.wxi @@ -3,7 +3,11 @@ - + + + + + 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 15c2ac84d87..03631ec66e8 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets @@ -290,6 +290,7 @@ +