Process Unreal custom tables in CreateBootstrapperApplicationManifestCommand

4 files changed, 113 insertions, 0 deletions

diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
index 84c02ac9..2a230a90 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
@@ -16,6 +16,8 @@ namespace WixToolset.Core.Burn.Bundles
 
     internal class CreateBootstrapperApplicationManifestCommand
     {
+        private static readonly char[] ColonCharacter = new[] { ':' };
+
         public CreateBootstrapperApplicationManifestCommand(IntermediateSection section, WixBundleTuple bundleTuple, IEnumerable<PackageFacade> chainPackages, int lastUXPayloadIndex, Dictionary<string, WixBundlePayloadTuple> payloadTuples, string intermediateFolder)
         {
             this.Section = section;
@@ -277,6 +279,51 @@ namespace WixToolset.Core.Burn.Bundles
                     writer.WriteEndElement();
                 }
             }
+
+            var dataTablesById = this.Section.Tuples.OfType<WixCustomTableTuple>()
+                                                .Where(t => t.Unreal && t.Id != null)
+                                                .ToDictionary(t => t.Id.Id);
+            var dataRowsByTable = this.Section.Tuples.OfType<WixCustomRowTuple>()
+                                              .GroupBy(t => t.Table);
+            foreach (var tableDataRows in dataRowsByTable)
+            {
+                var tableName = tableDataRows.Key;
+                if (!dataTablesById.TryGetValue(tableName, out var tableTuple))
+                {
+                    // This should have been a linker error.
+                    continue;
+                }
+
+                var columnNames = tableTuple.ColumnNames.Split('\t');
+
+                // We simply assert that the table (and field) name is valid, because
+                // this is up to the extension developer to get right. An author will
+                // only affect the attribute value, and that will get properly escaped.
+#if DEBUG
+                Debug.Assert(Common.IsIdentifier(tableName));
+                foreach (var columnName in columnNames)
+                {
+                    Debug.Assert(Common.IsIdentifier(columnName));
+                }
+#endif // DEBUG
+
+                foreach (var rowTuple in tableDataRows)
+                {
+                    writer.WriteStartElement(tableName);
+
+                    //var rowFields = rowTuple.FieldDataSeparated;
+                    foreach (var field in rowTuple.FieldDataSeparated)
+                    {
+                        var splitField = field.Split(ColonCharacter, 2);
+                        if (splitField.Length == 2)
+                        {
+                            writer.WriteAttributeString(splitField[0], splitField[1]);
+                        }
+                    }
+
+                    writer.WriteEndElement();
+                }
+            }
         }
 
         private WixBundlePayloadTuple CreateBootstrapperApplicationManifestPayloadRow(string baManifestPath)
diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
index ebfdb872..53036919 100644
--- a/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
@@ -13,6 +13,45 @@ namespace WixToolsetTest.CoreIntegration
     public class BundleManifestFixture
     {
         [Fact]
+        public void PopulatesBAManifestWithUnrealCustomTable()
+        {
+            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.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:BundleCustomTable");
+                Assert.Equal(3, customElements.Count);
+                Assert.Equal("<BundleCustomTable Id='one' Column2='two' />", customElements[0].GetTestXml());
+                Assert.Equal("<BundleCustomTable Column2='&lt;' Id='&gt;' />", customElements[1].GetTestXml());
+                Assert.Equal("<BundleCustomTable Id='1' Column2='2' />", customElements[2].GetTestXml());
+            }
+        }
+
+        [Fact]
         public void PopulatesManifestWithBundleExtension()
         {
             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
new file mode 100644
index 00000000..dacbc014
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <PackageGroup Id="BundlePackages">
+            <PackageGroupRef Id="MinimalPackageGroup" />
+        </PackageGroup>
+
+        <CustomTable Id="BundleCustomTable" Unreal="yes">
+            <Column Id="Id" Type="string" PrimaryKey="yes" />
+            <Column Id="Column2" Type="string" PrimaryKey="yes" />
+
+            <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>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index 3989699d..0651ec7a 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -22,6 +22,7 @@
     <Content Include="TestData\AppSearch\NestedDirSearchUnderRegSearch.msi" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\AppSearch\RegistrySearch.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\BadEnsureTable\BadEnsureTable.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\BundleCustomTable\BundleCustomTable.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\BundleExtension\BundleExtension.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\BundleExtension\BundleExtensionSearches.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\BundleExtension\BundleWithSearches.wxs" CopyToOutputDirectory="PreserveNewest" />