diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-07-14 14:20:14 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-07-14 14:22:39 -0700 |
| commit | 038c5777f980346ed70a195064eeb2bcca152194 (patch) | |
| tree | 9ce2d1e67eb94b0143a749efccbe49ef2f728311 /src | |
| parent | c5d9ddb397d8341a8fe3a95aa498a1726a3b6199 (diff) | |
| download | wix-038c5777f980346ed70a195064eeb2bcca152194.tar.gz wix-038c5777f980346ed70a195064eeb2bcca152194.tar.bz2 wix-038c5777f980346ed70a195064eeb2bcca152194.zip | |
Fix short filenames containing bind variables
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.Core/CompilerCore.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
| 238 | /// <returns>True if the identifier is a valid loc identifier.</returns> | 238 | /// <returns>True if the identifier is a valid loc identifier.</returns> |
| 239 | public bool IsValidLocIdentifier(string identifier) | 239 | public bool IsValidLocIdentifier(string identifier) |
| 240 | { | 240 | { |
| 241 | return this.parseHelper.IsValidIdentifier(identifier); | 241 | return this.parseHelper.IsValidLocIdentifier(identifier); |
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | /// <summary> | 244 | /// <summary> |
| @@ -770,7 +770,7 @@ namespace WixToolset.Core | |||
| 770 | 770 | ||
| 771 | if (0 < value.Length) | 771 | if (0 < value.Length) |
| 772 | { | 772 | { |
| 773 | if (!this.IsValidShortFilename(value, allowWildcards) && !this.IsValidLocIdentifier(value)) | 773 | if (!this.IsValidShortFilename(value, allowWildcards) && !Common.ContainsValidBinderVariable(value)) |
| 774 | { | 774 | { |
| 775 | this.Write(ErrorMessages.IllegalShortFilename(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value)); | 775 | this.Write(ErrorMessages.IllegalShortFilename(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value)); |
| 776 | } | 776 | } |