diff options
3 files changed, 10 insertions, 2 deletions
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 | |||
| 445 | attributes |= (tuple.Attributes & FileTupleAttributes.System) == FileTupleAttributes.System ? WindowsInstallerConstants.MsidbFileAttributesSystem : 0; | 445 | attributes |= (tuple.Attributes & FileTupleAttributes.System) == FileTupleAttributes.System ? WindowsInstallerConstants.MsidbFileAttributesSystem : 0; |
| 446 | attributes |= (tuple.Attributes & FileTupleAttributes.Vital) == FileTupleAttributes.Vital ? WindowsInstallerConstants.MsidbFileAttributesVital : 0; | 446 | attributes |= (tuple.Attributes & FileTupleAttributes.Vital) == FileTupleAttributes.Vital ? WindowsInstallerConstants.MsidbFileAttributesVital : 0; |
| 447 | row.Attributes = attributes; | 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 | } | ||
| 448 | } | 456 | } |
| 449 | 457 | ||
| 450 | private void AddIniFileTuple(IniFileTuple tuple, Output output) | 458 | 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 | |||
| 294 | } | 294 | } |
| 295 | } | 295 | } |
| 296 | 296 | ||
| 297 | [Fact(Skip = "Test demonstrates failure")] | 297 | [Fact] |
| 298 | public void PopulatesFontTable() | 298 | public void PopulatesFontTable() |
| 299 | { | 299 | { |
| 300 | var folder = TestData.Get(@"TestData"); | 300 | 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 @@ | |||
| 3 | <Fragment> | 3 | <Fragment> |
| 4 | <ComponentGroup Id="ProductComponents"> | 4 | <ComponentGroup Id="ProductComponents"> |
| 5 | <Component Id="FontComp" Directory="INSTALLFOLDER"> | 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> | 7 | </Component> |
| 8 | </ComponentGroup> | 8 | </ComponentGroup> |
| 9 | </Fragment> | 9 | </Fragment> |
