4 files changed, 74 insertions, 7 deletions

diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index 020e35fe..3fa06f9c 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -3612,6 +3612,7 @@ namespace WixToolset.Core
             string tableId = null;
             var unreal = false;
             var columns = new List<WixCustomTableColumnSymbol>();
+            var foundColumns = false;
 
             foreach (var attrib in node.Attributes())
             {
@@ -3653,6 +3654,8 @@ namespace WixToolset.Core
                     switch (child.Name.LocalName)
                     {
                         case "Column":
+                            foundColumns = true;
+
                             var column = this.ParseColumnElement(child, childSourceLineNumbers, tableId);
                             if (column != null)
                             {
@@ -3690,6 +3693,67 @@ namespace WixToolset.Core
                         Unreal = unreal,
                     });
                 }
+                else if (!foundColumns)
+                {
+                    this.Core.Write(ErrorMessages.ExpectedElement(sourceLineNumbers, node.Name.LocalName, "Column"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Parses a CustomTableRef element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        private void ParseCustomTableRefElement(XElement node)
+        {
+            var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
+            string tableId = null;
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || CompilerCore.WixNamespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            tableId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixCustomTable, tableId);
+                            break;
+                        default:
+                            this.Core.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.Core.ParseExtensionAttribute(node, attrib);
+                }
+            }
+
+            if (null == tableId)
+            {
+                this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
+            }
+
+            foreach (var child in node.Elements())
+            {
+                if (CompilerCore.WixNamespace == child.Name.Namespace)
+                {
+                    var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child);
+                    switch (child.Name.LocalName)
+                    {
+                        case "Row":
+                            this.ParseRowElement(child, childSourceLineNumbers, tableId);
+                            break;
+                        default:
+                            this.Core.UnexpectedElement(node, child);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.Core.ParseExtensionElement(node, child);
+                }
             }
         }
 
@@ -6155,6 +6219,9 @@ namespace WixToolset.Core
                     case "CustomTable":
                         this.ParseCustomTableElement(child);
                         break;
+                    case "CustomTableRef":
+                        this.ParseCustomTableRefElement(child);
+                        break;
                     case "Directory":
                         this.ParseDirectoryElement(child, null, CompilerConstants.IntegerNotSet, String.Empty);
                         break;
diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs
index 29f240f4..11063bd8 100644
--- a/src/WixToolset.Core/Compiler_2.cs
+++ b/src/WixToolset.Core/Compiler_2.cs
@@ -195,6 +195,9 @@ namespace WixToolset.Core
                         case "CustomTable":
                             this.ParseCustomTableElement(child);
                             break;
+                        case "CustomTableRef":
+                            this.ParseCustomTableRefElement(child);
+                            break;
                         case "Directory":
                             this.ParseDirectoryElement(child, null, CompilerConstants.IntegerNotSet, String.Empty);
                             break;
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
         {
             var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
             string customDataId = null;
-            var foundChild = false;
 
             foreach (var attrib in node.Attributes())
             {
@@ -924,6 +923,7 @@ namespace WixToolset.Core
                     {
                         case "Id":
                             customDataId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixBundleCustomData, customDataId);
                             break;
                         default:
                             this.Core.UnexpectedAttribute(node, attrib);
@@ -943,7 +943,6 @@ namespace WixToolset.Core
 
             foreach (var child in node.Elements())
             {
-                foundChild = true;
                 if (CompilerCore.WixNamespace == child.Name.Namespace)
                 {
                     var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child);
@@ -962,11 +961,6 @@ namespace WixToolset.Core
                     this.Core.ParseExtensionElement(node, child);
                 }
             }
-
-            if (!foundChild)
-            {
-                this.Core.Write(ErrorMessages.ExpectedElement(sourceLineNumbers, node.Name.LocalName));
-            }
         }
 
         /// <summary>
diff --git a/src/WixToolset.Core/Compiler_Module.cs b/src/WixToolset.Core/Compiler_Module.cs
index a7d94701..2ecd9113 100644
--- a/src/WixToolset.Core/Compiler_Module.cs
+++ b/src/WixToolset.Core/Compiler_Module.cs
@@ -141,6 +141,9 @@ namespace WixToolset.Core
                         case "CustomTable":
                             this.ParseCustomTableElement(child);
                             break;
+                        case "CustomTableRef":
+                            this.ParseCustomTableRefElement(child);
+                            break;
                         case "Dependency":
                             this.ParseDependencyElement(child);
                             break;