Skip to content
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

Update implicit global namespace support for WPF #4963

Merged
merged 1 commit into from
Jul 30, 2021
Merged

Update implicit global namespace support for WPF #4963

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
13 changes: 13 additions & 0 deletions ...aging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project>
<!--
Generates implicit global namespace imports file <projectname>.ImplicitGlobalNamespaceImports.cs.
-->
<ItemGroup Condition="'$(DisableImplicitNamespaceImports_WPF)' != 'true'
and '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
and $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0'))
and '$(UseWPF)' == 'true'">
<Import Remove="System.IO" />
<Import Remove="System.Net.Http" />
</ItemGroup>

</Project>
7 changes: 7 additions & 0 deletions ...ing/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project>
<PropertyGroup>
<DisableImplicitNamespaceImports_WPF Condition="'$(DisableImplicitNamespaceImports_WPF)' == ''
and '$(DisableImplicitNamespaceImports)' != 'true'">false</DisableImplicitNamespaceImports_WPF>
</PropertyGroup>

</Project>
2 changes: 2 additions & 0 deletions packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,4 +168,6 @@
-->
<Import Project="Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.props" />

<Import Project="Microsoft.NET.Sdk.WindowsDesktop.WPF.props" />

</Project>
9 changes: 6 additions & 3 deletions packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,17 @@
<NetSdkWarning ResourceName="WindowsDesktopFrameworkRequiresVersion30" />
</Target>

<!-- 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'"/>

<!-- Import WPF-specific targets -->
<Import Project="Microsoft.NET.Sdk.WindowsDesktop.WPF.targets" Condition="'$(UseWPF)' == 'true'"/>

<!-- Import WPF Build logic only when we don't import NETFX's WinFX targets -->
<Import Project="Microsoft.WinFX.targets" Condition="'$(ImportFrameworkWinFXTargets)' != 'true'"/>

</Project>
2 changes: 0 additions & 2 deletions src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
<AlwaysCompileMarkupFilesInSeparateDomain Condition="'$(AlwaysCompileMarkupFilesInSeparateDomain)' == '' ">true</AlwaysCompileMarkupFilesInSeparateDomain>
<LocalizationDirectivesToLocFile Condition="'$(LocalizationDirectivesToLocFile)' == ''">None</LocalizationDirectivesToLocFile>

<!-- Disable implicit namespace imports for WPF. This should be removed after support is added in .NET 6.0 rc 1. -->
<DisableImplicitNamespaceImports Condition="'$(DisableImplicitNamespaceImports)' != 'false' and '$(UseWPF)' == 'true'">true</DisableImplicitNamespaceImports>
</PropertyGroup>

<!-- Some Default Settings -->
Expand Down