3 files changed, 17 insertions, 13 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index 205feeac..2e4b4827 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -36,7 +36,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             this.Intermediate = context.IntermediateRepresentation;
             this.Messaging = context.Messaging;
             this.OutputPath = context.OutputPath;
-            this.PdbFile = context.OutputPdbPath;
             this.IntermediateFolder = context.IntermediateFolder;
             this.Validator = validator;
 
@@ -61,8 +60,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         private IEnumerable<IWindowsInstallerBackendExtension> BackendExtensions { get; }
 
-        private string PdbFile { get; }
-
         private Intermediate Intermediate { get; }
 
         private IMessaging Messaging { get; }
@@ -84,6 +81,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         public IEnumerable<string> ContentFilePaths { get; private set; }
 
+        public Pdb Pdb { get; private set; }
+
         public void Execute()
         {
             var section = this.Intermediate.Sections.Single();
@@ -428,14 +427,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 return;
             }
 
-            // Output the output to a file.
-            if (!String.IsNullOrEmpty(this.PdbFile))
-            {
-                Pdb pdb = new Pdb();
-                pdb.Output = output;
-                pdb.Save(this.PdbFile);
-            }
-
             // Merge modules.
             if (containsMergeModules)
             {
@@ -514,6 +505,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             this.FileTransfers = fileTransfers;
             this.ContentFilePaths = fileFacades.Select(r => r.WixFile.Source.Path).ToList();
+            this.Pdb = new Pdb { Output = output };
 
             // TODO: Eventually this gets removed
             var intermediate = new Intermediate(this.Intermediate.Id, new[] { section }, this.Intermediate.Localizations.ToDictionary(l => l.Culture, StringComparer.OrdinalIgnoreCase), this.Intermediate.EmbedFilePaths);
diff --git a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
index 00f09db3..60aec15b 100644
--- a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
@@ -2,6 +2,7 @@
 
 namespace WixToolset.Core.WindowsInstaller
 {
+    using System;
     using WixToolset.Core.WindowsInstaller.Bind;
     using WixToolset.Core.WindowsInstaller.Inscribe;
     using WixToolset.Core.WindowsInstaller.Unbind;
@@ -32,7 +33,12 @@ namespace WixToolset.Core.WindowsInstaller
 
             foreach (var extension in backendExtensions)
             {
-                extension.PostBackendBind(result);
+                extension.PostBackendBind(result, command.Pdb);
+            }
+
+            if (!String.IsNullOrEmpty(context.OutputPdbPath))
+            {
+                command.Pdb?.Save(context.OutputPdbPath);
             }
 
             return result;
diff --git a/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
index 9c70860e..4076da66 100644
--- a/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
@@ -2,6 +2,7 @@
 
 namespace WixToolset.Core.WindowsInstaller
 {
+    using System;
     using WixToolset.Core.WindowsInstaller.Bind;
     using WixToolset.Core.WindowsInstaller.Unbind;
     using WixToolset.Data;
@@ -31,7 +32,12 @@ namespace WixToolset.Core.WindowsInstaller
 
             foreach (var extension in backendExtensions)
             {
-                extension.PostBackendBind(result);
+                extension.PostBackendBind(result, command.Pdb);
+            }
+
+            if (!String.IsNullOrEmpty(context.OutputPdbPath))
+            {
+                command.Pdb?.Save(context.OutputPdbPath);
             }
 
             return result;