3 files changed, 92 insertions, 9 deletions

diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index cb85281d..9681cb3f 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -6229,6 +6229,9 @@ namespace WixToolset.Core
                     case "BundleCustomData":
                         this.ParseBundleCustomDataElement(child);
                         break;
+                    case "BundleCustomDataRef":
+                        this.ParseBundleCustomDataRefElement(child);
+                        break;
                     case "BundleExtension":
                         this.ParseBundleExtensionElement(child);
                         break;
diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs
index 5154a72f..2b274474 100644
--- a/src/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/WixToolset.Core/Compiler_Bundle.cs
@@ -280,6 +280,9 @@ namespace WixToolset.Core
                     case "BundleCustomData":
                         this.ParseBundleCustomDataElement(child);
                         break;
+                    case "BundleCustomDataRef":
+                        this.ParseBundleCustomDataRefElement(child);
+                        break;
                     case "BundleExtension":
                         this.ParseBundleExtensionElement(child);
                         break;
@@ -784,6 +787,7 @@ namespace WixToolset.Core
             WixBundleCustomDataType? customDataType = null;
             string extensionId = null;
             var attributeDefinitions = new List<WixBundleCustomDataAttributeTuple>();
+            var foundAttributeDefinitions = false;
 
             foreach (var attrib in node.Attributes())
             {
@@ -831,9 +835,9 @@ namespace WixToolset.Core
             }
 
             var hasExtensionId = null != extensionId;
-            if (hasExtensionId && !customDataType.HasValue)
+            if (!customDataType.HasValue)
             {
-                customDataType = WixBundleCustomDataType.BundleExtension;
+                customDataType = hasExtensionId ? WixBundleCustomDataType.BundleExtension : WixBundleCustomDataType.BootstrapperApplication;
             }
 
             if (!customDataType.HasValue)
@@ -860,6 +864,8 @@ namespace WixToolset.Core
                     switch (child.Name.LocalName)
                     {
                         case "BundleAttributeDefinition":
+                            foundAttributeDefinitions = true;
+
                             var attributeDefinition = this.ParseBundleAttributeDefinitionElement(child, childSourceLineNumbers, customDataId);
                             if (attributeDefinition != null)
                             {
@@ -894,6 +900,73 @@ namespace WixToolset.Core
                     });
                 }
             }
+            else if (!foundAttributeDefinitions)
+            {
+                this.Core.Write(ErrorMessages.ExpectedElement(sourceLineNumbers, node.Name.LocalName, "BundleAttributeDefinition"));
+            }
+        }
+
+        /// <summary>
+        /// Parses a BundleCustomDataRef element.
+        /// </summary>
+        /// <param name="node">Element to parse.</param>
+        private void ParseBundleCustomDataRefElement(XElement node)
+        {
+            var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
+            string customDataId = null;
+            var foundChild = false;
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || CompilerCore.WixNamespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            customDataId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.Core.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.Core.ParseExtensionAttribute(node, attrib);
+                }
+            }
+
+            if (null == customDataId)
+            {
+                this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
+            }
+
+            foreach (var child in node.Elements())
+            {
+                foundChild = true;
+                if (CompilerCore.WixNamespace == child.Name.Namespace)
+                {
+                    var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child);
+                    switch (child.Name.LocalName)
+                    {
+                        case "BundleElement":
+                            this.ParseBundleElementElement(child, childSourceLineNumbers, customDataId);
+                            break;
+                        default:
+                            this.Core.UnexpectedElement(node, child);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.Core.ParseExtensionElement(node, child);
+                }
+            }
+
+            if (!foundChild)
+            {
+                this.Core.Write(ErrorMessages.ExpectedElement(sourceLineNumbers, node.Name.LocalName));
+            }
         }
 
         /// <summary>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs
index 38d207ca..8482a57e 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs
@@ -5,7 +5,7 @@
             <PackageGroupRef Id="MinimalPackageGroup" />
         </PackageGroup>
 
-        <BundleCustomData Id="BundleCustomTableBA" Type="bootstrapperApplication">
+        <BundleCustomData Id="BundleCustomTableBA">
             <BundleAttributeDefinition Id="Id" />
             <BundleAttributeDefinition Id="Column2" />
 
@@ -17,16 +17,23 @@
                 <BundleAttribute Id="Column2">&lt;</BundleAttribute>
                 <BundleAttribute Id="Id">&gt;</BundleAttribute>
             </BundleElement>
-            <BundleElement>
-                <BundleAttribute Id="Id">1</BundleAttribute>
-                <BundleAttribute Id="Column2">2</BundleAttribute>
-            </BundleElement>
         </BundleCustomData>
 
-        <BundleCustomData Id="BundleCustomTableBE" Type="bundleExtension" ExtensionId="CustomTableExtension">
+        <BundleCustomData Id="BundleCustomTableBE" ExtensionId="CustomTableExtension">
             <BundleAttributeDefinition Id="Id" />
             <BundleAttributeDefinition Id="Column2" />
+        </BundleCustomData>
+    </Fragment>
 
+    <Fragment>
+        <BundleCustomDataRef Id="BundleCustomTableBA">
+            <BundleElement>
+                <BundleAttribute Id="Id">1</BundleAttribute>
+                <BundleAttribute Id="Column2">2</BundleAttribute>
+            </BundleElement>
+        </BundleCustomDataRef>
+
+        <BundleCustomDataRef Id="BundleCustomTableBE">
             <BundleElement>
                 <BundleAttribute Id="Id">one</BundleAttribute>
                 <BundleAttribute Id="Column2">two</BundleAttribute>
@@ -39,7 +46,7 @@
                 <BundleAttribute Id="Id">1</BundleAttribute>
                 <BundleAttribute Id="Column2">2</BundleAttribute>
             </BundleElement>
-        </BundleCustomData>
+        </BundleCustomDataRef>
 
         <BundleExtension Id="CustomTableExtension" SourceFile="fakeba.dll" />
     </Fragment>