From 148ad02da05070245c8345d6650e2a70bd4706be Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 12 Apr 2020 11:19:14 +1000 Subject: Merge and move default tuple logic from CreateOutputFromIRCommand to WindowsInstallerBackendHelper. --- src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (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 5d1e89ac..489fdacb 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs @@ -33,6 +33,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.Messaging = context.ServiceProvider.GetService(); this.BackendHelper = context.ServiceProvider.GetService(); + this.WindowsInstallerBackendHelper = context.ServiceProvider.GetService(); this.PathResolver = this.ServiceProvider.GetService(); @@ -60,6 +61,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind private IBackendHelper BackendHelper { get; } + private IWindowsInstallerBackendHelper WindowsInstallerBackendHelper { get; } + private IPathResolver PathResolver { get; } private int Codepage { get; } @@ -343,7 +346,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // Time to create the output object. Try to put as much above here as possible, updating the IR is better. { - var command = new CreateOutputFromIRCommand(this.Messaging, section, tableDefinitions, this.BackendExtensions); + var command = new CreateOutputFromIRCommand(this.Messaging, section, tableDefinitions, this.BackendExtensions, this.WindowsInstallerBackendHelper); command.Execute(); output = command.Output; -- cgit v1.2.3-55-g6feb