Skip to content

Commit

Permalink
Change build to support net5.0 TFs
Browse files Browse the repository at this point in the history
This updates our build to support the use of `net5.0` as a target
framework inside of our repository.

Note: this is back porting some changes from the covariant returns
branch. Wanted to get them into master sooner so we get more exposure to
them.
  • Loading branch information
jaredpar authored and Neal Gafter committed Jul 27, 2020
1 parent 03aee9f commit 01be338
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion eng/targets/Imports.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/Tools/BuildBoss/ProjectCheckerUtil.cs
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ private bool CheckTargetFrameworks(TextWriter textWriter)
case "net20":
case "net472":
case "netcoreapp3.1":
case "net5.0":
continue;
}

Expand Down

0 comments on commit 01be338

Please sign in to comment.