From bf187ab399db33b40fc3de8ac9b1e2a82cc47a19 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 11 Apr 2020 15:35:30 +1000 Subject: Sync tables.xml with tuple definitions. --- .../Bind/CreateOutputFromIRCommand.cs | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs index 79b7b67b..7de1b1d0 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs @@ -124,10 +124,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.AddMsiEmbeddedUITuple((MsiEmbeddedUITuple)tuple); break; - case TupleDefinitionType.MsiFileHash: - this.AddMsiFileHashTuple((MsiFileHashTuple)tuple); - break; - case TupleDefinitionType.MsiServiceConfig: this.AddMsiServiceConfigTuple((MsiServiceConfigTuple)tuple); break; @@ -517,6 +513,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind fontRow[0] = tuple.Id.Id; fontRow[1] = tuple.FontTitle; } + + if (tuple.SelfRegCost.HasValue) + { + var selfRegRow = this.CreateRow(tuple, "SelfReg"); + selfRegRow[0] = tuple.Id.Id; + selfRegRow[1] = tuple.SelfRegCost.Value; + } } private void AddIniFileTuple(IniFileTuple tuple) @@ -577,17 +580,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[4] = tuple.Source; } - private void AddMsiFileHashTuple(MsiFileHashTuple tuple) - { - var row = this.CreateRow(tuple, "MsiFileHash"); - row[0] = tuple.Id.Id; - row[1] = tuple.Options; - row[2] = tuple.HashPart1; - row[3] = tuple.HashPart2; - row[4] = tuple.HashPart3; - row[5] = tuple.HashPart4; - } - private void AddMsiServiceConfigTuple(MsiServiceConfigTuple tuple) { var events = tuple.OnInstall ? WindowsInstallerConstants.MsidbServiceConfigEventInstall : 0; -- cgit v1.2.3-55-g6feb