Update to WixOutput file structure to fix embedded file handling

1 files changed, 12 insertions, 10 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
index 2ebb3f13..5cd7204a 100644
--- a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
@@ -2,7 +2,6 @@
 
 namespace WixToolset.Core.WindowsInstaller
 {
-    using System;
     using WixToolset.Core.WindowsInstaller.Bind;
     using WixToolset.Core.WindowsInstaller.Inscribe;
     using WixToolset.Core.WindowsInstaller.Unbind;
@@ -26,18 +25,21 @@ namespace WixToolset.Core.WindowsInstaller
 
             var validator = Validator.CreateFromContext(context, "darice.cub");
 
-            var command = new BindDatabaseCommand(context, backendExtensions, validator);
-            command.Execute();
+            using (var command = new BindDatabaseCommand(context, backendExtensions, validator))
+            {
+                command.Execute();
 
-            var result = context.ServiceProvider.GetService<IBindResult>();
-            result.FileTransfers = command.FileTransfers;
-            result.TrackedFiles = command.TrackedFiles;
+                var result = context.ServiceProvider.GetService<IBindResult>();
+                result.FileTransfers = command.FileTransfers;
+                result.TrackedFiles = command.TrackedFiles;
 
-            foreach (var extension in backendExtensions)
-            {
-                extension.PostBackendBind(result, command.Pdb);
+                foreach (var extension in backendExtensions)
+                {
+                    extension.PostBackendBind(result, command.Wixout);
+                }
+
+                return result;
             }
-            return result;
         }
 
         public IDecompileResult Decompile(IDecompileContext context)