Implement BundleCustomData. Remove Unreal from CustomTable.

4 files changed, 80 insertions, 65 deletions

diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
index 4b1ec718..ae83150a 100644
--- a/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
@@ -13,7 +13,7 @@ namespace WixToolsetTest.CoreIntegration
     public class BundleManifestFixture
     {
         [Fact]
-        public void PopulatesBAManifestWithUnrealCustomTable()
+        public void PopulatesBAManifestWithBootstrapperApplicationBundleCustomData()
         {
             var folder = TestData.Get(@"TestData");
 
@@ -43,11 +43,50 @@ namespace WixToolsetTest.CoreIntegration
                 var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
                 extractResult.AssertSuccess();
 
-                var customElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:BundleCustomTable");
+                var customElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:BundleCustomTableBA");
                 Assert.Equal(3, customElements.Count);
-                Assert.Equal("<BundleCustomTable Id='one' Column2='two' />", customElements[0].GetTestXml());
-                Assert.Equal("<BundleCustomTable Id='&gt;' Column2='&lt;' />", customElements[1].GetTestXml());
-                Assert.Equal("<BundleCustomTable Id='1' Column2='2' />", customElements[2].GetTestXml());
+                Assert.Equal("<BundleCustomTableBA Id='one' Column2='two' />", customElements[0].GetTestXml());
+                Assert.Equal("<BundleCustomTableBA Id='&gt;' Column2='&lt;' />", customElements[1].GetTestXml());
+                Assert.Equal("<BundleCustomTableBA Id='1' Column2='2' />", customElements[2].GetTestXml());
+            }
+        }
+
+        [Fact]
+        public void PopulatesBEManifestWithBundleExtensionBundleCustomData()
+        {
+            var folder = TestData.Get(@"TestData");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var bundlePath = Path.Combine(baseFolder, @"bin\test.exe");
+                var baFolderPath = Path.Combine(baseFolder, "ba");
+                var extractFolderPath = Path.Combine(baseFolder, "extract");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "BundleCustomTable", "BundleCustomTable.wxs"),
+                    Path.Combine(folder, "BundleWithPackageGroupRef", "MinimalPackageGroup.wxs"),
+                    Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
+                    "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", bundlePath
+                });
+
+                result.AssertSuccess();
+
+                Assert.True(File.Exists(bundlePath));
+
+                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
+                extractResult.AssertSuccess();
+
+                var customElements = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='CustomTableExtension']/be:BundleCustomTableBE");
+                Assert.Equal(3, customElements.Count);
+                Assert.Equal("<BundleCustomTableBE Id='one' Column2='two' />", customElements[0].GetTestXml());
+                Assert.Equal("<BundleCustomTableBE Id='&gt;' Column2='&lt;' />", customElements[1].GetTestXml());
+                Assert.Equal("<BundleCustomTableBE Id='1' Column2='2' />", customElements[2].GetTestXml());
             }
         }
 
diff --git a/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs b/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs
index 85a0ffae..afba1cbc 100644
--- a/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs
@@ -3,7 +3,6 @@
 namespace WixToolsetTest.CoreIntegration
 {
     using System.IO;
-    using Microsoft.Build.Tasks;
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
     using Xunit;
@@ -160,36 +159,6 @@ namespace WixToolsetTest.CoreIntegration
         }
 
         [Fact]
-        public void UnrealCustomTableIsNotPresentInMsi()
-        {
-            var folder = TestData.Get(@"TestData");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var msiPath = Path.Combine(baseFolder, @"bin\test.msi");
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "CustomTable", "CustomTable.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
-                    Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
-                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                var results = Query.QueryDatabase(msiPath, new[] { "CustomTable2" });
-                Assert.Empty(results);
-            }
-        }
-
-        [Fact]
         public void CanCompileAndDecompile()
         {
             var folder = TestData.Get(@"TestData");
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs
index dacbc014..38d207ca 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs
@@ -5,22 +5,42 @@
             <PackageGroupRef Id="MinimalPackageGroup" />
         </PackageGroup>
 
-        <CustomTable Id="BundleCustomTable" Unreal="yes">
-            <Column Id="Id" Type="string" PrimaryKey="yes" />
-            <Column Id="Column2" Type="string" PrimaryKey="yes" />
+        <BundleCustomData Id="BundleCustomTableBA" Type="bootstrapperApplication">
+            <BundleAttributeDefinition Id="Id" />
+            <BundleAttributeDefinition Id="Column2" />
 
-            <Row>
-                <Data Column="Id">one</Data>
-                <Data Column="Column2">two</Data>
-            </Row>
-            <Row>
-                <Data Column="Column2">&lt;</Data>
-                <Data Column="Id">&gt;</Data>
-            </Row>
-            <Row>
-                <Data Column="Id">1</Data>
-                <Data Column="Column2">2</Data>
-            </Row>
-        </CustomTable>
+            <BundleElement>
+                <BundleAttribute Id="Id">one</BundleAttribute>
+                <BundleAttribute Id="Column2">two</BundleAttribute>
+            </BundleElement>
+            <BundleElement>
+                <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">
+            <BundleAttributeDefinition Id="Id" />
+            <BundleAttributeDefinition Id="Column2" />
+
+            <BundleElement>
+                <BundleAttribute Id="Id">one</BundleAttribute>
+                <BundleAttribute Id="Column2">two</BundleAttribute>
+            </BundleElement>
+            <BundleElement>
+                <BundleAttribute Id="Column2">&lt;</BundleAttribute>
+                <BundleAttribute Id="Id">&gt;</BundleAttribute>
+            </BundleElement>
+            <BundleElement>
+                <BundleAttribute Id="Id">1</BundleAttribute>
+                <BundleAttribute Id="Column2">2</BundleAttribute>
+            </BundleElement>
+        </BundleCustomData>
+
+        <BundleExtension Id="CustomTableExtension" SourceFile="fakeba.dll" />
     </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs
index 51aee5f2..d6a2521e 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs
@@ -17,18 +17,5 @@
                 <Data Column="Component_">test.txt</Data>
             </Row>
         </CustomTable>
-
-        <CustomTable Id="CustomTable2" Unreal="yes">
-            <Column Id="ColumnA" Type="string" PrimaryKey="yes" />
-            <Column Id="Component_" Type="string" Width="72" KeyTable="Component" KeyColumn="1" />
-            <Row>
-                <Data Column="ColumnA">RowA</Data>
-                <Data Column="Component_">test.txt</Data>
-            </Row>
-            <Row>
-                <Data Column="ColumnA">RowB</Data>
-                <Data Column="Component_">test.txt</Data>
-            </Row>
-        </CustomTable>
     </Fragment>
 </Wix>