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..bf73415b568 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
@@ -20,9 +20,30 @@
     <PackageDescription>WindowsDesktop SDK</PackageDescription>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <_WinFormsNuGetPath>$(PkgMicrosoft_Private_Winforms)</_WinFormsNuGetPath>
+    <_WinFormsContentPath>$(_WinFormsNuGetPath)\Wpf.Sdk.WindowsDesktop\*</_WinFormsContentPath>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackagingContent Include="Sdk\*" SubFolder="root\Sdk" />
     <PackagingContent Include="targets\*" SubFolder="root\targets" />
     <PackagingContent Include="useSharedDesignerContext.txt" SubFolder="root" />
+
+    <!-- Windows Forms specific -->
+    <PackagingContent Include="$(_WinFormsContentPath)" SubFolder="root\targets" />
   </ItemGroup>
+
+  <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>
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 fd610f3ac50..defea24c22f 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
@@ -171,4 +171,7 @@
     <ImportFrameworkWinFXTargets Condition="'$(ImportFrameworkWinFXTargets)' == ''">false</ImportFrameworkWinFXTargets>
   </PropertyGroup>
 
+  <!-- Import Windows Forms specific props -->
+  <Import Project="System.Windows.Forms.Analyzers.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..7634aae5edb 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,7 @@
   <!-- 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 specific targets -->
+  <Import Project="System.Windows.Forms.Analyzers.targets" />
+
 </Project>