Skip to content

Commit 2165555

Browse files
Stabilize upgrade codes for host msi (#61606)
* Stabilize upgrade codes for host msi * Override ProviderKey with values from 6.0.0 release * Fixing typo * Update version of Microsoft.DotNet.Build.Tasks.Installers package
1 parent 39ecea6 commit 2165555

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

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>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21560.2">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21565.3">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
59+
<Sha>a35b36664af90a8e61f051ad06fb8039380b1526</Sha>
6060
</Dependency>
6161
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21560.2">
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
@@ -62,7 +62,7 @@
6262
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21560.2</MicrosoftDotNetXUnitExtensionsVersion>
6363
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21560.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
6464
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksArchivesVersion>
65-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksInstallersVersion>
65+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21565.3</MicrosoftDotNetBuildTasksInstallersVersion>
6666
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksPackagingVersion>
6767
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksTemplatingVersion>
6868
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,20 @@
2121
<RpmScriptsDirectory>$(MSBuildThisFileDirectory)rpm_scripts/host</RpmScriptsDirectory>
2222
<RpmAfterInstallScript>$(RpmScriptsDirectory)/after_install.sh</RpmAfterInstallScript>
2323
<RpmAfterRemoveScript>$(RpmScriptsDirectory)/after_remove.sh</RpmAfterRemoveScript>
24+
<!-- Stabilizes upgrade codes, using values from 6.0.0 release - do not change -->
25+
<UpgradeCode Condition="'$(TargetArchitecture)' == 'arm64'">{FD6988BF-5CCB-4202-3752-072442B1070B}</UpgradeCode>
26+
<UpgradeCode Condition="'$(TargetArchitecture)' == 'x64'">{97C9F490-5379-6902-7B80-D2723CA59D95}</UpgradeCode>
27+
<UpgradeCode Condition="'$(TargetArchitecture)' == 'x86'">{181630A5-53EA-4D70-E563-06F64946DE38}</UpgradeCode>
2428
</PropertyGroup>
2529

2630
<ItemGroup>
2731
<WixSrcFile Include="host.wxs" />
2832
<WixExtraComponentGroupRefId Include="InstallSharedHostandDetectionKeys" />
2933
<CandleVariables Include="ExtraPropertyRefIds" Value="ProductCPU;RTM_ProductVersion" />
34+
<!-- Stabilizes provider key, using values from 6.0.0 release - do not change -->
35+
<CandleVariables Condition="'$(TargetArchitecture)' == 'arm64'" Include="DependencyKey" Value="Dotnet_CLI_SharedHost_48.3.31210_arm64" />
36+
<CandleVariables Condition="'$(TargetArchitecture)' == 'x64'" Include="DependencyKey" Value="Dotnet_CLI_SharedHost_48.3.31210_x64" />
37+
<CandleVariables Condition="'$(TargetArchitecture)' == 'x86'" Include="DependencyKey" Value="Dotnet_CLI_SharedHost_48.3.31210_x86" />
3038
</ItemGroup>
3139

3240
<ItemGroup>

0 commit comments

Comments
 (0)