aboutsummaryrefslogtreecommitdiff
path: root/src/wixext/BalWindowsInstallerBackendBinderExtension.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixext/BalWindowsInstallerBackendBinderExtension.cs')
-rw-r--r--src/wixext/BalWindowsInstallerBackendBinderExtension.cs16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/wixext/BalWindowsInstallerBackendBinderExtension.cs b/src/wixext/BalWindowsInstallerBackendBinderExtension.cs
index fbda9d1b..3dc00da6 100644
--- a/src/wixext/BalWindowsInstallerBackendBinderExtension.cs
+++ b/src/wixext/BalWindowsInstallerBackendBinderExtension.cs
@@ -6,6 +6,7 @@ namespace WixToolset.Bal
6 using System.Linq; 6 using System.Linq;
7 using System.Xml; 7 using System.Xml;
8 using WixToolset.Data; 8 using WixToolset.Data;
9 using WixToolset.Data.Burn;
9 using WixToolset.Data.WindowsInstaller; 10 using WixToolset.Data.WindowsInstaller;
10 using WixToolset.Data.WindowsInstaller.Rows; 11 using WixToolset.Data.WindowsInstaller.Rows;
11 using WixToolset.Extensibility; 12 using WixToolset.Extensibility;
@@ -13,9 +14,6 @@ namespace WixToolset.Bal
13 14
14 public class BalWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension 15 public class BalWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension
15 { 16 {
16 // TODO: don't duplicate this from WixToolset.Core.Compiler
17 public const string BurnUXContainerId = "WixUXContainer";
18
19 private static readonly TableDefinition[] Tables = LoadTables(); 17 private static readonly TableDefinition[] Tables = LoadTables();
20 18
21 protected override TableDefinition[] TableDefinitionsForTuples => Tables; 19 protected override TableDefinition[] TableDefinitionsForTuples => Tables;
@@ -30,11 +28,11 @@ namespace WixToolset.Bal
30 } 28 }
31 } 29 }
32 30
33 public override void PostBackendBind(BindResult result, Pdb pdb) 31 public override void PostBackendBind(IBindResult result, WixOutput wixout)
34 { 32 {
35 base.PostBackendBind(result, pdb); 33 base.PostBackendBind(result, wixout);
36 34
37 var output = pdb.Output; 35 var output = WindowsInstallerData.Load(wixout.Uri.AbsoluteUri, false);
38 36
39 // Only process Bundles. 37 // Only process Bundles.
40 if (OutputType.Bundle != output.Type) 38 if (OutputType.Bundle != output.Type)
@@ -64,7 +62,7 @@ namespace WixToolset.Bal
64 } 62 }
65 } 63 }
66 64
67 private void VerifyBAFunctions(Output output) 65 private void VerifyBAFunctions(WindowsInstallerData output)
68 { 66 {
69 Row baFunctionsRow = null; 67 Row baFunctionsRow = null;
70 var baFunctionsTable = output.Tables["WixBalBAFunctions"]; 68 var baFunctionsTable = output.Tables["WixBalBAFunctions"];
@@ -98,14 +96,14 @@ namespace WixToolset.Bal
98 // TODO: May need to revisit this depending on the outcome of #5273. 96 // TODO: May need to revisit this depending on the outcome of #5273.
99 var payloadId = (string)baFunctionsRow[0]; 97 var payloadId = (string)baFunctionsRow[0];
100 var bundlePayloadRow = payloadPropertiesRows.Single(x => payloadId == x.Id); 98 var bundlePayloadRow = payloadPropertiesRows.Single(x => payloadId == x.Id);
101 if (BurnUXContainerId != bundlePayloadRow.Container) 99 if (BurnConstants.BurnUXContainerName != bundlePayloadRow.Container)
102 { 100 {
103 this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsRow.SourceLineNumbers)); 101 this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsRow.SourceLineNumbers));
104 } 102 }
105 } 103 }
106 } 104 }
107 105
108 private void VerifyPrereqPackages(Output output) 106 private void VerifyPrereqPackages(WindowsInstallerData output)
109 { 107 {
110 var prereqInfoTable = output.Tables["WixMbaPrereqInformation"]; 108 var prereqInfoTable = output.Tables["WixMbaPrereqInformation"];
111 if (null == prereqInfoTable || prereqInfoTable.Rows.Count == 0) 109 if (null == prereqInfoTable || prereqInfoTable.Rows.Count == 0)