Update to WixOutput file structure to fix embedded file handling

1 files changed, 12 insertions, 19 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
index d5281759..f048b4e2 100644
--- a/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
@@ -2,7 +2,6 @@
 
 namespace WixToolset.Core.WindowsInstaller
 {
-    using System;
     using WixToolset.Core.WindowsInstaller.Bind;
     using WixToolset.Core.WindowsInstaller.Unbind;
     using WixToolset.Data;
@@ -25,24 +24,21 @@ namespace WixToolset.Core.WindowsInstaller
 
             var validator = Validator.CreateFromContext(context, "mergemod.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);
+                }
 
-            if (!String.IsNullOrEmpty(context.OutputPdbPath))
-            {
-                command.Pdb?.Save(context.OutputPdbPath);
+                return result;
             }
-
-            return result;
         }
 
         public IDecompileResult Decompile(IDecompileContext context)
@@ -67,10 +63,7 @@ namespace WixToolset.Core.WindowsInstaller
             return result;
         }
 
-        public bool Inscribe(IInscribeContext context)
-        {
-            return false;
-        }
+        public bool Inscribe(IInscribeContext context) => false;
 
         public Intermediate Unbind(IUnbindContext context)
         {