From 404e5661ee971b9b2544185c3a28b24fafc06185 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 12 Jun 2020 12:42:26 -0700 Subject: Implement update control text --- .../Bind/BindDatabaseCommand.cs | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs index bdb089ee..65e4bf13 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs @@ -325,6 +325,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind command.Execute(); } + // Update control text from files on disk. + { + var command = new UpdateControlTextCommand(this.Messaging, section); + command.Execute(); + } + // Update file sequence. { var command = new UpdateMediaSequencesCommand(section, fileFacades); @@ -615,21 +621,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } - /// - /// Update Control and BBControl text by reading from files when necessary. - /// - /// Internal representation of the msi database to operate upon. - private void UpdateControlText(WindowsInstallerData output) - { - var command = new UpdateControlTextCommand(); - command.Messaging = this.Messaging; - command.BBControlTable = output.Tables["BBControl"]; - command.WixBBControlTable = output.Tables["WixBBControl"]; - command.ControlTable = output.Tables["Control"]; - command.WixControlTable = output.Tables["WixControl"]; - command.Execute(); - } - private string ResolveMedia(MediaTuple media, string mediaLayoutDirectory, string layoutDirectory) { string layout = null; -- cgit v1.2.3-55-g6feb