aboutsummaryrefslogtreecommitdiff
path: root/src/api
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2023-09-10 22:34:56 -0400
committerBob Arnson <github@bobs.org>2024-01-08 14:04:21 -0500
commitf676ceeaedbba4125d3e0c691959afcba182d008 (patch)
treecdf12f0b9c2be3b0eb0b1346d5e07ff6142432d3 /src/api
parent44a13ff738267fc7e1147e46cd86df6cdbba7bb3 (diff)
downloadwix-f676ceeaedbba4125d3e0c691959afcba182d008.tar.gz
wix-f676ceeaedbba4125d3e0c691959afcba182d008.tar.bz2
wix-f676ceeaedbba4125d3e0c691959afcba182d008.zip
Support naked files.
Implements https://github.com/wixtoolset/issues/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](https://github.com/wixtoolset/issues/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).
Diffstat (limited to 'src/api')
-rw-r--r--src/api/wix/WixToolset.Data/ErrorMessages.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/api/wix/WixToolset.Data/ErrorMessages.cs b/src/api/wix/WixToolset.Data/ErrorMessages.cs
index e7c88613..79b835cd 100644
--- a/src/api/wix/WixToolset.Data/ErrorMessages.cs
+++ b/src/api/wix/WixToolset.Data/ErrorMessages.cs
@@ -2256,6 +2256,11 @@ namespace WixToolset.Data
2256 return Message(sourceLineNumbers, Ids.IllegalInnerText, "The {0} element contains inner text which is obsolete. Use the {1} attribute instead.", elementName, attributeName); 2256 return Message(sourceLineNumbers, Ids.IllegalInnerText, "The {0} element contains inner text which is obsolete. Use the {1} attribute instead.", elementName, attributeName);
2257 } 2257 }
2258 2258
2259 public static Message IllegalAttributeWhenNested(SourceLineNumber sourceLineNumbers, string attributeName)
2260 {
2261 return Message(sourceLineNumbers, Ids.IllegalAttributeWhenNested, "The File element contains an attribute '{0}' that cannot be used in a File element that is a child of a Component element.", attributeName);
2262 }
2263
2259 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) 2264 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
2260 { 2265 {
2261 return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args); 2266 return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args);