From 2671a0e0c551dbe2ba6a4a02cb053d5bc92ec189 Mon Sep 17 00:00:00 2001 From: Rob Mensching <rob@firegiant.com> Date: Wed, 29 Jun 2022 13:43:20 -0700 Subject: Rename CompilerErrors.IllegalName to CompilerErrors.IllegalTagName --- src/wix/WixToolset.Core/CompilerErrors.cs | 2 +- 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 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); } - public static Message IllegalName(SourceLineNumber sourceLineNumbers, string parentElement, string name) + public static Message IllegalTagName(SourceLineNumber sourceLineNumbers, string parentElement, string name) { 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); } 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 if (!String.IsNullOrEmpty(name) && !this.Core.IsValidLongFilename(name)) { - this.Core.Write(CompilerErrors.IllegalName(sourceLineNumbers, node.Name.LocalName, name)); + this.Core.Write(CompilerErrors.IllegalTagName(sourceLineNumbers, node.Name.LocalName, name)); } if (String.IsNullOrEmpty(regid)) @@ -178,7 +178,7 @@ namespace WixToolset.Core if (!String.IsNullOrEmpty(name) && !this.Core.IsValidLongFilename(name)) { - this.Core.Write(CompilerErrors.IllegalName(sourceLineNumbers, node.Name.LocalName, name)); + this.Core.Write(CompilerErrors.IllegalTagName(sourceLineNumbers, node.Name.LocalName, name)); } if (String.IsNullOrEmpty(regid)) -- cgit v1.2.3-55-g6feb