diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2021-11-16 06:44:21 +0300 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2021-11-16 06:44:21 +0300 |
| commit | b3afe992253738208ccaaa058e726553889928de (patch) | |
| tree | b2af7126e0bc7b8f2b5f99c4f96c30ad8b475b4d | |
| parent | 11f2c11ea0e98d8aa883e0546fcec1b0f214f02e (diff) | |
| parent | 97f0e8a5e4110244224fbc115c8d3dc5c44a360f (diff) | |
Merge in 'release/5.0' changesv5.0.13
| -rw-r--r-- | eng/Version.Details.xml | 4 | ||||
| -rw-r--r-- | global.json | 2 | ||||
| -rw-r--r-- | src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj | 9 |
3 files changed, 12 insertions, 3 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a73ed0ec61..240ccc2c442 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -62,9 +62,9 @@ <Uri>https://github.com/dotnet/arcade</Uri> <Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.21552.7"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.21565.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha> + <Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha> </Dependency> <Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri> diff --git a/global.json b/global.json index 05fef491c83..9c17d797aac 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "msbuild-sdks": { "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.21552.7", "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21552.7", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.21552.7", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.21565.1", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21552.7", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj index 19679aa1701..8dfd1561b77 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj @@ -19,6 +19,11 @@ <VSInsertionShortComponentName>SharedHost</VSInsertionShortComponentName> <PublishRootDir>$(IntermediateOutputPath)publishRoot/</PublishRootDir> + + <!-- Stabilizes upgrade codes, using values from 5.0.12 release - do not change --> + <UpgradeCode Condition="'$(TargetArchitecture)' == 'arm64'">{01641E02-508B-44C0-03F9-9C24097910A8}</UpgradeCode> + <UpgradeCode Condition="'$(TargetArchitecture)' == 'x64'">{8DA8DDFA-591B-6F59-58DF-79F2FA881F7B}</UpgradeCode> + <UpgradeCode Condition="'$(TargetArchitecture)' == 'x86'">{49C53A16-52DB-5FC0-1519-43577C49406B}</UpgradeCode> </PropertyGroup> <!-- Always clean this up to avoid side-by-side versions in unclean dev builds. --> @@ -46,6 +51,10 @@ <CandleVariables Include="ExtraPropertyRefIds" Value="ProductCPU;RTM_ProductVersion" /> <CandleVariables Include="HostSrc" Value="$(PublishRootDir)" /> + <!-- Stabilizes provider key, using values from 5.0.12 release - do not change --> + <CandleVariables Condition="'$(TargetArchitecture)' == 'arm64'" Include="DependencyKey" Value="Dotnet_CLI_SharedHost_40.48.30622_arm64" /> + <CandleVariables Condition="'$(TargetArchitecture)' == 'x64'" Include="DependencyKey" Value="Dotnet_CLI_SharedHost_40.48.30622_x64" /> + <CandleVariables Condition="'$(TargetArchitecture)' == 'x86'" Include="DependencyKey" Value="Dotnet_CLI_SharedHost_40.48.30622_x86" /> </ItemGroup> </Target> |