aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-04-12 11:19:14 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-04-12 12:46:21 +1000
commit148ad02da05070245c8345d6650e2a70bd4706be (patch)
tree819c60d1c2b19848fb12bae9d9f7e009db387a43 /src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
parent6d8b6f79b44b6a41a630aa3aad5a3c7f16701798 (diff)
downloadwix-148ad02da05070245c8345d6650e2a70bd4706be.tar.gz
wix-148ad02da05070245c8345d6650e2a70bd4706be.tar.bz2
wix-148ad02da05070245c8345d6650e2a70bd4706be.zip
Merge and move default tuple logic from CreateOutputFromIRCommand to WindowsInstallerBackendHelper.
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs5
1 files changed, 4 insertions, 1 deletions
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
33 this.Messaging = context.ServiceProvider.GetService<IMessaging>(); 33 this.Messaging = context.ServiceProvider.GetService<IMessaging>();
34 34
35 this.BackendHelper = context.ServiceProvider.GetService<IBackendHelper>(); 35 this.BackendHelper = context.ServiceProvider.GetService<IBackendHelper>();
36 this.WindowsInstallerBackendHelper = context.ServiceProvider.GetService<IWindowsInstallerBackendHelper>();
36 37
37 this.PathResolver = this.ServiceProvider.GetService<IPathResolver>(); 38 this.PathResolver = this.ServiceProvider.GetService<IPathResolver>();
38 39
@@ -60,6 +61,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
60 61
61 private IBackendHelper BackendHelper { get; } 62 private IBackendHelper BackendHelper { get; }
62 63
64 private IWindowsInstallerBackendHelper WindowsInstallerBackendHelper { get; }
65
63 private IPathResolver PathResolver { get; } 66 private IPathResolver PathResolver { get; }
64 67
65 private int Codepage { get; } 68 private int Codepage { get; }
@@ -343,7 +346,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
343 346
344 // Time to create the output object. Try to put as much above here as possible, updating the IR is better. 347 // Time to create the output object. Try to put as much above here as possible, updating the IR is better.
345 { 348 {
346 var command = new CreateOutputFromIRCommand(this.Messaging, section, tableDefinitions, this.BackendExtensions); 349 var command = new CreateOutputFromIRCommand(this.Messaging, section, tableDefinitions, this.BackendExtensions, this.WindowsInstallerBackendHelper);
347 command.Execute(); 350 command.Execute();
348 351
349 output = command.Output; 352 output = command.Output;