diff options
Diffstat (limited to 'src/wixext/BalBurnBackendExtension.cs')
-rw-r--r-- | src/wixext/BalBurnBackendExtension.cs | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs index b767d2c0..3f2cda05 100644 --- a/src/wixext/BalBurnBackendExtension.cs +++ b/src/wixext/BalBurnBackendExtension.cs | |||
@@ -5,27 +5,27 @@ namespace WixToolset.Bal | |||
5 | using System; | 5 | using System; |
6 | using System.Collections.Generic; | 6 | using System.Collections.Generic; |
7 | using System.Linq; | 7 | using System.Linq; |
8 | using WixToolset.Bal.Tuples; | 8 | using WixToolset.Bal.Symbols; |
9 | using WixToolset.Data; | 9 | using WixToolset.Data; |
10 | using WixToolset.Data.Burn; | 10 | using WixToolset.Data.Burn; |
11 | using WixToolset.Data.Tuples; | 11 | using WixToolset.Data.Symbols; |
12 | using WixToolset.Extensibility; | 12 | using WixToolset.Extensibility; |
13 | 13 | ||
14 | public class BalBurnBackendExtension : BaseBurnBackendExtension | 14 | public class BalBurnBackendExtension : BaseBurnBackendExtension |
15 | { | 15 | { |
16 | private static readonly IntermediateTupleDefinition[] BurnTupleDefinitions = | 16 | private static readonly IntermediateSymbolDefinition[] BurnSymbolDefinitions = |
17 | { | 17 | { |
18 | BalTupleDefinitions.WixBalBAFactoryAssembly, | 18 | BalSymbolDefinitions.WixBalBAFactoryAssembly, |
19 | BalTupleDefinitions.WixBalBAFunctions, | 19 | BalSymbolDefinitions.WixBalBAFunctions, |
20 | BalTupleDefinitions.WixBalCondition, | 20 | BalSymbolDefinitions.WixBalCondition, |
21 | BalTupleDefinitions.WixBalPackageInfo, | 21 | BalSymbolDefinitions.WixBalPackageInfo, |
22 | BalTupleDefinitions.WixDncOptions, | 22 | BalSymbolDefinitions.WixDncOptions, |
23 | BalTupleDefinitions.WixMbaPrereqInformation, | 23 | BalSymbolDefinitions.WixMbaPrereqInformation, |
24 | BalTupleDefinitions.WixStdbaOptions, | 24 | BalSymbolDefinitions.WixStdbaOptions, |
25 | BalTupleDefinitions.WixStdbaOverridableVariable, | 25 | BalSymbolDefinitions.WixStdbaOverridableVariable, |
26 | }; | 26 | }; |
27 | 27 | ||
28 | protected override IEnumerable<IntermediateTupleDefinition> TupleDefinitions => BurnTupleDefinitions; | 28 | protected override IEnumerable<IntermediateSymbolDefinition> SymbolDefinitions => BurnSymbolDefinitions; |
29 | 29 | ||
30 | public override void BundleFinalize() | 30 | public override void BundleFinalize() |
31 | { | 31 | { |
@@ -34,8 +34,8 @@ namespace WixToolset.Bal | |||
34 | var intermediate = this.Context.IntermediateRepresentation; | 34 | var intermediate = this.Context.IntermediateRepresentation; |
35 | var section = intermediate.Sections.Single(); | 35 | var section = intermediate.Sections.Single(); |
36 | 36 | ||
37 | var baTuple = section.Tuples.OfType<WixBootstrapperApplicationTuple>().SingleOrDefault(); | 37 | var baSymbol = section.Symbols.OfType<WixBootstrapperApplicationSymbol>().SingleOrDefault(); |
38 | var baId = baTuple?.Id?.Id; | 38 | var baId = baSymbol?.Id?.Id; |
39 | if (null == baId) | 39 | if (null == baId) |
40 | { | 40 | { |
41 | return; | 41 | return; |
@@ -59,46 +59,46 @@ namespace WixToolset.Bal | |||
59 | 59 | ||
60 | private void VerifyBAFunctions(IntermediateSection section) | 60 | private void VerifyBAFunctions(IntermediateSection section) |
61 | { | 61 | { |
62 | WixBalBAFunctionsTuple baFunctionsTuple = null; | 62 | WixBalBAFunctionsSymbol baFunctionsSymbol = null; |
63 | foreach (var tuple in section.Tuples.OfType<WixBalBAFunctionsTuple>()) | 63 | foreach (var symbol in section.Symbols.OfType<WixBalBAFunctionsSymbol>()) |
64 | { | 64 | { |
65 | if (null == baFunctionsTuple) | 65 | if (null == baFunctionsSymbol) |
66 | { | 66 | { |
67 | baFunctionsTuple = tuple; | 67 | baFunctionsSymbol = symbol; |
68 | } | 68 | } |
69 | else | 69 | else |
70 | { | 70 | { |
71 | this.Messaging.Write(BalErrors.MultipleBAFunctions(tuple.SourceLineNumbers)); | 71 | this.Messaging.Write(BalErrors.MultipleBAFunctions(symbol.SourceLineNumbers)); |
72 | } | 72 | } |
73 | } | 73 | } |
74 | 74 | ||
75 | var payloadPropertiesTuples = section.Tuples.OfType<WixBundlePayloadTuple>().ToList(); | 75 | var payloadPropertiesSymbols = section.Symbols.OfType<WixBundlePayloadSymbol>().ToList(); |
76 | if (null == baFunctionsTuple) | 76 | if (null == baFunctionsSymbol) |
77 | { | 77 | { |
78 | foreach (var payloadPropertiesTuple in payloadPropertiesTuples) | 78 | foreach (var payloadPropertiesSymbol in payloadPropertiesSymbols) |
79 | { | 79 | { |
80 | // TODO: Make core WiX canonicalize Name (this won't catch '.\bafunctions.dll'). | 80 | // TODO: Make core WiX canonicalize Name (this won't catch '.\bafunctions.dll'). |
81 | if (string.Equals(payloadPropertiesTuple.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase)) | 81 | if (string.Equals(payloadPropertiesSymbol.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase)) |
82 | { | 82 | { |
83 | this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesTuple.SourceLineNumbers)); | 83 | this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesSymbol.SourceLineNumbers)); |
84 | } | 84 | } |
85 | } | 85 | } |
86 | } | 86 | } |
87 | else | 87 | else |
88 | { | 88 | { |
89 | var payloadId = baFunctionsTuple.Id; | 89 | var payloadId = baFunctionsSymbol.Id; |
90 | var bundlePayloadTuple = payloadPropertiesTuples.Single(x => payloadId == x.Id); | 90 | var bundlePayloadSymbol = payloadPropertiesSymbols.Single(x => payloadId == x.Id); |
91 | if (BurnConstants.BurnUXContainerName != bundlePayloadTuple.ContainerRef) | 91 | if (BurnConstants.BurnUXContainerName != bundlePayloadSymbol.ContainerRef) |
92 | { | 92 | { |
93 | this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsTuple.SourceLineNumbers)); | 93 | this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsSymbol.SourceLineNumbers)); |
94 | } | 94 | } |
95 | } | 95 | } |
96 | } | 96 | } |
97 | 97 | ||
98 | private void VerifyPrereqPackages(IntermediateSection section, bool isDNC) | 98 | private void VerifyPrereqPackages(IntermediateSection section, bool isDNC) |
99 | { | 99 | { |
100 | var prereqInfoTuples = section.Tuples.OfType<WixMbaPrereqInformationTuple>().ToList(); | 100 | var prereqInfoSymbols = section.Symbols.OfType<WixMbaPrereqInformationSymbol>().ToList(); |
101 | if (prereqInfoTuples.Count == 0) | 101 | if (prereqInfoSymbols.Count == 0) |
102 | { | 102 | { |
103 | var message = isDNC ? BalErrors.MissingDNCPrereq() : BalErrors.MissingMBAPrereq(); | 103 | var message = isDNC ? BalErrors.MissingDNCPrereq() : BalErrors.MissingMBAPrereq(); |
104 | this.Messaging.Write(message); | 104 | this.Messaging.Write(message); |
@@ -108,24 +108,24 @@ namespace WixToolset.Bal | |||
108 | var foundLicenseFile = false; | 108 | var foundLicenseFile = false; |
109 | var foundLicenseUrl = false; | 109 | var foundLicenseUrl = false; |
110 | 110 | ||
111 | foreach (var prereqInfoTuple in prereqInfoTuples) | 111 | foreach (var prereqInfoSymbol in prereqInfoSymbols) |
112 | { | 112 | { |
113 | if (null != prereqInfoTuple.LicenseFile) | 113 | if (null != prereqInfoSymbol.LicenseFile) |
114 | { | 114 | { |
115 | if (foundLicenseFile || foundLicenseUrl) | 115 | if (foundLicenseFile || foundLicenseUrl) |
116 | { | 116 | { |
117 | this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoTuple.SourceLineNumbers)); | 117 | this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoSymbol.SourceLineNumbers)); |
118 | return; | 118 | return; |
119 | } | 119 | } |
120 | 120 | ||
121 | foundLicenseFile = true; | 121 | foundLicenseFile = true; |
122 | } | 122 | } |
123 | 123 | ||
124 | if (null != prereqInfoTuple.LicenseUrl) | 124 | if (null != prereqInfoSymbol.LicenseUrl) |
125 | { | 125 | { |
126 | if (foundLicenseFile || foundLicenseUrl) | 126 | if (foundLicenseFile || foundLicenseUrl) |
127 | { | 127 | { |
128 | this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoTuple.SourceLineNumbers)); | 128 | this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoSymbol.SourceLineNumbers)); |
129 | return; | 129 | return; |
130 | } | 130 | } |
131 | 131 | ||
@@ -138,7 +138,7 @@ namespace WixToolset.Bal | |||
138 | { | 138 | { |
139 | var isSCD = false; | 139 | var isSCD = false; |
140 | 140 | ||
141 | var dncOptions = section.Tuples.OfType<WixDncOptionsTuple>().SingleOrDefault(); | 141 | var dncOptions = section.Symbols.OfType<WixDncOptionsSymbol>().SingleOrDefault(); |
142 | if (dncOptions != null) | 142 | if (dncOptions != null) |
143 | { | 143 | { |
144 | isSCD = dncOptions.SelfContainedDeployment != 0; | 144 | isSCD = dncOptions.SelfContainedDeployment != 0; |