Stabilize host's UpgradeCode and ProviderKey (#61810)

dotnet · Nov 23, 2021 · f24b363 · f24b363
1 parent 8b67772
commit f24b363
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -54,9 +54,9 @@
  <Uri>https://github.com/dotnet/arcade</Uri>
  <Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21559.3">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21568.2">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha>
+ <Sha>7097001cd87357ebc6fb82f3c7a801efeed70e3f</Sha>
  </Dependency>
  <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.21559.3">
  <Uri>https://github.com/dotnet/arcade</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -65,7 +65,7 @@
  <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.21559.3</MicrosoftDotNetXUnitExtensionsVersion>
  <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21559.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
  <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksArchivesVersion>
- <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksInstallersVersion>
+ <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.21568.2</MicrosoftDotNetBuildTasksInstallersVersion>
  <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksPackagingVersion>
  <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksTemplatingVersion>
  <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>

diff --git a/src/installer/pkg/sfx/installers/dotnet-host.proj b/src/installer/pkg/sfx/installers/dotnet-host.proj
@@ -9,6 +9,7 @@
  <UseCustomDirectoryHarvesting>true</UseCustomDirectoryHarvesting>
  <WixIncludeRegistryKeys>true</WixIncludeRegistryKeys>
  <RegKeyProductName>sharedhost</RegKeyProductName>
+ <!-- Contributes to DependencyKey which ensures stable provider key - do not change -->
  <WixDependencyKeyName>Dotnet_CLI_SharedHost</WixDependencyKeyName>
  <OutputFilesCandleVariable>HostSrc</OutputFilesCandleVariable>
  <MajorUpgradeSchedule>afterInstallExecute</MajorUpgradeSchedule>
@@ -21,12 +22,16 @@
  <RpmScriptsDirectory>$(MSBuildThisFileDirectory)rpm_scripts/host</RpmScriptsDirectory>
  <RpmAfterInstallScript>$(RpmScriptsDirectory)/after_install.sh</RpmAfterInstallScript>
  <RpmAfterRemoveScript>$(RpmScriptsDirectory)/after_remove.sh</RpmAfterRemoveScript>
+ <!-- Enables stable upgrade code - do not change -->
+ <MsiUpgradeCodeSeed>dotnet-host $(MajorVersion).$(MinorVersion) $(Platform)</MsiUpgradeCodeSeed>
  </PropertyGroup>
 
  <ItemGroup>
  <WixSrcFile Include="host.wxs" />
  <WixExtraComponentGroupRefId Include="InstallSharedHostandDetectionKeys" />
  <CandleVariables Include="ExtraPropertyRefIds" Value="ProductCPU;RTM_ProductVersion" />
+ <!-- Enables stable provider key - do not change -->
+ <CandleVariables Include="DependencyKey" Value="$(WixDependencyKeyName)_$(MajorVersion).$(MinorVersion)_$(TargetArchitecture)" />
  </ItemGroup>
 
  <ItemGroup>