fixup! Ingest and import Windows Forms analyzer props

Author: RussKie

eng/WindowsForms.targets

@@ -0,0 +1,19 @@
+<Project>
+
+  <!-- 
+    This target *only* validates the content of Microsoft.Private.Winforms NuGet package
+    to ensure we correctly import and reference props and targets.
+   -->
+  <Target Name="_EnsureWindowsFormsPackagingContent" BeforeTargets="IdentifyPackageAssets">
+    <Error Text="Unable to resolve path to Microsoft.Private.Winforms NuGet package. Is %24(PkgMicrosoft_Private_Winforms) defined?"
+           Condition="'$(_WinFormsNuGetPath)' == ''"/>
+
+    <ItemGroup>
+      <_WinFormsContent Include="$(_WinFormsContentPath)" />
+    </ItemGroup>
+
+    <Error Text="Microsoft.Private.Winforms NuGet package contains no content. Is this expected?"
+           Condition="@(_WinFormsContent->Count()) == 0"/>
+  </Target>
+
+</Project>

packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj

@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <ProjectGuid>{440d06b8-e3de-4c0d-ad25-cd4f43d836e1}</ProjectGuid>
     <TargetFramework>net6.0</TargetFramework>
@@ -27,6 +28,8 @@
   </ItemGroup>
 
   <!-- Windows Forms specific -->
+  <Import Project="$(RepositoryEngineeringDir)WindowsForms.targets" />
+
   <PropertyGroup>
     <_WinFormsNuGetPath>$(PkgMicrosoft_Private_Winforms)</_WinFormsNuGetPath>
     <_WinFormsContentPath>$(_WinFormsNuGetPath)\sdk\dotnet-wpf\*</_WinFormsContentPath>
@@ -36,19 +39,4 @@
     <PackagingContent Include="$(_WinFormsContentPath)" SubFolder="root\targets" />
   </ItemGroup>
 
-  <!-- 
-    This target *only* validates the content of Microsoft.Private.Winforms NuGet package
-    to ensure we correctly import and reference props and targets.
-   -->
-  <Target Name="_EnsureWindowsFormsPackagingContent" BeforeTargets="IdentifyPackageAssets">
-    <Error Text="Unable to resolve path to Microsoft.Private.Winforms NuGet package. Is %24(PkgMicrosoft_Private_Winforms) defined?"
-           Condition="'$(_WinFormsNuGetPath)' == ''"/>
-
-    <ItemGroup>
-      <_WinFormsContent Include="$(_WinFormsContentPath)" />
-    </ItemGroup>
-
-    <Error Text="Microsoft.Private.Winforms NuGet package contains no content. Is this expected?"
-           Condition="@(_WinFormsContent->Count()) == 0"/>
-  </Target>
 </Project>