From db8eb66d5decd2eda3935bd542a5d4abb5a0d86c Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Thu, 23 Jul 2020 16:43:54 -0700
Subject: [PATCH] Fix net5.0 TFM inference.

---
 Source/MSBuild.Sdk.Extras/Build/Inference.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/MSBuild.Sdk.Extras/Build/Inference.targets b/Source/MSBuild.Sdk.Extras/Build/Inference.targets
index 47f5a37..a8994b2 100644
--- a/Source/MSBuild.Sdk.Extras/Build/Inference.targets
+++ b/Source/MSBuild.Sdk.Extras/Build/Inference.targets
@@ -52,7 +52,7 @@
   <PropertyGroup Condition=" ('$(TargetFrameworkIdentifier)' == '' OR '$(TargetFrameworkIdentifier)' == '_') AND '$(_SdkShortFrameworkIdentifier)' != ''">
     <TargetFrameworkIdentifier Condition="'$(_SdkShortFrameworkIdentifier)' == 'net'">.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkIdentifier Condition="'$(_SdkShortFrameworkIdentifier)' == 'netstandard'">.NETStandard</TargetFrameworkIdentifier>
-    <TargetFrameworkIdentifier Condition="'$(_SdkShortFrameworkIdentifier)' == 'netcoreapp'">.NETCoreApp</TargetFrameworkIdentifier>
+    <TargetFrameworkIdentifier Condition="'$(_SdkShortFrameworkIdentifier)' == 'netcoreapp' OR ('$(_SdkShortFrameworkIdentifier)' == 'net' AND $(_SdkShortFrameworkVersion[0]) >= 5)">.NETCoreApp</TargetFrameworkIdentifier>
     <TargetFrameworkIdentifier Condition="'$(_SdkShortFrameworkIdentifier)' == 'portable'">.NETPortable</TargetFrameworkIdentifier>
     <TargetFrameworkIdentifier Condition="'$(_SdkShortFrameworkIdentifier)' == 'netmf'">.NETMicroFramework</TargetFrameworkIdentifier>