Skip to content

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

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.

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 2 commits into from
Jun 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions eng/WpfArcadeSdk/tools/Pbt.props
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 8 additions & 1 deletion eng/WpfArcadeSdk/tools/Pbt.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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)') "/>
Expand Down