未验证 提交 3c69cafa 编写于 作者: M Matt Mitchell 提交者: GitHub

Fix RuntimeFrameworkReferences for RTM builds (#3406)

In RTM and post-RTM, the ref pack will rev less frequently, and so the ref pack version should be used for the targeting pack version.
In addition, the RuntimeFrameworkVersion should be set to a property that will track the stable version of the runtime, rather than the internal version.
上级 e83115f0
...@@ -93,6 +93,14 @@ ...@@ -93,6 +93,14 @@
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1dfd9438149f74ae11918a7b0709b8d58c61443f</Sha> <Sha>1dfd9438149f74ae11918a7b0709b8d58c61443f</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-rc.1.20428.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1dfd9438149f74ae11918a7b0709b8d58c61443f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20428.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1dfd9438149f74ae11918a7b0709b8d58c61443f</Sha>
</Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20419.21"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20419.21">
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
<!-- Packages that come from https://github.com/dotnet/core-setup --> <!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup> <PropertyGroup>
<MicrosoftNETCoreAppInternalVersion>5.0.0-rc.1.20428.3</MicrosoftNETCoreAppInternalVersion> <MicrosoftNETCoreAppInternalVersion>5.0.0-rc.1.20428.3</MicrosoftNETCoreAppInternalVersion>
<MicrosoftNETCoreAppRefVersion>5.0.0-rc.1.20428.3</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>5.0.0-rc.1.20428.3</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>5.0.0-rc.1.20428.3</MicrosoftNETCorePlatformsVersion> <MicrosoftNETCorePlatformsVersion>5.0.0-rc.1.20428.3</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>5.0.0-rc.1.20428.3</SystemDrawingCommonVersion> <SystemDrawingCommonVersion>5.0.0-rc.1.20428.3</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>5.0.0-rc.1.20428.3</SystemDirectoryServicesVersion> <SystemDirectoryServicesVersion>5.0.0-rc.1.20428.3</SystemDirectoryServicesVersion>
......
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppInternalVersion)'!='' And <RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppRuntimewinx64Version)'!='' And
'$(NoTargets)'!='true' And '$(NoTargets)'!='true' And
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0')">$(MicrosoftNETCoreAppInternalVersion)</RuntimeFrameworkVersion> ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0')">$(MicrosoftNETCoreAppRuntimewinx64Version)</RuntimeFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<!-- workaround for package downgrade in Microsoft.NetCore.Platforms --> <!-- workaround for package downgrade in Microsoft.NetCore.Platforms -->
......
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
Condition="'$(ManagedCxx)'=='true'"/> Condition="'$(ManagedCxx)'=='true'"/>
<FrameworkReference Update="Microsoft.NETCore.App" <FrameworkReference Update="Microsoft.NETCore.App"
Condition="'$(MicrosoftNETCoreAppInternalVersion)'!='' Condition="'$(MicrosoftNETCoreAppRefVersion)'!=''
And '$(NoTargets)'!='true' And '$(NoTargets)'!='true'
And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0') And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0')
And '$(MSBuildProjectExtension)'!='.vcxproj'"> And '$(MSBuildProjectExtension)'!='.vcxproj'">
<TargetingPackVersion>$(MicrosoftNETCoreAppInternalVersion)</TargetingPackVersion> <TargetingPackVersion>$(MicrosoftNETCoreAppRefVersion)</TargetingPackVersion>
</FrameworkReference> </FrameworkReference>
<!-- <!--
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册