aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-06-21 15:03:44 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-06-22 14:12:31 +1000
commite845e1f100dfddd479b97d2d4a092b4150b4c2f1 (patch)
tree8f5f4f2d7503b9ae7151ddd67f43ccf91216eaa0 /src
parent828adda1db78cebd5852ed0ed609bc7a76609463 (diff)
downloadwix-e845e1f100dfddd479b97d2d4a092b4150b4c2f1.tar.gz
wix-e845e1f100dfddd479b97d2d4a092b4150b4c2f1.tar.bz2
wix-e845e1f100dfddd479b97d2d4a092b4150b4c2f1.zip
Fix BaseBurnBackendExtension.TryAddTupleToDataManifest.
Diffstat (limited to 'src')
-rw-r--r--src/WixToolset.Extensibility/BaseBurnBackendExtension.cs16
1 files changed, 10 insertions, 6 deletions
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 @@
2 2
3namespace WixToolset.Extensibility 3namespace WixToolset.Extensibility
4{ 4{
5 using System.Collections.Generic;
6 using System.Linq;
5 using WixToolset.Data; 7 using WixToolset.Data;
8 using WixToolset.Data.Burn;
6 using WixToolset.Extensibility.Data; 9 using WixToolset.Extensibility.Data;
7 using WixToolset.Extensibility.Services; 10 using WixToolset.Extensibility.Services;
8 11
@@ -23,13 +26,13 @@ namespace WixToolset.Extensibility
23 /// </summary> 26 /// </summary>
24 protected IBurnBackendHelper BackendHelper { get; private set; } 27 protected IBurnBackendHelper BackendHelper { get; private set; }
25 28
26 public virtual void BundleFinalize() 29 /// <summary>
27 { 30 /// Optional tuple definitions.
28 } 31 /// </summary>
32 protected virtual IEnumerable<IntermediateTupleDefinition> TupleDefinitions => Enumerable.Empty<IntermediateTupleDefinition>();
29 33
30 public virtual bool IsTupleForExtension(IntermediateTuple tuple) 34 public virtual void BundleFinalize()
31 { 35 {
32 return false;
33 } 36 }
34 37
35 public virtual void PostBackendBind(IBindResult result) 38 public virtual void PostBackendBind(IBindResult result)
@@ -55,7 +58,8 @@ namespace WixToolset.Extensibility
55 58
56 public virtual bool TryAddTupleToDataManifest(IntermediateSection section, IntermediateTuple tuple) 59 public virtual bool TryAddTupleToDataManifest(IntermediateSection section, IntermediateTuple tuple)
57 { 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))
59 { 63 {
60 this.BackendHelper.AddBootstrapperApplicationData(tuple); 64 this.BackendHelper.AddBootstrapperApplicationData(tuple);
61 return true; 65 return true;