@joebigelow / wix / commits / e845e1f1

Fix BaseBurnBackendExtension.TryAddTupleToDataManifest.

Sean Hall committed Jun 21, 2020 at 15:03 UTC e845e1f100dfddd479b97d2d4a092b4150b4c2f1
1 file changed +10 -6
src/WixToolset.Extensibility/BaseBurnBackendExtension.cs
+10 -6
@@ -2,7 +2,10 @@
2
3 namespace WixToolset.Extensibility
4 {
5 + using System.Collections.Generic;
6 + using System.Linq;
7 using WixToolset.Data;
8 + using WixToolset.Data.Burn;
9 using WixToolset.Extensibility.Data;
10 using WixToolset.Extensibility.Services;
11
@@ -23,13 +26,13 @@ namespace WixToolset.Extensibility
26 /// </summary>
27 protected IBurnBackendHelper BackendHelper { get; private set; }
28
26 - public virtual void BundleFinalize()
27 - {
28 - }
29 + /// <summary>
30 + /// Optional tuple definitions.
31 + /// </summary>
32 + protected virtual IEnumerable<IntermediateTupleDefinition> TupleDefinitions => Enumerable.Empty<IntermediateTupleDefinition>();
33
30 - public virtual bool IsTupleForExtension(IntermediateTuple tuple)
34 + public virtual void BundleFinalize()
35 {
32 - return false;
36 }
37
38 public virtual void PostBackendBind(IBindResult result)
@@ -55,7 +58,8 @@ namespace WixToolset.Extensibility
58
59 public virtual bool TryAddTupleToDataManifest(IntermediateSection section, IntermediateTuple tuple)
60 {
58 - if (this.IsTupleForExtension(tuple) && tuple.HasTag(WixToolset.Data.Burn.BurnConstants.BootstrapperApplicationDataTupleDefinitionTag))
61 + if (this.TupleDefinitions.Any(t => t == tuple.Definition) &&
62 + tuple.Definition.HasTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag))
63 {
64 this.BackendHelper.AddBootstrapperApplicationData(tuple);
65 return true;