未验证 提交 0e65a17d 编写于 作者: V Vatsan Madhavan 提交者: GitHub

Define _WindowsDesktopSdkTargetFrameworkVersionFloor before ...

Define _WindowsDesktopSdkTargetFrameworkVersionFloor before  Microsoft.NET.Sdk.WindowsDesktop.targets is imported (#1077)

* Define _WindowsDesktopSdkTargetFrameworkVersionFloor before  Microsoft.NET.Sdk.WindowsDesktop.targets is imported

* Suppress NETSDK1106
上级 ff9ab35b
......@@ -12,6 +12,14 @@
<PbtDir>$(ArtifactsTmpDir)PresentationBuildTasks\$(PbtTfm)\</PbtDir>
</PropertyGroup>
<!--
Local markup compilation uses $(InternalMarkupCompilation) instead of $(UseWpf). Suppress the
corresponding SDK warning.
-->
<PropertyGroup>
<MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);NETSDK1106</MSBuildWarningsAsMessages>
</PropertyGroup>
<!--
We will use Microsoft.NET.Sdk.WindowsDesktop targets directly when local PresentationBuildTasks is not available
We do not need to import Microsoft.NET.Sdk.WindowsDesktop.props from the Sdk - this only provides us with
......
......@@ -90,7 +90,14 @@
-->
<Import Project="$(WpfSourceDir)PresentationBuildTasks\Microsoft.WinFX.targets"
Condition="'$(InternalMarkupCompilation)'=='true' And Exists('$(LocalMicrosoftWinFXTargets)') "/>
<!--
_WindowsDesktopSdkTargetFrameworkVersionFloor is defined in Microsoft.NET.WindowDesktop.props.
This needs to be defined before Microsoft.NET.Sdk.WindowsDesktop.targets is imported.
-->
<PropertyGroup Condition="'$(InternalMarkupCompilation)'=='true' And !Exists('$(LocalMicrosoftWinFXTargets)') ">
<_WindowsDesktopSdkTargetFrameworkVersionFloor Condition="'$(_WindowsDesktopSdkTargetFrameworkVersionFloor)' == ''">3.0</_WindowsDesktopSdkTargetFrameworkVersionFloor>
</PropertyGroup>
<Import Sdk="Microsoft.NET.Sdk.WindowsDesktop"
Project="../targets/Microsoft.NET.Sdk.WindowsDesktop.targets"
Condition="'$(InternalMarkupCompilation)'=='true' And !Exists('$(LocalMicrosoftWinFXTargets)') "/>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册