Skip to content

Add global usings and plumb through the WPF #5183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 9, 2021
Merged

Add global usings and plumb through the WPF #5183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions pkg/Microsoft.Private.Winforms/Microsoft.Private.Winforms.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
27 changes: 27 additions & 0 deletions pkg/Microsoft.Private.Winforms/sdk/dotnet-wpf/System.Windows.Forms.GlobalUsings.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
21 changes: 21 additions & 0 deletions pkg/Microsoft.Private.Winforms/sdk/dotnet-wpf/System.Windows.Forms.GlobalUsings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>