Skip to content

Commit 6ba1916

Browse files
committed
Future-proof a check for net5.0 or later
- avoid comparisons involving `$(TargetFramework)` in .targets files - fine to compare it with `''` or `$(DefaultNetCoreTargetFramework)`
1 parent 029184a commit 6ba1916

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

eng/targets/ReferenceAssembly.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
Condition=" '$(TargetFrameworkIdentifier)' != '.NETFramework' ">
5151
<PropertyGroup>
5252
<_RefSourceFileTFM>$(TargetFramework)</_RefSourceFileTFM>
53-
<_RefSourceFileTFM Condition="$(TargetFramework.StartsWith('netcoreapp'))">netcoreapp</_RefSourceFileTFM>
54-
<_RefSourceFileTFM Condition=" '$(TargetFramework)' == 'net5.0' ">netcoreapp</_RefSourceFileTFM>
53+
<_RefSourceFileTFM Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND
54+
$([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '5.0'))">netcoreapp</_RefSourceFileTFM>
5555
<_RefProjectFileTFM>$(TargetFramework)</_RefProjectFileTFM>
5656
<_RefProjectFileTFM Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">%24(DefaultNetCoreTargetFramework)</_RefProjectFileTFM>
5757

0 commit comments

Comments
 (0)