From 860676fa5b40a1904478151e9b4934c004e7db63 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 7 Oct 2019 11:18:13 -0700
Subject: Implement Bundle build

---
 src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 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 830880ee..53451752 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -30,6 +30,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             this.BackendHelper = context.ServiceProvider.GetService<IBackendHelper>();
 
+            this.PathResolver = this.ServiceProvider.GetService<IPathResolver>();
+
             this.TableDefinitions = WindowsInstallerStandardInternal.GetTableDefinitions();
 
             this.CabbingThreadCount = context.CabbingThreadCount;
@@ -54,6 +56,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         private IBackendHelper BackendHelper { get; }
 
+        private IPathResolver PathResolver { get; }
+
         private int Codepage { get; }
 
         private int CabbingThreadCount { get; }
@@ -241,7 +245,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             // Set generated component guids.
             {
-                var command = new CalculateComponentGuids(this.Messaging, this.BackendHelper, section);
+                var command = new CalculateComponentGuids(this.Messaging, this.BackendHelper, this.PathResolver, section);
                 command.Execute();
             }
 
@@ -501,7 +505,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             // Process uncompressed files.
             if (!this.Messaging.EncounteredError && !this.SuppressLayout && uncompressedFiles.Any())
             {
-                var command = new ProcessUncompressedFilesCommand(section, this.BackendHelper);
+                var command = new ProcessUncompressedFilesCommand(section, this.BackendHelper, this.PathResolver);
                 command.Compressed = compressed;
                 command.FileFacades = uncompressedFiles;
                 command.LayoutDirectory = layoutDirectory;
-- 
cgit v1.2.3-55-g6feb