diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-07-10 21:36:24 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-07-10 21:39:48 +1000 |
| commit | 01ad1ca4991e830239156b10412165ce4dd839af (patch) | |
| tree | c6f2bc7a887e7a4f2d3ad27799c7e55748497222 /src/WixToolset.Core/Compiler_Bundle.cs | |
| parent | 8ce57f2f167db67687470f2e9744cd4930c6dd95 (diff) | |
| download | wix-01ad1ca4991e830239156b10412165ce4dd839af.tar.gz wix-01ad1ca4991e830239156b10412165ce4dd839af.tar.bz2 wix-01ad1ca4991e830239156b10412165ce4dd839af.zip | |
Add CustomTableRef element.
Diffstat (limited to 'src/WixToolset.Core/Compiler_Bundle.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler_Bundle.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs index 2089f037..7cdb8ca0 100644 --- a/src/WixToolset.Core/Compiler_Bundle.cs +++ b/src/WixToolset.Core/Compiler_Bundle.cs | |||
| @@ -914,7 +914,6 @@ namespace WixToolset.Core | |||
| 914 | { | 914 | { |
| 915 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 915 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| 916 | string customDataId = null; | 916 | string customDataId = null; |
| 917 | var foundChild = false; | ||
| 918 | 917 | ||
| 919 | foreach (var attrib in node.Attributes()) | 918 | foreach (var attrib in node.Attributes()) |
| 920 | { | 919 | { |
| @@ -924,6 +923,7 @@ namespace WixToolset.Core | |||
| 924 | { | 923 | { |
| 925 | case "Id": | 924 | case "Id": |
| 926 | customDataId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); | 925 | customDataId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); |
| 926 | this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixBundleCustomData, customDataId); | ||
| 927 | break; | 927 | break; |
| 928 | default: | 928 | default: |
| 929 | this.Core.UnexpectedAttribute(node, attrib); | 929 | this.Core.UnexpectedAttribute(node, attrib); |
| @@ -943,7 +943,6 @@ namespace WixToolset.Core | |||
| 943 | 943 | ||
| 944 | foreach (var child in node.Elements()) | 944 | foreach (var child in node.Elements()) |
| 945 | { | 945 | { |
| 946 | foundChild = true; | ||
| 947 | if (CompilerCore.WixNamespace == child.Name.Namespace) | 946 | if (CompilerCore.WixNamespace == child.Name.Namespace) |
| 948 | { | 947 | { |
| 949 | var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child); | 948 | var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child); |
| @@ -962,11 +961,6 @@ namespace WixToolset.Core | |||
| 962 | this.Core.ParseExtensionElement(node, child); | 961 | this.Core.ParseExtensionElement(node, child); |
| 963 | } | 962 | } |
| 964 | } | 963 | } |
| 965 | |||
| 966 | if (!foundChild) | ||
| 967 | { | ||
| 968 | this.Core.Write(ErrorMessages.ExpectedElement(sourceLineNumbers, node.Name.LocalName)); | ||
| 969 | } | ||
| 970 | } | 964 | } |
| 971 | 965 | ||
| 972 | /// <summary> | 966 | /// <summary> |
