From 083019c02fb04a1d4020bf97768d92efbb610ad2 Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Fri, 30 Jul 2021 13:18:50 -0700
Subject: [PATCH] Update implicit global namespace support for WPF

---
 .../Microsoft.NET.Sdk.WindowsDesktop.WPF.props      | 13 +++++++++++++
 .../Microsoft.NET.Sdk.WindowsDesktop.WPF.targets    |  7 +++++++
 .../targets/Microsoft.NET.Sdk.WindowsDesktop.props  |  2 ++
 .../Microsoft.NET.Sdk.WindowsDesktop.targets        |  9 ++++++---
 .../PresentationBuildTasks/Microsoft.WinFX.targets  |  2 --
 5 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props
 create mode 100644 packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.targets

diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props
new file mode 100644
index 00000000000..295097fa7c9
--- /dev/null
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props
@@ -0,0 +1,13 @@
+<Project>
+  <!--
+    Generates implicit global namespace imports file <projectname>.ImplicitGlobalNamespaceImports.cs.
+  -->
+  <ItemGroup Condition="'$(DisableImplicitNamespaceImports_WPF)' != 'true'
+                        and '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
+                        and $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0'))
+                        and '$(UseWPF)' == 'true'">
+    <Import Remove="System.IO" />
+    <Import Remove="System.Net.Http" />
+  </ItemGroup>
+
+</Project>
diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.targets b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.targets
new file mode 100644
index 00000000000..ac904aa438c
--- /dev/null
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.targets
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <DisableImplicitNamespaceImports_WPF Condition="'$(DisableImplicitNamespaceImports_WPF)' == ''
+                   and '$(DisableImplicitNamespaceImports)' != 'true'">false</DisableImplicitNamespaceImports_WPF>
+  </PropertyGroup>
+
+</Project>
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 2fa1259f2b0..6d5304f9e38 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
@@ -168,4 +168,6 @@
   -->
   <Import Project="Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.props" />
 
+  <Import Project="Microsoft.NET.Sdk.WindowsDesktop.WPF.props" />
+
 </Project>
diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
index d3767df4210..a77eb09ad94 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
@@ -152,9 +152,6 @@
     <NetSdkWarning ResourceName="WindowsDesktopFrameworkRequiresVersion30" />
   </Target>
 
-  <!-- Import WPF Build logic only when we don't import NETFX's WinFX targets -->
-  <Import Project="Microsoft.WinFX.targets" Condition="'$(ImportFrameworkWinFXTargets)' != 'true'"/>
-
   <!--
     Import Windows Forms targets.
     These come via the Windows Forms transport package, that can be found under
@@ -162,4 +159,10 @@
   -->
   <Import Project="Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.targets" Condition="'$(UseWindowsForms)' == 'true'"/>
 
+  <!-- Import WPF-specific targets -->
+  <Import Project="Microsoft.NET.Sdk.WindowsDesktop.WPF.targets" Condition="'$(UseWPF)' == 'true'"/>
+
+  <!-- Import WPF Build logic only when we don't import NETFX's WinFX targets -->
+  <Import Project="Microsoft.WinFX.targets" Condition="'$(ImportFrameworkWinFXTargets)' != 'true'"/>
+
 </Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
index e9009324aa7..2b51517e7c3 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
@@ -19,8 +19,6 @@
     <AlwaysCompileMarkupFilesInSeparateDomain Condition="'$(AlwaysCompileMarkupFilesInSeparateDomain)' == '' ">true</AlwaysCompileMarkupFilesInSeparateDomain>
     <LocalizationDirectivesToLocFile Condition="'$(LocalizationDirectivesToLocFile)' == ''">None</LocalizationDirectivesToLocFile>
 
-    <!-- Disable implicit namespace imports for WPF.  This should be removed after support is added in .NET 6.0 rc 1. -->
-    <DisableImplicitNamespaceImports Condition="'$(DisableImplicitNamespaceImports)' != 'false' and '$(UseWPF)' == 'true'">true</DisableImplicitNamespaceImports>
   </PropertyGroup>
 
   <!-- Some Default Settings -->