From f389ed3260f6803dd880ef7316eebc59ec1b52c5 Mon Sep 17 00:00:00 2001
From: Igor Velikorossov <igor.velikorossov@microsoft.com>
Date: Thu, 1 Jul 2021 15:58:34 +1000
Subject: [PATCH] Add global usings and plumb through the WPF into Windows
 Desktop SDK

Resolves #5074
Relates to https://github.com/dotnet/sdk/pull/18459
---
 .../Microsoft.Private.Winforms.csproj         | 25 ++++++++++-------
 .../System.Windows.Forms.GlobalUsings.props   | 27 +++++++++++++++++++
 .../System.Windows.Forms.GlobalUsings.targets | 21 +++++++++++++++
 3 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100644 pkg/Microsoft.Private.Winforms/sdk/dotnet-wpf/System.Windows.Forms.GlobalUsings.props
 create mode 100644 pkg/Microsoft.Private.Winforms/sdk/dotnet-wpf/System.Windows.Forms.GlobalUsings.targets

diff --git a/pkg/Microsoft.Private.Winforms/Microsoft.Private.Winforms.csproj b/pkg/Microsoft.Private.Winforms/Microsoft.Private.Winforms.csproj
index 702cf4fb3fa..fa87dc0a12e 100644
--- a/pkg/Microsoft.Private.Winforms/Microsoft.Private.Winforms.csproj
+++ b/pkg/Microsoft.Private.Winforms/Microsoft.Private.Winforms.csproj
@@ -58,35 +58,42 @@
       <PackagePath></PackagePath>
     </None>
   </ItemGroup>
+  
+  <ItemGroup>
+    <None Include="sdk\dotnet-wpf\*">
+      <Pack>True</Pack>
+      <PackagePath>sdk\dotnet-wpf</PackagePath>
+    </None>
+  </ItemGroup>
 
   <!-- Any projects referenced here will have their outputs automatically put into the package -->
   <!-- If you add a new csproj, and you want the outputs in the package, you must add it here -->
   <ItemGroup>
-    <!-- Facade for System.Drawing include -->
+    <!-- Facade for System.Drawing -->
     <ProjectReference Include="..\..\src\System.Drawing\src\System.Drawing.Facade.csproj" />
 
-    <!-- Facade for System.Design include -->
+    <!-- Facade for System.Design -->
     <ProjectReference Include="..\..\src\System.Design\src\System.Design.Facade.csproj" />
 
-    <!-- Facade for System.Drawing.Design include -->
+    <!-- Facade for System.Drawing.Design -->
     <ProjectReference Include="..\..\src\System.Drawing.Design\src\System.Drawing.Design.Facade.csproj" />
 
-    <!-- Reference and Source System.Windows.Forms includes -->
+    <!-- Reference and Source System.Windows.Forms -->
     <ProjectReference Include="..\..\src\System.Windows.Forms\src\System.Windows.Forms.csproj" />
 
-    <!-- Reference and Source System.Windows.Forms.Primitives includes -->
+    <!-- Reference and Source System.Windows.Forms.Primitives -->
     <ProjectReference Include="..\..\src\System.Windows.Forms.Primitives\src\System.Windows.Forms.Primitives.csproj" />
 
-    <!-- Reference and Source System.Windows.Forms.Design includes -->
+    <!-- Reference and Source System.Windows.Forms.Design -->
     <ProjectReference Include="..\..\src\System.Windows.Forms.Design\src\System.Windows.Forms.Design.csproj" />
 
-    <!-- Facade for System.Windows.Forms.Design.Editors includes -->
+    <!-- Facade for System.Windows.Forms.Design.Editors -->
     <ProjectReference Include="..\..\src\System.Windows.Forms.Design.Editors\src\System.Windows.Forms.Design.Editors.Facade3x.csproj" />
     
-    <!-- Facade for Microsoft.VisualBasic include -->
+    <!-- Facade for Microsoft.VisualBasic -->
     <ProjectReference Include="..\..\src\Microsoft.VisualBasic\src\Microsoft.VisualBasic.Facade.csproj" />
 
-    <!-- Reference and Source Microsoft.VisualBasic.Forms includes -->
+    <!-- Reference and Source Microsoft.VisualBasic.Forms -->
     <ProjectReference Include="..\..\src\Microsoft.VisualBasic.Forms\src\Microsoft.VisualBasic.Forms.vbproj" />
 
     <ProjectReference Include="..\..\src\Accessibility\src\Accessibility.ilproj" />
diff --git a/pkg/Microsoft.Private.Winforms/sdk/dotnet-wpf/System.Windows.Forms.GlobalUsings.props b/pkg/Microsoft.Private.Winforms/sdk/dotnet-wpf/System.Windows.Forms.GlobalUsings.props
new file mode 100644
index 00000000000..bf3d76ff58b
--- /dev/null
+++ b/pkg/Microsoft.Private.Winforms/sdk/dotnet-wpf/System.Windows.Forms.GlobalUsings.props
@@ -0,0 +1,27 @@
+<!--
+    This props file comes from dotnet/winforms. It gets ingested by dotnet/wpf and processed by
+    packaging/Microsoft.NET.Sdk.WindowsDesktop project.
+    
+    It is referenced via Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props.
+   -->
+
+<Project>
+  <!--
+    ============================================================
+                                     GenerateImplicitNamespaceImports
+    Generates implicit namespace imports source to intermediate directory for C# projects
+    ============================================================
+    -->
+  <ItemGroup Condition="'$(DisableImplicitNamespaceImports_WindowsForms)' != 'true'
+                        and '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
+                        and $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0'))
+                        and '$(UseWindowsForms)' == 'true'">
+    <Import Include="System" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.IO" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Drawing" />
+    <Import Include="System.Windows.Forms" />
+  </ItemGroup>
+
+</Project>
diff --git a/pkg/Microsoft.Private.Winforms/sdk/dotnet-wpf/System.Windows.Forms.GlobalUsings.targets b/pkg/Microsoft.Private.Winforms/sdk/dotnet-wpf/System.Windows.Forms.GlobalUsings.targets
new file mode 100644
index 00000000000..405b7a4ff20
--- /dev/null
+++ b/pkg/Microsoft.Private.Winforms/sdk/dotnet-wpf/System.Windows.Forms.GlobalUsings.targets
@@ -0,0 +1,21 @@
+<!--
+    This props file comes from dotnet/winforms. It gets ingested by dotnet/wpf and processed by
+    packaging/Microsoft.NET.Sdk.WindowsDesktop project.
+    
+    It is referenced via Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets.
+   -->
+
+<Project>
+  <!--
+    ============================================================
+                                     GenerateImplicitNamespaceImports
+    Generates implicit namespace imports source to intermediate directory for C# projects
+    ============================================================
+    -->
+  <PropertyGroup>
+    <DisableImplicitNamespaceImports_WindowsForms
+        Condition="'$(DisableImplicitNamespaceImports_WindowsForms)' == ''
+                   and '$(DisableImplicitNamespaceImports)' != 'true'">false</DisableImplicitNamespaceImports_WindowsForms>
+  </PropertyGroup>
+
+</Project>