Skip to content

Commit

Permalink
Merge pull request #12764 from BenVillalobos/importwinfx-netframework…
Browse files Browse the repository at this point in the history
…-fix

Enable Importing Framework's WinFX Targets By Default While Allowing Opt-Out
  • Loading branch information
Wesboy-Ren authored Aug 5, 2020
2 parents ab6f793 + 960c4aa commit 23abc73
Showing 1 changed file with 2 additions and 4 deletions.
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

0 comments on commit 23abc73

Please sign in to comment.