From 038c5777f980346ed70a195064eeb2bcca152194 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 14 Jul 2020 14:20:14 -0700
Subject: Fix short filenames containing bind variables

---
 src/WixToolset.Core/CompilerCore.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.Core/CompilerCore.cs b/src/WixToolset.Core/CompilerCore.cs
index e2c1a3d6..8e4f3d89 100644
--- a/src/WixToolset.Core/CompilerCore.cs
+++ b/src/WixToolset.Core/CompilerCore.cs
@@ -238,7 +238,7 @@ namespace WixToolset.Core
         /// <returns>True if the identifier is a valid loc identifier.</returns>
         public bool IsValidLocIdentifier(string identifier)
         {
-            return this.parseHelper.IsValidIdentifier(identifier);
+            return this.parseHelper.IsValidLocIdentifier(identifier);
         }
 
         /// <summary>
@@ -770,7 +770,7 @@ namespace WixToolset.Core
 
             if (0 < value.Length)
             {
-                if (!this.IsValidShortFilename(value, allowWildcards) && !this.IsValidLocIdentifier(value))
+                if (!this.IsValidShortFilename(value, allowWildcards) && !Common.ContainsValidBinderVariable(value))
                 {
                     this.Write(ErrorMessages.IllegalShortFilename(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
                 }
-- 
cgit v1.2.3-55-g6feb