The Great Tuple to Symbol Rename (tm)
Rob Mensching committed
Jun 27, 2020 at 01:31 UTC
b3138ce92cf76c523d77862610a4256c49bcb689
12 files changed
+252
-252
src/wixext/BalBurnBackendExtension.cs
+36
-36
@@ -5,27 +5,27 @@ namespace WixToolset.Bal
5
using System;
6
using System.Collections.Generic;
7
using System.Linq;
8
- using WixToolset.Bal.Tuples;
8
+ using WixToolset.Bal.Symbols;
9
using WixToolset.Data;
10
using WixToolset.Data.Burn;
11
- using WixToolset.Data.Tuples;
11
+ using WixToolset.Data.Symbols;
12
using WixToolset.Extensibility;
13
14
public class BalBurnBackendExtension : BaseBurnBackendExtension
15
{
16
- private static readonly IntermediateTupleDefinition[] BurnTupleDefinitions =
16
+ private static readonly IntermediateSymbolDefinition[] BurnSymbolDefinitions =
17
{
18
- BalTupleDefinitions.WixBalBAFactoryAssembly,
19
- BalTupleDefinitions.WixBalBAFunctions,
20
- BalTupleDefinitions.WixBalCondition,
21
- BalTupleDefinitions.WixBalPackageInfo,
22
- BalTupleDefinitions.WixDncOptions,
23
- BalTupleDefinitions.WixMbaPrereqInformation,
24
- BalTupleDefinitions.WixStdbaOptions,
25
- BalTupleDefinitions.WixStdbaOverridableVariable,
18
+ BalSymbolDefinitions.WixBalBAFactoryAssembly,
19
+ BalSymbolDefinitions.WixBalBAFunctions,
20
+ BalSymbolDefinitions.WixBalCondition,
21
+ BalSymbolDefinitions.WixBalPackageInfo,
22
+ BalSymbolDefinitions.WixDncOptions,
23
+ BalSymbolDefinitions.WixMbaPrereqInformation,
24
+ BalSymbolDefinitions.WixStdbaOptions,
25
+ BalSymbolDefinitions.WixStdbaOverridableVariable,
26
};
27
28
- protected override IEnumerable<IntermediateTupleDefinition> TupleDefinitions => BurnTupleDefinitions;
28
+ protected override IEnumerable<IntermediateSymbolDefinition> SymbolDefinitions => BurnSymbolDefinitions;
29
30
public override void BundleFinalize()
31
{
@@ -34,8 +34,8 @@ namespace WixToolset.Bal
34
var intermediate = this.Context.IntermediateRepresentation;
35
var section = intermediate.Sections.Single();
36
37
- var baTuple = section.Tuples.OfType<WixBootstrapperApplicationTuple>().SingleOrDefault();
38
- var baId = baTuple?.Id?.Id;
37
+ var baSymbol = section.Symbols.OfType<WixBootstrapperApplicationSymbol>().SingleOrDefault();
38
+ var baId = baSymbol?.Id?.Id;
39
if (null == baId)
40
{
41
return;
@@ -59,46 +59,46 @@ namespace WixToolset.Bal
59
60
private void VerifyBAFunctions(IntermediateSection section)
61
{
62
- WixBalBAFunctionsTuple baFunctionsTuple = null;
63
- foreach (var tuple in section.Tuples.OfType<WixBalBAFunctionsTuple>())
62
+ WixBalBAFunctionsSymbol baFunctionsSymbol = null;
63
+ foreach (var symbol in section.Symbols.OfType<WixBalBAFunctionsSymbol>())
64
{
65
- if (null == baFunctionsTuple)
65
+ if (null == baFunctionsSymbol)
66
{
67
- baFunctionsTuple = tuple;
67
+ baFunctionsSymbol = symbol;
68
}
69
else
70
{
71
- this.Messaging.Write(BalErrors.MultipleBAFunctions(tuple.SourceLineNumbers));
71
+ this.Messaging.Write(BalErrors.MultipleBAFunctions(symbol.SourceLineNumbers));
72
}
73
}
74
75
- var payloadPropertiesTuples = section.Tuples.OfType<WixBundlePayloadTuple>().ToList();
76
- if (null == baFunctionsTuple)
75
+ var payloadPropertiesSymbols = section.Symbols.OfType<WixBundlePayloadSymbol>().ToList();
76
+ if (null == baFunctionsSymbol)
77
{
78
- foreach (var payloadPropertiesTuple in payloadPropertiesTuples)
78
+ foreach (var payloadPropertiesSymbol in payloadPropertiesSymbols)
79
{
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
{
83
- this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesTuple.SourceLineNumbers));
83
+ this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesSymbol.SourceLineNumbers));
84
}
85
}
86
}
87
else
88
{
89
- var payloadId = baFunctionsTuple.Id;
90
- var bundlePayloadTuple = payloadPropertiesTuples.Single(x => payloadId == x.Id);
91
- if (BurnConstants.BurnUXContainerName != bundlePayloadTuple.ContainerRef)
89
+ var payloadId = baFunctionsSymbol.Id;
90
+ var bundlePayloadSymbol = payloadPropertiesSymbols.Single(x => payloadId == x.Id);
91
+ if (BurnConstants.BurnUXContainerName != bundlePayloadSymbol.ContainerRef)
92
{
93
- this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsTuple.SourceLineNumbers));
93
+ this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsSymbol.SourceLineNumbers));
94
}
95
}
96
}
97
98
private void VerifyPrereqPackages(IntermediateSection section, bool isDNC)
99
{
100
- var prereqInfoTuples = section.Tuples.OfType<WixMbaPrereqInformationTuple>().ToList();
101
- if (prereqInfoTuples.Count == 0)
100
+ var prereqInfoSymbols = section.Symbols.OfType<WixMbaPrereqInformationSymbol>().ToList();
101
+ if (prereqInfoSymbols.Count == 0)
102
{
103
var message = isDNC ? BalErrors.MissingDNCPrereq() : BalErrors.MissingMBAPrereq();
104
this.Messaging.Write(message);
@@ -108,24 +108,24 @@ namespace WixToolset.Bal
108
var foundLicenseFile = false;
109
var foundLicenseUrl = false;
110
111
- foreach (var prereqInfoTuple in prereqInfoTuples)
111
+ foreach (var prereqInfoSymbol in prereqInfoSymbols)
112
{
113
- if (null != prereqInfoTuple.LicenseFile)
113
+ if (null != prereqInfoSymbol.LicenseFile)
114
{
115
if (foundLicenseFile || foundLicenseUrl)
116
{
117
- this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoTuple.SourceLineNumbers));
117
+ this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoSymbol.SourceLineNumbers));
118
return;
119
}
120
121
foundLicenseFile = true;
122
}
123
124
- if (null != prereqInfoTuple.LicenseUrl)
124
+ if (null != prereqInfoSymbol.LicenseUrl)
125
{
126
if (foundLicenseFile || foundLicenseUrl)
127
{
128
- this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoTuple.SourceLineNumbers));
128
+ this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoSymbol.SourceLineNumbers));
129
return;
130
}
131
@@ -138,7 +138,7 @@ namespace WixToolset.Bal
138
{
139
var isSCD = false;
140
141
- var dncOptions = section.Tuples.OfType<WixDncOptionsTuple>().SingleOrDefault();
141
+ var dncOptions = section.Symbols.OfType<WixDncOptionsSymbol>().SingleOrDefault();
142
if (dncOptions != null)
143
{
144
isSCD = dncOptions.SelfContainedDeployment != 0;
src/wixext/BalCompiler.cs
+45
-45
@@ -5,9 +5,9 @@ namespace WixToolset.Bal
5
using System;
6
using System.Collections.Generic;
7
using System.Xml.Linq;
8
- using WixToolset.Bal.Tuples;
8
+ using WixToolset.Bal.Symbols;
9
using WixToolset.Data;
10
- using WixToolset.Data.Tuples;
10
+ using WixToolset.Data.Symbols;
11
using WixToolset.Extensibility;
12
13
/// <summary>
@@ -15,14 +15,14 @@ namespace WixToolset.Bal
15
/// </summary>
16
public sealed class BalCompiler : BaseCompilerExtension
17
{
18
- private readonly Dictionary<string, WixMbaPrereqInformationTuple> prereqInfoTuplesByPackageId;
18
+ private readonly Dictionary<string, WixMbaPrereqInformationSymbol> prereqInfoSymbolsByPackageId;
19
20
/// <summary>
21
/// Instantiate a new BalCompiler.
22
/// </summary>
23
public BalCompiler()
24
{
25
- this.prereqInfoTuplesByPackageId = new Dictionary<string, WixMbaPrereqInformationTuple>();
25
+ this.prereqInfoSymbolsByPackageId = new Dictionary<string, WixMbaPrereqInformationSymbol>();
26
}
27
28
public override XNamespace Namespace => "http://wixtoolset.org/schemas/v4/wxs/bal";
@@ -87,7 +87,7 @@ namespace WixToolset.Bal
87
public override void ParseAttribute(Intermediate intermediate, IntermediateSection section, XElement parentElement, XAttribute attribute, IDictionary<string, string> context)
88
{
89
var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(parentElement);
90
- WixMbaPrereqInformationTuple prereqInfo;
90
+ WixMbaPrereqInformationSymbol prereqInfo;
91
92
switch (parentElement.Name.LocalName)
93
{
@@ -110,7 +110,7 @@ namespace WixToolset.Bal
110
case "MsiPackage":
111
case "MspPackage":
112
var displayInternalUICondition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attribute);
113
- section.AddTuple(new WixBalPackageInfoTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, packageId))
113
+ section.AddSymbol(new WixBalPackageInfoSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, packageId))
114
{
115
PackageId = packageId,
116
DisplayInternalUICondition = displayInternalUICondition,
@@ -123,7 +123,7 @@ namespace WixToolset.Bal
123
break;
124
case "PrereqLicenseFile":
125
126
- if (!this.prereqInfoTuplesByPackageId.TryGetValue(packageId, out prereqInfo))
126
+ if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo))
127
{
128
// at the time the extension attribute is parsed, the compiler might not yet have
129
// parsed the PrereqPackage attribute, so we need to get it directly from the parent element.
@@ -131,12 +131,12 @@ namespace WixToolset.Bal
131
132
if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage))
133
{
134
- prereqInfo = section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers)
134
+ prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers)
135
{
136
PackageId = packageId,
137
});
138
139
- this.prereqInfoTuplesByPackageId.Add(packageId, prereqInfo);
139
+ this.prereqInfoSymbolsByPackageId.Add(packageId, prereqInfo);
140
}
141
else
142
{
@@ -156,7 +156,7 @@ namespace WixToolset.Bal
156
break;
157
case "PrereqLicenseUrl":
158
159
- if (!this.prereqInfoTuplesByPackageId.TryGetValue(packageId, out prereqInfo))
159
+ if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo))
160
{
161
// at the time the extension attribute is parsed, the compiler might not yet have
162
// parsed the PrereqPackage attribute, so we need to get it directly from the parent element.
@@ -164,12 +164,12 @@ namespace WixToolset.Bal
164
165
if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage))
166
{
167
- prereqInfo = section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers)
167
+ prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers)
168
{
169
PackageId = packageId,
170
});
171
172
- this.prereqInfoTuplesByPackageId.Add(packageId, prereqInfo);
172
+ this.prereqInfoSymbolsByPackageId.Add(packageId, prereqInfo);
173
}
174
else
175
{
@@ -190,14 +190,14 @@ namespace WixToolset.Bal
190
case "PrereqPackage":
191
if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute))
192
{
193
- if (!this.prereqInfoTuplesByPackageId.TryGetValue(packageId, out prereqInfo))
193
+ if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo))
194
{
195
- prereqInfo = section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers)
195
+ prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers)
196
{
197
PackageId = packageId,
198
});
199
200
- this.prereqInfoTuplesByPackageId.Add(packageId, prereqInfo);
200
+ this.prereqInfoSymbolsByPackageId.Add(packageId, prereqInfo);
201
}
202
}
203
break;
@@ -222,7 +222,7 @@ namespace WixToolset.Bal
222
{
223
// There can only be one.
224
var id = new Identifier(AccessModifier.Public, "TheBAFactoryAssembly");
225
- section.AddTuple(new WixBalBAFactoryAssemblyTuple(sourceLineNumbers, id)
225
+ section.AddSymbol(new WixBalBAFactoryAssemblySymbol(sourceLineNumbers, id)
226
{
227
PayloadId = payloadId,
228
});
@@ -231,7 +231,7 @@ namespace WixToolset.Bal
231
case "BAFunctions":
232
if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute))
233
{
234
- section.AddTuple(new WixBalBAFunctionsTuple(sourceLineNumbers)
234
+ section.AddSymbol(new WixBalBAFunctionsSymbol(sourceLineNumbers)
235
{
236
PayloadId = payloadId,
237
});
@@ -258,7 +258,7 @@ namespace WixToolset.Bal
258
case "Overridable":
259
if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute))
260
{
261
- section.AddTuple(new WixStdbaOverridableVariableTuple(sourceLineNumbers)
261
+ section.AddSymbol(new WixStdbaOverridableVariableSymbol(sourceLineNumbers)
262
{
263
Name = variableName.Value,
264
});
@@ -318,7 +318,7 @@ namespace WixToolset.Bal
318
319
if (!this.Messaging.EncounteredError)
320
{
321
- section.AddTuple(new WixBalConditionTuple(sourceLineNumbers)
321
+ section.AddSymbol(new WixBalConditionSymbol(sourceLineNumbers)
322
{
323
Condition = condition,
324
Message = message,
@@ -378,13 +378,13 @@ namespace WixToolset.Bal
378
379
if (!this.Messaging.EncounteredError)
380
{
381
- section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers)
381
+ section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers)
382
{
383
PackageId = packageId,
384
LicenseFile = licenseFile,
385
LicenseUrl = licenseUrl,
386
});
387
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixBundlePackage, packageId);
387
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePackage, packageId);
388
}
389
}
390
@@ -488,7 +488,7 @@ namespace WixToolset.Bal
488
{
489
if (!String.IsNullOrEmpty(launchTarget))
490
{
491
- section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget"))
491
+ section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget"))
492
{
493
Value = launchTarget,
494
Type = "string",
@@ -497,7 +497,7 @@ namespace WixToolset.Bal
497
498
if (!String.IsNullOrEmpty(launchTargetElevatedId))
499
{
500
- section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTargetElevatedId"))
500
+ section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTargetElevatedId"))
501
{
502
Value = launchTargetElevatedId,
503
Type = "string",
@@ -506,7 +506,7 @@ namespace WixToolset.Bal
506
507
if (!String.IsNullOrEmpty(launchArguments))
508
{
509
- section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchArguments"))
509
+ section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchArguments"))
510
{
511
Value = launchArguments,
512
Type = "string",
@@ -515,7 +515,7 @@ namespace WixToolset.Bal
515
516
if (YesNoType.Yes == launchHidden)
517
{
518
- section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchHidden"))
518
+ section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchHidden"))
519
{
520
Value = "yes",
521
Type = "string",
@@ -525,7 +525,7 @@ namespace WixToolset.Bal
525
526
if (!String.IsNullOrEmpty(launchWorkingDir))
527
{
528
- section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchWorkingFolder"))
528
+ section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchWorkingFolder"))
529
{
530
Value = launchWorkingDir,
531
Type = "string",
@@ -534,7 +534,7 @@ namespace WixToolset.Bal
534
535
if (!String.IsNullOrEmpty(licenseFile))
536
{
537
- section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseRtf"))
537
+ section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseRtf"))
538
{
539
Value = licenseFile,
540
});
@@ -542,7 +542,7 @@ namespace WixToolset.Bal
542
543
if (null != licenseUrl)
544
{
545
- section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseUrl"))
545
+ section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseUrl"))
546
{
547
Value = licenseUrl,
548
});
@@ -550,7 +550,7 @@ namespace WixToolset.Bal
550
551
if (!String.IsNullOrEmpty(logoFile))
552
{
553
- section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogo"))
553
+ section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogo"))
554
{
555
Value = logoFile,
556
});
@@ -558,7 +558,7 @@ namespace WixToolset.Bal
558
559
if (!String.IsNullOrEmpty(logoSideFile))
560
{
561
- section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogoSide"))
561
+ section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogoSide"))
562
{
563
Value = logoSideFile,
564
});
@@ -566,7 +566,7 @@ namespace WixToolset.Bal
566
567
if (!String.IsNullOrEmpty(themeFile))
568
{
569
- section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeXml"))
569
+ section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeXml"))
570
{
571
Value = themeFile,
572
});
@@ -574,7 +574,7 @@ namespace WixToolset.Bal
574
575
if (!String.IsNullOrEmpty(localizationFile))
576
{
577
- section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeWxl"))
577
+ section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeWxl"))
578
{
579
Value = localizationFile,
580
});
@@ -582,30 +582,30 @@ namespace WixToolset.Bal
582
583
if (YesNoType.Yes == suppressOptionsUI || YesNoType.Yes == suppressDowngradeFailure || YesNoType.Yes == suppressRepair || YesNoType.Yes == showVersion || YesNoType.Yes == supportCacheOnly)
584
{
585
- var tuple = section.AddTuple(new WixStdbaOptionsTuple(sourceLineNumbers));
585
+ var symbol = section.AddSymbol(new WixStdbaOptionsSymbol(sourceLineNumbers));
586
if (YesNoType.Yes == suppressOptionsUI)
587
{
588
- tuple.SuppressOptionsUI = 1;
588
+ symbol.SuppressOptionsUI = 1;
589
}
590
591
if (YesNoType.Yes == suppressDowngradeFailure)
592
{
593
- tuple.SuppressDowngradeFailure = 1;
593
+ symbol.SuppressDowngradeFailure = 1;
594
}
595
596
if (YesNoType.Yes == suppressRepair)
597
{
598
- tuple.SuppressRepair = 1;
598
+ symbol.SuppressRepair = 1;
599
}
600
601
if (YesNoType.Yes == showVersion)
602
{
603
- tuple.ShowVersion = 1;
603
+ symbol.ShowVersion = 1;
604
}
605
606
if (YesNoType.Yes == supportCacheOnly)
607
{
608
- tuple.SupportCacheOnly = 1;
608
+ symbol.SupportCacheOnly = 1;
609
}
610
}
611
}
@@ -654,7 +654,7 @@ namespace WixToolset.Bal
654
{
655
if (!String.IsNullOrEmpty(logoFile))
656
{
657
- section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo"))
657
+ section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo"))
658
{
659
Value = logoFile,
660
});
@@ -662,7 +662,7 @@ namespace WixToolset.Bal
662
663
if (!String.IsNullOrEmpty(themeFile))
664
{
665
- section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeXml"))
665
+ section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeXml"))
666
{
667
Value = themeFile,
668
});
@@ -670,7 +670,7 @@ namespace WixToolset.Bal
670
671
if (!String.IsNullOrEmpty(localizationFile))
672
{
673
- section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeWxl"))
673
+ section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeWxl"))
674
{
675
Value = localizationFile,
676
});
@@ -725,7 +725,7 @@ namespace WixToolset.Bal
725
{
726
if (!String.IsNullOrEmpty(logoFile))
727
{
728
- section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo"))
728
+ section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo"))
729
{
730
Value = logoFile,
731
});
@@ -733,7 +733,7 @@ namespace WixToolset.Bal
733
734
if (!String.IsNullOrEmpty(themeFile))
735
{
736
- section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeXml"))
736
+ section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeXml"))
737
{
738
Value = themeFile,
739
});
@@ -741,7 +741,7 @@ namespace WixToolset.Bal
741
742
if (!String.IsNullOrEmpty(localizationFile))
743
{
744
- section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeWxl"))
744
+ section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeWxl"))
745
{
746
Value = localizationFile,
747
});
@@ -749,7 +749,7 @@ namespace WixToolset.Bal
749
750
if (YesNoType.Yes == selfContainedDeployment)
751
{
752
- section.AddTuple(new WixDncOptionsTuple(sourceLineNumbers)
752
+ section.AddSymbol(new WixDncOptionsSymbol(sourceLineNumbers)
753
{
754
SelfContainedDeployment = 1,
755
});
src/wixext/BalExtensionData.cs
+5
-5
@@ -16,15 +16,15 @@ namespace WixToolset.Bal
16
/// <value>The default culture.</value>
17
public override string DefaultCulture => "en-US";
18
19
- public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
19
+ public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
20
{
21
- tupleDefinition = BalTupleDefinitions.ByName(name);
22
- return tupleDefinition != null;
21
+ symbolDefinition = BalSymbolDefinitions.ByName(name);
22
+ return symbolDefinition != null;
23
}
24
25
- public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
25
+ public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
26
{
27
- return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.Bal.bal.wixlib", tupleDefinitions);
27
+ return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.Bal.bal.wixlib", symbolDefinitions);
28
}
29
}
30
}
src/wixext/Tuples/BalTupleDefinitions.cs
+30
-30
@@ -6,7 +6,7 @@ namespace WixToolset.Bal
6
using WixToolset.Data;
7
using WixToolset.Data.Burn;
8
9
- public enum BalTupleDefinitionType
9
+ public enum BalSymbolDefinitionType
10
{
11
WixBalBAFactoryAssembly,
12
WixBalBAFunctions,
@@ -18,13 +18,13 @@ namespace WixToolset.Bal
18
WixStdbaOverridableVariable,
19
}
20
21
- public static partial class BalTupleDefinitions
21
+ public static partial class BalSymbolDefinitions
22
{
23
public static readonly Version Version = new Version("4.0.0");
24
25
- public static IntermediateTupleDefinition ByName(string name)
25
+ public static IntermediateSymbolDefinition ByName(string name)
26
{
27
- if (!Enum.TryParse(name, out BalTupleDefinitionType type))
27
+ if (!Enum.TryParse(name, out BalSymbolDefinitionType type))
28
{
29
return null;
30
}
@@ -32,49 +32,49 @@ namespace WixToolset.Bal
32
return ByType(type);
33
}
34
35
- public static IntermediateTupleDefinition ByType(BalTupleDefinitionType type)
35
+ public static IntermediateSymbolDefinition ByType(BalSymbolDefinitionType type)
36
{
37
switch (type)
38
{
39
- case BalTupleDefinitionType.WixBalBAFactoryAssembly:
40
- return BalTupleDefinitions.WixBalBAFactoryAssembly;
39
+ case BalSymbolDefinitionType.WixBalBAFactoryAssembly:
40
+ return BalSymbolDefinitions.WixBalBAFactoryAssembly;
41
42
- case BalTupleDefinitionType.WixBalBAFunctions:
43
- return BalTupleDefinitions.WixBalBAFunctions;
42
+ case BalSymbolDefinitionType.WixBalBAFunctions:
43
+ return BalSymbolDefinitions.WixBalBAFunctions;
44
45
- case BalTupleDefinitionType.WixBalCondition:
46
- return BalTupleDefinitions.WixBalCondition;
45
+ case BalSymbolDefinitionType.WixBalCondition:
46
+ return BalSymbolDefinitions.WixBalCondition;
47
48
- case BalTupleDefinitionType.WixBalPackageInfo:
49
- return BalTupleDefinitions.WixBalPackageInfo;
48
+ case BalSymbolDefinitionType.WixBalPackageInfo:
49
+ return BalSymbolDefinitions.WixBalPackageInfo;
50
51
- case BalTupleDefinitionType.WixDncOptions:
52
- return BalTupleDefinitions.WixDncOptions;
51
+ case BalSymbolDefinitionType.WixDncOptions:
52
+ return BalSymbolDefinitions.WixDncOptions;
53
54
- case BalTupleDefinitionType.WixMbaPrereqInformation:
55
- return BalTupleDefinitions.WixMbaPrereqInformation;
54
+ case BalSymbolDefinitionType.WixMbaPrereqInformation:
55
+ return BalSymbolDefinitions.WixMbaPrereqInformation;
56
57
- case BalTupleDefinitionType.WixStdbaOptions:
58
- return BalTupleDefinitions.WixStdbaOptions;
57
+ case BalSymbolDefinitionType.WixStdbaOptions:
58
+ return BalSymbolDefinitions.WixStdbaOptions;
59
60
- case BalTupleDefinitionType.WixStdbaOverridableVariable:
61
- return BalTupleDefinitions.WixStdbaOverridableVariable;
60
+ case BalSymbolDefinitionType.WixStdbaOverridableVariable:
61
+ return BalSymbolDefinitions.WixStdbaOverridableVariable;
62
63
default:
64
throw new ArgumentOutOfRangeException(nameof(type));
65
}
66
}
67
68
- static BalTupleDefinitions()
68
+ static BalSymbolDefinitions()
69
{
70
- WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
71
- WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
72
- WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
73
- WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
74
- WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
75
- WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
76
- WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
77
- WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
70
+ WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
71
+ WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
72
+ WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
73
+ WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
74
+ WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
75
+ WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
76
+ WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
77
+ WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
78
}
79
}
80
}
src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs
+14
-14
@@ -3,45 +3,45 @@
3
namespace WixToolset.Bal
4
{
5
using WixToolset.Data;
6
- using WixToolset.Bal.Tuples;
6
+ using WixToolset.Bal.Symbols;
7
8
- public static partial class BalTupleDefinitions
8
+ public static partial class BalSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixBalBAFactoryAssembly = new IntermediateTupleDefinition(
11
- BalTupleDefinitionType.WixBalBAFactoryAssembly.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixBalBAFactoryAssembly = new IntermediateSymbolDefinition(
11
+ BalSymbolDefinitionType.WixBalBAFactoryAssembly.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixBalBAFactoryTupleFields.PayloadId), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.PayloadId), IntermediateFieldType.String),
15
},
16
- typeof(WixBalBAFactoryAssemblyTuple));
16
+ typeof(WixBalBAFactoryAssemblySymbol));
17
}
18
}
19
20
-namespace WixToolset.Bal.Tuples
20
+namespace WixToolset.Bal.Symbols
21
{
22
using WixToolset.Data;
23
24
- public enum WixBalBAFactoryTupleFields
24
+ public enum WixBalBAFactorySymbolFields
25
{
26
PayloadId,
27
}
28
29
- public class WixBalBAFactoryAssemblyTuple : IntermediateTuple
29
+ public class WixBalBAFactoryAssemblySymbol : IntermediateSymbol
30
{
31
- public WixBalBAFactoryAssemblyTuple() : base(BalTupleDefinitions.WixBalBAFactoryAssembly, null, null)
31
+ public WixBalBAFactoryAssemblySymbol() : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, null, null)
32
{
33
}
34
35
- public WixBalBAFactoryAssemblyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalBAFactoryAssembly, sourceLineNumber, id)
35
+ public WixBalBAFactoryAssemblySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, sourceLineNumber, id)
36
{
37
}
38
39
- public IntermediateField this[WixBalBAFactoryTupleFields index] => this.Fields[(int)index];
39
+ public IntermediateField this[WixBalBAFactorySymbolFields index] => this.Fields[(int)index];
40
41
public string PayloadId
42
{
43
- get => this.Fields[(int)WixBalBAFactoryTupleFields.PayloadId].AsString();
44
- set => this.Set((int)WixBalBAFactoryTupleFields.PayloadId, value);
43
+ get => this.Fields[(int)WixBalBAFactorySymbolFields.PayloadId].AsString();
44
+ set => this.Set((int)WixBalBAFactorySymbolFields.PayloadId, value);
45
}
46
}
47
}
\ No newline at end of file
src/wixext/Tuples/WixBalBAFunctionsTuple.cs
+14
-14
@@ -3,45 +3,45 @@
3
namespace WixToolset.Bal
4
{
5
using WixToolset.Data;
6
- using WixToolset.Bal.Tuples;
6
+ using WixToolset.Bal.Symbols;
7
8
- public static partial class BalTupleDefinitions
8
+ public static partial class BalSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixBalBAFunctions = new IntermediateTupleDefinition(
11
- BalTupleDefinitionType.WixBalBAFunctions.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixBalBAFunctions = new IntermediateSymbolDefinition(
11
+ BalSymbolDefinitionType.WixBalBAFunctions.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixBalBAFunctionsTupleFields.PayloadId), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixBalBAFunctionsSymbolFields.PayloadId), IntermediateFieldType.String),
15
},
16
- typeof(WixBalBAFunctionsTuple));
16
+ typeof(WixBalBAFunctionsSymbol));
17
}
18
}
19
20
-namespace WixToolset.Bal.Tuples
20
+namespace WixToolset.Bal.Symbols
21
{
22
using WixToolset.Data;
23
24
- public enum WixBalBAFunctionsTupleFields
24
+ public enum WixBalBAFunctionsSymbolFields
25
{
26
PayloadId,
27
}
28
29
- public class WixBalBAFunctionsTuple : IntermediateTuple
29
+ public class WixBalBAFunctionsSymbol : IntermediateSymbol
30
{
31
- public WixBalBAFunctionsTuple() : base(BalTupleDefinitions.WixBalBAFunctions, null, null)
31
+ public WixBalBAFunctionsSymbol() : base(BalSymbolDefinitions.WixBalBAFunctions, null, null)
32
{
33
}
34
35
- public WixBalBAFunctionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalBAFunctions, sourceLineNumber, id)
35
+ public WixBalBAFunctionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFunctions, sourceLineNumber, id)
36
{
37
}
38
39
- public IntermediateField this[WixBalBAFunctionsTupleFields index] => this.Fields[(int)index];
39
+ public IntermediateField this[WixBalBAFunctionsSymbolFields index] => this.Fields[(int)index];
40
41
public string PayloadId
42
{
43
- get => this.Fields[(int)WixBalBAFunctionsTupleFields.PayloadId].AsString();
44
- set => this.Set((int)WixBalBAFunctionsTupleFields.PayloadId, value);
43
+ get => this.Fields[(int)WixBalBAFunctionsSymbolFields.PayloadId].AsString();
44
+ set => this.Set((int)WixBalBAFunctionsSymbolFields.PayloadId, value);
45
}
46
}
47
}
\ No newline at end of file
src/wixext/Tuples/WixBalConditionTuple.cs
+17
-17
@@ -3,53 +3,53 @@
3
namespace WixToolset.Bal
4
{
5
using WixToolset.Data;
6
- using WixToolset.Bal.Tuples;
6
+ using WixToolset.Bal.Symbols;
7
8
- public static partial class BalTupleDefinitions
8
+ public static partial class BalSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixBalCondition = new IntermediateTupleDefinition(
11
- BalTupleDefinitionType.WixBalCondition.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixBalCondition = new IntermediateSymbolDefinition(
11
+ BalSymbolDefinitionType.WixBalCondition.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixBalConditionTupleFields.Condition), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(WixBalConditionTupleFields.Message), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Condition), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Message), IntermediateFieldType.String),
16
},
17
- typeof(WixBalConditionTuple));
17
+ typeof(WixBalConditionSymbol));
18
}
19
}
20
21
-namespace WixToolset.Bal.Tuples
21
+namespace WixToolset.Bal.Symbols
22
{
23
using WixToolset.Data;
24
25
- public enum WixBalConditionTupleFields
25
+ public enum WixBalConditionSymbolFields
26
{
27
Condition,
28
Message,
29
}
30
31
- public class WixBalConditionTuple : IntermediateTuple
31
+ public class WixBalConditionSymbol : IntermediateSymbol
32
{
33
- public WixBalConditionTuple() : base(BalTupleDefinitions.WixBalCondition, null, null)
33
+ public WixBalConditionSymbol() : base(BalSymbolDefinitions.WixBalCondition, null, null)
34
{
35
}
36
37
- public WixBalConditionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalCondition, sourceLineNumber, id)
37
+ public WixBalConditionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalCondition, sourceLineNumber, id)
38
{
39
}
40
41
- public IntermediateField this[WixBalConditionTupleFields index] => this.Fields[(int)index];
41
+ public IntermediateField this[WixBalConditionSymbolFields index] => this.Fields[(int)index];
42
43
public string Condition
44
{
45
- get => this.Fields[(int)WixBalConditionTupleFields.Condition].AsString();
46
- set => this.Set((int)WixBalConditionTupleFields.Condition, value);
45
+ get => this.Fields[(int)WixBalConditionSymbolFields.Condition].AsString();
46
+ set => this.Set((int)WixBalConditionSymbolFields.Condition, value);
47
}
48
49
public string Message
50
{
51
- get => this.Fields[(int)WixBalConditionTupleFields.Message].AsString();
52
- set => this.Set((int)WixBalConditionTupleFields.Message, value);
51
+ get => this.Fields[(int)WixBalConditionSymbolFields.Message].AsString();
52
+ set => this.Set((int)WixBalConditionSymbolFields.Message, value);
53
}
54
}
55
}
\ No newline at end of file
src/wixext/Tuples/WixBalPackageInfoTuple.cs
+17
-17
@@ -3,53 +3,53 @@
3
namespace WixToolset.Bal
4
{
5
using WixToolset.Data;
6
- using WixToolset.Bal.Tuples;
6
+ using WixToolset.Bal.Symbols;
7
8
- public static partial class BalTupleDefinitions
8
+ public static partial class BalSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixBalPackageInfo = new IntermediateTupleDefinition(
11
- BalTupleDefinitionType.WixBalPackageInfo.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixBalPackageInfo = new IntermediateSymbolDefinition(
11
+ BalSymbolDefinitionType.WixBalPackageInfo.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixBalPackageInfoTupleFields.PackageId), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(WixBalPackageInfoTupleFields.DisplayInternalUICondition), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.PackageId), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.DisplayInternalUICondition), IntermediateFieldType.String),
16
},
17
- typeof(WixBalPackageInfoTuple));
17
+ typeof(WixBalPackageInfoSymbol));
18
}
19
}
20
21
-namespace WixToolset.Bal.Tuples
21
+namespace WixToolset.Bal.Symbols
22
{
23
using WixToolset.Data;
24
25
- public enum WixBalPackageInfoTupleFields
25
+ public enum WixBalPackageInfoSymbolFields
26
{
27
PackageId,
28
DisplayInternalUICondition,
29
}
30
31
- public class WixBalPackageInfoTuple : IntermediateTuple
31
+ public class WixBalPackageInfoSymbol : IntermediateSymbol
32
{
33
- public WixBalPackageInfoTuple() : base(BalTupleDefinitions.WixBalPackageInfo, null, null)
33
+ public WixBalPackageInfoSymbol() : base(BalSymbolDefinitions.WixBalPackageInfo, null, null)
34
{
35
}
36
37
- public WixBalPackageInfoTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalPackageInfo, sourceLineNumber, id)
37
+ public WixBalPackageInfoSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalPackageInfo, sourceLineNumber, id)
38
{
39
}
40
41
- public IntermediateField this[WixBalPackageInfoTupleFields index] => this.Fields[(int)index];
41
+ public IntermediateField this[WixBalPackageInfoSymbolFields index] => this.Fields[(int)index];
42
43
public string PackageId
44
{
45
- get => this.Fields[(int)WixBalPackageInfoTupleFields.PackageId].AsString();
46
- set => this.Set((int)WixBalPackageInfoTupleFields.PackageId, value);
45
+ get => this.Fields[(int)WixBalPackageInfoSymbolFields.PackageId].AsString();
46
+ set => this.Set((int)WixBalPackageInfoSymbolFields.PackageId, value);
47
}
48
49
public string DisplayInternalUICondition
50
{
51
- get => this.Fields[(int)WixBalPackageInfoTupleFields.DisplayInternalUICondition].AsString();
52
- set => this.Set((int)WixBalPackageInfoTupleFields.DisplayInternalUICondition, value);
51
+ get => this.Fields[(int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition].AsString();
52
+ set => this.Set((int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition, value);
53
}
54
}
55
}
src/wixext/Tuples/WixDncOptionsTuple.cs
+14
-14
@@ -3,45 +3,45 @@
3
namespace WixToolset.Bal
4
{
5
using WixToolset.Data;
6
- using WixToolset.Bal.Tuples;
6
+ using WixToolset.Bal.Symbols;
7
8
- public static partial class BalTupleDefinitions
8
+ public static partial class BalSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixDncOptions = new IntermediateTupleDefinition(
11
- BalTupleDefinitionType.WixDncOptions.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixDncOptions = new IntermediateSymbolDefinition(
11
+ BalSymbolDefinitionType.WixDncOptions.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixDncOptionsTupleFields.SelfContainedDeployment), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(WixDncOptionsSymbolFields.SelfContainedDeployment), IntermediateFieldType.Number),
15
},
16
- typeof(WixDncOptionsTuple));
16
+ typeof(WixDncOptionsSymbol));
17
}
18
}
19
20
-namespace WixToolset.Bal.Tuples
20
+namespace WixToolset.Bal.Symbols
21
{
22
using WixToolset.Data;
23
24
- public enum WixDncOptionsTupleFields
24
+ public enum WixDncOptionsSymbolFields
25
{
26
SelfContainedDeployment,
27
}
28
29
- public class WixDncOptionsTuple : IntermediateTuple
29
+ public class WixDncOptionsSymbol : IntermediateSymbol
30
{
31
- public WixDncOptionsTuple() : base(BalTupleDefinitions.WixDncOptions, null, null)
31
+ public WixDncOptionsSymbol() : base(BalSymbolDefinitions.WixDncOptions, null, null)
32
{
33
}
34
35
- public WixDncOptionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixDncOptions, sourceLineNumber, id)
35
+ public WixDncOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixDncOptions, sourceLineNumber, id)
36
{
37
}
38
39
- public IntermediateField this[WixDncOptionsTupleFields index] => this.Fields[(int)index];
39
+ public IntermediateField this[WixDncOptionsSymbolFields index] => this.Fields[(int)index];
40
41
public int SelfContainedDeployment
42
{
43
- get => this.Fields[(int)WixDncOptionsTupleFields.SelfContainedDeployment].AsNumber();
44
- set => this.Set((int)WixDncOptionsTupleFields.SelfContainedDeployment, value);
43
+ get => this.Fields[(int)WixDncOptionsSymbolFields.SelfContainedDeployment].AsNumber();
44
+ set => this.Set((int)WixDncOptionsSymbolFields.SelfContainedDeployment, value);
45
}
46
}
47
}
\ No newline at end of file
src/wixext/Tuples/WixMbaPrereqInformationTuple.cs
+20
-20
@@ -3,61 +3,61 @@
3
namespace WixToolset.Bal
4
{
5
using WixToolset.Data;
6
- using WixToolset.Bal.Tuples;
6
+ using WixToolset.Bal.Symbols;
7
8
- public static partial class BalTupleDefinitions
8
+ public static partial class BalSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixMbaPrereqInformation = new IntermediateTupleDefinition(
11
- BalTupleDefinitionType.WixMbaPrereqInformation.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixMbaPrereqInformation = new IntermediateSymbolDefinition(
11
+ BalSymbolDefinitionType.WixMbaPrereqInformation.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationTupleFields.PackageId), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationTupleFields.LicenseFile), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationTupleFields.LicenseUrl), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.PackageId), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseFile), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseUrl), IntermediateFieldType.String),
17
},
18
- typeof(WixMbaPrereqInformationTuple));
18
+ typeof(WixMbaPrereqInformationSymbol));
19
}
20
}
21
22
-namespace WixToolset.Bal.Tuples
22
+namespace WixToolset.Bal.Symbols
23
{
24
using WixToolset.Data;
25
26
- public enum WixMbaPrereqInformationTupleFields
26
+ public enum WixMbaPrereqInformationSymbolFields
27
{
28
PackageId,
29
LicenseFile,
30
LicenseUrl,
31
}
32
33
- public class WixMbaPrereqInformationTuple : IntermediateTuple
33
+ public class WixMbaPrereqInformationSymbol : IntermediateSymbol
34
{
35
- public WixMbaPrereqInformationTuple() : base(BalTupleDefinitions.WixMbaPrereqInformation, null, null)
35
+ public WixMbaPrereqInformationSymbol() : base(BalSymbolDefinitions.WixMbaPrereqInformation, null, null)
36
{
37
}
38
39
- public WixMbaPrereqInformationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixMbaPrereqInformation, sourceLineNumber, id)
39
+ public WixMbaPrereqInformationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixMbaPrereqInformation, sourceLineNumber, id)
40
{
41
}
42
43
- public IntermediateField this[WixMbaPrereqInformationTupleFields index] => this.Fields[(int)index];
43
+ public IntermediateField this[WixMbaPrereqInformationSymbolFields index] => this.Fields[(int)index];
44
45
public string PackageId
46
{
47
- get => this.Fields[(int)WixMbaPrereqInformationTupleFields.PackageId].AsString();
48
- set => this.Set((int)WixMbaPrereqInformationTupleFields.PackageId, value);
47
+ get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.PackageId].AsString();
48
+ set => this.Set((int)WixMbaPrereqInformationSymbolFields.PackageId, value);
49
}
50
51
public string LicenseFile
52
{
53
- get => this.Fields[(int)WixMbaPrereqInformationTupleFields.LicenseFile].AsString();
54
- set => this.Set((int)WixMbaPrereqInformationTupleFields.LicenseFile, value);
53
+ get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseFile].AsString();
54
+ set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseFile, value);
55
}
56
57
public string LicenseUrl
58
{
59
- get => this.Fields[(int)WixMbaPrereqInformationTupleFields.LicenseUrl].AsString();
60
- set => this.Set((int)WixMbaPrereqInformationTupleFields.LicenseUrl, value);
59
+ get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseUrl].AsString();
60
+ set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseUrl, value);
61
}
62
}
63
}
\ No newline at end of file
src/wixext/Tuples/WixStdbaOptionsTuple.cs
+26
-26
@@ -3,29 +3,29 @@
3
namespace WixToolset.Bal
4
{
5
using WixToolset.Data;
6
- using WixToolset.Bal.Tuples;
6
+ using WixToolset.Bal.Symbols;
7
8
- public static partial class BalTupleDefinitions
8
+ public static partial class BalSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixStdbaOptions = new IntermediateTupleDefinition(
11
- BalTupleDefinitionType.WixStdbaOptions.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixStdbaOptions = new IntermediateSymbolDefinition(
11
+ BalSymbolDefinitionType.WixStdbaOptions.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SuppressOptionsUI), IntermediateFieldType.Number),
15
- new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SuppressDowngradeFailure), IntermediateFieldType.Number),
16
- new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SuppressRepair), IntermediateFieldType.Number),
17
- new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.ShowVersion), IntermediateFieldType.Number),
18
- new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SupportCacheOnly), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressOptionsUI), IntermediateFieldType.Number),
15
+ new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressDowngradeFailure), IntermediateFieldType.Number),
16
+ new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressRepair), IntermediateFieldType.Number),
17
+ new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.ShowVersion), IntermediateFieldType.Number),
18
+ new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SupportCacheOnly), IntermediateFieldType.Number),
19
},
20
- typeof(WixStdbaOptionsTuple));
20
+ typeof(WixStdbaOptionsSymbol));
21
}
22
}
23
24
-namespace WixToolset.Bal.Tuples
24
+namespace WixToolset.Bal.Symbols
25
{
26
using WixToolset.Data;
27
28
- public enum WixStdbaOptionsTupleFields
28
+ public enum WixStdbaOptionsSymbolFields
29
{
30
SuppressOptionsUI,
31
SuppressDowngradeFailure,
@@ -34,46 +34,46 @@ namespace WixToolset.Bal.Tuples
34
SupportCacheOnly,
35
}
36
37
- public class WixStdbaOptionsTuple : IntermediateTuple
37
+ public class WixStdbaOptionsSymbol : IntermediateSymbol
38
{
39
- public WixStdbaOptionsTuple() : base(BalTupleDefinitions.WixStdbaOptions, null, null)
39
+ public WixStdbaOptionsSymbol() : base(BalSymbolDefinitions.WixStdbaOptions, null, null)
40
{
41
}
42
43
- public WixStdbaOptionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixStdbaOptions, sourceLineNumber, id)
43
+ public WixStdbaOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOptions, sourceLineNumber, id)
44
{
45
}
46
47
- public IntermediateField this[WixStdbaOptionsTupleFields index] => this.Fields[(int)index];
47
+ public IntermediateField this[WixStdbaOptionsSymbolFields index] => this.Fields[(int)index];
48
49
public int SuppressOptionsUI
50
{
51
- get => this.Fields[(int)WixStdbaOptionsTupleFields.SuppressOptionsUI].AsNumber();
52
- set => this.Set((int)WixStdbaOptionsTupleFields.SuppressOptionsUI, value);
51
+ get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressOptionsUI].AsNumber();
52
+ set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressOptionsUI, value);
53
}
54
55
public int SuppressDowngradeFailure
56
{
57
- get => this.Fields[(int)WixStdbaOptionsTupleFields.SuppressDowngradeFailure].AsNumber();
58
- set => this.Set((int)WixStdbaOptionsTupleFields.SuppressDowngradeFailure, value);
57
+ get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure].AsNumber();
58
+ set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure, value);
59
}
60
61
public int SuppressRepair
62
{
63
- get => this.Fields[(int)WixStdbaOptionsTupleFields.SuppressRepair].AsNumber();
64
- set => this.Set((int)WixStdbaOptionsTupleFields.SuppressRepair, value);
63
+ get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressRepair].AsNumber();
64
+ set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressRepair, value);
65
}
66
67
public int ShowVersion
68
{
69
- get => this.Fields[(int)WixStdbaOptionsTupleFields.ShowVersion].AsNumber();
70
- set => this.Set((int)WixStdbaOptionsTupleFields.ShowVersion, value);
69
+ get => this.Fields[(int)WixStdbaOptionsSymbolFields.ShowVersion].AsNumber();
70
+ set => this.Set((int)WixStdbaOptionsSymbolFields.ShowVersion, value);
71
}
72
73
public int SupportCacheOnly
74
{
75
- get => this.Fields[(int)WixStdbaOptionsTupleFields.SupportCacheOnly].AsNumber();
76
- set => this.Set((int)WixStdbaOptionsTupleFields.SupportCacheOnly, value);
75
+ get => this.Fields[(int)WixStdbaOptionsSymbolFields.SupportCacheOnly].AsNumber();
76
+ set => this.Set((int)WixStdbaOptionsSymbolFields.SupportCacheOnly, value);
77
}
78
}
79
}
\ No newline at end of file
src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs
+14
-14
@@ -3,45 +3,45 @@
3
namespace WixToolset.Bal
4
{
5
using WixToolset.Data;
6
- using WixToolset.Bal.Tuples;
6
+ using WixToolset.Bal.Symbols;
7
8
- public static partial class BalTupleDefinitions
8
+ public static partial class BalSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition WixStdbaOverridableVariable = new IntermediateTupleDefinition(
11
- BalTupleDefinitionType.WixStdbaOverridableVariable.ToString(),
10
+ public static readonly IntermediateSymbolDefinition WixStdbaOverridableVariable = new IntermediateSymbolDefinition(
11
+ BalSymbolDefinitionType.WixStdbaOverridableVariable.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(WixStdbaOverridableVariableTupleFields.Name), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(WixStdbaOverridableVariableSymbolFields.Name), IntermediateFieldType.String),
15
},
16
- typeof(WixStdbaOverridableVariableTuple));
16
+ typeof(WixStdbaOverridableVariableSymbol));
17
}
18
}
19
20
-namespace WixToolset.Bal.Tuples
20
+namespace WixToolset.Bal.Symbols
21
{
22
using WixToolset.Data;
23
24
- public enum WixStdbaOverridableVariableTupleFields
24
+ public enum WixStdbaOverridableVariableSymbolFields
25
{
26
Name,
27
}
28
29
- public class WixStdbaOverridableVariableTuple : IntermediateTuple
29
+ public class WixStdbaOverridableVariableSymbol : IntermediateSymbol
30
{
31
- public WixStdbaOverridableVariableTuple() : base(BalTupleDefinitions.WixStdbaOverridableVariable, null, null)
31
+ public WixStdbaOverridableVariableSymbol() : base(BalSymbolDefinitions.WixStdbaOverridableVariable, null, null)
32
{
33
}
34
35
- public WixStdbaOverridableVariableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixStdbaOverridableVariable, sourceLineNumber, id)
35
+ public WixStdbaOverridableVariableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOverridableVariable, sourceLineNumber, id)
36
{
37
}
38
39
- public IntermediateField this[WixStdbaOverridableVariableTupleFields index] => this.Fields[(int)index];
39
+ public IntermediateField this[WixStdbaOverridableVariableSymbolFields index] => this.Fields[(int)index];
40
41
public string Name
42
{
43
- get => this.Fields[(int)WixStdbaOverridableVariableTupleFields.Name].AsString();
44
- set => this.Set((int)WixStdbaOverridableVariableTupleFields.Name, value);
43
+ get => this.Fields[(int)WixStdbaOverridableVariableSymbolFields.Name].AsString();
44
+ set => this.Set((int)WixStdbaOverridableVariableSymbolFields.Name, value);
45
}
46
}
47
}
\ No newline at end of file