From b3138ce92cf76c523d77862610a4256c49bcb689 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 27 Jun 2020 01:31:52 -0700 Subject: The Great Tuple to Symbol Rename (tm) --- src/wixext/BalBurnBackendExtension.cs | 72 ++++++++--------- src/wixext/BalCompiler.cs | 90 +++++++++++----------- src/wixext/BalExtensionData.cs | 10 +-- src/wixext/Tuples/BalTupleDefinitions.cs | 60 +++++++-------- src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs | 28 +++---- src/wixext/Tuples/WixBalBAFunctionsTuple.cs | 28 +++---- src/wixext/Tuples/WixBalConditionTuple.cs | 34 ++++---- src/wixext/Tuples/WixBalPackageInfoTuple.cs | 34 ++++---- src/wixext/Tuples/WixDncOptionsTuple.cs | 28 +++---- src/wixext/Tuples/WixMbaPrereqInformationTuple.cs | 40 +++++----- src/wixext/Tuples/WixStdbaOptionsTuple.cs | 52 ++++++------- .../Tuples/WixStdbaOverridableVariableTuple.cs | 28 +++---- 12 files changed, 252 insertions(+), 252 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 using System; using System.Collections.Generic; using System.Linq; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; using WixToolset.Data; using WixToolset.Data.Burn; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; public class BalBurnBackendExtension : BaseBurnBackendExtension { - private static readonly IntermediateTupleDefinition[] BurnTupleDefinitions = + private static readonly IntermediateSymbolDefinition[] BurnSymbolDefinitions = { - BalTupleDefinitions.WixBalBAFactoryAssembly, - BalTupleDefinitions.WixBalBAFunctions, - BalTupleDefinitions.WixBalCondition, - BalTupleDefinitions.WixBalPackageInfo, - BalTupleDefinitions.WixDncOptions, - BalTupleDefinitions.WixMbaPrereqInformation, - BalTupleDefinitions.WixStdbaOptions, - BalTupleDefinitions.WixStdbaOverridableVariable, + BalSymbolDefinitions.WixBalBAFactoryAssembly, + BalSymbolDefinitions.WixBalBAFunctions, + BalSymbolDefinitions.WixBalCondition, + BalSymbolDefinitions.WixBalPackageInfo, + BalSymbolDefinitions.WixDncOptions, + BalSymbolDefinitions.WixMbaPrereqInformation, + BalSymbolDefinitions.WixStdbaOptions, + BalSymbolDefinitions.WixStdbaOverridableVariable, }; - protected override IEnumerable TupleDefinitions => BurnTupleDefinitions; + protected override IEnumerable SymbolDefinitions => BurnSymbolDefinitions; public override void BundleFinalize() { @@ -34,8 +34,8 @@ namespace WixToolset.Bal var intermediate = this.Context.IntermediateRepresentation; var section = intermediate.Sections.Single(); - var baTuple = section.Tuples.OfType().SingleOrDefault(); - var baId = baTuple?.Id?.Id; + var baSymbol = section.Symbols.OfType().SingleOrDefault(); + var baId = baSymbol?.Id?.Id; if (null == baId) { return; @@ -59,46 +59,46 @@ namespace WixToolset.Bal private void VerifyBAFunctions(IntermediateSection section) { - WixBalBAFunctionsTuple baFunctionsTuple = null; - foreach (var tuple in section.Tuples.OfType()) + WixBalBAFunctionsSymbol baFunctionsSymbol = null; + foreach (var symbol in section.Symbols.OfType()) { - if (null == baFunctionsTuple) + if (null == baFunctionsSymbol) { - baFunctionsTuple = tuple; + baFunctionsSymbol = symbol; } else { - this.Messaging.Write(BalErrors.MultipleBAFunctions(tuple.SourceLineNumbers)); + this.Messaging.Write(BalErrors.MultipleBAFunctions(symbol.SourceLineNumbers)); } } - var payloadPropertiesTuples = section.Tuples.OfType().ToList(); - if (null == baFunctionsTuple) + var payloadPropertiesSymbols = section.Symbols.OfType().ToList(); + if (null == baFunctionsSymbol) { - foreach (var payloadPropertiesTuple in payloadPropertiesTuples) + foreach (var payloadPropertiesSymbol in payloadPropertiesSymbols) { // TODO: Make core WiX canonicalize Name (this won't catch '.\bafunctions.dll'). - if (string.Equals(payloadPropertiesTuple.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(payloadPropertiesSymbol.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase)) { - this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesTuple.SourceLineNumbers)); + this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesSymbol.SourceLineNumbers)); } } } else { - var payloadId = baFunctionsTuple.Id; - var bundlePayloadTuple = payloadPropertiesTuples.Single(x => payloadId == x.Id); - if (BurnConstants.BurnUXContainerName != bundlePayloadTuple.ContainerRef) + var payloadId = baFunctionsSymbol.Id; + var bundlePayloadSymbol = payloadPropertiesSymbols.Single(x => payloadId == x.Id); + if (BurnConstants.BurnUXContainerName != bundlePayloadSymbol.ContainerRef) { - this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsTuple.SourceLineNumbers)); + this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsSymbol.SourceLineNumbers)); } } } private void VerifyPrereqPackages(IntermediateSection section, bool isDNC) { - var prereqInfoTuples = section.Tuples.OfType().ToList(); - if (prereqInfoTuples.Count == 0) + var prereqInfoSymbols = section.Symbols.OfType().ToList(); + if (prereqInfoSymbols.Count == 0) { var message = isDNC ? BalErrors.MissingDNCPrereq() : BalErrors.MissingMBAPrereq(); this.Messaging.Write(message); @@ -108,24 +108,24 @@ namespace WixToolset.Bal var foundLicenseFile = false; var foundLicenseUrl = false; - foreach (var prereqInfoTuple in prereqInfoTuples) + foreach (var prereqInfoSymbol in prereqInfoSymbols) { - if (null != prereqInfoTuple.LicenseFile) + if (null != prereqInfoSymbol.LicenseFile) { if (foundLicenseFile || foundLicenseUrl) { - this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoTuple.SourceLineNumbers)); + this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoSymbol.SourceLineNumbers)); return; } foundLicenseFile = true; } - if (null != prereqInfoTuple.LicenseUrl) + if (null != prereqInfoSymbol.LicenseUrl) { if (foundLicenseFile || foundLicenseUrl) { - this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoTuple.SourceLineNumbers)); + this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoSymbol.SourceLineNumbers)); return; } @@ -138,7 +138,7 @@ namespace WixToolset.Bal { var isSCD = false; - var dncOptions = section.Tuples.OfType().SingleOrDefault(); + var dncOptions = section.Symbols.OfType().SingleOrDefault(); if (dncOptions != null) { isSCD = dncOptions.SelfContainedDeployment != 0; diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index 03b74e57..294cf45c 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -5,9 +5,9 @@ namespace WixToolset.Bal using System; using System.Collections.Generic; using System.Xml.Linq; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; /// @@ -15,14 +15,14 @@ namespace WixToolset.Bal /// public sealed class BalCompiler : BaseCompilerExtension { - private readonly Dictionary prereqInfoTuplesByPackageId; + private readonly Dictionary prereqInfoSymbolsByPackageId; /// /// Instantiate a new BalCompiler. /// public BalCompiler() { - this.prereqInfoTuplesByPackageId = new Dictionary(); + this.prereqInfoSymbolsByPackageId = new Dictionary(); } public override XNamespace Namespace => "http://wixtoolset.org/schemas/v4/wxs/bal"; @@ -87,7 +87,7 @@ namespace WixToolset.Bal public override void ParseAttribute(Intermediate intermediate, IntermediateSection section, XElement parentElement, XAttribute attribute, IDictionary context) { var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(parentElement); - WixMbaPrereqInformationTuple prereqInfo; + WixMbaPrereqInformationSymbol prereqInfo; switch (parentElement.Name.LocalName) { @@ -110,7 +110,7 @@ namespace WixToolset.Bal case "MsiPackage": case "MspPackage": var displayInternalUICondition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attribute); - section.AddTuple(new WixBalPackageInfoTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, packageId)) + section.AddSymbol(new WixBalPackageInfoSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, packageId)) { PackageId = packageId, DisplayInternalUICondition = displayInternalUICondition, @@ -123,7 +123,7 @@ namespace WixToolset.Bal break; case "PrereqLicenseFile": - if (!this.prereqInfoTuplesByPackageId.TryGetValue(packageId, out prereqInfo)) + if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo)) { // at the time the extension attribute is parsed, the compiler might not yet have // parsed the PrereqPackage attribute, so we need to get it directly from the parent element. @@ -131,12 +131,12 @@ namespace WixToolset.Bal if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) { - prereqInfo = section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers) + prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) { PackageId = packageId, }); - this.prereqInfoTuplesByPackageId.Add(packageId, prereqInfo); + this.prereqInfoSymbolsByPackageId.Add(packageId, prereqInfo); } else { @@ -156,7 +156,7 @@ namespace WixToolset.Bal break; case "PrereqLicenseUrl": - if (!this.prereqInfoTuplesByPackageId.TryGetValue(packageId, out prereqInfo)) + if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo)) { // at the time the extension attribute is parsed, the compiler might not yet have // parsed the PrereqPackage attribute, so we need to get it directly from the parent element. @@ -164,12 +164,12 @@ namespace WixToolset.Bal if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) { - prereqInfo = section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers) + prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) { PackageId = packageId, }); - this.prereqInfoTuplesByPackageId.Add(packageId, prereqInfo); + this.prereqInfoSymbolsByPackageId.Add(packageId, prereqInfo); } else { @@ -190,14 +190,14 @@ namespace WixToolset.Bal case "PrereqPackage": if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { - if (!this.prereqInfoTuplesByPackageId.TryGetValue(packageId, out prereqInfo)) + if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo)) { - prereqInfo = section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers) + prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) { PackageId = packageId, }); - this.prereqInfoTuplesByPackageId.Add(packageId, prereqInfo); + this.prereqInfoSymbolsByPackageId.Add(packageId, prereqInfo); } } break; @@ -222,7 +222,7 @@ namespace WixToolset.Bal { // There can only be one. var id = new Identifier(AccessModifier.Public, "TheBAFactoryAssembly"); - section.AddTuple(new WixBalBAFactoryAssemblyTuple(sourceLineNumbers, id) + section.AddSymbol(new WixBalBAFactoryAssemblySymbol(sourceLineNumbers, id) { PayloadId = payloadId, }); @@ -231,7 +231,7 @@ namespace WixToolset.Bal case "BAFunctions": if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { - section.AddTuple(new WixBalBAFunctionsTuple(sourceLineNumbers) + section.AddSymbol(new WixBalBAFunctionsSymbol(sourceLineNumbers) { PayloadId = payloadId, }); @@ -258,7 +258,7 @@ namespace WixToolset.Bal case "Overridable": if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { - section.AddTuple(new WixStdbaOverridableVariableTuple(sourceLineNumbers) + section.AddSymbol(new WixStdbaOverridableVariableSymbol(sourceLineNumbers) { Name = variableName.Value, }); @@ -318,7 +318,7 @@ namespace WixToolset.Bal if (!this.Messaging.EncounteredError) { - section.AddTuple(new WixBalConditionTuple(sourceLineNumbers) + section.AddSymbol(new WixBalConditionSymbol(sourceLineNumbers) { Condition = condition, Message = message, @@ -378,13 +378,13 @@ namespace WixToolset.Bal if (!this.Messaging.EncounteredError) { - section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers) + section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) { PackageId = packageId, LicenseFile = licenseFile, LicenseUrl = licenseUrl, }); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixBundlePackage, packageId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePackage, packageId); } } @@ -488,7 +488,7 @@ namespace WixToolset.Bal { if (!String.IsNullOrEmpty(launchTarget)) { - section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget")) + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget")) { Value = launchTarget, Type = "string", @@ -497,7 +497,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(launchTargetElevatedId)) { - section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTargetElevatedId")) + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTargetElevatedId")) { Value = launchTargetElevatedId, Type = "string", @@ -506,7 +506,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(launchArguments)) { - section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchArguments")) + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchArguments")) { Value = launchArguments, Type = "string", @@ -515,7 +515,7 @@ namespace WixToolset.Bal if (YesNoType.Yes == launchHidden) { - section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchHidden")) + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchHidden")) { Value = "yes", Type = "string", @@ -525,7 +525,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(launchWorkingDir)) { - section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchWorkingFolder")) + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchWorkingFolder")) { Value = launchWorkingDir, Type = "string", @@ -534,7 +534,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(licenseFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseRtf")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseRtf")) { Value = licenseFile, }); @@ -542,7 +542,7 @@ namespace WixToolset.Bal if (null != licenseUrl) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseUrl")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseUrl")) { Value = licenseUrl, }); @@ -550,7 +550,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(logoFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogo")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogo")) { Value = logoFile, }); @@ -558,7 +558,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(logoSideFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogoSide")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogoSide")) { Value = logoSideFile, }); @@ -566,7 +566,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(themeFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeXml")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeXml")) { Value = themeFile, }); @@ -574,7 +574,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(localizationFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeWxl")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeWxl")) { Value = localizationFile, }); @@ -582,30 +582,30 @@ namespace WixToolset.Bal if (YesNoType.Yes == suppressOptionsUI || YesNoType.Yes == suppressDowngradeFailure || YesNoType.Yes == suppressRepair || YesNoType.Yes == showVersion || YesNoType.Yes == supportCacheOnly) { - var tuple = section.AddTuple(new WixStdbaOptionsTuple(sourceLineNumbers)); + var symbol = section.AddSymbol(new WixStdbaOptionsSymbol(sourceLineNumbers)); if (YesNoType.Yes == suppressOptionsUI) { - tuple.SuppressOptionsUI = 1; + symbol.SuppressOptionsUI = 1; } if (YesNoType.Yes == suppressDowngradeFailure) { - tuple.SuppressDowngradeFailure = 1; + symbol.SuppressDowngradeFailure = 1; } if (YesNoType.Yes == suppressRepair) { - tuple.SuppressRepair = 1; + symbol.SuppressRepair = 1; } if (YesNoType.Yes == showVersion) { - tuple.ShowVersion = 1; + symbol.ShowVersion = 1; } if (YesNoType.Yes == supportCacheOnly) { - tuple.SupportCacheOnly = 1; + symbol.SupportCacheOnly = 1; } } } @@ -654,7 +654,7 @@ namespace WixToolset.Bal { if (!String.IsNullOrEmpty(logoFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo")) { Value = logoFile, }); @@ -662,7 +662,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(themeFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeXml")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeXml")) { Value = themeFile, }); @@ -670,7 +670,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(localizationFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeWxl")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeWxl")) { Value = localizationFile, }); @@ -725,7 +725,7 @@ namespace WixToolset.Bal { if (!String.IsNullOrEmpty(logoFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo")) { Value = logoFile, }); @@ -733,7 +733,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(themeFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeXml")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeXml")) { Value = themeFile, }); @@ -741,7 +741,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(localizationFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeWxl")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeWxl")) { Value = localizationFile, }); @@ -749,7 +749,7 @@ namespace WixToolset.Bal if (YesNoType.Yes == selfContainedDeployment) { - section.AddTuple(new WixDncOptionsTuple(sourceLineNumbers) + section.AddSymbol(new WixDncOptionsSymbol(sourceLineNumbers) { SelfContainedDeployment = 1, }); diff --git a/src/wixext/BalExtensionData.cs b/src/wixext/BalExtensionData.cs index 46152b53..55daf005 100644 --- a/src/wixext/BalExtensionData.cs +++ b/src/wixext/BalExtensionData.cs @@ -16,15 +16,15 @@ namespace WixToolset.Bal /// The default culture. public override string DefaultCulture => "en-US"; - public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) + public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) { - tupleDefinition = BalTupleDefinitions.ByName(name); - return tupleDefinition != null; + symbolDefinition = BalSymbolDefinitions.ByName(name); + return symbolDefinition != null; } - public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions) + public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) { - return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.Bal.bal.wixlib", tupleDefinitions); + return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.Bal.bal.wixlib", symbolDefinitions); } } } diff --git a/src/wixext/Tuples/BalTupleDefinitions.cs b/src/wixext/Tuples/BalTupleDefinitions.cs index 08e7ba2a..90865621 100644 --- a/src/wixext/Tuples/BalTupleDefinitions.cs +++ b/src/wixext/Tuples/BalTupleDefinitions.cs @@ -6,7 +6,7 @@ namespace WixToolset.Bal using WixToolset.Data; using WixToolset.Data.Burn; - public enum BalTupleDefinitionType + public enum BalSymbolDefinitionType { WixBalBAFactoryAssembly, WixBalBAFunctions, @@ -18,13 +18,13 @@ namespace WixToolset.Bal WixStdbaOverridableVariable, } - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { public static readonly Version Version = new Version("4.0.0"); - public static IntermediateTupleDefinition ByName(string name) + public static IntermediateSymbolDefinition ByName(string name) { - if (!Enum.TryParse(name, out BalTupleDefinitionType type)) + if (!Enum.TryParse(name, out BalSymbolDefinitionType type)) { return null; } @@ -32,49 +32,49 @@ namespace WixToolset.Bal return ByType(type); } - public static IntermediateTupleDefinition ByType(BalTupleDefinitionType type) + public static IntermediateSymbolDefinition ByType(BalSymbolDefinitionType type) { switch (type) { - case BalTupleDefinitionType.WixBalBAFactoryAssembly: - return BalTupleDefinitions.WixBalBAFactoryAssembly; + case BalSymbolDefinitionType.WixBalBAFactoryAssembly: + return BalSymbolDefinitions.WixBalBAFactoryAssembly; - case BalTupleDefinitionType.WixBalBAFunctions: - return BalTupleDefinitions.WixBalBAFunctions; + case BalSymbolDefinitionType.WixBalBAFunctions: + return BalSymbolDefinitions.WixBalBAFunctions; - case BalTupleDefinitionType.WixBalCondition: - return BalTupleDefinitions.WixBalCondition; + case BalSymbolDefinitionType.WixBalCondition: + return BalSymbolDefinitions.WixBalCondition; - case BalTupleDefinitionType.WixBalPackageInfo: - return BalTupleDefinitions.WixBalPackageInfo; + case BalSymbolDefinitionType.WixBalPackageInfo: + return BalSymbolDefinitions.WixBalPackageInfo; - case BalTupleDefinitionType.WixDncOptions: - return BalTupleDefinitions.WixDncOptions; + case BalSymbolDefinitionType.WixDncOptions: + return BalSymbolDefinitions.WixDncOptions; - case BalTupleDefinitionType.WixMbaPrereqInformation: - return BalTupleDefinitions.WixMbaPrereqInformation; + case BalSymbolDefinitionType.WixMbaPrereqInformation: + return BalSymbolDefinitions.WixMbaPrereqInformation; - case BalTupleDefinitionType.WixStdbaOptions: - return BalTupleDefinitions.WixStdbaOptions; + case BalSymbolDefinitionType.WixStdbaOptions: + return BalSymbolDefinitions.WixStdbaOptions; - case BalTupleDefinitionType.WixStdbaOverridableVariable: - return BalTupleDefinitions.WixStdbaOverridableVariable; + case BalSymbolDefinitionType.WixStdbaOverridableVariable: + return BalSymbolDefinitions.WixStdbaOverridableVariable; default: throw new ArgumentOutOfRangeException(nameof(type)); } } - static BalTupleDefinitions() + static BalSymbolDefinitions() { - WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); - WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); - WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); - WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); - WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); - WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); - WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); - WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); + WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); } } } diff --git a/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs b/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs index e33ea562..0423a52f 100644 --- a/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs +++ b/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs @@ -3,45 +3,45 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixBalBAFactoryAssembly = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixBalBAFactoryAssembly.ToString(), + public static readonly IntermediateSymbolDefinition WixBalBAFactoryAssembly = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalBAFactoryAssembly.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixBalBAFactoryTupleFields.PayloadId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.PayloadId), IntermediateFieldType.String), }, - typeof(WixBalBAFactoryAssemblyTuple)); + typeof(WixBalBAFactoryAssemblySymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixBalBAFactoryTupleFields + public enum WixBalBAFactorySymbolFields { PayloadId, } - public class WixBalBAFactoryAssemblyTuple : IntermediateTuple + public class WixBalBAFactoryAssemblySymbol : IntermediateSymbol { - public WixBalBAFactoryAssemblyTuple() : base(BalTupleDefinitions.WixBalBAFactoryAssembly, null, null) + public WixBalBAFactoryAssemblySymbol() : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, null, null) { } - public WixBalBAFactoryAssemblyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalBAFactoryAssembly, sourceLineNumber, id) + public WixBalBAFactoryAssemblySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, sourceLineNumber, id) { } - public IntermediateField this[WixBalBAFactoryTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixBalBAFactorySymbolFields index] => this.Fields[(int)index]; public string PayloadId { - get => this.Fields[(int)WixBalBAFactoryTupleFields.PayloadId].AsString(); - set => this.Set((int)WixBalBAFactoryTupleFields.PayloadId, value); + get => this.Fields[(int)WixBalBAFactorySymbolFields.PayloadId].AsString(); + set => this.Set((int)WixBalBAFactorySymbolFields.PayloadId, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixBalBAFunctionsTuple.cs b/src/wixext/Tuples/WixBalBAFunctionsTuple.cs index f753f239..19c7602d 100644 --- a/src/wixext/Tuples/WixBalBAFunctionsTuple.cs +++ b/src/wixext/Tuples/WixBalBAFunctionsTuple.cs @@ -3,45 +3,45 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixBalBAFunctions = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixBalBAFunctions.ToString(), + public static readonly IntermediateSymbolDefinition WixBalBAFunctions = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalBAFunctions.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixBalBAFunctionsTupleFields.PayloadId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalBAFunctionsSymbolFields.PayloadId), IntermediateFieldType.String), }, - typeof(WixBalBAFunctionsTuple)); + typeof(WixBalBAFunctionsSymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixBalBAFunctionsTupleFields + public enum WixBalBAFunctionsSymbolFields { PayloadId, } - public class WixBalBAFunctionsTuple : IntermediateTuple + public class WixBalBAFunctionsSymbol : IntermediateSymbol { - public WixBalBAFunctionsTuple() : base(BalTupleDefinitions.WixBalBAFunctions, null, null) + public WixBalBAFunctionsSymbol() : base(BalSymbolDefinitions.WixBalBAFunctions, null, null) { } - public WixBalBAFunctionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalBAFunctions, sourceLineNumber, id) + public WixBalBAFunctionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFunctions, sourceLineNumber, id) { } - public IntermediateField this[WixBalBAFunctionsTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixBalBAFunctionsSymbolFields index] => this.Fields[(int)index]; public string PayloadId { - get => this.Fields[(int)WixBalBAFunctionsTupleFields.PayloadId].AsString(); - set => this.Set((int)WixBalBAFunctionsTupleFields.PayloadId, value); + get => this.Fields[(int)WixBalBAFunctionsSymbolFields.PayloadId].AsString(); + set => this.Set((int)WixBalBAFunctionsSymbolFields.PayloadId, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixBalConditionTuple.cs b/src/wixext/Tuples/WixBalConditionTuple.cs index 4c0ddd1d..c2527fbc 100644 --- a/src/wixext/Tuples/WixBalConditionTuple.cs +++ b/src/wixext/Tuples/WixBalConditionTuple.cs @@ -3,53 +3,53 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixBalCondition = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixBalCondition.ToString(), + public static readonly IntermediateSymbolDefinition WixBalCondition = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalCondition.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixBalConditionTupleFields.Condition), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixBalConditionTupleFields.Message), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Condition), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Message), IntermediateFieldType.String), }, - typeof(WixBalConditionTuple)); + typeof(WixBalConditionSymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixBalConditionTupleFields + public enum WixBalConditionSymbolFields { Condition, Message, } - public class WixBalConditionTuple : IntermediateTuple + public class WixBalConditionSymbol : IntermediateSymbol { - public WixBalConditionTuple() : base(BalTupleDefinitions.WixBalCondition, null, null) + public WixBalConditionSymbol() : base(BalSymbolDefinitions.WixBalCondition, null, null) { } - public WixBalConditionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalCondition, sourceLineNumber, id) + public WixBalConditionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalCondition, sourceLineNumber, id) { } - public IntermediateField this[WixBalConditionTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixBalConditionSymbolFields index] => this.Fields[(int)index]; public string Condition { - get => this.Fields[(int)WixBalConditionTupleFields.Condition].AsString(); - set => this.Set((int)WixBalConditionTupleFields.Condition, value); + get => this.Fields[(int)WixBalConditionSymbolFields.Condition].AsString(); + set => this.Set((int)WixBalConditionSymbolFields.Condition, value); } public string Message { - get => this.Fields[(int)WixBalConditionTupleFields.Message].AsString(); - set => this.Set((int)WixBalConditionTupleFields.Message, value); + get => this.Fields[(int)WixBalConditionSymbolFields.Message].AsString(); + set => this.Set((int)WixBalConditionSymbolFields.Message, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixBalPackageInfoTuple.cs b/src/wixext/Tuples/WixBalPackageInfoTuple.cs index 32be3105..b09cb191 100644 --- a/src/wixext/Tuples/WixBalPackageInfoTuple.cs +++ b/src/wixext/Tuples/WixBalPackageInfoTuple.cs @@ -3,53 +3,53 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixBalPackageInfo = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixBalPackageInfo.ToString(), + public static readonly IntermediateSymbolDefinition WixBalPackageInfo = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalPackageInfo.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixBalPackageInfoTupleFields.PackageId), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixBalPackageInfoTupleFields.DisplayInternalUICondition), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.PackageId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.DisplayInternalUICondition), IntermediateFieldType.String), }, - typeof(WixBalPackageInfoTuple)); + typeof(WixBalPackageInfoSymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixBalPackageInfoTupleFields + public enum WixBalPackageInfoSymbolFields { PackageId, DisplayInternalUICondition, } - public class WixBalPackageInfoTuple : IntermediateTuple + public class WixBalPackageInfoSymbol : IntermediateSymbol { - public WixBalPackageInfoTuple() : base(BalTupleDefinitions.WixBalPackageInfo, null, null) + public WixBalPackageInfoSymbol() : base(BalSymbolDefinitions.WixBalPackageInfo, null, null) { } - public WixBalPackageInfoTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalPackageInfo, sourceLineNumber, id) + public WixBalPackageInfoSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalPackageInfo, sourceLineNumber, id) { } - public IntermediateField this[WixBalPackageInfoTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixBalPackageInfoSymbolFields index] => this.Fields[(int)index]; public string PackageId { - get => this.Fields[(int)WixBalPackageInfoTupleFields.PackageId].AsString(); - set => this.Set((int)WixBalPackageInfoTupleFields.PackageId, value); + get => this.Fields[(int)WixBalPackageInfoSymbolFields.PackageId].AsString(); + set => this.Set((int)WixBalPackageInfoSymbolFields.PackageId, value); } public string DisplayInternalUICondition { - get => this.Fields[(int)WixBalPackageInfoTupleFields.DisplayInternalUICondition].AsString(); - set => this.Set((int)WixBalPackageInfoTupleFields.DisplayInternalUICondition, value); + get => this.Fields[(int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition].AsString(); + set => this.Set((int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition, value); } } } diff --git a/src/wixext/Tuples/WixDncOptionsTuple.cs b/src/wixext/Tuples/WixDncOptionsTuple.cs index 8a36879b..b9a41c21 100644 --- a/src/wixext/Tuples/WixDncOptionsTuple.cs +++ b/src/wixext/Tuples/WixDncOptionsTuple.cs @@ -3,45 +3,45 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixDncOptions = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixDncOptions.ToString(), + public static readonly IntermediateSymbolDefinition WixDncOptions = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixDncOptions.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixDncOptionsTupleFields.SelfContainedDeployment), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixDncOptionsSymbolFields.SelfContainedDeployment), IntermediateFieldType.Number), }, - typeof(WixDncOptionsTuple)); + typeof(WixDncOptionsSymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixDncOptionsTupleFields + public enum WixDncOptionsSymbolFields { SelfContainedDeployment, } - public class WixDncOptionsTuple : IntermediateTuple + public class WixDncOptionsSymbol : IntermediateSymbol { - public WixDncOptionsTuple() : base(BalTupleDefinitions.WixDncOptions, null, null) + public WixDncOptionsSymbol() : base(BalSymbolDefinitions.WixDncOptions, null, null) { } - public WixDncOptionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixDncOptions, sourceLineNumber, id) + public WixDncOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixDncOptions, sourceLineNumber, id) { } - public IntermediateField this[WixDncOptionsTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixDncOptionsSymbolFields index] => this.Fields[(int)index]; public int SelfContainedDeployment { - get => this.Fields[(int)WixDncOptionsTupleFields.SelfContainedDeployment].AsNumber(); - set => this.Set((int)WixDncOptionsTupleFields.SelfContainedDeployment, value); + get => this.Fields[(int)WixDncOptionsSymbolFields.SelfContainedDeployment].AsNumber(); + set => this.Set((int)WixDncOptionsSymbolFields.SelfContainedDeployment, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs b/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs index bcbe9f84..e4d78da0 100644 --- a/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs +++ b/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixMbaPrereqInformation = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixMbaPrereqInformation.ToString(), + public static readonly IntermediateSymbolDefinition WixMbaPrereqInformation = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixMbaPrereqInformation.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationTupleFields.PackageId), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationTupleFields.LicenseFile), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationTupleFields.LicenseUrl), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.PackageId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseFile), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseUrl), IntermediateFieldType.String), }, - typeof(WixMbaPrereqInformationTuple)); + typeof(WixMbaPrereqInformationSymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixMbaPrereqInformationTupleFields + public enum WixMbaPrereqInformationSymbolFields { PackageId, LicenseFile, LicenseUrl, } - public class WixMbaPrereqInformationTuple : IntermediateTuple + public class WixMbaPrereqInformationSymbol : IntermediateSymbol { - public WixMbaPrereqInformationTuple() : base(BalTupleDefinitions.WixMbaPrereqInformation, null, null) + public WixMbaPrereqInformationSymbol() : base(BalSymbolDefinitions.WixMbaPrereqInformation, null, null) { } - public WixMbaPrereqInformationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixMbaPrereqInformation, sourceLineNumber, id) + public WixMbaPrereqInformationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixMbaPrereqInformation, sourceLineNumber, id) { } - public IntermediateField this[WixMbaPrereqInformationTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixMbaPrereqInformationSymbolFields index] => this.Fields[(int)index]; public string PackageId { - get => this.Fields[(int)WixMbaPrereqInformationTupleFields.PackageId].AsString(); - set => this.Set((int)WixMbaPrereqInformationTupleFields.PackageId, value); + get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.PackageId].AsString(); + set => this.Set((int)WixMbaPrereqInformationSymbolFields.PackageId, value); } public string LicenseFile { - get => this.Fields[(int)WixMbaPrereqInformationTupleFields.LicenseFile].AsString(); - set => this.Set((int)WixMbaPrereqInformationTupleFields.LicenseFile, value); + get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseFile].AsString(); + set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseFile, value); } public string LicenseUrl { - get => this.Fields[(int)WixMbaPrereqInformationTupleFields.LicenseUrl].AsString(); - set => this.Set((int)WixMbaPrereqInformationTupleFields.LicenseUrl, value); + get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseUrl].AsString(); + set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseUrl, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixStdbaOptionsTuple.cs b/src/wixext/Tuples/WixStdbaOptionsTuple.cs index d930eb47..cb2694da 100644 --- a/src/wixext/Tuples/WixStdbaOptionsTuple.cs +++ b/src/wixext/Tuples/WixStdbaOptionsTuple.cs @@ -3,29 +3,29 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixStdbaOptions = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixStdbaOptions.ToString(), + public static readonly IntermediateSymbolDefinition WixStdbaOptions = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixStdbaOptions.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SuppressOptionsUI), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SuppressDowngradeFailure), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SuppressRepair), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.ShowVersion), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SupportCacheOnly), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressOptionsUI), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressDowngradeFailure), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressRepair), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.ShowVersion), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SupportCacheOnly), IntermediateFieldType.Number), }, - typeof(WixStdbaOptionsTuple)); + typeof(WixStdbaOptionsSymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixStdbaOptionsTupleFields + public enum WixStdbaOptionsSymbolFields { SuppressOptionsUI, SuppressDowngradeFailure, @@ -34,46 +34,46 @@ namespace WixToolset.Bal.Tuples SupportCacheOnly, } - public class WixStdbaOptionsTuple : IntermediateTuple + public class WixStdbaOptionsSymbol : IntermediateSymbol { - public WixStdbaOptionsTuple() : base(BalTupleDefinitions.WixStdbaOptions, null, null) + public WixStdbaOptionsSymbol() : base(BalSymbolDefinitions.WixStdbaOptions, null, null) { } - public WixStdbaOptionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixStdbaOptions, sourceLineNumber, id) + public WixStdbaOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOptions, sourceLineNumber, id) { } - public IntermediateField this[WixStdbaOptionsTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixStdbaOptionsSymbolFields index] => this.Fields[(int)index]; public int SuppressOptionsUI { - get => this.Fields[(int)WixStdbaOptionsTupleFields.SuppressOptionsUI].AsNumber(); - set => this.Set((int)WixStdbaOptionsTupleFields.SuppressOptionsUI, value); + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressOptionsUI].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressOptionsUI, value); } public int SuppressDowngradeFailure { - get => this.Fields[(int)WixStdbaOptionsTupleFields.SuppressDowngradeFailure].AsNumber(); - set => this.Set((int)WixStdbaOptionsTupleFields.SuppressDowngradeFailure, value); + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure, value); } public int SuppressRepair { - get => this.Fields[(int)WixStdbaOptionsTupleFields.SuppressRepair].AsNumber(); - set => this.Set((int)WixStdbaOptionsTupleFields.SuppressRepair, value); + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressRepair].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressRepair, value); } public int ShowVersion { - get => this.Fields[(int)WixStdbaOptionsTupleFields.ShowVersion].AsNumber(); - set => this.Set((int)WixStdbaOptionsTupleFields.ShowVersion, value); + get => this.Fields[(int)WixStdbaOptionsSymbolFields.ShowVersion].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.ShowVersion, value); } public int SupportCacheOnly { - get => this.Fields[(int)WixStdbaOptionsTupleFields.SupportCacheOnly].AsNumber(); - set => this.Set((int)WixStdbaOptionsTupleFields.SupportCacheOnly, value); + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SupportCacheOnly].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SupportCacheOnly, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs b/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs index 3ba982ea..1d84d1aa 100644 --- a/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs +++ b/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs @@ -3,45 +3,45 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixStdbaOverridableVariable = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixStdbaOverridableVariable.ToString(), + public static readonly IntermediateSymbolDefinition WixStdbaOverridableVariable = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixStdbaOverridableVariable.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixStdbaOverridableVariableTupleFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixStdbaOverridableVariableSymbolFields.Name), IntermediateFieldType.String), }, - typeof(WixStdbaOverridableVariableTuple)); + typeof(WixStdbaOverridableVariableSymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixStdbaOverridableVariableTupleFields + public enum WixStdbaOverridableVariableSymbolFields { Name, } - public class WixStdbaOverridableVariableTuple : IntermediateTuple + public class WixStdbaOverridableVariableSymbol : IntermediateSymbol { - public WixStdbaOverridableVariableTuple() : base(BalTupleDefinitions.WixStdbaOverridableVariable, null, null) + public WixStdbaOverridableVariableSymbol() : base(BalSymbolDefinitions.WixStdbaOverridableVariable, null, null) { } - public WixStdbaOverridableVariableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixStdbaOverridableVariable, sourceLineNumber, id) + public WixStdbaOverridableVariableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOverridableVariable, sourceLineNumber, id) { } - public IntermediateField this[WixStdbaOverridableVariableTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixStdbaOverridableVariableSymbolFields index] => this.Fields[(int)index]; public string Name { - get => this.Fields[(int)WixStdbaOverridableVariableTupleFields.Name].AsString(); - set => this.Set((int)WixStdbaOverridableVariableTupleFields.Name, value); + get => this.Fields[(int)WixStdbaOverridableVariableSymbolFields.Name].AsString(); + set => this.Set((int)WixStdbaOverridableVariableSymbolFields.Name, value); } } } \ No newline at end of file -- cgit v1.2.3-55-g6feb