Skip to content

Commit 123b057

Browse files
authored
Update SDK (#5084)
Relates to dotnet/sdk#19521 Relates to dotnet/sdk#19599
1 parent b00955b commit 123b057

File tree

4 files changed

+3
-21
lines changed

4 files changed

+3
-21
lines changed

Directory.Build.props

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
<WindowsDesktopARM64Support>true</WindowsDesktopARM64Support>
55
</PropertyGroup>
66

7-
<!-- Disable global usings, as those require 'preview' language version -->
8-
<PropertyGroup>
9-
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
10-
</PropertyGroup>
11-
127
<!-- Normalize $(TestWpfArcadeSdkPath) by appending a '\' to it if one is missing -->
138
<PropertyGroup Condition="'$(TestWpfArcadeSdkPath)'!=''">
149
<WpfArcadeSdkPath>$(TestWpfArcadeSdkPath)</WpfArcadeSdkPath>

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
<!--
33
Generates implicit global namespace imports file <projectname>.ImplicitGlobalNamespaceImports.cs.
44
-->
5-
<ItemGroup Condition="'$(DisableImplicitNamespaceImports_WPF)' != 'true'
6-
and '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
7-
and $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0'))
8-
and '$(UseWPF)' == 'true'">
9-
<Import Remove="System.IO" />
10-
<Import Remove="System.Net.Http" />
5+
<ItemGroup Condition="'$(UseWPF)' == 'true' and ('$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable')">
6+
<Using Remove="System.IO" />
7+
<Using Remove="System.Net.Http" />
118
</ItemGroup>
129

1310
</Project>

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

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,6 @@
159159
-->
160160
<Import Project="Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.targets" Condition="'$(UseWindowsForms)' == 'true'"/>
161161

162-
<!-- Import WPF-specific targets -->
163-
<Import Project="Microsoft.NET.Sdk.WindowsDesktop.WPF.targets" Condition="'$(UseWPF)' == 'true'"/>
164-
165162
<!-- Import WPF Build logic only when we don't import NETFX's WinFX targets -->
166163
<Import Project="Microsoft.WinFX.targets" Condition="'$(ImportFrameworkWinFXTargets)' != 'true'"/>
167164

0 commit comments

Comments
 (0)