From 733a460485adbc7af974623f272dbd7deabfce79 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Thu, 8 Aug 2019 12:03:15 -0700
Subject: [PATCH 1/3] - Addresses #1567 - Completes work started in
 https://github.com/dotnet/sdk/issues/3438

Removes unsupported TFM's from SupportedTargetFramework.
---
 .../Microsoft.NET.Sdk.WindowsDesktop.props    | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props
index 923c2d9bdf3..e3275add43b 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props
@@ -132,4 +132,45 @@
     <_SDKImplicitReference Include="WindowsFormsIntegration"
                        Condition=" ('$(UseWindowsForms)' == 'true') And ('$(UseWPF)' == 'true') "/>
   </ItemGroup>
+  
+  
+  <!-- 
+        Supported (and unsupported) TargetFrameworks 
+        
+        Visual Studio Project System determines the list of valid TargetFrameworks to show 
+        in the Project properties by querying SupportedTargetFramework values. 
+        
+        The Project System does not refer to this list at this time for .NET Framework TFM's.
+  -->
+
+  <!-- 
+    When WindowsDesktop SDK is used without setting UseWPF or UseWinForms, it shows a (suppressible) warning and functions much
+    like Microsoft.NET.Sdk
+    
+    Likewise, when WindowsDesktop SDK is used with a netcore TFM that is less than 3.0, it will simply act as if it were an
+    Microsoft.NET.Sdk project (and show a suppressible build-time warning). 
+    
+    Detect these situations and skip updates to @(SupportedTargetFramework) etc. 
+  --> 
+  <ItemGroup Condition="('$(UseWPF)' == 'true' Or '$(UseWindowsForms)' == 'true') And 
+                        '$(_TargetFrameworkVersionWithoutV)' != '' And '$(_TargetFrameworkVersionWithoutV)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)'">
+
+    <!-- 
+            Windows Forms and WPF are supported only on .NET Core 3.0+
+    -->
+    <_UnsupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v1.0" />
+    <_UnsupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v1.1" />
+    <_UnsupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v2.0" />
+    <_UnsupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v2.1" />
+    <_UnsupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v2.2" />
+
+    <!--
+            Windows Forms and WPF are not supported an any .NET Standard targets
+    -->
+    <_UnsupportedNETStandardTargetFramework Include="@(SupportedNETStandardTargetFramework)" />
+
+    <SupportedNETCoreAppTargetFramework Remove="@(_UnsupportedNETCoreAppTargetFramework)" />
+    <SupportedNETStandardTargetFramework Remove="@(_UnsupportedNETStandardTargetFramework)" />
+    <SupportedTargetFramework Remove="@(_UnsupportedNETCoreAppTargetFramework);@(_UnsupportedNETStandardTargetFramework)" />
+  </ItemGroup>
 </Project>

From c7c3cec0784b1a384e3b1206cec094500a106141 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Thu, 8 Aug 2019 14:42:42 -0700
Subject: [PATCH 2/3] Add netfx exclusions

---
 .../Microsoft.NET.Sdk.WindowsDesktop.props       | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props
index e3275add43b..95042e1d783 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props
@@ -156,7 +156,7 @@
                         '$(_TargetFrameworkVersionWithoutV)' != '' And '$(_TargetFrameworkVersionWithoutV)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)'">
 
     <!-- 
-            Windows Forms and WPF are supported only on .NET Core 3.0+
+        Windows Forms and WPF are supported only on .NET Core 3.0+
     -->
     <_UnsupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v1.0" />
     <_UnsupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v1.1" />
@@ -165,12 +165,22 @@
     <_UnsupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v2.2" />
 
     <!--
-            Windows Forms and WPF are not supported an any .NET Standard targets
+        Windows Forms and WPF are not supported an any .NET Standard targets
     -->
     <_UnsupportedNETStandardTargetFramework Include="@(SupportedNETStandardTargetFramework)" />
 
+    <!--
+        Windows Forms and WPF are supported on .NET Framework 3.0+
+        
+        The SDK does not define versions < 2.0 in @(SupportedNETFrameworkTargetFramework) list, so none of those
+        need to be excluded here - removing 2.0 would suffice.
+    -->
+    <_UnsupportedNETFrameworkTargetFramework Include=".NETFramework,Version=v2.0" />
+
     <SupportedNETCoreAppTargetFramework Remove="@(_UnsupportedNETCoreAppTargetFramework)" />
     <SupportedNETStandardTargetFramework Remove="@(_UnsupportedNETStandardTargetFramework)" />
-    <SupportedTargetFramework Remove="@(_UnsupportedNETCoreAppTargetFramework);@(_UnsupportedNETStandardTargetFramework)" />
+    <SupportedNETFrameworkTargetFramework Remove="@(_UnsupportedNETFrameworkTargetFramework)" />
+    
+    <SupportedTargetFramework Remove="@(_UnsupportedNETCoreAppTargetFramework);@(_UnsupportedNETStandardTargetFramework);@(_UnsupportedNETFrameworkTargetFramework)" />
   </ItemGroup>
 </Project>

From f526e10df2719572bb3503ef5e80e6524ca3c7b4 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Thu, 8 Aug 2019 15:38:58 -0700
Subject: [PATCH 3/3] Update comment describing supported version of WPF and
 WinForms (for netfx) better.

---
 .../targets/Microsoft.NET.Sdk.WindowsDesktop.props    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props
index 95042e1d783..840d77d64bd 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props
@@ -170,7 +170,16 @@
     <_UnsupportedNETStandardTargetFramework Include="@(SupportedNETStandardTargetFramework)" />
 
     <!--
-        Windows Forms and WPF are supported on .NET Framework 3.0+
+        Windows Forms was supported since .NET Framework 1.0, and is currently supported on 
+        .NET Framework 2.0+. 
+        
+        WPF is supported on .NET Framework and WPF are supported on .NET Framework 3.0+
+        
+        In practice, the WindowsDesktop SDK is only supported on .NET Framework 3.0+ - this is controlled
+        by $(_WindowsDesktopSdkTargetFrameworkVersionFloor), defined as 3.0, which applies to both .NETFramework
+        and .NETCore.
+        
+        Here, we will encode .NET Framework 3.0 as the lowest supported version for both Windows Forms and WPF. 
         
         The SDK does not define versions < 2.0 in @(SupportedNETFrameworkTargetFramework) list, so none of those
         need to be excluded here - removing 2.0 would suffice.