Integrate interface-only WixToolset.Extensibility change

1 files changed, 6 insertions, 2 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
index 88be831e..890c446c 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
@@ -34,7 +34,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         private Dictionary<string, string> lastCabinetAddedToMediaTable; // Key is First Cabinet Name, Value is Last Cabinet Added in the Split Sequence
 
-        public CreateCabinetsCommand(IBackendHelper backendHelper)
+        public CreateCabinetsCommand(IServiceProvider serviceProvider, IBackendHelper backendHelper)
         {
             this.fileTransfers = new List<IFileTransfer>();
 
@@ -42,9 +42,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             this.newCabNamesCallBack = this.NewCabNamesCallBack;
 
+            this.ServiceProvider = serviceProvider;
+
             this.BackendHelper = backendHelper;
         }
 
+        public IServiceProvider ServiceProvider { get; }
+
         public IBackendHelper BackendHelper { get; }
 
         /// <summary>
@@ -221,7 +225,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 }
             }
 
-            var cabinetResolver = new CabinetResolver(this.CabCachePath, this.BackendExtensions);
+            var cabinetResolver = new CabinetResolver(this.ServiceProvider, this.CabCachePath, this.BackendExtensions);
 
             var resolvedCabinet = cabinetResolver.ResolveCabinet(tempCabinetFileX, fileFacades);