aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/CompilerCore.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2019-03-01 11:12:52 -0800
committerRob Mensching <rob@robmensching.com>2019-03-01 11:15:40 -0800
commit5392cf57c09bddde7157e5b26c5c2a013f819ead (patch)
tree96063a49293bd9eea122218e770b52d3c20812f2 /src/WixToolset.Core/CompilerCore.cs
parenta4f5a5a042c00254607fbecdf132a2e2a91a1bdd (diff)
downloadwix-5392cf57c09bddde7157e5b26c5c2a013f819ead.tar.gz
wix-5392cf57c09bddde7157e5b26c5c2a013f819ead.tar.bz2
wix-5392cf57c09bddde7157e5b26c5c2a013f819ead.zip
Integrate interface-only WixToolset.Extensibility change
Diffstat (limited to 'src/WixToolset.Core/CompilerCore.cs')
-rw-r--r--src/WixToolset.Core/CompilerCore.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/WixToolset.Core/CompilerCore.cs b/src/WixToolset.Core/CompilerCore.cs
index cc881f48..4df94713 100644
--- a/src/WixToolset.Core/CompilerCore.cs
+++ b/src/WixToolset.Core/CompilerCore.cs
@@ -534,7 +534,7 @@ namespace WixToolset.Core
534 string value = this.GetAttributeValue(sourceLineNumbers, attribute); 534 string value = this.GetAttributeValue(sourceLineNumbers, attribute);
535 535
536 // allow for localization of code page names and values 536 // allow for localization of code page names and values
537 if (IsValidLocIdentifier(value)) 537 if (this.IsValidLocIdentifier(value))
538 { 538 {
539 return value; 539 return value;
540 } 540 }
@@ -648,7 +648,7 @@ namespace WixToolset.Core
648 648
649 if (0 < value.Length) 649 if (0 < value.Length)
650 { 650 {
651 if (IsValidLocIdentifier(value) || Common.IsValidBinderVariable(value)) 651 if (this.IsValidLocIdentifier(value) || Common.IsValidBinderVariable(value))
652 { 652 {
653 return value; 653 return value;
654 } 654 }
@@ -1010,7 +1010,7 @@ namespace WixToolset.Core
1010 /// <param name="parentElement">Element containing element to be parsed.</param> 1010 /// <param name="parentElement">Element containing element to be parsed.</param>
1011 /// <param name="element">Element to be parsed.</param> 1011 /// <param name="element">Element to be parsed.</param>
1012 /// <param name="contextValues">Extra information about the context in which this element is being parsed.</param> 1012 /// <param name="contextValues">Extra information about the context in which this element is being parsed.</param>
1013 public ComponentKeyPath ParsePossibleKeyPathExtensionElement(XElement parentElement, XElement element, IDictionary<string, string> context) 1013 public IComponentKeyPath ParsePossibleKeyPathExtensionElement(XElement parentElement, XElement element, IDictionary<string, string> context)
1014 { 1014 {
1015 return this.parseHelper.ParsePossibleKeyPathExtensionElement(this.extensions.Values, this.intermediate, this.ActiveSection, parentElement, element, context); 1015 return this.parseHelper.ParsePossibleKeyPathExtensionElement(this.extensions.Values, this.intermediate, this.ActiveSection, parentElement, element, context);
1016 } 1016 }