2 files changed, 13 insertions, 1 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs
index 6ca1d89f..e874eed6 100644
--- a/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs
@@ -5,6 +5,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
     using System;
     using System.Collections.Generic;
     using System.ComponentModel;
+    using System.Linq;
     using WixToolset.Core.Native;
     using WixToolset.Data;
     using WixToolset.Extensibility;
@@ -37,6 +38,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                 {
                     var unbindCommand = new UnbindDatabaseCommand(this.Messaging, database, this.Context.DecompilePath, this.Context.DecompileType, this.Context.ExtractFolder, this.Context.IntermediateFolder, this.Context.IsAdminImage, false, skipSummaryInfo: false);
                     var output = unbindCommand.Execute();
+                    var extractedFilePaths = new List<string>(unbindCommand.ExportedFiles);
 
                     var decompiler = new Decompiler(this.Messaging, this.Extensions, this.Context.BaseSourcePath, this.Context.SuppressCustomTables, this.Context.SuppressDroppingEmptyTables, this.Context.SuppressUI, this.Context.TreatProductAsModule);
                     result.Document = decompiler.Decompile(output);
@@ -47,7 +49,8 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                         var extractCommand = new ExtractCabinetsCommand(output, database, this.Context.DecompilePath, this.Context.ExtractFolder, this.Context.IntermediateFolder, this.Context.TreatProductAsModule);
                         extractCommand.Execute();
 
-                        result.ExtractedFilePaths = extractCommand.ExtractedFiles;
+                        extractedFilePaths.AddRange(extractCommand.ExtractedFiles);
+                        result.ExtractedFilePaths = extractedFilePaths;
                     }
                     else
                     {
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
index 3bbc29f1..86ecea38 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
@@ -7,6 +7,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;
+    using System.Linq;
     using System.Text.RegularExpressions;
     using WixToolset.Core.Native;
     using WixToolset.Data;
@@ -17,6 +18,8 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
 
     internal class UnbindDatabaseCommand
     {
+        private List<string> exportedFiles;
+
         public UnbindDatabaseCommand(IMessaging messaging, Database database, string databasePath, OutputType outputType, string exportBasePath, string intermediateFolder, bool isAdminImage, bool suppressDemodularization, bool skipSummaryInfo)
         {
             this.Messaging = messaging;
@@ -52,10 +55,14 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
 
         public TableDefinitionCollection TableDefinitions { get; }
 
+        public IEnumerable<string> ExportedFiles => this.exportedFiles;
+
         private int SectionCount { get; set; }
 
         public Output Execute()
         {
+            this.exportedFiles = new List<string>();
+
             string modularizationGuid = null;
             var output = new Output(new SourceLineNumber(this.DatabasePath));
             View validationView = null;
@@ -343,6 +350,8 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                                                                 fs.Write(buffer, 0, bytesRead);
                                                             }
                                                         }
+
+                                                        this.exportedFiles.Add(sourceFile);
                                                     }
 
                                                     row[i] = sourceFile;