From 59a8dadcee33343dd724e4e048f0a471f314452f Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 7 Oct 2019 14:41:09 -0700
Subject: Write Font table correctly

---
 .../Bind/CreateOutputFromIRCommand.cs                             | 8 ++++++++
 src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs        | 2 +-
 .../WixToolsetTest.CoreIntegration/TestData/Font/FontTitle.wxs    | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
index 75a694d1..13db96fa 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
@@ -445,6 +445,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             attributes |= (tuple.Attributes & FileTupleAttributes.System) == FileTupleAttributes.System ? WindowsInstallerConstants.MsidbFileAttributesSystem : 0;
             attributes |= (tuple.Attributes & FileTupleAttributes.Vital) == FileTupleAttributes.Vital ? WindowsInstallerConstants.MsidbFileAttributesVital : 0;
             row.Attributes = attributes;
+
+            if (!String.IsNullOrEmpty(tuple.FontTitle))
+            {
+                var fontTable = output.EnsureTable(this.TableDefinitions["Font"]);
+                var fontRow = fontTable.CreateRow(tuple.SourceLineNumbers);
+                fontRow[0] = tuple.Id.Id;
+                fontRow[1] = tuple.FontTitle;
+            }
         }
 
         private void AddIniFileTuple(IniFileTuple tuple, Output output)
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index c391abac..1ab51714 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -294,7 +294,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void PopulatesFontTable()
         {
             var folder = TestData.Get(@"TestData");
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Font/FontTitle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Font/FontTitle.wxs
index b7899b87..6fb9ef05 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Font/FontTitle.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Font/FontTitle.wxs
@@ -3,7 +3,7 @@
     <Fragment>
         <ComponentGroup Id="ProductComponents">
             <Component Id="FontComp" Directory="INSTALLFOLDER">
-                <File Source="test.txt" FontTitle="FakeFont" />
+                <File Id="test.txt" Source="test.txt" FontTitle="FakeFont" />
             </Component>
         </ComponentGroup>
     </Fragment>
-- 
cgit v1.2.3-55-g6feb