From e845e1f100dfddd479b97d2d4a092b4150b4c2f1 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 21 Jun 2020 15:03:44 +1000
Subject: Fix BaseBurnBackendExtension.TryAddTupleToDataManifest.

---
 src/WixToolset.Extensibility/BaseBurnBackendExtension.cs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.Extensibility/BaseBurnBackendExtension.cs b/src/WixToolset.Extensibility/BaseBurnBackendExtension.cs
index 5dc36715..524f1de8 100644
--- a/src/WixToolset.Extensibility/BaseBurnBackendExtension.cs
+++ b/src/WixToolset.Extensibility/BaseBurnBackendExtension.cs
@@ -2,7 +2,10 @@
 
 namespace WixToolset.Extensibility
 {
+    using System.Collections.Generic;
+    using System.Linq;
     using WixToolset.Data;
+    using WixToolset.Data.Burn;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
 
@@ -23,13 +26,13 @@ namespace WixToolset.Extensibility
         /// </summary>
         protected IBurnBackendHelper BackendHelper { get; private set; }
 
-        public virtual void BundleFinalize()
-        {
-        }
+        /// <summary>
+        /// Optional tuple definitions.
+        /// </summary>
+        protected virtual IEnumerable<IntermediateTupleDefinition> TupleDefinitions => Enumerable.Empty<IntermediateTupleDefinition>();
 
-        public virtual bool IsTupleForExtension(IntermediateTuple tuple)
+        public virtual void BundleFinalize()
         {
-            return false;
         }
 
         public virtual void PostBackendBind(IBindResult result)
@@ -55,7 +58,8 @@ namespace WixToolset.Extensibility
 
         public virtual bool TryAddTupleToDataManifest(IntermediateSection section, IntermediateTuple tuple)
         {
-            if (this.IsTupleForExtension(tuple) && tuple.HasTag(WixToolset.Data.Burn.BurnConstants.BootstrapperApplicationDataTupleDefinitionTag))
+            if (this.TupleDefinitions.Any(t => t == tuple.Definition) &&
+                tuple.Definition.HasTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag))
             {
                 this.BackendHelper.AddBootstrapperApplicationData(tuple);
                 return true;
-- 
cgit v1.2.3-55-g6feb