From cbc1b0a2226ed02c78f33480d9c0efbd0a47d9e2 Mon Sep 17 00:00:00 2001
From: Ben Villalobos <bevillal@microsoft.com>
Date: Tue, 4 Aug 2020 10:19:29 -0700
Subject: [PATCH 1/2] import framework winfx targets by default when we target
 .netframework

---
 .../targets/Microsoft.NET.Sdk.BeforeCommon.targets              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
index 3703921cac95..086f918ed153 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
@@ -25,7 +25,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     Make it opt-out, just in case, if something fails or we don't want to use 'WindowsDesktop' SDK.
   -->
   <PropertyGroup>
-    <ImportFrameworkWinFXTargets Condition="'$(ImportFrameworkWinFXTargets)' == ''">false</ImportFrameworkWinFXTargets>
+    <ImportFrameworkWinFXTargets Condition="'$(ImportFrameworkWinFXTargets)' == '' and '$(TargetFrameworkIdentifier)' != '.NETFramework'">false</ImportFrameworkWinFXTargets>
   </PropertyGroup>
 
   <PropertyGroup>

From 960c4aa41fdc9bd11ad9da51981de4831c28a79f Mon Sep 17 00:00:00 2001
From: Ben Villalobos <bevillal@microsoft.com>
Date: Tue, 4 Aug 2020 11:44:58 -0700
Subject: [PATCH 2/2] revert to behavior before fix, allowing for 'opt-out of
 the import'

---
 .../targets/Microsoft.NET.Sdk.BeforeCommon.targets          | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
index 086f918ed153..c170f2f6fb36 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
@@ -20,12 +20,10 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <!--
     Workaround: https://github.com/microsoft/msbuild/issues/4948
-    Disable .NET Framework's inbox WinFX targets when using the SDK, since, we really don't use it's build logic
-    and is superseded by 'WindowsDesktop' SDK that provides it's own WinFX for both NETFX and CoreCLR targets.
-    Make it opt-out, just in case, if something fails or we don't want to use 'WindowsDesktop' SDK.
+    Allow opt-out of importing framework's winfx.targets.
   -->
   <PropertyGroup>
-    <ImportFrameworkWinFXTargets Condition="'$(ImportFrameworkWinFXTargets)' == '' and '$(TargetFrameworkIdentifier)' != '.NETFramework'">false</ImportFrameworkWinFXTargets>
+    <ImportFrameworkWinFXTargets Condition="'$(ImportFrameworkWinFXTargets)' == ''">true</ImportFrameworkWinFXTargets>
   </PropertyGroup>
 
   <PropertyGroup>