Skip to content

Commit 92c9eef

Browse files
committed
fixup! Import System.Windows.Forms global usings
1 parent 4e73f36 commit 92c9eef

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

eng/WindowsForms.targets

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
<ItemGroup>
1212
<_WinFormsContent Include="$(_WinFormsContentPath)" />
1313
</ItemGroup>
14-
15-
<Error Text="Microsoft.Private.Winforms NuGet package contains no content. Is this expected?"
16-
Condition="@(_WinFormsContent->Count()) == 0"/>
1714
</Target>
1815

1916
</Project>

packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,11 @@
161161
<SupportedTargetFramework Remove="@(_UnsupportedNETCoreAppTargetFramework);@(_UnsupportedNETStandardTargetFramework);@(_UnsupportedNETFrameworkTargetFramework)" />
162162
</ItemGroup>
163163

164-
<Import Project="System.Windows.Forms.GlobalUsings.props" />
164+
<!--
165+
Import Windows Forms props.
166+
These come via the Windows Forms transport package, that can be found under
167+
https://github.com/dotnet/winforms/tree/main/pkg/Microsoft.Private.Winforms/sdk
168+
-->
169+
<Import Project="System.Windows.Forms.props" />
165170

166171
</Project>

packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,11 @@
155155
<!-- Import WPF Build logic only when we don't import NETFX's WinFX targets -->
156156
<Import Project="Microsoft.WinFX.targets" Condition="'$(ImportFrameworkWinFXTargets)' != 'true'"/>
157157

158-
<Import Project="System.Windows.Forms.GlobalUsings.targets" />
158+
<!--
159+
Import Windows Forms targets.
160+
These come via the Windows Forms transport package, that can be found under
161+
https://github.com/dotnet/winforms/tree/main/pkg/Microsoft.Private.Winforms/sdk
162+
-->
163+
<Import Project="System.Windows.Forms.targets" />
159164

160165
</Project>

0 commit comments

Comments
 (0)