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.

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

Don't import Microsoft.WinFX.targets for sdk style projects #5200

Merged
merged 5 commits into from
Apr 8, 2020

Conversation

benvillalobos
Copy link
Member

@benvillalobos benvillalobos commented Mar 25, 2020

Part 1 to fix #4948

Part 2 (sets the ImportWinFXTargets property to false): dotnet/sdk#10998

This conditionally imports winfx.targets for all non-sdk style builds. Pairs with another PR for the sdk
that ensures the condition will fall through.

Copy link
Contributor

@cdmihai cdmihai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, pending my comment.

Copy link
Member

@rainersigwald rainersigwald left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please get the SDK PR going and test the combination to be sure it works before merging.

@benvillalobos
Copy link
Member Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@benvillalobos
Copy link
Member Author

Verified that this works locally 👍

src/Shared/Traits.cs Outdated Show resolved Hide resolved
@rainersigwald rainersigwald added this to the MSBuild 16.6 Preview 3 milestone Apr 7, 2020
@benvillalobos benvillalobos merged commit 781e5ce into dotnet:master Apr 8, 2020
sfoslund pushed a commit to sfoslund/msbuild that referenced this pull request May 15, 2020
)

* Conditional import on microsoft.winfx.targets

* Escape hatch for logging ALL task inputs rather than truncating them

* Short circuiting the condition to prevent a file check if the property is false.

* Changed name to be more explicit

* Revert "Escape hatch for logging ALL task inputs rather than truncating them"

This reverts commit 07a6146.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Do not import .NET Framework's copy of Microsoft.WinFX.targets when building Sdk style projects.
4 participants