From f56ab787834ce5ecb1b40f71fb7c7f6b470ab1e3 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Mon, 24 Feb 2020 20:44:34 -0500
Subject: Fix File/@TrueType.

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

(limited to 'src')

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
index 5707f7ce..3a165582 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
@@ -531,7 +531,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             attributes |= (tuple.Attributes & FileTupleAttributes.Vital) == FileTupleAttributes.Vital ? WindowsInstallerConstants.MsidbFileAttributesVital : 0;
             row.Attributes = attributes;
 
-            if (!String.IsNullOrEmpty(tuple.FontTitle))
+            if (tuple.FontTitle != null)
             {
                 var fontRow = this.CreateRow(tuple, "Font");
                 fontRow[0] = tuple.Id.Id;
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index 6fd02d5f..d93b3d54 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -594,7 +594,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void PopulatesFontTableFromTrueType()
         {
             var folder = TestData.Get(@"TestData");
@@ -622,7 +622,7 @@ namespace WixToolsetTest.CoreIntegration
                 var results = Query.QueryDatabase(msiPath, new[] { "Font" });
                 Assert.Equal(new[]
                 {
-                    "Font:TrueTypeFontComp.ttf\t",
+                    "Font:TrueTypeFontFile\t",
                 }, results);
             }
         }
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs
index ff94ce52..6ac48963 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs
@@ -3,7 +3,7 @@
     <Fragment>
         <ComponentGroup Id="ProductComponents">
             <Component Id="TrueTypeFontComp" Directory="INSTALLFOLDER" Guid="C8116E5E-F731-427C-AF43-6FF8B8D7DA64">
-                <File Source="test.txt" Name="TrueTypeFontComp.ttf" TrueType="yes" />
+                <File Id="TrueTypeFontFile" Source="test.txt" Name="TrueTypeFontComp.ttf" TrueType="yes" />
             </Component>
         </ComponentGroup>
     </Fragment>
-- 
cgit v1.2.3-55-g6feb