Integrate the latest Extensibility changes

2 files changed, 16 insertions, 11 deletions

diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index dea1f47d..93620e1b 100644
--- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -23,7 +23,7 @@ namespace WixToolset.Core.Burn
     /// </summary>
     internal class BindBundleCommand
     {
-        public BindBundleCommand(IBindContext context, IEnumerable<IBurnBackendExtension> backedExtensions)
+        public BindBundleCommand(IBindContext context, IEnumerable<IBurnBackendBinderExtension> backedExtensions)
         {
             this.ServiceProvider = context.ServiceProvider;
 
@@ -58,7 +58,7 @@ namespace WixToolset.Core.Burn
 
         public IEnumerable<IExpectedExtractFile> ExpectedEmbeddedFiles { get; }
 
-        private IEnumerable<IBurnBackendExtension> BackendExtensions { get; }
+        private IEnumerable<IBurnBackendBinderExtension> BackendExtensions { get; }
 
         private Intermediate Output {  get; }
 
@@ -380,16 +380,21 @@ namespace WixToolset.Core.Burn
             // Update the bundle per-machine/per-user scope based on the chained packages.
             this.ResolveBundleInstallScope(section, bundleSymbol, orderedFacades);
 
-            // Generate data for all manifests.
+            // Give the extension one last hook before generating the output files.
+            foreach (var extension in this.BackendExtensions)
             {
-                var command = new GenerateManifestDataFromIRCommand(this.Messaging, section, this.BackendExtensions, this.InternalBurnBackendHelper, extensionSearchSymbolsById);
-                command.Execute();
+                extension.SymbolsFinalized(section);
             }
 
-            // Give the extension one last hook before generating the output files.
-            foreach (var extension in this.BackendExtensions)
+            if (this.Messaging.EncounteredError)
             {
-                extension.BundleFinalize();
+                return;
+            }
+
+            // Generate data for all manifests.
+            {
+                var command = new GenerateManifestDataFromIRCommand(this.Messaging, section, this.BackendExtensions, this.InternalBurnBackendHelper, extensionSearchSymbolsById);
+                command.Execute();
             }
 
             if (this.Messaging.EncounteredError)
diff --git a/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs b/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs
index 93a1a0bc..c51d380c 100644
--- a/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs
+++ b/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs
@@ -16,7 +16,7 @@ namespace WixToolset.Core.Burn.Bind
 
     internal class GenerateManifestDataFromIRCommand
     {
-        public GenerateManifestDataFromIRCommand(IMessaging messaging, IntermediateSection section, IEnumerable<IBurnBackendExtension> backendExtensions, IBurnBackendHelper backendHelper, IDictionary<string, IList<IntermediateSymbol>> extensionSearchSymbolsById)
+        public GenerateManifestDataFromIRCommand(IMessaging messaging, IntermediateSection section, IEnumerable<IBurnBackendBinderExtension> backendExtensions, IBurnBackendHelper backendHelper, IDictionary<string, IList<IntermediateSymbol>> extensionSearchSymbolsById)
         {
             this.Messaging = messaging;
             this.Section = section;
@@ -25,7 +25,7 @@ namespace WixToolset.Core.Burn.Bind
             this.ExtensionSearchSymbolsById = extensionSearchSymbolsById;
         }
 
-        private IEnumerable<IBurnBackendExtension> BackendExtensions { get; }
+        private IEnumerable<IBurnBackendBinderExtension> BackendExtensions { get; }
 
         private IBurnBackendHelper BackendHelper { get; }
 
@@ -220,7 +220,7 @@ namespace WixToolset.Core.Burn.Bind
         {
             foreach (var extension in this.BackendExtensions)
             {
-                if (extension.TryAddSymbolToDataManifest(this.Section, symbol))
+                if (extension.TryProcessSymbol(this.Section, symbol))
                 {
                     return true;
                 }