Support wixout and extract Resolve and Layout from Binder

1 files changed, 5 insertions, 3 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
index 4753677a..00f09db3 100644
--- a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
@@ -12,9 +12,11 @@ namespace WixToolset.Core.WindowsInstaller
 
     internal class MsiBackend : IBackend
     {
-        public BindResult Bind(IBindContext context)
+        public BindResult Bind(WixToolset.Extensibility.IBindContext context)
         {
-            var backendExtensions = context.ExtensionManager.Create<IWindowsInstallerBackendExtension>();
+            var extensionManager = context.ServiceProvider.GetService<IExtensionManager>();
+
+            var backendExtensions = extensionManager.Create<IWindowsInstallerBackendExtension>();
 
             foreach (var extension in backendExtensions)
             {
@@ -26,7 +28,7 @@ namespace WixToolset.Core.WindowsInstaller
             var command = new BindDatabaseCommand(context, backendExtensions, validator);
             command.Execute();
 
-            var result = new BindResult(command.FileTransfers, command.ContentFilePaths);
+            var result = new BindResult { FileTransfers = command.FileTransfers, ContentFilePaths = command.ContentFilePaths };
 
             foreach (var extension in backendExtensions)
             {