Write Font table correctly
Rob Mensching committed
Oct 7, 2019 at 14:41 UTC
59a8dadcee33343dd724e4e048f0a471f314452f
3 files changed
+10
-2
src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+8
@@ -445,6 +445,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind
445
attributes |= (tuple.Attributes & FileTupleAttributes.System) == FileTupleAttributes.System ? WindowsInstallerConstants.MsidbFileAttributesSystem : 0;
446
attributes |= (tuple.Attributes & FileTupleAttributes.Vital) == FileTupleAttributes.Vital ? WindowsInstallerConstants.MsidbFileAttributesVital : 0;
447
row.Attributes = attributes;
448
+
449
+ if (!String.IsNullOrEmpty(tuple.FontTitle))
450
+ {
451
+ var fontTable = output.EnsureTable(this.TableDefinitions["Font"]);
452
+ var fontRow = fontTable.CreateRow(tuple.SourceLineNumbers);
453
+ fontRow[0] = tuple.Id.Id;
454
+ fontRow[1] = tuple.FontTitle;
455
+ }
456
}
457
458
private void AddIniFileTuple(IniFileTuple tuple, Output output)
src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+1
-1
@@ -294,7 +294,7 @@ namespace WixToolsetTest.CoreIntegration
294
}
295
}
296
297
- [Fact(Skip = "Test demonstrates failure")]
297
+ [Fact]
298
public void PopulatesFontTable()
299
{
300
var folder = TestData.Get(@"TestData");
src/test/WixToolsetTest.CoreIntegration/TestData/Font/FontTitle.wxs
+1
-1
@@ -3,7 +3,7 @@
3
<Fragment>
4
<ComponentGroup Id="ProductComponents">
5
<Component Id="FontComp" Directory="INSTALLFOLDER">
6
- <File Source="test.txt" FontTitle="FakeFont" />
6
+ <File Id="test.txt" Source="test.txt" FontTitle="FakeFont" />
7
</Component>
8
</ComponentGroup>
9
</Fragment>