aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-04-11 15:35:30 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-04-12 12:46:21 +1000
commitbf187ab399db33b40fc3de8ac9b1e2a82cc47a19 (patch)
tree355eef0970820ee0788db412fc09a006668721d6 /src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
parentfecacf19e8ea73500b7a936f809dc92f7317886b (diff)
downloadwix-bf187ab399db33b40fc3de8ac9b1e2a82cc47a19.tar.gz
wix-bf187ab399db33b40fc3de8ac9b1e2a82cc47a19.tar.bz2
wix-bf187ab399db33b40fc3de8ac9b1e2a82cc47a19.zip
Sync tables.xml with tuple definitions.
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs22
1 files changed, 7 insertions, 15 deletions
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
124 this.AddMsiEmbeddedUITuple((MsiEmbeddedUITuple)tuple); 124 this.AddMsiEmbeddedUITuple((MsiEmbeddedUITuple)tuple);
125 break; 125 break;
126 126
127 case TupleDefinitionType.MsiFileHash:
128 this.AddMsiFileHashTuple((MsiFileHashTuple)tuple);
129 break;
130
131 case TupleDefinitionType.MsiServiceConfig: 127 case TupleDefinitionType.MsiServiceConfig:
132 this.AddMsiServiceConfigTuple((MsiServiceConfigTuple)tuple); 128 this.AddMsiServiceConfigTuple((MsiServiceConfigTuple)tuple);
133 break; 129 break;
@@ -517,6 +513,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind
517 fontRow[0] = tuple.Id.Id; 513 fontRow[0] = tuple.Id.Id;
518 fontRow[1] = tuple.FontTitle; 514 fontRow[1] = tuple.FontTitle;
519 } 515 }
516
517 if (tuple.SelfRegCost.HasValue)
518 {
519 var selfRegRow = this.CreateRow(tuple, "SelfReg");
520 selfRegRow[0] = tuple.Id.Id;
521 selfRegRow[1] = tuple.SelfRegCost.Value;
522 }
520 } 523 }
521 524
522 private void AddIniFileTuple(IniFileTuple tuple) 525 private void AddIniFileTuple(IniFileTuple tuple)
@@ -577,17 +580,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
577 row[4] = tuple.Source; 580 row[4] = tuple.Source;
578 } 581 }
579 582
580 private void AddMsiFileHashTuple(MsiFileHashTuple tuple)
581 {
582 var row = this.CreateRow(tuple, "MsiFileHash");
583 row[0] = tuple.Id.Id;
584 row[1] = tuple.Options;
585 row[2] = tuple.HashPart1;
586 row[3] = tuple.HashPart2;
587 row[4] = tuple.HashPart3;
588 row[5] = tuple.HashPart4;
589 }
590
591 private void AddMsiServiceConfigTuple(MsiServiceConfigTuple tuple) 583 private void AddMsiServiceConfigTuple(MsiServiceConfigTuple tuple)
592 { 584 {
593 var events = tuple.OnInstall ? WindowsInstallerConstants.MsidbServiceConfigEventInstall : 0; 585 var events = tuple.OnInstall ? WindowsInstallerConstants.MsidbServiceConfigEventInstall : 0;