未验证 提交 4f57f64b 编写于 作者: V Vatsan Madhavan 提交者: GitHub

Merge pull request #2817 from wpfcontrib/runtimeframeworkversion-fixup

Fix RuntimeFrameworkVersion logic
<Project>
<PropertyGroup>
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppVersion)'!='' And
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppInternalVersion)'!='' And
'$(NoTargets)'!='true' And
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0')">$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0')">$(MicrosoftNETCoreAppInternalVersion)</RuntimeFrameworkVersion>
</PropertyGroup>
<!-- workaround for package downgrade in Microsoft.NetCore.Platforms -->
......
......@@ -13,12 +13,12 @@
Condition="'$(ManagedCxx)'=='true'"/>
<FrameworkReference Update="Microsoft.NETCore.App"
Condition="'$(MicrosoftNETCoreAppVersion)'!=''
Condition="'$(MicrosoftNETCoreAppInternalVersion)'!=''
And '$(NoTargets)'!='true'
And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0')
And '$(MSBuildProjectExtension)'!='.vcxproj'">
<TargetingPackVersion>$(MicrosoftNETCoreAppVersion)</TargetingPackVersion>
<TargetingPackVersion>$(MicrosoftNETCoreAppInternalVersion)</TargetingPackVersion>
</FrameworkReference>
<!--
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册