Skip to content

Commit f24b363

Browse files
Stabilize host's UpgradeCode and ProviderKey (#61810)
1 parent 8b67772 commit f24b363

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
<Uri>https://github.com/dotnet/arcade</Uri>
5555
<Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21559.3">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21568.2">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha>
59+
<Sha>7097001cd87357ebc6fb82f3c7a801efeed70e3f</Sha>
6060
</Dependency>
6161
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.21559.3">
6262
<Uri>https://github.com/dotnet/arcade</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.21559.3</MicrosoftDotNetXUnitExtensionsVersion>
6666
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21559.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
6767
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksArchivesVersion>
68-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksInstallersVersion>
68+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.21568.2</MicrosoftDotNetBuildTasksInstallersVersion>
6969
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksPackagingVersion>
7070
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksTemplatingVersion>
7171
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>

src/installer/pkg/sfx/installers/dotnet-host.proj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<UseCustomDirectoryHarvesting>true</UseCustomDirectoryHarvesting>
1010
<WixIncludeRegistryKeys>true</WixIncludeRegistryKeys>
1111
<RegKeyProductName>sharedhost</RegKeyProductName>
12+
<!-- Contributes to DependencyKey which ensures stable provider key - do not change -->
1213
<WixDependencyKeyName>Dotnet_CLI_SharedHost</WixDependencyKeyName>
1314
<OutputFilesCandleVariable>HostSrc</OutputFilesCandleVariable>
1415
<MajorUpgradeSchedule>afterInstallExecute</MajorUpgradeSchedule>
@@ -21,12 +22,16 @@
2122
<RpmScriptsDirectory>$(MSBuildThisFileDirectory)rpm_scripts/host</RpmScriptsDirectory>
2223
<RpmAfterInstallScript>$(RpmScriptsDirectory)/after_install.sh</RpmAfterInstallScript>
2324
<RpmAfterRemoveScript>$(RpmScriptsDirectory)/after_remove.sh</RpmAfterRemoveScript>
25+
<!-- Enables stable upgrade code - do not change -->
26+
<MsiUpgradeCodeSeed>dotnet-host $(MajorVersion).$(MinorVersion) $(Platform)</MsiUpgradeCodeSeed>
2427
</PropertyGroup>
2528

2629
<ItemGroup>
2730
<WixSrcFile Include="host.wxs" />
2831
<WixExtraComponentGroupRefId Include="InstallSharedHostandDetectionKeys" />
2932
<CandleVariables Include="ExtraPropertyRefIds" Value="ProductCPU;RTM_ProductVersion" />
33+
<!-- Enables stable provider key - do not change -->
34+
<CandleVariables Include="DependencyKey" Value="$(WixDependencyKeyName)_$(MajorVersion).$(MinorVersion)_$(TargetArchitecture)" />
3035
</ItemGroup>
3136

3237
<ItemGroup>

0 commit comments

Comments
 (0)