From d49e8c5653a2f43052b5d390488900c9d5855279 Mon Sep 17 00:00:00 2001
From: Igor Velikorossov <igor.velikorossov@microsoft.com>
Date: Thu, 1 Jul 2021 18:17:08 +1000
Subject: [PATCH 1/2] Import Windows Forms related props and targets into
 Windows Desktop

* Establish a mechanism to import Windows Forms related functionality
into Windows Desktop SDK via the Windows Forms transport package.

* Add a basic validation of the content of the shipping package in
.\eng\WindowsFormsImports.targets.
---
 eng/WindowsFormsImports.targets               | 51 +++++++++++++++++++
 ....NET.Sdk.WindowsDesktop.ArchNeutral.csproj |  5 ++
 .../Microsoft.NET.Sdk.WindowsDesktop.props    |  7 +++
 .../Microsoft.NET.Sdk.WindowsDesktop.targets  |  7 +++
 4 files changed, 70 insertions(+)
 create mode 100644 eng/WindowsFormsImports.targets

diff --git a/eng/WindowsFormsImports.targets b/eng/WindowsFormsImports.targets
new file mode 100644
index 00000000000..3e97ce9a4bd
--- /dev/null
+++ b/eng/WindowsFormsImports.targets
@@ -0,0 +1,51 @@
+<Project>
+
+  <PropertyGroup>
+    <_WindowsFormsNuGetPath>$(PkgMicrosoft_Private_Winforms)</_WindowsFormsNuGetPath>
+  </PropertyGroup>
+
+  <!--
+    ============================================================
+                      _ValidateWindowsFormsPackagingContent
+    Validates the content of Microsoft.Private.Winforms NuGet package
+    to ensure we correctly import and reference props and targets.
+    ============================================================
+   -->
+  <Target Name="_ValidateWindowsFormsPackagingContent">
+    <PropertyGroup>
+      <_WindowsFormsContentPath>$(_WindowsFormsNuGetPath)\sdk\dotnet-wpf\*</_WindowsFormsContentPath>
+      <_WindowsFormsRequiredFileName>Microsoft.NET.SDk.WindowsDesktop.WindowsForms</_WindowsFormsRequiredFileName>
+    </PropertyGroup>
+
+    <Error Text="Unable to resolve path to Microsoft.Private.Winforms NuGet package. Is %24(PkgMicrosoft_Private_Winforms) defined?"
+           Condition="'$(_WindowsFormsNuGetPath)' == ''"/>
+
+    <ItemGroup>
+      <!-- Enumerate all transported files -->
+      <_WindowsFormsContent Include="$(_WindowsFormsContentPath)" />
+      <!-- ...and verify Microsoft.NET.SDk.WindowsDesktop.WindowsForms.props/.targets are present -->
+      <_WindowsFormsContentFiles Include="@(_WindowsFormsContent->'%(FileName)%(Extension)')"
+          Condition=" '%(FileName)%(Extension)' == '$(_WindowsFormsRequiredFileName).props'
+                   or '%(FileName)%(Extension)' == '$(_WindowsFormsRequiredFileName).targets' "/>
+    </ItemGroup>
+
+    <!-- Fail if the required files are missing -->
+    <Error Text="Microsoft.Private.Winforms NuGet package does not contain $(_WindowsFormsRequiredFileName).props or $(_WindowsFormsRequiredFileName).targets"
+           Condition="@(_WindowsFormsContentFiles->Count()) != 2"/>
+  </Target>
+
+
+  <!--
+    ============================================================
+                      _IdentifyWindowsFormsPackageAssets
+    Add props/targets shipped by Windows Forms to the collection of files that get packaged
+    in to Microsoft.NET.Sdk.WindowsDesktop.<configuration>.<version>.nupkg.
+    ============================================================
+  -->
+  <Target Name="_IdentifyWindowsFormsPackageAssets" BeforeTargets="IdentifyPackageAssets" DependsOnTargets="_ValidateWindowsFormsPackagingContent">
+    <ItemGroup>
+      <PackagingContent Include="$(_WindowsFormsContentPath)" SubFolder="root\targets" />
+    </ItemGroup>
+  </Target>
+
+</Project>
diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
index 275fd4a4cb9..0ea912c719d 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <ProjectGuid>{440d06b8-e3de-4c0d-ad25-cd4f43d836e1}</ProjectGuid>
     <TargetFramework>net6.0</TargetFramework>
@@ -25,4 +26,8 @@
     <PackagingContent Include="targets\*" SubFolder="root\targets" />
     <PackagingContent Include="useSharedDesignerContext.txt" SubFolder="root" />
   </ItemGroup>
+
+  <!-- Windows Forms specific -->
+  <Import Project="$(RepositoryEngineeringDir)WindowsFormsImports.targets" />
+
 </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 d04f9b04b58..9211b579579 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
@@ -161,4 +161,11 @@
     <SupportedTargetFramework Remove="@(_UnsupportedNETCoreAppTargetFramework);@(_UnsupportedNETStandardTargetFramework);@(_UnsupportedNETFrameworkTargetFramework)" />
   </ItemGroup>
 
+  <!--
+    Import Windows Forms props.
+    These come via the Windows Forms transport package, that can be found under
+    https://github.com/dotnet/winforms/tree/main/pkg/Microsoft.Private.Winforms/sdk
+  -->
+  <Import Project="Microsoft.NET.SDk.WindowsDesktop.WindowsForms.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 edadf38f4b3..cf7f272ec8f 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
@@ -155,4 +155,11 @@
   <!-- 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
+    https://github.com/dotnet/winforms/tree/main/pkg/Microsoft.Private.Winforms/sdk
+  -->
+  <Import Project="Microsoft.NET.SDk.WindowsDesktop.WindowsForms.targets" Condition="'$(UseWindowsForms)' == 'true'"/>
+
 </Project>

From 67fdbea2feb65c222b85a8d3469aad92532a7674 Mon Sep 17 00:00:00 2001
From: Igor Velikorossov <igor.velikorossov@microsoft.com>
Date: Fri, 23 Jul 2021 14:05:05 +1000
Subject: [PATCH 2/2] fixup! Import Windows Forms related props and targets
 into Windows Desktop

---
 .../Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj       | 4 ++--
 ...icrosoft.NET.Sdk.WindowsDesktop.WinForms.Packaging.targets | 4 ++--
 .../targets/Microsoft.NET.Sdk.WindowsDesktop.props            | 2 +-
 .../targets/Microsoft.NET.Sdk.WindowsDesktop.targets          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename eng/WindowsFormsImports.targets => packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.WinForms.Packaging.targets (94%)

diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
index 0ea912c719d..242293a0c2a 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
@@ -27,7 +27,7 @@
     <PackagingContent Include="useSharedDesignerContext.txt" SubFolder="root" />
   </ItemGroup>
 
-  <!-- Windows Forms specific -->
-  <Import Project="$(RepositoryEngineeringDir)WindowsFormsImports.targets" />
+  <!-- Windows Forms validation and packaging -->
+  <Import Project="Microsoft.NET.Sdk.WindowsDesktop.WinForms.Packaging.targets" />
 
 </Project>
diff --git a/eng/WindowsFormsImports.targets b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.WinForms.Packaging.targets
similarity index 94%
rename from eng/WindowsFormsImports.targets
rename to packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.WinForms.Packaging.targets
index 3e97ce9a4bd..241ea1dc6f0 100644
--- a/eng/WindowsFormsImports.targets
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.WinForms.Packaging.targets
@@ -14,7 +14,7 @@
   <Target Name="_ValidateWindowsFormsPackagingContent">
     <PropertyGroup>
       <_WindowsFormsContentPath>$(_WindowsFormsNuGetPath)\sdk\dotnet-wpf\*</_WindowsFormsContentPath>
-      <_WindowsFormsRequiredFileName>Microsoft.NET.SDk.WindowsDesktop.WindowsForms</_WindowsFormsRequiredFileName>
+      <_WindowsFormsRequiredFileName>Microsoft.NET.Sdk.WindowsDesktop.WindowsForms</_WindowsFormsRequiredFileName>
     </PropertyGroup>
 
     <Error Text="Unable to resolve path to Microsoft.Private.Winforms NuGet package. Is %24(PkgMicrosoft_Private_Winforms) defined?"
@@ -23,7 +23,7 @@
     <ItemGroup>
       <!-- Enumerate all transported files -->
       <_WindowsFormsContent Include="$(_WindowsFormsContentPath)" />
-      <!-- ...and verify Microsoft.NET.SDk.WindowsDesktop.WindowsForms.props/.targets are present -->
+      <!-- ...and verify Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.props/.targets are present -->
       <_WindowsFormsContentFiles Include="@(_WindowsFormsContent->'%(FileName)%(Extension)')"
           Condition=" '%(FileName)%(Extension)' == '$(_WindowsFormsRequiredFileName).props'
                    or '%(FileName)%(Extension)' == '$(_WindowsFormsRequiredFileName).targets' "/>
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 9211b579579..2fa1259f2b0 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
@@ -166,6 +166,6 @@
     These come via the Windows Forms transport package, that can be found under
     https://github.com/dotnet/winforms/tree/main/pkg/Microsoft.Private.Winforms/sdk
   -->
-  <Import Project="Microsoft.NET.SDk.WindowsDesktop.WindowsForms.props" />
+  <Import Project="Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.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 cf7f272ec8f..d3767df4210 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
@@ -160,6 +160,6 @@
     These come via the Windows Forms transport package, that can be found under
     https://github.com/dotnet/winforms/tree/main/pkg/Microsoft.Private.Winforms/sdk
   -->
-  <Import Project="Microsoft.NET.SDk.WindowsDesktop.WindowsForms.targets" Condition="'$(UseWindowsForms)' == 'true'"/>
+  <Import Project="Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.targets" Condition="'$(UseWindowsForms)' == 'true'"/>
 
 </Project>