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

Support naked files. #479

Merged
merged 1 commit into from
Jan 8, 2024
Merged

Support naked files. #479

merged 1 commit into from
Jan 8, 2024

Conversation

barnson
Copy link
Member

@barnson barnson commented Dec 29, 2023

Implements wixtoolset/issues#7696.

File elements can appear where Component elements do in WiX v4. The compiler generates an appropriate per-file component. Naked files under Directory, DirectoryRef, Fragment, StandardDirectory, or Package elements are included in a package via the default-feature feature. Naked files appearing under ComponentGroup, Feature, FeatureRef, and FeatureGroup generate the component and the reference to the parent element.

Components and naked Files default to being installed to INSTALLFOLDER
(including a default INSTALLFOLDER if one isn't otherwise authored).

@barnson
Copy link
Member Author

barnson commented Jan 3, 2024

Added:

Components and naked Files default to being installed to INSTALLFOLDER
(including a default INSTALLFOLDER if one isn't otherwise authored).

Copy link
Member

@robmen robmen left a comment

Choose a reason for hiding this comment

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

Overall, looks good. One small suggestion.

string condition = null;
string subdirectory = null;

var keyPath = this.ParseFileElementAttributes(node, "TemporaryComponentId", directoryId, diskId: CompilerConstants.IntegerNotSet, sourcePath, out var _, componentGuid: "*", isNakedFile: true, out var fileSymbol, out var assemblySymbol);
Copy link
Member

Choose a reason for hiding this comment

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

How about setting this to an invalid Id like "@WixTempComponentId"? That way, if it ever sneaks through too far into the build process, an error will occur.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ooh, I like that!

Implements wixtoolset/issues#7696.

`File` elements can appear where `Component` elements do in WiX v4. The
compiler generates an appropriate per-file component. Naked files under
`Directory`, `DirectoryRef`, `Fragment`, `StandardDirectory`, or
`Package` elements are included in a package via the [default-feature
feature](wixtoolset/issues#7581). Naked files
appearing under `ComponentGroup`, `Feature`, `FeatureRef`, and
`FeatureGroup` generate the component and the reference to the parent
element.

Components and naked Files default to being installed to INSTALLFOLDER
(including a default INSTALLFOLDER if one isn't otherwise authored).
@barnson barnson enabled auto-merge (rebase) January 8, 2024 18:55
@barnson barnson merged commit f676cee into develop Jan 8, 2024
2 checks passed
@barnson barnson deleted the bob/NakedFileEx branch January 8, 2024 19:04
@github-actions github-actions bot locked and limited conversation to collaborators Jan 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants