diff options
Diffstat (limited to 'src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs')
-rw-r--r-- | src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs index fa4f50ba..2d5c5b2e 100644 --- a/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs +++ b/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs | |||
@@ -468,7 +468,7 @@ namespace WixToolset.Core.ExtensibilityServices | |||
468 | } | 468 | } |
469 | else if (allowRelative) | 469 | else if (allowRelative) |
470 | { | 470 | { |
471 | value = this.GetCanonicalRelativePath(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value); | 471 | value = this.BundleValidator.GetCanonicalRelativePath(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value); |
472 | } | 472 | } |
473 | else if (CompilerCore.IsAmbiguousFilename(value)) | 473 | else if (CompilerCore.IsAmbiguousFilename(value)) |
474 | { | 474 | { |
@@ -859,27 +859,5 @@ namespace WixToolset.Core.ExtensibilityServices | |||
859 | 859 | ||
860 | return extension != null; | 860 | return extension != null; |
861 | } | 861 | } |
862 | |||
863 | #region IBundleValidator | ||
864 | public string GetCanonicalRelativePath(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string relativePath) | ||
865 | { | ||
866 | return this.BundleValidator.GetCanonicalRelativePath(sourceLineNumbers, elementName, attributeName, relativePath); | ||
867 | } | ||
868 | |||
869 | public bool ValidateBundleMsiPropertyName(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string propertyName) | ||
870 | { | ||
871 | return this.BundleValidator.ValidateBundleMsiPropertyName(sourceLineNumbers, elementName, attributeName, propertyName); | ||
872 | } | ||
873 | |||
874 | public bool ValidateBundleVariableName(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string variableName) | ||
875 | { | ||
876 | return this.BundleValidator.ValidateBundleVariableName(sourceLineNumbers, elementName, attributeName, variableName); | ||
877 | } | ||
878 | |||
879 | public bool ValidateBundleCondition(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string condition, BundleConditionPhase phase) | ||
880 | { | ||
881 | return this.BundleValidator.ValidateBundleCondition(sourceLineNumbers, elementName, attributeName, condition, phase); | ||
882 | } | ||
883 | #endregion | ||
884 | } | 862 | } |
885 | } | 863 | } |