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

Enable Importing Framework's WinFX Targets By Default While Allowing Opt-Out #12764

Merged
merged 2 commits into from
Aug 5, 2020
Merged

Enable Importing Framework's WinFX Targets By Default While Allowing Opt-Out #12764

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbc1b0a
import framework winfx targets by default when we target .netframework
benvillalobos Aug 4, 2020
960c4aa
revert to behavior before fix, allowing for 'opt-out of the import'
benvillalobos Aug 4, 2020
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
6 changes: 2 additions & 4 deletions src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@ Copyright (c) .NET Foundation. All rights reserved.

<!--
Workaround: https://github.com/microsoft/msbuild/issues/4948
Disable .NET Framework's inbox WinFX targets when using the SDK, since, we really don't use it's build logic
and is superseded by 'WindowsDesktop' SDK that provides it's own WinFX for both NETFX and CoreCLR targets.
Make it opt-out, just in case, if something fails or we don't want to use 'WindowsDesktop' SDK.
Allow opt-out of importing framework's winfx.targets.
-->
<PropertyGroup>
<ImportFrameworkWinFXTargets Condition="'$(ImportFrameworkWinFXTargets)' == ''">false</ImportFrameworkWinFXTargets>
<ImportFrameworkWinFXTargets Condition="'$(ImportFrameworkWinFXTargets)' == ''">true</ImportFrameworkWinFXTargets>
</PropertyGroup>

<PropertyGroup>
Expand Down