diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-06-29 13:43:20 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-06-29 23:58:30 -0700 |
| commit | 2671a0e0c551dbe2ba6a4a02cb053d5bc92ec189 (patch) | |
| tree | 266a6500bb9631ee4f6ce075aeda7abdda27455b | |
| parent | 744cde09b8c4a5338a99cd4af24f81459c82713b (diff) | |
| download | wix-2671a0e0c551dbe2ba6a4a02cb053d5bc92ec189.tar.gz wix-2671a0e0c551dbe2ba6a4a02cb053d5bc92ec189.tar.bz2 wix-2671a0e0c551dbe2ba6a4a02cb053d5bc92ec189.zip | |
Rename CompilerErrors.IllegalName to CompilerErrors.IllegalTagName
| -rw-r--r-- | src/wix/WixToolset.Core/CompilerErrors.cs | 2 | ||||
| -rw-r--r-- | src/wix/WixToolset.Core/Compiler_Tag.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/wix/WixToolset.Core/CompilerErrors.cs b/src/wix/WixToolset.Core/CompilerErrors.cs index 1afdfe45..492732f7 100644 --- a/src/wix/WixToolset.Core/CompilerErrors.cs +++ b/src/wix/WixToolset.Core/CompilerErrors.cs | |||
| @@ -21,7 +21,7 @@ namespace WixToolset.Core | |||
| 21 | return Message(sourceLineNumbers, Ids.IllegalBundleVariableName, "The {0}/@{1} attribute's value, '{2}', is not a legal bundle variable name. Identifiers may contain ASCII characters A-Z, a-z, digits, or underscores (_). Every identifier must begin with either a letter or an underscore.", elementName, attributeName, value); | 21 | return Message(sourceLineNumbers, Ids.IllegalBundleVariableName, "The {0}/@{1} attribute's value, '{2}', is not a legal bundle variable name. Identifiers may contain ASCII characters A-Z, a-z, digits, or underscores (_). Every identifier must begin with either a letter or an underscore.", elementName, attributeName, value); |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | public static Message IllegalName(SourceLineNumber sourceLineNumbers, string parentElement, string name) | 24 | public static Message IllegalTagName(SourceLineNumber sourceLineNumbers, string parentElement, string name) |
| 25 | { | 25 | { |
| 26 | return Message(sourceLineNumbers, Ids.IllegalName, "The Tag/@Name attribute value, '{1}', contains invalid filename identifiers. The Tag/@Name may have defaulted from the {0}/@Name attrbute. If so, use the Tag/@Name attribute to provide a valid filename. Any character except for the follow may be used: \\ ? | > < : / * \".", parentElement, name); | 26 | return Message(sourceLineNumbers, Ids.IllegalName, "The Tag/@Name attribute value, '{1}', contains invalid filename identifiers. The Tag/@Name may have defaulted from the {0}/@Name attrbute. If so, use the Tag/@Name attribute to provide a valid filename. Any character except for the follow may be used: \\ ? | > < : / * \".", parentElement, name); |
| 27 | } | 27 | } |
diff --git a/src/wix/WixToolset.Core/Compiler_Tag.cs b/src/wix/WixToolset.Core/Compiler_Tag.cs index dfb14c5d..991c87fd 100644 --- a/src/wix/WixToolset.Core/Compiler_Tag.cs +++ b/src/wix/WixToolset.Core/Compiler_Tag.cs | |||
| @@ -68,7 +68,7 @@ namespace WixToolset.Core | |||
| 68 | 68 | ||
| 69 | if (!String.IsNullOrEmpty(name) && !this.Core.IsValidLongFilename(name)) | 69 | if (!String.IsNullOrEmpty(name) && !this.Core.IsValidLongFilename(name)) |
| 70 | { | 70 | { |
| 71 | this.Core.Write(CompilerErrors.IllegalName(sourceLineNumbers, node.Name.LocalName, name)); | 71 | this.Core.Write(CompilerErrors.IllegalTagName(sourceLineNumbers, node.Name.LocalName, name)); |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | if (String.IsNullOrEmpty(regid)) | 74 | if (String.IsNullOrEmpty(regid)) |
| @@ -178,7 +178,7 @@ namespace WixToolset.Core | |||
| 178 | 178 | ||
| 179 | if (!String.IsNullOrEmpty(name) && !this.Core.IsValidLongFilename(name)) | 179 | if (!String.IsNullOrEmpty(name) && !this.Core.IsValidLongFilename(name)) |
| 180 | { | 180 | { |
| 181 | this.Core.Write(CompilerErrors.IllegalName(sourceLineNumbers, node.Name.LocalName, name)); | 181 | this.Core.Write(CompilerErrors.IllegalTagName(sourceLineNumbers, node.Name.LocalName, name)); |
| 182 | } | 182 | } |
| 183 | 183 | ||
| 184 | if (String.IsNullOrEmpty(regid)) | 184 | if (String.IsNullOrEmpty(regid)) |