未验证 提交 1def11b2 编写于 作者: J Jared Parsons 提交者: GitHub

Merge pull request #46306 from jaredpar/net50

Change build to support `net5.0` TFs
......@@ -23,7 +23,7 @@
Only generate our runtimeconfig.json files for net core apps. It's unnecessary in desktop projects
but gets included in lots of output items like VSIX.
-->
<GenerateRuntimeConfigurationFiles Condition="'$(TargetFramework)' != 'netcoreapp3.1'">false</GenerateRuntimeConfigurationFiles>
<GenerateRuntimeConfigurationFiles Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">false</GenerateRuntimeConfigurationFiles>
<!--
When building a .NET Core exe make sure to include the template runtimeconfig.json file
......@@ -36,7 +36,7 @@
This condition will be evaluated multiple times in multi-targeted projects hence need to be careful
to only set in the inner builds, not the outer build where only $(TargetFrameworks) is defined.
-->
<DisableNullableWarnings Condition="'$(DisableNullableWarnings)' == '' AND $(TargetFrameworks.Contains('netcoreapp3.1')) AND '$(TargetFramework)' != '' AND '$(TargetFramework)' != 'netcoreapp3.1'">true</DisableNullableWarnings>
<DisableNullableWarnings Condition="'$(DisableNullableWarnings)' == '' AND '$(TargetFramework)' != '' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">true</DisableNullableWarnings>
<!--
Disable code style analyzers in "older" targets for a multi-targeted project. These analyzers don't
......
......@@ -274,6 +274,7 @@ private bool CheckTargetFrameworks(TextWriter textWriter)
case "net20":
case "net472":
case "netcoreapp3.1":
case "net5.0":
continue;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册