Skip to content

Commit 97f0e8a

Browse files
Stabilize upgrade code and dependency key for host msi (#61619)
* Stabilize upgrade code and dependency key for host msi * Picking up newest Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk package
1 parent 87c62eb commit 97f0e8a

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@
6262
<Uri>https://github.com/dotnet/arcade</Uri>
6363
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.21552.7">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.21565.1">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
67+
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
6868
</Dependency>
6969
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6">
7070
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"msbuild-sdks": {
1515
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.21552.7",
1616
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21552.7",
17-
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.21552.7",
17+
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.21565.1",
1818
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21552.7",
1919
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2020
"Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4",

src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
<VSInsertionShortComponentName>SharedHost</VSInsertionShortComponentName>
2020

2121
<PublishRootDir>$(IntermediateOutputPath)publishRoot/</PublishRootDir>
22+
23+
<!-- Stabilizes upgrade codes, using values from 5.0.12 release - do not change -->
24+
<UpgradeCode Condition="'$(TargetArchitecture)' == 'arm64'">{01641E02-508B-44C0-03F9-9C24097910A8}</UpgradeCode>
25+
<UpgradeCode Condition="'$(TargetArchitecture)' == 'x64'">{8DA8DDFA-591B-6F59-58DF-79F2FA881F7B}</UpgradeCode>
26+
<UpgradeCode Condition="'$(TargetArchitecture)' == 'x86'">{49C53A16-52DB-5FC0-1519-43577C49406B}</UpgradeCode>
2227
</PropertyGroup>
2328

2429
<!-- Always clean this up to avoid side-by-side versions in unclean dev builds. -->
@@ -46,6 +51,10 @@
4651

4752
<CandleVariables Include="ExtraPropertyRefIds" Value="ProductCPU;RTM_ProductVersion" />
4853
<CandleVariables Include="HostSrc" Value="$(PublishRootDir)" />
54+
<!-- Stabilizes provider key, using values from 5.0.12 release - do not change -->
55+
<CandleVariables Condition="'$(TargetArchitecture)' == 'arm64'" Include="DependencyKey" Value="Dotnet_CLI_SharedHost_40.48.30622_arm64" />
56+
<CandleVariables Condition="'$(TargetArchitecture)' == 'x64'" Include="DependencyKey" Value="Dotnet_CLI_SharedHost_40.48.30622_x64" />
57+
<CandleVariables Condition="'$(TargetArchitecture)' == 'x86'" Include="DependencyKey" Value="Dotnet_CLI_SharedHost_40.48.30622_x86" />
4958
</ItemGroup>
5059
</Target>
5160

0 commit comments

Comments
 (0)