Update to WixOutput file structure to fix embedded file handling

1 files changed, 24 insertions, 14 deletions

diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs
index 972258fe..5ee60984 100644
--- a/src/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -100,29 +100,38 @@ namespace WixToolset.Core.CommandLine
 
             if (this.OutputType == OutputType.Library)
             {
-                var wixlib = this.LibraryPhase(wixobjs, wxls, this.commandLine.BindFiles, this.commandLine.BindPaths);
-
-                if (!this.Messaging.EncounteredError)
+                using (new IntermediateFieldContext("wix.lib"))
                 {
-                    wixlib.Save(this.commandLine.OutputFile);
+                    var wixlib = this.LibraryPhase(wixobjs, wxls, this.commandLine.BindFiles, this.commandLine.BindPaths);
+
+                    if (!this.Messaging.EncounteredError)
+                    {
+                        wixlib.Save(this.commandLine.OutputFile);
+                    }
                 }
             }
             else
             {
-                if (wixipl == null)
-                {
-                    wixipl = this.LinkPhase(wixobjs, this.commandLine.LibraryFilePaths, creator);
-                }
-
-                if (!this.Messaging.EncounteredError)
+                using (new IntermediateFieldContext("wix.link"))
                 {
-                    if (this.OutputType == OutputType.IntermediatePostLink)
+                    if (wixipl == null)
                     {
-                        wixipl.Save(this.commandLine.OutputFile);
+                        wixipl = this.LinkPhase(wixobjs, this.commandLine.LibraryFilePaths, creator);
                     }
-                    else
+
+                    if (!this.Messaging.EncounteredError)
                     {
-                        this.BindPhase(wixipl, wxls, filterCultures, this.commandLine.CabCachePath, this.commandLine.BindPaths, this.commandLine.BurnStubPath);
+                        if (this.OutputType == OutputType.IntermediatePostLink)
+                        {
+                            wixipl.Save(this.commandLine.OutputFile);
+                        }
+                        else
+                        {
+                            using (new IntermediateFieldContext("wix.bind"))
+                            {
+                                this.BindPhase(wixipl, wxls, filterCultures, this.commandLine.CabCachePath, this.commandLine.BindPaths, this.commandLine.BurnStubPath);
+                            }
+                        }
                     }
                 }
             }
@@ -469,6 +478,7 @@ namespace WixToolset.Core.CommandLine
                             break;
                         }
 
+                        case "bf":
                         case "bindfiles":
                             this.BindFiles = true;
                             return true;