From 3b3854e3cb7c171cd356497531a040596af5d214 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Wed, 5 Dec 2018 19:12:53 -0500
Subject: Return object fields exported from unbinding in the decompile
 results.

---
 .../Decompile/DecompileMsiOrMsmCommand.cs                            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/WixToolset.Core.WindowsInstaller/Decompile')

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
                     {
-- 
cgit v1.2.3-55-g6feb