Fix short filenames containing bind variables
Rob Mensching committed
Jul 14, 2020 at 14:20 UTC
038c5777f980346ed70a195064eeb2bcca152194
1 file changed
+2
-2
src/WixToolset.Core/CompilerCore.cs
+2
-2
@@ -238,7 +238,7 @@ namespace WixToolset.Core
238
/// <returns>True if the identifier is a valid loc identifier.</returns>
239
public bool IsValidLocIdentifier(string identifier)
240
{
241
- return this.parseHelper.IsValidIdentifier(identifier);
241
+ return this.parseHelper.IsValidLocIdentifier(identifier);
242
}
243
244
/// <summary>
@@ -770,7 +770,7 @@ namespace WixToolset.Core
770
771
if (0 < value.Length)
772
{
773
- if (!this.IsValidShortFilename(value, allowWildcards) && !this.IsValidLocIdentifier(value))
773
+ if (!this.IsValidShortFilename(value, allowWildcards) && !Common.ContainsValidBinderVariable(value))
774
{
775
this.Write(ErrorMessages.IllegalShortFilename(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
776
}