Ensure naked files take Subdirectory into account. #557
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
barnson
force-pushed
the
bob/wixbug8674
branch
2 times, most recently
from
d9c3799 to
e804d30
Compare
barnson
force-pushed
the
bob/wixbug8674
branch
from
e804d30 to
b29798a
Compare
|
@robmen, you enabled automerge but didn't approve. |
|
Yes. I'm still mulling over this one. |
Naked files generated their ids using the attributes that are common to both naked and clothed files. But naked files also support @subdirectory to magic up a subdirectory in a specified directory (@Directory) or the default INSTALLFOLDER. That subdirectory needs to factor in to the generated file id (which is then used as the component id too). Without it, generated ids for files with the same name but from different @subdirectory values would be duplicated. (Authored file ids must also continue to be supported.) Naked files now generate different file and component ids. :( Fixes wixtoolset/issues#8674
robmen
requested changes
Dec 28, 2024
barnson
force-pushed
the
bob/wixbug8674
branch
from
b29798a to
9076f42
Compare
robmen
approved these changes
Dec 29, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Naked files generated their ids using the attributes that are common to both naked and clothed files. But naked files also support Subdirectory to magic up a subdirectory in a specified directory (Directory) or the default INSTALLFOLDER. That subdirectory needs to factor in to the generated file id (which is then used as the component id too). Without it, generated ids for files with the same name but from different Subdirectory values would be duplicated. (Authored file ids must also continue to be supported.)
Naked files now generate different file and component ids. :(
Fixes wixtoolset/issues#8674