Fix File/@TrueType.
Bob Arnson committed
Feb 24, 2020 at 20:44 UTC
f56ab787834ce5ecb1b40f71fb7c7f6b470ab1e3
3 files changed
+4
-4
src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+1
-1
@@ -531,7 +531,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
531
attributes |= (tuple.Attributes & FileTupleAttributes.Vital) == FileTupleAttributes.Vital ? WindowsInstallerConstants.MsidbFileAttributesVital : 0;
532
row.Attributes = attributes;
533
534
- if (!String.IsNullOrEmpty(tuple.FontTitle))
534
+ if (tuple.FontTitle != null)
535
{
536
var fontRow = this.CreateRow(tuple, "Font");
537
fontRow[0] = tuple.Id.Id;
src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+2
-2
@@ -594,7 +594,7 @@ namespace WixToolsetTest.CoreIntegration
594
}
595
}
596
597
- [Fact(Skip = "Test demonstrates failure")]
597
+ [Fact]
598
public void PopulatesFontTableFromTrueType()
599
{
600
var folder = TestData.Get(@"TestData");
@@ -622,7 +622,7 @@ namespace WixToolsetTest.CoreIntegration
622
var results = Query.QueryDatabase(msiPath, new[] { "Font" });
623
Assert.Equal(new[]
624
{
625
- "Font:TrueTypeFontComp.ttf\t",
625
+ "Font:TrueTypeFontFile\t",
626
}, results);
627
}
628
}
src/test/WixToolsetTest.CoreIntegration/TestData/Font/TrueType.wxs
+1
-1
@@ -3,7 +3,7 @@
3
<Fragment>
4
<ComponentGroup Id="ProductComponents">
5
<Component Id="TrueTypeFontComp" Directory="INSTALLFOLDER" Guid="C8116E5E-F731-427C-AF43-6FF8B8D7DA64">
6
- <File Source="test.txt" Name="TrueTypeFontComp.ttf" TrueType="yes" />
6
+ <File Id="TrueTypeFontFile" Source="test.txt" Name="TrueTypeFontComp.ttf" TrueType="yes" />
7
</Component>
8
</ComponentGroup>
9
</Fragment>