未验证 提交 123b0571 编写于 作者: I Igor Velikorossov 提交者: GitHub
上级 b00955b0
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
<WindowsDesktopARM64Support>true</WindowsDesktopARM64Support> <WindowsDesktopARM64Support>true</WindowsDesktopARM64Support>
</PropertyGroup> </PropertyGroup>
<!-- Disable global usings, as those require 'preview' language version -->
<PropertyGroup>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup>
<!-- Normalize $(TestWpfArcadeSdkPath) by appending a '\' to it if one is missing --> <!-- Normalize $(TestWpfArcadeSdkPath) by appending a '\' to it if one is missing -->
<PropertyGroup Condition="'$(TestWpfArcadeSdkPath)'!=''"> <PropertyGroup Condition="'$(TestWpfArcadeSdkPath)'!=''">
<WpfArcadeSdkPath>$(TestWpfArcadeSdkPath)</WpfArcadeSdkPath> <WpfArcadeSdkPath>$(TestWpfArcadeSdkPath)</WpfArcadeSdkPath>
......
...@@ -2,12 +2,9 @@ ...@@ -2,12 +2,9 @@
<!-- <!--
Generates implicit global namespace imports file <projectname>.ImplicitGlobalNamespaceImports.cs. Generates implicit global namespace imports file <projectname>.ImplicitGlobalNamespaceImports.cs.
--> -->
<ItemGroup Condition="'$(DisableImplicitNamespaceImports_WPF)' != 'true' <ItemGroup Condition="'$(UseWPF)' == 'true' and ('$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable')">
and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' <Using Remove="System.IO" />
and $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0')) <Using Remove="System.Net.Http" />
and '$(UseWPF)' == 'true'">
<Import Remove="System.IO" />
<Import Remove="System.Net.Http" />
</ItemGroup> </ItemGroup>
</Project> </Project>
<Project>
<PropertyGroup>
<DisableImplicitNamespaceImports_WPF Condition="'$(DisableImplicitNamespaceImports_WPF)' == ''
and '$(DisableImplicitNamespaceImports)' != 'true'">false</DisableImplicitNamespaceImports_WPF>
</PropertyGroup>
</Project>
...@@ -159,9 +159,6 @@ ...@@ -159,9 +159,6 @@
--> -->
<Import Project="Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.targets" Condition="'$(UseWindowsForms)' == 'true'"/> <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 WPF Build logic only when we don't import NETFX's WinFX targets -->
<Import Project="Microsoft.WinFX.targets" Condition="'$(ImportFrameworkWinFXTargets)' != 'true'"/> <Import Project="Microsoft.WinFX.targets" Condition="'$(ImportFrameworkWinFXTargets)' != 'true'"/>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册