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
Fix default file inclusion of .RESW and image files in .NET projects #1389
Conversation
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
6de2bf5
to
f94b815
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I want to be sure that things like the introduction of
EnableDefaultPRIResourceItems
is not unacceptable
I think this is a very reasonable extension of the current pattern. With MSBuild there's always a risk of name collision but this is very specific and doesn't appear to be currently used.
@dsplaisted do you have any concerns from the SDK perspective?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The globbing looks good, but it seems like there may be issues with moving the EnableCoreMrtTooling
logic to .props files.
A possible way to work around this would be to move the logic that sets EnableCoreMrtTooling
back to the .targets, import MrtCore.props
unconditionally, and then add a check for EnableCoreMrtTooling
to all the ItemGroups in MrtCore.props
.
f94b815
to
34e1254
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
d2d1b85
to
ed66a7a
Compare
…. Comments will be added after verification.
… This does seem to work. Will run full verification with build pipeline artifacts.
… the None Include op which happens in a .NET SDK props file that's evaluated after MrtCore.props.
…Core.props for why. Also, fixed a mistake in MrtCore.props. This version has been tested. Some more testing will be done to be sure before check-in.
469a24e
to
28c3285
Compare
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
The existing solution (added in #771) has an issue: app devs cannot opt out an image or a RESW file from PRI inclusion.
Closes #980
How verified (commit 11)
Setup:
Verification:
(BA below means Build Action)
EnableDefaultPRIResourceItems
to false. BA of RESW file changed toNone
. Remove set. BA changes back toPRIResource
.EnableDefaultContentItems
to false. BA of image file changed toNone
. Remove set. BA changes back toContent
. (BA of image file that wasNone
already remains None and isNone
after set is removed too.)EnableDefaultItems
to false. All image and RESW files disappeared in Solution Explorer (regardless of their BA). Remove set. All files come back.Note:
PRIResource
orContent
. I'll create a tracking item for this too and link to this PR.