@joebigelow / wix / commits / 97875703

The Great Tuple to Symbol Rename (tm)

Rob Mensching committed Jun 24, 2020 at 14:05 UTC 9787570331b511bab73ac8f4f38a3b8cfa053ca5
202 files changed +5642 -5642
src/WixToolset.Data/Burn/BurnConstants.cs
+2 -2
@@ -12,8 +12,8 @@ namespace WixToolset.Data.Burn
12 public const string BundleExtensionDataWixOutputStreamName = "wix-bextdata";
13 public const string BootstrapperApplicationDataWixOutputStreamName = "wix-badata.xml";
14
15 - public const string BootstrapperApplicationDataTupleDefinitionTag = "WixBootstrapperApplicationData";
16 - public const string BundleExtensionSearchTupleDefinitionTag = "WixBundleExtensionSearch";
15 + public const string BootstrapperApplicationDataSymbolDefinitionTag = "WixBootstrapperApplicationData";
16 + public const string BundleExtensionSearchSymbolDefinitionTag = "WixBundleExtensionSearch";
17
18 // The following constants must stay in sync with src\burn\engine\core.h
19 public const string BURN_BUNDLE_NAME = "WixBundleName";
src/WixToolset.Data/ErrorMessages.cs
+3 -3
@@ -212,7 +212,7 @@ namespace WixToolset.Data
212 {
213 return Message(null, Ids.CouldNotDetermineProductCodeFromTransformSummaryInfo, "Could not determine ProductCode from transform summary information.");
214 }
215 -
215 +
216 public static Message CreateCabAddFileFailed()
217 {
218 return Message(null, Ids.CreateCabAddFileFailed, "An error (E_FAIL) was returned while adding files to a CAB file. This most commonly happens when creating a CAB file 2 GB or larger. Either reduce the size of your installation package, raise Media/@CompressionLevel to a higher compression level, or split your installation package's files into more than one CAB file.");
@@ -1486,7 +1486,7 @@ namespace WixToolset.Data
1486
1487 public static Message MissingBundleSearch(SourceLineNumber sourceLineNumbers, string searchId)
1488 {
1489 - return Message(sourceLineNumbers, Ids.MissingBundleSearch, "Bundle Search with id '{0}' has no corresponding implementation tuple.", searchId);
1489 + return Message(sourceLineNumbers, Ids.MissingBundleSearch, "Bundle Search with id '{0}' has no corresponding implementation symbol.", searchId);
1490 }
1491
1492 public static Message MissingDependencyVersion(string packageId)
@@ -1981,7 +1981,7 @@ namespace WixToolset.Data
1981
1982 public static Message UnableToConvertFieldToNumber(string value)
1983 {
1984 - return Message(null, Ids.UnableToConvertFieldToNumber, "Unable to convert intermediate tuple field value '{0}' to a number. This means the intermediate is corrupt or of an unsupported version.", value);
1984 + return Message(null, Ids.UnableToConvertFieldToNumber, "Unable to convert intermediate symbol field value '{0}' to a number. This means the intermediate is corrupt or of an unsupported version.", value);
1985 }
1986
1987 public static Message UnableToOpenModule(SourceLineNumber sourceLineNumbers, string modulePath, string message)
src/WixToolset.Data/ITupleDefinitionCreator.cs
+3 -3
@@ -2,10 +2,10 @@
2
3 namespace WixToolset.Data
4 {
5 - public interface ITupleDefinitionCreator
5 + public interface ISymbolDefinitionCreator
6 {
7 - void AddCustomTupleDefinition(IntermediateTupleDefinition definition);
7 + void AddCustomSymbolDefinition(IntermediateSymbolDefinition definition);
8
9 - bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition);
9 + bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition);
10 }
11 }
src/WixToolset.Data/Identifier.cs
+3 -3
@@ -7,7 +7,7 @@ namespace WixToolset.Data
7 using SimpleJson;
8
9 /// <summary>
10 - /// Class to define the identifier and access for a tuple.
10 + /// Class to define the identifier and access for a symbol.
11 /// </summary>
12 [DebuggerDisplay("{Access} {Id,nq}")]
13 public class Identifier
@@ -46,12 +46,12 @@ namespace WixToolset.Data
46 }
47
48 /// <summary>
49 - /// Access modifier for a tuple.
49 + /// Access modifier for a symbol.
50 /// </summary>
51 public AccessModifier Access { get; }
52
53 /// <summary>
54 - /// Identifier for the tuple.
54 + /// Identifier for the symbol.
55 /// </summary>
56 public string Id { get; }
57
src/WixToolset.Data/Intermediate.cs
+27 -27
@@ -69,7 +69,7 @@ namespace WixToolset.Data
69 /// <returns>Returns the loaded intermediate.</returns>
70 public static Intermediate Load(string path, bool suppressVersionCheck = false)
71 {
72 - var creator = new SimpleTupleDefinitionCreator();
72 + var creator = new SimpleSymbolDefinitionCreator();
73 return Intermediate.Load(path, creator, suppressVersionCheck);
74 }
75
@@ -82,7 +82,7 @@ namespace WixToolset.Data
82 /// <returns>Returns the loaded intermediate.</returns>
83 public static Intermediate Load(Assembly assembly, string resourceName, bool suppressVersionCheck = false)
84 {
85 - var creator = new SimpleTupleDefinitionCreator();
85 + var creator = new SimpleSymbolDefinitionCreator();
86 return Intermediate.Load(assembly, resourceName, creator, suppressVersionCheck);
87 }
88
@@ -91,10 +91,10 @@ namespace WixToolset.Data
91 /// </summary>
92 /// <param name="assembly">Assembly with intermediate embedded in resource stream.</param>
93 /// <param name="resourceName">Name of resource stream.</param>
94 - /// <param name="creator">ITupleDefinitionCreator to use when reconstituting the intermediate.</param>
94 + /// <param name="creator">ISymbolDefinitionCreator to use when reconstituting the intermediate.</param>
95 /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param>
96 /// <returns>Returns the loaded intermediate.</returns>
97 - public static Intermediate Load(Assembly assembly, string resourceName, ITupleDefinitionCreator creator, bool suppressVersionCheck = false)
97 + public static Intermediate Load(Assembly assembly, string resourceName, ISymbolDefinitionCreator creator, bool suppressVersionCheck = false)
98 {
99 using (var wixout = WixOutput.Read(assembly, resourceName))
100 {
@@ -106,10 +106,10 @@ namespace WixToolset.Data
106 /// Loads an intermediate from a path on disk.
107 /// </summary>
108 /// <param name="path">Path to intermediate file saved on disk.</param>
109 - /// <param name="creator">ITupleDefinitionCreator to use when reconstituting the intermediate.</param>
109 + /// <param name="creator">ISymbolDefinitionCreator to use when reconstituting the intermediate.</param>
110 /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param>
111 /// <returns>Returns the loaded intermediate.</returns>
112 - public static Intermediate Load(string path, ITupleDefinitionCreator creator, bool suppressVersionCheck = false)
112 + public static Intermediate Load(string path, ISymbolDefinitionCreator creator, bool suppressVersionCheck = false)
113 {
114 using (var wixout = WixOutput.Read(path))
115 {
@@ -121,12 +121,12 @@ namespace WixToolset.Data
121 /// Loads an intermediate from a WixOutput object.
122 /// </summary>
123 /// <param name="wixOutput">WixOutput object.</param>
124 - /// <param name="creator">ITupleDefinitionCreator to use when reconstituting the intermediate.</param>
124 + /// <param name="creator">ISymbolDefinitionCreator to use when reconstituting the intermediate.</param>
125 /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param>
126 /// <returns>Returns the loaded intermediate.</returns>
127 public static Intermediate Load(WixOutput wixOutput, bool suppressVersionCheck = false)
128 {
129 - var creator = new SimpleTupleDefinitionCreator();
129 + var creator = new SimpleSymbolDefinitionCreator();
130 return Intermediate.LoadIntermediate(wixOutput, creator, suppressVersionCheck);
131 }
132
@@ -134,10 +134,10 @@ namespace WixToolset.Data
134 /// Loads an intermediate from a WixOutput object.
135 /// </summary>
136 /// <param name="wixOutput">WixOutput object.</param>
137 - /// <param name="creator">ITupleDefinitionCreator to use when reconstituting the intermediate.</param>
137 + /// <param name="creator">ISymbolDefinitionCreator to use when reconstituting the intermediate.</param>
138 /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param>
139 /// <returns>Returns the loaded intermediate.</returns>
140 - public static Intermediate Load(WixOutput wixOutput, ITupleDefinitionCreator creator, bool suppressVersionCheck = false)
140 + public static Intermediate Load(WixOutput wixOutput, ISymbolDefinitionCreator creator, bool suppressVersionCheck = false)
141 {
142 return Intermediate.LoadIntermediate(wixOutput, creator, suppressVersionCheck);
143 }
@@ -150,7 +150,7 @@ namespace WixToolset.Data
150 /// <returns>Returns the loaded intermediates</returns>
151 public static IEnumerable<Intermediate> Load(IEnumerable<string> intermediateFiles)
152 {
153 - var creator = new SimpleTupleDefinitionCreator();
153 + var creator = new SimpleSymbolDefinitionCreator();
154 return Intermediate.Load(intermediateFiles, creator);
155 }
156
@@ -158,10 +158,10 @@ namespace WixToolset.Data
158 /// Loads several intermediates from paths on disk using the same definitions.
159 /// </summary>
160 /// <param name="intermediateFiles">Paths to intermediate files saved on disk.</param>
161 - /// <param name="creator">ITupleDefinitionCreator to use when reconstituting the intermediates.</param>
161 + /// <param name="creator">ISymbolDefinitionCreator to use when reconstituting the intermediates.</param>
162 /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param>
163 /// <returns>Returns the loaded intermediates</returns>
164 - public static IEnumerable<Intermediate> Load(IEnumerable<string> intermediateFiles, ITupleDefinitionCreator creator, bool suppressVersionCheck = false)
164 + public static IEnumerable<Intermediate> Load(IEnumerable<string> intermediateFiles, ISymbolDefinitionCreator creator, bool suppressVersionCheck = false)
165 {
166 var jsons = new Queue<JsonWithPath>();
167 var intermediates = new List<Intermediate>();
@@ -240,10 +240,10 @@ namespace WixToolset.Data
240 /// </summary>
241 /// <param name="stream">Stream to intermediate file.</param>
242 /// <param name="baseUri">Path name of intermediate file.</param>
243 - /// <param name="creator">ITupleDefinitionCreator to use when reconstituting the intermediate.</param>
243 + /// <param name="creator">ISymbolDefinitionCreator to use when reconstituting the intermediate.</param>
244 /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param>
245 /// <returns>Returns the loaded intermediate.</returns>
246 - private static Intermediate LoadIntermediate(WixOutput wixout, ITupleDefinitionCreator creator, bool suppressVersionCheck = false)
246 + private static Intermediate LoadIntermediate(WixOutput wixout, ISymbolDefinitionCreator creator, bool suppressVersionCheck = false)
247 {
248 var data = wixout.GetData(WixOutputStreamName);
249 var json = Intermediate.LoadJson(data, wixout.Uri, suppressVersionCheck);
@@ -281,8 +281,8 @@ namespace WixToolset.Data
281 /// Loads custom definitions in intermediate json into the creator.
282 /// </summary>
283 /// <param name="json">Json version of intermediate.</param>
284 - /// <param name="creator">ITupleDefinitionCreator to use when reconstituting the intermediate.</param>
285 - private static void LoadDefinitions(JsonObject json, ITupleDefinitionCreator creator)
284 + /// <param name="creator">ISymbolDefinitionCreator to use when reconstituting the intermediate.</param>
285 + private static void LoadDefinitions(JsonObject json, ISymbolDefinitionCreator creator)
286 {
287 var definitionsJson = json.GetValueOrDefault<JsonArray>("definitions");
288
@@ -290,8 +290,8 @@ namespace WixToolset.Data
290 {
291 foreach (JsonObject definitionJson in definitionsJson)
292 {
293 - var definition = IntermediateTupleDefinition.Deserialize(definitionJson);
294 - creator.AddCustomTupleDefinition(definition);
293 + var definition = IntermediateSymbolDefinition.Deserialize(definitionJson);
294 + creator.AddCustomSymbolDefinition(definition);
295 }
296 }
297 }
@@ -301,9 +301,9 @@ namespace WixToolset.Data
301 /// </summary>
302 /// <param name="json">Json version of intermediate.</param>
303 /// <param name="baseUri">Path to the intermediate.</param>
304 - /// <param name="creator">ITupleDefinitionCreator to use when reconstituting the intermediate.</param>
304 + /// <param name="creator">ISymbolDefinitionCreator to use when reconstituting the intermediate.</param>
305 /// <returns>The finalized intermediate.</returns>
306 - private static Intermediate FinalizeLoad(JsonObject json, Uri baseUri, ITupleDefinitionCreator creator)
306 + private static Intermediate FinalizeLoad(JsonObject json, Uri baseUri, ISymbolDefinitionCreator creator)
307 {
308 var id = json.GetValueOrDefault<string>("id");
309 var level = json.GetValueOrDefault<string>("level");
@@ -331,7 +331,7 @@ namespace WixToolset.Data
331
332 private void SaveEmbedFiles(WixOutput wixout)
333 {
334 - var embeddedFields = this.Sections.SelectMany(s => s.Tuples)
334 + var embeddedFields = this.Sections.SelectMany(s => s.Symbols)
335 .SelectMany(t => t.Fields)
336 .Where(f => f?.Type == IntermediateFieldType.Path)
337 .Select(f => f.AsPath())
@@ -440,15 +440,15 @@ namespace WixToolset.Data
440 return entryName;
441 }
442
443 - private Dictionary<string, IntermediateTupleDefinition> GetCustomDefinitionsInSections()
443 + private Dictionary<string, IntermediateSymbolDefinition> GetCustomDefinitionsInSections()
444 {
445 - var customDefinitions = new Dictionary<string, IntermediateTupleDefinition>();
445 + var customDefinitions = new Dictionary<string, IntermediateSymbolDefinition>();
446
447 - foreach (var tuple in this.Sections.SelectMany(s => s.Tuples).Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension))
447 + foreach (var symbol in this.Sections.SelectMany(s => s.Symbols).Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension))
448 {
449 - if (!customDefinitions.ContainsKey(tuple.Definition.Name))
449 + if (!customDefinitions.ContainsKey(symbol.Definition.Name))
450 {
451 - customDefinitions.Add(tuple.Definition.Name, tuple.Definition);
451 + customDefinitions.Add(symbol.Definition.Name, symbol.Definition);
452 }
453 }
454
src/WixToolset.Data/IntermediateSection.cs
+13 -13
@@ -22,7 +22,7 @@ namespace WixToolset.Data
22 this.Id = id;
23 this.Type = type;
24 this.Codepage = codepage;
25 - this.Tuples = new List<IntermediateTuple>();
25 + this.Symbols = new List<IntermediateSymbol>();
26 }
27
28 /// <summary>
@@ -54,14 +54,14 @@ namespace WixToolset.Data
54 public string LibraryId { get; set; }
55
56 /// <summary>
57 - /// Tuples in the section.
57 + /// Symbols in the section.
58 /// </summary>
59 - public IList<IntermediateTuple> Tuples { get; }
59 + public IList<IntermediateSymbol> Symbols { get; }
60
61 /// <summary>
62 /// Parse a section from the JSON data.
63 /// </summary>
64 - internal static IntermediateSection Deserialize(ITupleDefinitionCreator creator, Uri baseUri, JsonObject jsonObject)
64 + internal static IntermediateSection Deserialize(ISymbolDefinitionCreator creator, Uri baseUri, JsonObject jsonObject)
65 {
66 var codepage = jsonObject.GetValueOrDefault("codepage", 0);
67 var id = jsonObject.GetValueOrDefault<string>("id");
@@ -74,12 +74,12 @@ namespace WixToolset.Data
74
75 var section = new IntermediateSection(id, type, codepage);
76
77 - var tuplesJson = jsonObject.GetValueOrDefault<JsonArray>("tuples");
77 + var symbolsJson = jsonObject.GetValueOrDefault<JsonArray>("symbols");
78
79 - foreach (JsonObject tupleJson in tuplesJson)
79 + foreach (JsonObject symbolJson in symbolsJson)
80 {
81 - var tuple = IntermediateTuple.Deserialize(creator, baseUri, tupleJson);
82 - section.Tuples.Add(tuple);
81 + var symbol = IntermediateSymbol.Deserialize(creator, baseUri, symbolJson);
82 + section.Symbols.Add(symbol);
83 }
84
85 return section;
@@ -98,15 +98,15 @@ namespace WixToolset.Data
98 jsonObject.Add("id", this.Id);
99 }
100
101 - var tuplesJson = new JsonArray(this.Tuples.Count);
101 + var symbolsJson = new JsonArray(this.Symbols.Count);
102
103 - foreach (var tuple in this.Tuples)
103 + foreach (var symbol in this.Symbols)
104 {
105 - var tupleJson = tuple.Serialize();
106 - tuplesJson.Add(tupleJson);
105 + var symbolJson = symbol.Serialize();
106 + symbolsJson.Add(symbolJson);
107 }
108
109 - jsonObject.Add("tuples", tuplesJson);
109 + jsonObject.Add("symbols", symbolsJson);
110
111 return jsonObject;
112 }
src/WixToolset.Data/IntermediateSectionExtensions.cs
+4 -4
@@ -4,11 +4,11 @@ namespace WixToolset.Data
4 {
5 public static class IntermediateSectionExtensions
6 {
7 - public static T AddTuple<T>(this IntermediateSection section, T tuple)
8 - where T : IntermediateTuple
7 + public static T AddSymbol<T>(this IntermediateSection section, T symbol)
8 + where T : IntermediateSymbol
9 {
10 - section.Tuples.Add(tuple);
11 - return tuple;
10 + section.Symbols.Add(symbol);
11 + return symbol;
12 }
13 }
14 }
src/WixToolset.Data/IntermediateTuple.cs
+12 -12
@@ -7,15 +7,15 @@ namespace WixToolset.Data
7 using SimpleJson;
8
9 [DebuggerDisplay("{DebuggerDisplay,nq}")]
10 - public class IntermediateTuple
10 + public class IntermediateSymbol
11 {
12 private object tags;
13
14 - public IntermediateTuple(IntermediateTupleDefinition definition) : this(definition, null, null)
14 + public IntermediateSymbol(IntermediateSymbolDefinition definition) : this(definition, null, null)
15 {
16 }
17
18 - public IntermediateTuple(IntermediateTupleDefinition definition, SourceLineNumber sourceLineNumber, Identifier id = null)
18 + public IntermediateSymbol(IntermediateSymbolDefinition definition, SourceLineNumber sourceLineNumber, Identifier id = null)
19 {
20 this.Definition = definition;
21 this.Fields = new IntermediateField[definition.FieldDefinitions.Length];
@@ -23,7 +23,7 @@ namespace WixToolset.Data
23 this.Id = id;
24 }
25
26 - public IntermediateTupleDefinition Definition { get; }
26 + public IntermediateSymbolDefinition Definition { get; }
27
28 public IntermediateField[] Fields { get; }
29
@@ -154,7 +154,7 @@ namespace WixToolset.Data
154 return false;
155 }
156
157 - internal static IntermediateTuple Deserialize(ITupleDefinitionCreator creator, Uri baseUri, JsonObject jsonObject)
157 + internal static IntermediateSymbol Deserialize(ISymbolDefinitionCreator creator, Uri baseUri, JsonObject jsonObject)
158 {
159 var definitionName = jsonObject.GetValueOrDefault<string>("type");
160 var idJson = jsonObject.GetValueOrDefault<JsonObject>("id");
@@ -166,18 +166,18 @@ namespace WixToolset.Data
166 var sourceLineNumbers = (sourceLineNumbersJson == null) ? null : SourceLineNumber.Deserialize(sourceLineNumbersJson);
167
168 // TODO: this isn't sufficient.
169 - if (!creator.TryGetTupleDefinitionByName(definitionName, out var definition))
169 + if (!creator.TryGetSymbolDefinitionByName(definitionName, out var definition))
170 {
171 throw new WixException(ErrorMessages.UnknownSymbolType(definitionName));
172 }
173
174 - var tuple = definition.CreateTuple(sourceLineNumbers, id);
174 + var symbol = definition.CreateSymbol(sourceLineNumbers, id);
175
176 - for (var i = 0; i < fieldsJson.Count && i < tuple.Fields.Length; ++i)
176 + for (var i = 0; i < fieldsJson.Count && i < symbol.Fields.Length; ++i)
177 {
178 if (fieldsJson[i] is JsonObject fieldJson)
179 {
180 - tuple.Fields[i] = IntermediateField.Deserialize(tuple.Definition.FieldDefinitions[i], baseUri, fieldJson);
180 + symbol.Fields[i] = IntermediateField.Deserialize(symbol.Definition.FieldDefinitions[i], baseUri, fieldJson);
181 }
182 }
183
@@ -186,7 +186,7 @@ namespace WixToolset.Data
186 }
187 else if (tagsJson.Count == 1)
188 {
189 - tuple.tags = (string)tagsJson[0];
189 + symbol.tags = (string)tagsJson[0];
190 }
191 else
192 {
@@ -197,10 +197,10 @@ namespace WixToolset.Data
197 tags[i] = (string)tagsJson[i];
198 }
199
200 - tuple.tags = tags;
200 + symbol.tags = tags;
201 }
202
203 - return tuple;
203 + return symbol;
204 }
205
206 internal JsonObject Serialize()
src/WixToolset.Data/IntermediateTupleDefinition.cs
+16 -16
@@ -5,50 +5,50 @@ namespace WixToolset.Data
5 using System;
6 using SimpleJson;
7
8 - public class IntermediateTupleDefinition
8 + public class IntermediateSymbolDefinition
9 {
10 private object tags;
11
12 - public IntermediateTupleDefinition(string name, IntermediateFieldDefinition[] fieldDefinitions, Type strongTupleType)
13 - : this(TupleDefinitionType.MustBeFromAnExtension, name, 0, fieldDefinitions, strongTupleType)
12 + public IntermediateSymbolDefinition(string name, IntermediateFieldDefinition[] fieldDefinitions, Type strongSymbolType)
13 + : this(SymbolDefinitionType.MustBeFromAnExtension, name, 0, fieldDefinitions, strongSymbolType)
14 {
15 }
16
17 - public IntermediateTupleDefinition(string name, int revision, IntermediateFieldDefinition[] fieldDefinitions, Type strongTupleType)
18 - : this(TupleDefinitionType.MustBeFromAnExtension, name, revision, fieldDefinitions, strongTupleType)
17 + public IntermediateSymbolDefinition(string name, int revision, IntermediateFieldDefinition[] fieldDefinitions, Type strongSymbolType)
18 + : this(SymbolDefinitionType.MustBeFromAnExtension, name, revision, fieldDefinitions, strongSymbolType)
19 {
20 }
21
22 - internal IntermediateTupleDefinition(TupleDefinitionType type, IntermediateFieldDefinition[] fieldDefinitions, Type strongTupleType)
23 - : this(type, type.ToString(), 0, fieldDefinitions, strongTupleType)
22 + internal IntermediateSymbolDefinition(SymbolDefinitionType type, IntermediateFieldDefinition[] fieldDefinitions, Type strongSymbolType)
23 + : this(type, type.ToString(), 0, fieldDefinitions, strongSymbolType)
24 {
25 }
26
27 - private IntermediateTupleDefinition(TupleDefinitionType type, string name, int revision, IntermediateFieldDefinition[] fieldDefinitions, Type strongTupleType)
27 + private IntermediateSymbolDefinition(SymbolDefinitionType type, string name, int revision, IntermediateFieldDefinition[] fieldDefinitions, Type strongSymbolType)
28 {
29 this.Type = type;
30 this.Name = name;
31 this.Revision = revision;
32 this.FieldDefinitions = fieldDefinitions;
33 - this.StrongTupleType = strongTupleType ?? typeof(IntermediateTuple);
33 + this.StrongSymbolType = strongSymbolType ?? typeof(IntermediateSymbol);
34 #if DEBUG
35 - if (this.StrongTupleType != typeof(IntermediateTuple) && !this.StrongTupleType.IsSubclassOf(typeof(IntermediateTuple))) { throw new ArgumentException(nameof(strongTupleType)); }
35 + if (this.StrongSymbolType != typeof(IntermediateSymbol) && !this.StrongSymbolType.IsSubclassOf(typeof(IntermediateSymbol))) { throw new ArgumentException(nameof(strongSymbolType)); }
36 #endif
37 }
38
39 public int Revision { get; }
40
41 - public TupleDefinitionType Type { get; }
41 + public SymbolDefinitionType Type { get; }
42
43 public string Name { get; }
44
45 public IntermediateFieldDefinition[] FieldDefinitions { get; }
46
47 - private Type StrongTupleType { get; }
47 + private Type StrongSymbolType { get; }
48
49 - public IntermediateTuple CreateTuple(SourceLineNumber sourceLineNumber = null, Identifier id = null)
49 + public IntermediateSymbol CreateSymbol(SourceLineNumber sourceLineNumber = null, Identifier id = null)
50 {
51 - var result = (this.StrongTupleType == typeof(IntermediateTuple)) ? (IntermediateTuple)Activator.CreateInstance(this.StrongTupleType, this) : (IntermediateTuple)Activator.CreateInstance(this.StrongTupleType);
51 + var result = (this.StrongSymbolType == typeof(IntermediateSymbol)) ? (IntermediateSymbol)Activator.CreateInstance(this.StrongSymbolType, this) : (IntermediateSymbol)Activator.CreateInstance(this.StrongSymbolType);
52 result.SourceLineNumbers = sourceLineNumber;
53 result.Id = id;
54
@@ -174,7 +174,7 @@ namespace WixToolset.Data
174 return false;
175 }
176
177 - internal static IntermediateTupleDefinition Deserialize(JsonObject jsonObject)
177 + internal static IntermediateSymbolDefinition Deserialize(JsonObject jsonObject)
178 {
179 var name = jsonObject.GetValueOrDefault<string>("name");
180 var revision = jsonObject.GetValueOrDefault("rev", 0);
@@ -191,7 +191,7 @@ namespace WixToolset.Data
191 fieldDefinitions[i] = new IntermediateFieldDefinition(fieldName, fieldType);
192 }
193
194 - var definition = new IntermediateTupleDefinition(name, revision, fieldDefinitions, null);
194 + var definition = new IntermediateSymbolDefinition(name, revision, fieldDefinitions, null);
195
196 if (tagsJson == null || tagsJson.Count == 0)
197 {
src/WixToolset.Data/IntermediateTupleExtensions.cs
+50 -50
@@ -2,118 +2,118 @@
2
3 namespace WixToolset.Data
4 {
5 - public static class IntermediateTupleExtensions
5 + public static class IntermediateSymbolExtensions
6 {
7 - public static bool AsBool(this IntermediateTuple tuple, int index) => tuple?.Fields[index].AsBool() ?? false;
7 + public static bool AsBool(this IntermediateSymbol symbol, int index) => symbol?.Fields[index].AsBool() ?? false;
8
9 - public static bool? AsNullableBool(this IntermediateTuple tuple, int index) => tuple?.Fields[index].AsNullableBool();
9 + public static bool? AsNullableBool(this IntermediateSymbol symbol, int index) => symbol?.Fields[index].AsNullableBool();
10
11 - public static int AsNumber(this IntermediateTuple tuple, int index) => tuple?.Fields[index].AsNumber() ?? 0;
11 + public static int AsNumber(this IntermediateSymbol symbol, int index) => symbol?.Fields[index].AsNumber() ?? 0;
12
13 - public static int? AsNullableNumber(this IntermediateTuple tuple, int index) => tuple?.Fields[index].AsNullableNumber();
13 + public static int? AsNullableNumber(this IntermediateSymbol symbol, int index) => symbol?.Fields[index].AsNullableNumber();
14
15 - public static string AsString(this IntermediateTuple tuple, int index) => tuple?.Fields[index].AsString();
15 + public static string AsString(this IntermediateSymbol symbol, int index) => symbol?.Fields[index].AsString();
16
17 - public static IntermediateField Set(this IntermediateTuple tuple, int index, bool value)
17 + public static IntermediateField Set(this IntermediateSymbol symbol, int index, bool value)
18 {
19 - var definition = tuple.Definition.FieldDefinitions[index];
19 + var definition = symbol.Definition.FieldDefinitions[index];
20
21 - var field = tuple.Fields[index].Set(definition, value);
21 + var field = symbol.Fields[index].Set(definition, value);
22
23 - return tuple.Fields[index] = field;
23 + return symbol.Fields[index] = field;
24 }
25
26 - public static IntermediateField Set(this IntermediateTuple tuple, int index, bool? value)
26 + public static IntermediateField Set(this IntermediateSymbol symbol, int index, bool? value)
27 {
28 - if (value == null && NoFieldMetadata(tuple, index))
28 + if (value == null && NoFieldMetadata(symbol, index))
29 {
30 - return tuple.Fields[index] = null;
30 + return symbol.Fields[index] = null;
31 }
32
33 - var definition = tuple.Definition.FieldDefinitions[index];
33 + var definition = symbol.Definition.FieldDefinitions[index];
34
35 - var field = tuple.Fields[index].Set(definition, value);
35 + var field = symbol.Fields[index].Set(definition, value);
36
37 - return tuple.Fields[index] = field;
37 + return symbol.Fields[index] = field;
38 }
39
40 - public static IntermediateField Set(this IntermediateTuple tuple, int index, long value)
40 + public static IntermediateField Set(this IntermediateSymbol symbol, int index, long value)
41 {
42 - var definition = tuple.Definition.FieldDefinitions[index];
42 + var definition = symbol.Definition.FieldDefinitions[index];
43
44 - var field = tuple.Fields[index].Set(definition, value);
44 + var field = symbol.Fields[index].Set(definition, value);
45
46 - return tuple.Fields[index] = field;
46 + return symbol.Fields[index] = field;
47 }
48
49 - public static IntermediateField Set(this IntermediateTuple tuple, int index, long? value)
49 + public static IntermediateField Set(this IntermediateSymbol symbol, int index, long? value)
50 {
51 - if (value == null && NoFieldMetadata(tuple, index))
51 + if (value == null && NoFieldMetadata(symbol, index))
52 {
53 - return tuple.Fields[index] = null;
53 + return symbol.Fields[index] = null;
54 }
55
56 - var definition = tuple.Definition.FieldDefinitions[index];
56 + var definition = symbol.Definition.FieldDefinitions[index];
57
58 - var field = tuple.Fields[index].Set(definition, value);
58 + var field = symbol.Fields[index].Set(definition, value);
59
60 - return tuple.Fields[index] = field;
60 + return symbol.Fields[index] = field;
61 }
62
63 - public static IntermediateField Set(this IntermediateTuple tuple, int index, int value)
63 + public static IntermediateField Set(this IntermediateSymbol symbol, int index, int value)
64 {
65 - var definition = tuple.Definition.FieldDefinitions[index];
65 + var definition = symbol.Definition.FieldDefinitions[index];
66
67 - var field = tuple.Fields[index].Set(definition, value);
67 + var field = symbol.Fields[index].Set(definition, value);
68
69 - return tuple.Fields[index] = field;
69 + return symbol.Fields[index] = field;
70 }
71
72 - public static IntermediateField Set(this IntermediateTuple tuple, int index, int? value)
72 + public static IntermediateField Set(this IntermediateSymbol symbol, int index, int? value)
73 {
74 - if (value == null && NoFieldMetadata(tuple, index))
74 + if (value == null && NoFieldMetadata(symbol, index))
75 {
76 - return tuple.Fields[index] = null;
76 + return symbol.Fields[index] = null;
77 }
78
79 - var definition = tuple.Definition.FieldDefinitions[index];
79 + var definition = symbol.Definition.FieldDefinitions[index];
80
81 - var field = tuple.Fields[index].Set(definition, value);
81 + var field = symbol.Fields[index].Set(definition, value);
82
83 - return tuple.Fields[index] = field;
83 + return symbol.Fields[index] = field;
84 }
85
86 - public static IntermediateField Set(this IntermediateTuple tuple, int index, IntermediateFieldPathValue value)
86 + public static IntermediateField Set(this IntermediateSymbol symbol, int index, IntermediateFieldPathValue value)
87 {
88 - if (value?.Path == null && value?.BaseUri == null && NoFieldMetadata(tuple, index))
88 + if (value?.Path == null && value?.BaseUri == null && NoFieldMetadata(symbol, index))
89 {
90 - return tuple.Fields[index] = null;
90 + return symbol.Fields[index] = null;
91 }
92
93 - var definition = tuple.Definition.FieldDefinitions[index];
93 + var definition = symbol.Definition.FieldDefinitions[index];
94
95 - var field = tuple.Fields[index].Set(definition, value);
95 + var field = symbol.Fields[index].Set(definition, value);
96
97 - return tuple.Fields[index] = field;
97 + return symbol.Fields[index] = field;
98 }
99
100 - public static IntermediateField Set(this IntermediateTuple tuple, int index, string value)
100 + public static IntermediateField Set(this IntermediateSymbol symbol, int index, string value)
101 {
102 - if (value == null && NoFieldMetadata(tuple, index))
102 + if (value == null && NoFieldMetadata(symbol, index))
103 {
104 - return tuple.Fields[index] = null;
104 + return symbol.Fields[index] = null;
105 }
106
107 - var definition = tuple.Definition.FieldDefinitions[index];
107 + var definition = symbol.Definition.FieldDefinitions[index];
108
109 - var field = tuple.Fields[index].Set(definition, value);
109 + var field = symbol.Fields[index].Set(definition, value);
110
111 - return tuple.Fields[index] = field;
111 + return symbol.Fields[index] = field;
112 }
113
114 - private static bool NoFieldMetadata(IntermediateTuple tuple, int index)
114 + private static bool NoFieldMetadata(IntermediateSymbol symbol, int index)
115 {
116 - var field = tuple?.Fields[index];
116 + var field = symbol?.Fields[index];
117
118 return field?.Context == null && field?.PreviousValue == null;
119 }
src/WixToolset.Data/Serialize/ElementCollection.cs
+27 -27
@@ -429,13 +429,13 @@ namespace WixToolset.Data.Serialize
429 {
430 if (this.collectionStack != null && this.collectionStack.Count > 0)
431 {
432 - CollectionTuple tuple = (CollectionTuple)this.collectionStack.Peek();
433 - object container = tuple.Collection.items[tuple.ContainerIndex];
432 + CollectionSymbol symbol = (CollectionSymbol)this.collectionStack.Peek();
433 + object container = symbol.Collection.items[symbol.ContainerIndex];
434
435 CollectionItem collectionItem = container as CollectionItem;
436 if (collectionItem != null)
437 {
438 - return collectionItem.Elements[tuple.ItemIndex];
438 + return collectionItem.Elements[symbol.ItemIndex];
439 }
440
441 throw new InvalidOperationException(String.Format(
@@ -474,12 +474,12 @@ namespace WixToolset.Data.Serialize
474 }
475
476 this.collectionStack = new Stack();
477 - this.collectionStack.Push(new CollectionTuple(this.collection));
477 + this.collectionStack.Push(new CollectionSymbol(this.collection));
478 }
479
480 - CollectionTuple tuple = (CollectionTuple)this.collectionStack.Peek();
480 + CollectionSymbol symbol = (CollectionSymbol)this.collectionStack.Peek();
481
482 - if (this.FindNext(tuple))
482 + if (this.FindNext(symbol))
483 {
484 return true;
485 }
@@ -507,50 +507,50 @@ namespace WixToolset.Data.Serialize
507 elementCollection.Count));
508 }
509
510 - CollectionTuple tuple = new CollectionTuple(elementCollection);
511 - this.collectionStack.Push(tuple);
512 - this.FindNext(tuple);
510 + CollectionSymbol symbol = new CollectionSymbol(elementCollection);
511 + this.collectionStack.Push(symbol);
512 + this.FindNext(symbol);
513 }
514
515 /// <summary>
516 - /// Finds the next item from a given tuple.
516 + /// Finds the next item from a given symbol.
517 /// </summary>
518 - /// <param name="tuple">The tuple to start looking from.</param>
518 + /// <param name="symbol">The symbol to start looking from.</param>
519 /// <returns>True if a next element is found, false otherwise.</returns>
520 - private bool FindNext(CollectionTuple tuple)
520 + private bool FindNext(CollectionSymbol symbol)
521 {
522 - object container = tuple.Collection.items[tuple.ContainerIndex];
522 + object container = symbol.Collection.items[symbol.ContainerIndex];
523
524 CollectionItem collectionItem = container as CollectionItem;
525 if (collectionItem != null)
526 {
527 - if (tuple.ItemIndex + 1 < collectionItem.Elements.Count)
527 + if (symbol.ItemIndex + 1 < collectionItem.Elements.Count)
528 {
529 - tuple.ItemIndex++;
529 + symbol.ItemIndex++;
530 return true;
531 }
532 }
533
534 ElementCollection elementCollection = container as ElementCollection;
535 - if (elementCollection != null && elementCollection.Count > 0 && tuple.ItemIndex == -1)
535 + if (elementCollection != null && elementCollection.Count > 0 && symbol.ItemIndex == -1)
536 {
537 - tuple.ItemIndex++;
537 + symbol.ItemIndex++;
538 this.PushCollection(elementCollection);
539 return true;
540 }
541
542 - tuple.ItemIndex = 0;
542 + symbol.ItemIndex = 0;
543
544 - for (int i = tuple.ContainerIndex + 1; i < tuple.Collection.items.Count; ++i)
544 + for (int i = symbol.ContainerIndex + 1; i < symbol.Collection.items.Count; ++i)
545 {
546 - object nestedContainer = tuple.Collection.items[i];
546 + object nestedContainer = symbol.Collection.items[i];
547
548 CollectionItem nestedCollectionItem = nestedContainer as CollectionItem;
549 if (nestedCollectionItem != null)
550 {
551 if (nestedCollectionItem.Elements.Count > 0)
552 {
553 - tuple.ContainerIndex = i;
553 + symbol.ContainerIndex = i;
554 return true;
555 }
556 }
@@ -558,7 +558,7 @@ namespace WixToolset.Data.Serialize
558 ElementCollection nestedElementCollection = nestedContainer as ElementCollection;
559 if (nestedElementCollection != null && nestedElementCollection.Count > 0)
560 {
561 - tuple.ContainerIndex = i;
561 + symbol.ContainerIndex = i;
562 this.PushCollection(nestedElementCollection);
563 return true;
564 }
@@ -571,23 +571,23 @@ namespace WixToolset.Data.Serialize
571 /// Class representing a single point in the collection. Consists of an ElementCollection,
572 /// a container index, and an index into the container.
573 /// </summary>
574 - private class CollectionTuple
574 + private class CollectionSymbol
575 {
576 private ElementCollection collection;
577 private int containerIndex;
578 private int itemIndex = -1;
579
580 /// <summary>
581 - /// Creates a new CollectionTuple.
581 + /// Creates a new CollectionSymbol.
582 /// </summary>
583 - /// <param name="collection">The collection for the tuple.</param>
584 - public CollectionTuple(ElementCollection collection)
583 + /// <param name="collection">The collection for the symbol.</param>
584 + public CollectionSymbol(ElementCollection collection)
585 {
586 this.collection = collection;
587 }
588
589 /// <summary>
590 - /// Gets the collection for the tuple.
590 + /// Gets the collection for the symbol.
591 /// </summary>
592 public ElementCollection Collection
593 {
src/WixToolset.Data/SimpleTupleDefinitionCreator.cs
+8 -8
@@ -4,11 +4,11 @@ namespace WixToolset.Data
4 {
5 using System.Collections.Generic;
6
7 - internal class SimpleTupleDefinitionCreator : ITupleDefinitionCreator
7 + internal class SimpleSymbolDefinitionCreator : ISymbolDefinitionCreator
8 {
9 - private Dictionary<string, IntermediateTupleDefinition> CustomDefinitionByName { get; } = new Dictionary<string, IntermediateTupleDefinition>();
9 + private Dictionary<string, IntermediateSymbolDefinition> CustomDefinitionByName { get; } = new Dictionary<string, IntermediateSymbolDefinition>();
10
11 - public void AddCustomTupleDefinition(IntermediateTupleDefinition definition)
11 + public void AddCustomSymbolDefinition(IntermediateSymbolDefinition definition)
12 {
13 if (!this.CustomDefinitionByName.TryGetValue(definition.Name, out var existing) || definition.Revision > existing.Revision)
14 {
@@ -16,16 +16,16 @@ namespace WixToolset.Data
16 }
17 }
18
19 - public bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
19 + public bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
20 {
21 - tupleDefinition = TupleDefinitions.ByName(name);
21 + symbolDefinition = SymbolDefinitions.ByName(name);
22
23 - if (tupleDefinition == null)
23 + if (symbolDefinition == null)
24 {
25 - tupleDefinition = this.CustomDefinitionByName.GetValueOrDefault(name);
25 + symbolDefinition = this.CustomDefinitionByName.GetValueOrDefault(name);
26 }
27
28 - return tupleDefinition != null;
28 + return symbolDefinition != null;
29 }
30 }
31 }
src/WixToolset.Data/TupleWithSection.cs
+27 -27
@@ -7,29 +7,29 @@ namespace WixToolset.Data
7 using System.Linq;
8
9 /// <summary>
10 - /// Tuple with section representing a single unique tuple.
10 + /// Symbol with section representing a single unique symbol.
11 /// </summary>
12 - public sealed class TupleWithSection
12 + public sealed class SymbolWithSection
13 {
14 - private HashSet<TupleWithSection> possibleConflicts;
15 - private HashSet<TupleWithSection> redundants;
14 + private HashSet<SymbolWithSection> possibleConflicts;
15 + private HashSet<SymbolWithSection> redundants;
16
17 /// <summary>
18 - /// Creates a symbol for a tuple.
18 + /// Creates a symbol for a symbol.
19 /// </summary>
20 - /// <param name="tuple">Tuple for the symbol</param>
21 - public TupleWithSection(IntermediateSection section, IntermediateTuple tuple)
20 + /// <param name="symbol">Symbol for the symbol</param>
21 + public SymbolWithSection(IntermediateSection section, IntermediateSymbol symbol)
22 {
23 - this.Tuple = tuple;
23 + this.Symbol = symbol;
24 this.Section = section;
25 - this.Name = String.Concat(this.Tuple.Definition.Name, ":", this.Tuple.Id.Id);
25 + this.Name = String.Concat(this.Symbol.Definition.Name, ":", this.Symbol.Id.Id);
26 }
27
28 /// <summary>
29 /// Gets the accessibility of the symbol which is a direct reflection of the accessibility of the row's accessibility.
30 /// </summary>
31 /// <value>Accessbility of the symbol.</value>
32 - public AccessModifier Access => this.Tuple.Id.Access;
32 + public AccessModifier Access => this.Symbol.Id.Access;
33
34 /// <summary>
35 /// Gets the name of the symbol.
@@ -38,10 +38,10 @@ namespace WixToolset.Data
38 public string Name { get; }
39
40 /// <summary>
41 - /// Gets the tuple for this symbol.
41 + /// Gets the symbol for this symbol.
42 /// </summary>
43 - /// <value>Tuple for this symbol.</value>
44 - public IntermediateTuple Tuple { get; }
43 + /// <value>Symbol for this symbol.</value>
44 + public IntermediateSymbol Symbol { get; }
45
46 /// <summary>
47 /// Gets the section for the symbol.
@@ -50,41 +50,41 @@ namespace WixToolset.Data
50 public IntermediateSection Section { get; }
51
52 /// <summary>
53 - /// Gets any duplicates of this tuple with sections that are possible conflicts.
53 + /// Gets any duplicates of this symbol with sections that are possible conflicts.
54 /// </summary>
55 - public IEnumerable<TupleWithSection> PossiblyConflicts => this.possibleConflicts ?? Enumerable.Empty<TupleWithSection>();
55 + public IEnumerable<SymbolWithSection> PossiblyConflicts => this.possibleConflicts ?? Enumerable.Empty<SymbolWithSection>();
56
57 /// <summary>
58 - /// Gets any duplicates of this tuple with sections that are redundant.
58 + /// Gets any duplicates of this symbol with sections that are redundant.
59 /// </summary>
60 - public IEnumerable<TupleWithSection> Redundants => this.redundants ?? Enumerable.Empty<TupleWithSection>();
60 + public IEnumerable<SymbolWithSection> Redundants => this.redundants ?? Enumerable.Empty<SymbolWithSection>();
61
62 /// <summary>
63 - /// Adds a duplicate tuple with sections that is a possible conflict.
63 + /// Adds a duplicate symbol with sections that is a possible conflict.
64 /// </summary>
65 - /// <param name="tupleWithSection">Tuple with section that is a possible conflict of this symbol.</param>
66 - public void AddPossibleConflict(TupleWithSection tupleWithSection)
65 + /// <param name="symbolWithSection">Symbol with section that is a possible conflict of this symbol.</param>
66 + public void AddPossibleConflict(SymbolWithSection symbolWithSection)
67 {
68 if (null == this.possibleConflicts)
69 {
70 - this.possibleConflicts = new HashSet<TupleWithSection>();
70 + this.possibleConflicts = new HashSet<SymbolWithSection>();
71 }
72
73 - this.possibleConflicts.Add(tupleWithSection);
73 + this.possibleConflicts.Add(symbolWithSection);
74 }
75
76 /// <summary>
77 - /// Adds a duplicate tuple that is redundant.
77 + /// Adds a duplicate symbol that is redundant.
78 /// </summary>
79 - /// <param name="tupleWithSection">Tuple with section that is redundant of this tuple.</param>
80 - public void AddRedundant(TupleWithSection tupleWithSection)
79 + /// <param name="symbolWithSection">Symbol with section that is redundant of this symbol.</param>
80 + public void AddRedundant(SymbolWithSection symbolWithSection)
81 {
82 if (null == this.redundants)
83 {
84 - this.redundants = new HashSet<TupleWithSection>();
84 + this.redundants = new HashSet<SymbolWithSection>();
85 }
86
87 - this.redundants.Add(tupleWithSection);
87 + this.redundants.Add(symbolWithSection);
88 }
89 }
90 }
src/WixToolset.Data/Tuples/ActionTextTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ActionText = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ActionText,
9 + public static readonly IntermediateSymbolDefinition ActionText = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ActionText,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ActionTextTupleFields.Action), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ActionTextTupleFields.Description), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ActionTextTupleFields.Template), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ActionTextSymbolFields.Action), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ActionTextSymbolFields.Description), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ActionTextSymbolFields.Template), IntermediateFieldType.String),
16 },
17 - typeof(ActionTextTuple));
17 + typeof(ActionTextSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum ActionTextTupleFields
23 + public enum ActionTextSymbolFields
24 {
25 Action,
26 Description,
27 Template,
28 }
29
30 - public class ActionTextTuple : IntermediateTuple
30 + public class ActionTextSymbol : IntermediateSymbol
31 {
32 - public ActionTextTuple() : base(TupleDefinitions.ActionText, null, null)
32 + public ActionTextSymbol() : base(SymbolDefinitions.ActionText, null, null)
33 {
34 }
35
36 - public ActionTextTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ActionText, sourceLineNumber, id)
36 + public ActionTextSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ActionText, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[ActionTextTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[ActionTextSymbolFields index] => this.Fields[(int)index];
41
42 public string Action
43 {
44 - get => (string)this.Fields[(int)ActionTextTupleFields.Action];
45 - set => this.Set((int)ActionTextTupleFields.Action, value);
44 + get => (string)this.Fields[(int)ActionTextSymbolFields.Action];
45 + set => this.Set((int)ActionTextSymbolFields.Action, value);
46 }
47
48 public string Description
49 {
50 - get => (string)this.Fields[(int)ActionTextTupleFields.Description];
51 - set => this.Set((int)ActionTextTupleFields.Description, value);
50 + get => (string)this.Fields[(int)ActionTextSymbolFields.Description];
51 + set => this.Set((int)ActionTextSymbolFields.Description, value);
52 }
53
54 public string Template
55 {
56 - get => (string)this.Fields[(int)ActionTextTupleFields.Template];
57 - set => this.Set((int)ActionTextTupleFields.Template, value);
56 + get => (string)this.Fields[(int)ActionTextSymbolFields.Template];
57 + set => this.Set((int)ActionTextSymbolFields.Template, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/AppIdTuple.cs
+32 -32
@@ -2,29 +2,29 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition AppId = new IntermediateTupleDefinition(
10 - TupleDefinitionType.AppId,
9 + public static readonly IntermediateSymbolDefinition AppId = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.AppId,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(AppIdTupleFields.AppId), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(AppIdTupleFields.RemoteServerName), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(AppIdTupleFields.LocalService), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(AppIdTupleFields.ServiceParameters), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(AppIdTupleFields.DllSurrogate), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(AppIdTupleFields.ActivateAtStorage), IntermediateFieldType.Number),
19 - new IntermediateFieldDefinition(nameof(AppIdTupleFields.RunAsInteractiveUser), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(AppIdSymbolFields.AppId), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(AppIdSymbolFields.RemoteServerName), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(AppIdSymbolFields.LocalService), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(AppIdSymbolFields.ServiceParameters), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(AppIdSymbolFields.DllSurrogate), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(AppIdSymbolFields.ActivateAtStorage), IntermediateFieldType.Number),
19 + new IntermediateFieldDefinition(nameof(AppIdSymbolFields.RunAsInteractiveUser), IntermediateFieldType.Number),
20 },
21 - typeof(AppIdTuple));
21 + typeof(AppIdSymbol));
22 }
23 }
24
25 -namespace WixToolset.Data.Tuples
25 +namespace WixToolset.Data.Symbols
26 {
27 - public enum AppIdTupleFields
27 + public enum AppIdSymbolFields
28 {
29 AppId,
30 RemoteServerName,
@@ -35,58 +35,58 @@ namespace WixToolset.Data.Tuples
35 RunAsInteractiveUser,
36 }
37
38 - public class AppIdTuple : IntermediateTuple
38 + public class AppIdSymbol : IntermediateSymbol
39 {
40 - public AppIdTuple() : base(TupleDefinitions.AppId, null, null)
40 + public AppIdSymbol() : base(SymbolDefinitions.AppId, null, null)
41 {
42 }
43
44 - public AppIdTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.AppId, sourceLineNumber, id)
44 + public AppIdSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.AppId, sourceLineNumber, id)
45 {
46 }
47
48 - public IntermediateField this[AppIdTupleFields index] => this.Fields[(int)index];
48 + public IntermediateField this[AppIdSymbolFields index] => this.Fields[(int)index];
49
50 public string AppId
51 {
52 - get => (string)this.Fields[(int)AppIdTupleFields.AppId];
53 - set => this.Set((int)AppIdTupleFields.AppId, value);
52 + get => (string)this.Fields[(int)AppIdSymbolFields.AppId];
53 + set => this.Set((int)AppIdSymbolFields.AppId, value);
54 }
55
56 public string RemoteServerName
57 {
58 - get => (string)this.Fields[(int)AppIdTupleFields.RemoteServerName];
59 - set => this.Set((int)AppIdTupleFields.RemoteServerName, value);
58 + get => (string)this.Fields[(int)AppIdSymbolFields.RemoteServerName];
59 + set => this.Set((int)AppIdSymbolFields.RemoteServerName, value);
60 }
61
62 public string LocalService
63 {
64 - get => (string)this.Fields[(int)AppIdTupleFields.LocalService];
65 - set => this.Set((int)AppIdTupleFields.LocalService, value);
64 + get => (string)this.Fields[(int)AppIdSymbolFields.LocalService];
65 + set => this.Set((int)AppIdSymbolFields.LocalService, value);
66 }
67
68 public string ServiceParameters
69 {
70 - get => (string)this.Fields[(int)AppIdTupleFields.ServiceParameters];
71 - set => this.Set((int)AppIdTupleFields.ServiceParameters, value);
70 + get => (string)this.Fields[(int)AppIdSymbolFields.ServiceParameters];
71 + set => this.Set((int)AppIdSymbolFields.ServiceParameters, value);
72 }
73
74 public string DllSurrogate
75 {
76 - get => (string)this.Fields[(int)AppIdTupleFields.DllSurrogate];
77 - set => this.Set((int)AppIdTupleFields.DllSurrogate, value);
76 + get => (string)this.Fields[(int)AppIdSymbolFields.DllSurrogate];
77 + set => this.Set((int)AppIdSymbolFields.DllSurrogate, value);
78 }
79
80 public bool? ActivateAtStorage
81 {
82 - get => (bool?)this.Fields[(int)AppIdTupleFields.ActivateAtStorage];
83 - set => this.Set((int)AppIdTupleFields.ActivateAtStorage, value);
82 + get => (bool?)this.Fields[(int)AppIdSymbolFields.ActivateAtStorage];
83 + set => this.Set((int)AppIdSymbolFields.ActivateAtStorage, value);
84 }
85
86 public bool? RunAsInteractiveUser
87 {
88 - get => (bool?)this.Fields[(int)AppIdTupleFields.RunAsInteractiveUser];
89 - set => this.Set((int)AppIdTupleFields.RunAsInteractiveUser, value);
88 + get => (bool?)this.Fields[(int)AppIdSymbolFields.RunAsInteractiveUser];
89 + set => this.Set((int)AppIdSymbolFields.RunAsInteractiveUser, value);
90 }
91 }
92 }
\ No newline at end of file
src/WixToolset.Data/Tuples/AppSearchTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition AppSearch = new IntermediateTupleDefinition(
10 - TupleDefinitionType.AppSearch,
9 + public static readonly IntermediateSymbolDefinition AppSearch = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.AppSearch,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(AppSearchTupleFields.PropertyRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(AppSearchTupleFields.SignatureRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(AppSearchSymbolFields.PropertyRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(AppSearchSymbolFields.SignatureRef), IntermediateFieldType.String),
15 },
16 - typeof(AppSearchTuple));
16 + typeof(AppSearchSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum AppSearchTupleFields
22 + public enum AppSearchSymbolFields
23 {
24 PropertyRef,
25 SignatureRef,
26 }
27
28 - public class AppSearchTuple : IntermediateTuple
28 + public class AppSearchSymbol : IntermediateSymbol
29 {
30 - public AppSearchTuple() : base(TupleDefinitions.AppSearch, null, null)
30 + public AppSearchSymbol() : base(SymbolDefinitions.AppSearch, null, null)
31 {
32 }
33
34 - public AppSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.AppSearch, sourceLineNumber, id)
34 + public AppSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.AppSearch, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[AppSearchTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[AppSearchSymbolFields index] => this.Fields[(int)index];
39
40 public string PropertyRef
41 {
42 - get => (string)this.Fields[(int)AppSearchTupleFields.PropertyRef];
43 - set => this.Set((int)AppSearchTupleFields.PropertyRef, value);
42 + get => (string)this.Fields[(int)AppSearchSymbolFields.PropertyRef];
43 + set => this.Set((int)AppSearchSymbolFields.PropertyRef, value);
44 }
45
46 public string SignatureRef
47 {
48 - get => (string)this.Fields[(int)AppSearchTupleFields.SignatureRef];
49 - set => this.Set((int)AppSearchTupleFields.SignatureRef, value);
48 + get => (string)this.Fields[(int)AppSearchSymbolFields.SignatureRef];
49 + set => this.Set((int)AppSearchSymbolFields.SignatureRef, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/AssemblyTuple.cs
+29 -29
@@ -2,28 +2,28 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Assembly = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Assembly,
9 + public static readonly IntermediateSymbolDefinition Assembly = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Assembly,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(AssemblyTupleFields.ComponentRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(AssemblyTupleFields.FeatureRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(AssemblyTupleFields.ManifestFileRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(AssemblyTupleFields.ApplicationFileRef), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(AssemblyTupleFields.Type), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(AssemblyTupleFields.ProcessorArchitecture), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(AssemblySymbolFields.ComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(AssemblySymbolFields.FeatureRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(AssemblySymbolFields.ManifestFileRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(AssemblySymbolFields.ApplicationFileRef), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(AssemblySymbolFields.Type), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(AssemblySymbolFields.ProcessorArchitecture), IntermediateFieldType.String),
19 },
20 - typeof(AssemblyTuple));
20 + typeof(AssemblySymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 - public enum AssemblyTupleFields
26 + public enum AssemblySymbolFields
27 {
28 ComponentRef,
29 FeatureRef,
@@ -45,52 +45,52 @@ namespace WixToolset.Data.Tuples
45 Win32Assembly,
46 }
47
48 - public class AssemblyTuple : IntermediateTuple
48 + public class AssemblySymbol : IntermediateSymbol
49 {
50 - public AssemblyTuple() : base(TupleDefinitions.Assembly, null, null)
50 + public AssemblySymbol() : base(SymbolDefinitions.Assembly, null, null)
51 {
52 }
53
54 - public AssemblyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Assembly, sourceLineNumber, id)
54 + public AssemblySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Assembly, sourceLineNumber, id)
55 {
56 }
57
58 - public IntermediateField this[AssemblyTupleFields index] => this.Fields[(int)index];
58 + public IntermediateField this[AssemblySymbolFields index] => this.Fields[(int)index];
59
60 public string ComponentRef
61 {
62 - get => (string)this.Fields[(int)AssemblyTupleFields.ComponentRef];
63 - set => this.Set((int)AssemblyTupleFields.ComponentRef, value);
62 + get => (string)this.Fields[(int)AssemblySymbolFields.ComponentRef];
63 + set => this.Set((int)AssemblySymbolFields.ComponentRef, value);
64 }
65
66 public string FeatureRef
67 {
68 - get => (string)this.Fields[(int)AssemblyTupleFields.FeatureRef];
69 - set => this.Set((int)AssemblyTupleFields.FeatureRef, value);
68 + get => (string)this.Fields[(int)AssemblySymbolFields.FeatureRef];
69 + set => this.Set((int)AssemblySymbolFields.FeatureRef, value);
70 }
71
72 public string ManifestFileRef
73 {
74 - get => (string)this.Fields[(int)AssemblyTupleFields.ManifestFileRef];
75 - set => this.Set((int)AssemblyTupleFields.ManifestFileRef, value);
74 + get => (string)this.Fields[(int)AssemblySymbolFields.ManifestFileRef];
75 + set => this.Set((int)AssemblySymbolFields.ManifestFileRef, value);
76 }
77
78 public string ApplicationFileRef
79 {
80 - get => (string)this.Fields[(int)AssemblyTupleFields.ApplicationFileRef];
81 - set => this.Set((int)AssemblyTupleFields.ApplicationFileRef, value);
80 + get => (string)this.Fields[(int)AssemblySymbolFields.ApplicationFileRef];
81 + set => this.Set((int)AssemblySymbolFields.ApplicationFileRef, value);
82 }
83
84 public AssemblyType Type
85 {
86 - get => (AssemblyType)this.Fields[(int)AssemblyTupleFields.Type].AsNumber();
87 - set => this.Set((int)AssemblyTupleFields.Type, (int)value);
86 + get => (AssemblyType)this.Fields[(int)AssemblySymbolFields.Type].AsNumber();
87 + set => this.Set((int)AssemblySymbolFields.Type, (int)value);
88 }
89
90 public string ProcessorArchitecture
91 {
92 - get => (string)this.Fields[(int)AssemblyTupleFields.ProcessorArchitecture];
93 - set => this.Set((int)AssemblyTupleFields.ProcessorArchitecture, value);
92 + get => (string)this.Fields[(int)AssemblySymbolFields.ProcessorArchitecture];
93 + set => this.Set((int)AssemblySymbolFields.ProcessorArchitecture, value);
94 }
95 }
96 }
src/WixToolset.Data/Tuples/BBControlTuple.cs
+65 -65
@@ -2,40 +2,40 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition BBControl = new IntermediateTupleDefinition(
10 - TupleDefinitionType.BBControl,
9 + public static readonly IntermediateSymbolDefinition BBControl = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.BBControl,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.BillboardRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.BBControl), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.Type), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.X), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.Y), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.Width), IntermediateFieldType.Number),
19 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.Height), IntermediateFieldType.Number),
20 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.Attributes), IntermediateFieldType.Number),
21 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.Enabled), IntermediateFieldType.Bool),
22 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.Indirect), IntermediateFieldType.Bool),
23 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.Integer), IntermediateFieldType.Bool),
24 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.LeftScroll), IntermediateFieldType.Bool),
25 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.RightAligned), IntermediateFieldType.Bool),
26 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.RightToLeft), IntermediateFieldType.Bool),
27 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.Sunken), IntermediateFieldType.Bool),
28 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.Visible), IntermediateFieldType.Bool),
29 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.Text), IntermediateFieldType.String),
30 - new IntermediateFieldDefinition(nameof(BBControlTupleFields.SourceFile), IntermediateFieldType.Path),
13 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.BillboardRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.BBControl), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Type), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.X), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Y), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Width), IntermediateFieldType.Number),
19 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Height), IntermediateFieldType.Number),
20 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Attributes), IntermediateFieldType.Number),
21 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Enabled), IntermediateFieldType.Bool),
22 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Indirect), IntermediateFieldType.Bool),
23 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Integer), IntermediateFieldType.Bool),
24 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.LeftScroll), IntermediateFieldType.Bool),
25 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.RightAligned), IntermediateFieldType.Bool),
26 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.RightToLeft), IntermediateFieldType.Bool),
27 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Sunken), IntermediateFieldType.Bool),
28 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Visible), IntermediateFieldType.Bool),
29 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Text), IntermediateFieldType.String),
30 + new IntermediateFieldDefinition(nameof(BBControlSymbolFields.SourceFile), IntermediateFieldType.Path),
31 },
32 - typeof(BBControlTuple));
32 + typeof(BBControlSymbol));
33 }
34 }
35
36 -namespace WixToolset.Data.Tuples
36 +namespace WixToolset.Data.Symbols
37 {
38 - public enum BBControlTupleFields
38 + public enum BBControlSymbolFields
39 {
40 BillboardRef,
41 BBControl,
@@ -57,124 +57,124 @@ namespace WixToolset.Data.Tuples
57 SourceFile
58 }
59
60 - public class BBControlTuple : IntermediateTuple
60 + public class BBControlSymbol : IntermediateSymbol
61 {
62 - public BBControlTuple() : base(TupleDefinitions.BBControl, null, null)
62 + public BBControlSymbol() : base(SymbolDefinitions.BBControl, null, null)
63 {
64 }
65
66 - public BBControlTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.BBControl, sourceLineNumber, id)
66 + public BBControlSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.BBControl, sourceLineNumber, id)
67 {
68 }
69
70 - public IntermediateField this[BBControlTupleFields index] => this.Fields[(int)index];
70 + public IntermediateField this[BBControlSymbolFields index] => this.Fields[(int)index];
71
72 public string BillboardRef
73 {
74 - get => (string)this.Fields[(int)BBControlTupleFields.BillboardRef];
75 - set => this.Set((int)BBControlTupleFields.BillboardRef, value);
74 + get => (string)this.Fields[(int)BBControlSymbolFields.BillboardRef];
75 + set => this.Set((int)BBControlSymbolFields.BillboardRef, value);
76 }
77
78 public string BBControl
79 {
80 - get => (string)this.Fields[(int)BBControlTupleFields.BBControl];
81 - set => this.Set((int)BBControlTupleFields.BBControl, value);
80 + get => (string)this.Fields[(int)BBControlSymbolFields.BBControl];
81 + set => this.Set((int)BBControlSymbolFields.BBControl, value);
82 }
83
84 public string Type
85 {
86 - get => (string)this.Fields[(int)BBControlTupleFields.Type];
87 - set => this.Set((int)BBControlTupleFields.Type, value);
86 + get => (string)this.Fields[(int)BBControlSymbolFields.Type];
87 + set => this.Set((int)BBControlSymbolFields.Type, value);
88 }
89
90 public int X
91 {
92 - get => (int)this.Fields[(int)BBControlTupleFields.X];
93 - set => this.Set((int)BBControlTupleFields.X, value);
92 + get => (int)this.Fields[(int)BBControlSymbolFields.X];
93 + set => this.Set((int)BBControlSymbolFields.X, value);
94 }
95
96 public int Y
97 {
98 - get => (int)this.Fields[(int)BBControlTupleFields.Y];
99 - set => this.Set((int)BBControlTupleFields.Y, value);
98 + get => (int)this.Fields[(int)BBControlSymbolFields.Y];
99 + set => this.Set((int)BBControlSymbolFields.Y, value);
100 }
101
102 public int Width
103 {
104 - get => (int)this.Fields[(int)BBControlTupleFields.Width].AsNumber();
105 - set => this.Set((int)BBControlTupleFields.Width, value);
104 + get => (int)this.Fields[(int)BBControlSymbolFields.Width].AsNumber();
105 + set => this.Set((int)BBControlSymbolFields.Width, value);
106 }
107
108 public int Height
109 {
110 - get => (int)this.Fields[(int)BBControlTupleFields.Height];
111 - set => this.Set((int)BBControlTupleFields.Height, value);
110 + get => (int)this.Fields[(int)BBControlSymbolFields.Height];
111 + set => this.Set((int)BBControlSymbolFields.Height, value);
112 }
113
114 public int Attributes
115 {
116 - get => this.Fields[(int)BBControlTupleFields.Attributes].AsNumber();
117 - set => this.Set((int)BBControlTupleFields.Attributes, value);
116 + get => this.Fields[(int)BBControlSymbolFields.Attributes].AsNumber();
117 + set => this.Set((int)BBControlSymbolFields.Attributes, value);
118 }
119
120 public bool Enabled
121 {
122 - get => this.Fields[(int)BBControlTupleFields.Enabled].AsBool();
123 - set => this.Set((int)BBControlTupleFields.Enabled, value);
122 + get => this.Fields[(int)BBControlSymbolFields.Enabled].AsBool();
123 + set => this.Set((int)BBControlSymbolFields.Enabled, value);
124 }
125
126 public bool Indirect
127 {
128 - get => this.Fields[(int)BBControlTupleFields.Indirect].AsBool();
129 - set => this.Set((int)BBControlTupleFields.Indirect, value);
128 + get => this.Fields[(int)BBControlSymbolFields.Indirect].AsBool();
129 + set => this.Set((int)BBControlSymbolFields.Indirect, value);
130 }
131
132 public bool Integer
133 {
134 - get => this.Fields[(int)BBControlTupleFields.Integer].AsBool();
135 - set => this.Set((int)BBControlTupleFields.Integer, value);
134 + get => this.Fields[(int)BBControlSymbolFields.Integer].AsBool();
135 + set => this.Set((int)BBControlSymbolFields.Integer, value);
136 }
137
138 public bool LeftScroll
139 {
140 - get => this.Fields[(int)BBControlTupleFields.LeftScroll].AsBool();
141 - set => this.Set((int)BBControlTupleFields.LeftScroll, value);
140 + get => this.Fields[(int)BBControlSymbolFields.LeftScroll].AsBool();
141 + set => this.Set((int)BBControlSymbolFields.LeftScroll, value);
142 }
143
144 public bool RightAligned
145 {
146 - get => this.Fields[(int)BBControlTupleFields.RightAligned].AsBool();
147 - set => this.Set((int)BBControlTupleFields.RightAligned, value);
146 + get => this.Fields[(int)BBControlSymbolFields.RightAligned].AsBool();
147 + set => this.Set((int)BBControlSymbolFields.RightAligned, value);
148 }
149
150 public bool RightToLeft
151 {
152 - get => this.Fields[(int)BBControlTupleFields.RightToLeft].AsBool();
153 - set => this.Set((int)BBControlTupleFields.RightToLeft, value);
152 + get => this.Fields[(int)BBControlSymbolFields.RightToLeft].AsBool();
153 + set => this.Set((int)BBControlSymbolFields.RightToLeft, value);
154 }
155
156 public bool Sunken
157 {
158 - get => this.Fields[(int)BBControlTupleFields.Sunken].AsBool();
159 - set => this.Set((int)BBControlTupleFields.Sunken, value);
158 + get => this.Fields[(int)BBControlSymbolFields.Sunken].AsBool();
159 + set => this.Set((int)BBControlSymbolFields.Sunken, value);
160 }
161
162 public bool Visible
163 {
164 - get => this.Fields[(int)BBControlTupleFields.Visible].AsBool();
165 - set => this.Set((int)BBControlTupleFields.Visible, value);
164 + get => this.Fields[(int)BBControlSymbolFields.Visible].AsBool();
165 + set => this.Set((int)BBControlSymbolFields.Visible, value);
166 }
167
168 public string Text
169 {
170 - get => (string)this.Fields[(int)BBControlTupleFields.Text];
171 - set => this.Set((int)BBControlTupleFields.Text, value);
170 + get => (string)this.Fields[(int)BBControlSymbolFields.Text];
171 + set => this.Set((int)BBControlSymbolFields.Text, value);
172 }
173
174 public IntermediateFieldPathValue SourceFile
175 {
176 - get => this.Fields[(int)BBControlTupleFields.SourceFile].AsPath();
177 - set => this.Set((int)BBControlTupleFields.SourceFile, value);
176 + get => this.Fields[(int)BBControlSymbolFields.SourceFile].AsPath();
177 + set => this.Set((int)BBControlSymbolFields.SourceFile, value);
178 }
179 }
180 }
\ No newline at end of file
src/WixToolset.Data/Tuples/BillboardTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Billboard = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Billboard,
9 + public static readonly IntermediateSymbolDefinition Billboard = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Billboard,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(BillboardTupleFields.FeatureRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(BillboardTupleFields.Action), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(BillboardTupleFields.Ordering), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(BillboardSymbolFields.FeatureRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(BillboardSymbolFields.Action), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(BillboardSymbolFields.Ordering), IntermediateFieldType.Number),
16 },
17 - typeof(BillboardTuple));
17 + typeof(BillboardSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum BillboardTupleFields
23 + public enum BillboardSymbolFields
24 {
25 FeatureRef,
26 Action,
27 Ordering,
28 }
29
30 - public class BillboardTuple : IntermediateTuple
30 + public class BillboardSymbol : IntermediateSymbol
31 {
32 - public BillboardTuple() : base(TupleDefinitions.Billboard, null, null)
32 + public BillboardSymbol() : base(SymbolDefinitions.Billboard, null, null)
33 {
34 }
35
36 - public BillboardTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Billboard, sourceLineNumber, id)
36 + public BillboardSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Billboard, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[BillboardTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[BillboardSymbolFields index] => this.Fields[(int)index];
41
42 public string FeatureRef
43 {
44 - get => (string)this.Fields[(int)BillboardTupleFields.FeatureRef];
45 - set => this.Set((int)BillboardTupleFields.FeatureRef, value);
44 + get => (string)this.Fields[(int)BillboardSymbolFields.FeatureRef];
45 + set => this.Set((int)BillboardSymbolFields.FeatureRef, value);
46 }
47
48 public string Action
49 {
50 - get => (string)this.Fields[(int)BillboardTupleFields.Action];
51 - set => this.Set((int)BillboardTupleFields.Action, value);
50 + get => (string)this.Fields[(int)BillboardSymbolFields.Action];
51 + set => this.Set((int)BillboardSymbolFields.Action, value);
52 }
53
54 public int? Ordering
55 {
56 - get => (int?)this.Fields[(int)BillboardTupleFields.Ordering];
57 - set => this.Set((int)BillboardTupleFields.Ordering, value);
56 + get => (int?)this.Fields[(int)BillboardSymbolFields.Ordering];
57 + set => this.Set((int)BillboardSymbolFields.Ordering, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/BinaryTuple.cs
+14 -14
@@ -2,43 +2,43 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Binary = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Binary,
9 + public static readonly IntermediateSymbolDefinition Binary = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Binary,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(BinaryTupleFields.Data), IntermediateFieldType.Path),
13 + new IntermediateFieldDefinition(nameof(BinarySymbolFields.Data), IntermediateFieldType.Path),
14 },
15 - typeof(BinaryTuple));
15 + typeof(BinarySymbol));
16 }
17 }
18
19 -namespace WixToolset.Data.Tuples
19 +namespace WixToolset.Data.Symbols
20 {
21 - public enum BinaryTupleFields
21 + public enum BinarySymbolFields
22 {
23 Data,
24 }
25
26 - public class BinaryTuple : IntermediateTuple
26 + public class BinarySymbol : IntermediateSymbol
27 {
28 - public BinaryTuple() : base(TupleDefinitions.Binary, null, null)
28 + public BinarySymbol() : base(SymbolDefinitions.Binary, null, null)
29 {
30 }
31
32 - public BinaryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Binary, sourceLineNumber, id)
32 + public BinarySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Binary, sourceLineNumber, id)
33 {
34 }
35
36 - public IntermediateField this[BinaryTupleFields index] => this.Fields[(int)index];
36 + public IntermediateField this[BinarySymbolFields index] => this.Fields[(int)index];
37
38 public IntermediateFieldPathValue Data
39 {
40 - get => this.Fields[(int)BinaryTupleFields.Data].AsPath();
41 - set => this.Set((int)BinaryTupleFields.Data, value);
40 + get => this.Fields[(int)BinarySymbolFields.Data].AsPath();
41 + set => this.Set((int)BinarySymbolFields.Data, value);
42 }
43 }
44 }
\ No newline at end of file
src/WixToolset.Data/Tuples/CCPSearchTuple.cs
+11 -11
@@ -2,35 +2,35 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition CCPSearch = new IntermediateTupleDefinition(
10 - TupleDefinitionType.CCPSearch,
9 + public static readonly IntermediateSymbolDefinition CCPSearch = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.CCPSearch,
11 new IntermediateFieldDefinition[]
12 {
13 },
14 - typeof(CCPSearchTuple));
14 + typeof(CCPSearchSymbol));
15 }
16 }
17
18 -namespace WixToolset.Data.Tuples
18 +namespace WixToolset.Data.Symbols
19 {
20 - public enum CCPSearchTupleFields
20 + public enum CCPSearchSymbolFields
21 {
22 }
23
24 - public class CCPSearchTuple : IntermediateTuple
24 + public class CCPSearchSymbol : IntermediateSymbol
25 {
26 - public CCPSearchTuple() : base(TupleDefinitions.CCPSearch, null, null)
26 + public CCPSearchSymbol() : base(SymbolDefinitions.CCPSearch, null, null)
27 {
28 }
29
30 - public CCPSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.CCPSearch, sourceLineNumber, id)
30 + public CCPSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.CCPSearch, sourceLineNumber, id)
31 {
32 }
33
34 - public IntermediateField this[CCPSearchTupleFields index] => this.Fields[(int)index];
34 + public IntermediateField this[CCPSearchSymbolFields index] => this.Fields[(int)index];
35 }
36 }
\ No newline at end of file
src/WixToolset.Data/Tuples/CheckBoxTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition CheckBox = new IntermediateTupleDefinition(
10 - TupleDefinitionType.CheckBox,
9 + public static readonly IntermediateSymbolDefinition CheckBox = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.CheckBox,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(CheckBoxTupleFields.Property), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(CheckBoxTupleFields.Value), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(CheckBoxSymbolFields.Property), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(CheckBoxSymbolFields.Value), IntermediateFieldType.String),
15 },
16 - typeof(CheckBoxTuple));
16 + typeof(CheckBoxSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum CheckBoxTupleFields
22 + public enum CheckBoxSymbolFields
23 {
24 Property,
25 Value,
26 }
27
28 - public class CheckBoxTuple : IntermediateTuple
28 + public class CheckBoxSymbol : IntermediateSymbol
29 {
30 - public CheckBoxTuple() : base(TupleDefinitions.CheckBox, null, null)
30 + public CheckBoxSymbol() : base(SymbolDefinitions.CheckBox, null, null)
31 {
32 }
33
34 - public CheckBoxTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.CheckBox, sourceLineNumber, id)
34 + public CheckBoxSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.CheckBox, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[CheckBoxTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[CheckBoxSymbolFields index] => this.Fields[(int)index];
39
40 public string Property
41 {
42 - get => (string)this.Fields[(int)CheckBoxTupleFields.Property];
43 - set => this.Set((int)CheckBoxTupleFields.Property, value);
42 + get => (string)this.Fields[(int)CheckBoxSymbolFields.Property];
43 + set => this.Set((int)CheckBoxSymbolFields.Property, value);
44 }
45
46 public string Value
47 {
48 - get => (string)this.Fields[(int)CheckBoxTupleFields.Value];
49 - set => this.Set((int)CheckBoxTupleFields.Value, value);
48 + get => (string)this.Fields[(int)CheckBoxSymbolFields.Value];
49 + set => this.Set((int)CheckBoxSymbolFields.Value, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ClassTuple.cs
+50 -50
@@ -2,35 +2,35 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Class = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Class,
9 + public static readonly IntermediateSymbolDefinition Class = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Class,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ClassTupleFields.CLSID), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ClassTupleFields.Context), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ClassTupleFields.ComponentRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ClassTupleFields.DefaultProgIdRef), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(ClassTupleFields.Description), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(ClassTupleFields.AppIdRef), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(ClassTupleFields.FileTypeMask), IntermediateFieldType.String),
20 - new IntermediateFieldDefinition(nameof(ClassTupleFields.IconRef), IntermediateFieldType.String),
21 - new IntermediateFieldDefinition(nameof(ClassTupleFields.IconIndex), IntermediateFieldType.Number),
22 - new IntermediateFieldDefinition(nameof(ClassTupleFields.DefInprocHandler), IntermediateFieldType.String),
23 - new IntermediateFieldDefinition(nameof(ClassTupleFields.Argument), IntermediateFieldType.String),
24 - new IntermediateFieldDefinition(nameof(ClassTupleFields.FeatureRef), IntermediateFieldType.String),
25 - new IntermediateFieldDefinition(nameof(ClassTupleFields.RelativePath), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(ClassSymbolFields.CLSID), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ClassSymbolFields.Context), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ClassSymbolFields.ComponentRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ClassSymbolFields.DefaultProgIdRef), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(ClassSymbolFields.Description), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(ClassSymbolFields.AppIdRef), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(ClassSymbolFields.FileTypeMask), IntermediateFieldType.String),
20 + new IntermediateFieldDefinition(nameof(ClassSymbolFields.IconRef), IntermediateFieldType.String),
21 + new IntermediateFieldDefinition(nameof(ClassSymbolFields.IconIndex), IntermediateFieldType.Number),
22 + new IntermediateFieldDefinition(nameof(ClassSymbolFields.DefInprocHandler), IntermediateFieldType.String),
23 + new IntermediateFieldDefinition(nameof(ClassSymbolFields.Argument), IntermediateFieldType.String),
24 + new IntermediateFieldDefinition(nameof(ClassSymbolFields.FeatureRef), IntermediateFieldType.String),
25 + new IntermediateFieldDefinition(nameof(ClassSymbolFields.RelativePath), IntermediateFieldType.Bool),
26 },
27 - typeof(ClassTuple));
27 + typeof(ClassSymbol));
28 }
29 }
30
31 -namespace WixToolset.Data.Tuples
31 +namespace WixToolset.Data.Symbols
32 {
33 - public enum ClassTupleFields
33 + public enum ClassSymbolFields
34 {
35 CLSID,
36 Context,
@@ -47,94 +47,94 @@ namespace WixToolset.Data.Tuples
47 RelativePath,
48 }
49
50 - public class ClassTuple : IntermediateTuple
50 + public class ClassSymbol : IntermediateSymbol
51 {
52 - public ClassTuple() : base(TupleDefinitions.Class, null, null)
52 + public ClassSymbol() : base(SymbolDefinitions.Class, null, null)
53 {
54 }
55
56 - public ClassTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Class, sourceLineNumber, id)
56 + public ClassSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Class, sourceLineNumber, id)
57 {
58 }
59
60 - public IntermediateField this[ClassTupleFields index] => this.Fields[(int)index];
60 + public IntermediateField this[ClassSymbolFields index] => this.Fields[(int)index];
61
62 public string CLSID
63 {
64 - get => (string)this.Fields[(int)ClassTupleFields.CLSID];
65 - set => this.Set((int)ClassTupleFields.CLSID, value);
64 + get => (string)this.Fields[(int)ClassSymbolFields.CLSID];
65 + set => this.Set((int)ClassSymbolFields.CLSID, value);
66 }
67
68 public string Context
69 {
70 - get => (string)this.Fields[(int)ClassTupleFields.Context];
71 - set => this.Set((int)ClassTupleFields.Context, value);
70 + get => (string)this.Fields[(int)ClassSymbolFields.Context];
71 + set => this.Set((int)ClassSymbolFields.Context, value);
72 }
73
74 public string ComponentRef
75 {
76 - get => (string)this.Fields[(int)ClassTupleFields.ComponentRef];
77 - set => this.Set((int)ClassTupleFields.ComponentRef, value);
76 + get => (string)this.Fields[(int)ClassSymbolFields.ComponentRef];
77 + set => this.Set((int)ClassSymbolFields.ComponentRef, value);
78 }
79
80 public string DefaultProgIdRef
81 {
82 - get => (string)this.Fields[(int)ClassTupleFields.DefaultProgIdRef];
83 - set => this.Set((int)ClassTupleFields.DefaultProgIdRef, value);
82 + get => (string)this.Fields[(int)ClassSymbolFields.DefaultProgIdRef];
83 + set => this.Set((int)ClassSymbolFields.DefaultProgIdRef, value);
84 }
85
86 public string Description
87 {
88 - get => (string)this.Fields[(int)ClassTupleFields.Description];
89 - set => this.Set((int)ClassTupleFields.Description, value);
88 + get => (string)this.Fields[(int)ClassSymbolFields.Description];
89 + set => this.Set((int)ClassSymbolFields.Description, value);
90 }
91
92 public string AppIdRef
93 {
94 - get => (string)this.Fields[(int)ClassTupleFields.AppIdRef];
95 - set => this.Set((int)ClassTupleFields.AppIdRef, value);
94 + get => (string)this.Fields[(int)ClassSymbolFields.AppIdRef];
95 + set => this.Set((int)ClassSymbolFields.AppIdRef, value);
96 }
97
98 public string FileTypeMask
99 {
100 - get => (string)this.Fields[(int)ClassTupleFields.FileTypeMask];
101 - set => this.Set((int)ClassTupleFields.FileTypeMask, value);
100 + get => (string)this.Fields[(int)ClassSymbolFields.FileTypeMask];
101 + set => this.Set((int)ClassSymbolFields.FileTypeMask, value);
102 }
103
104 public string IconRef
105 {
106 - get => (string)this.Fields[(int)ClassTupleFields.IconRef];
107 - set => this.Set((int)ClassTupleFields.IconRef, value);
106 + get => (string)this.Fields[(int)ClassSymbolFields.IconRef];
107 + set => this.Set((int)ClassSymbolFields.IconRef, value);
108 }
109
110 public int? IconIndex
111 {
112 - get => (int?)this.Fields[(int)ClassTupleFields.IconIndex];
113 - set => this.Set((int)ClassTupleFields.IconIndex, value);
112 + get => (int?)this.Fields[(int)ClassSymbolFields.IconIndex];
113 + set => this.Set((int)ClassSymbolFields.IconIndex, value);
114 }
115
116 public string DefInprocHandler
117 {
118 - get => (string)this.Fields[(int)ClassTupleFields.DefInprocHandler];
119 - set => this.Set((int)ClassTupleFields.DefInprocHandler, value);
118 + get => (string)this.Fields[(int)ClassSymbolFields.DefInprocHandler];
119 + set => this.Set((int)ClassSymbolFields.DefInprocHandler, value);
120 }
121
122 public string Argument
123 {
124 - get => (string)this.Fields[(int)ClassTupleFields.Argument];
125 - set => this.Set((int)ClassTupleFields.Argument, value);
124 + get => (string)this.Fields[(int)ClassSymbolFields.Argument];
125 + set => this.Set((int)ClassSymbolFields.Argument, value);
126 }
127
128 public string FeatureRef
129 {
130 - get => (string)this.Fields[(int)ClassTupleFields.FeatureRef];
131 - set => this.Set((int)ClassTupleFields.FeatureRef, value);
130 + get => (string)this.Fields[(int)ClassSymbolFields.FeatureRef];
131 + set => this.Set((int)ClassSymbolFields.FeatureRef, value);
132 }
133
134 public bool RelativePath
135 {
136 - get => this.Fields[(int)ClassTupleFields.RelativePath].AsBool();
137 - set => this.Set((int)ClassTupleFields.RelativePath, value);
136 + get => this.Fields[(int)ClassSymbolFields.RelativePath].AsBool();
137 + set => this.Set((int)ClassSymbolFields.RelativePath, value);
138 }
139 }
140 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ComboBoxTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ComboBox = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ComboBox,
9 + public static readonly IntermediateSymbolDefinition ComboBox = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ComboBox,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ComboBoxTupleFields.Property), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ComboBoxTupleFields.Order), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(ComboBoxTupleFields.Value), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ComboBoxTupleFields.Text), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ComboBoxSymbolFields.Property), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComboBoxSymbolFields.Order), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(ComboBoxSymbolFields.Value), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ComboBoxSymbolFields.Text), IntermediateFieldType.String),
17 },
18 - typeof(ComboBoxTuple));
18 + typeof(ComboBoxSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum ComboBoxTupleFields
24 + public enum ComboBoxSymbolFields
25 {
26 Property,
27 Order,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Text,
30 }
31
32 - public class ComboBoxTuple : IntermediateTuple
32 + public class ComboBoxSymbol : IntermediateSymbol
33 {
34 - public ComboBoxTuple() : base(TupleDefinitions.ComboBox, null, null)
34 + public ComboBoxSymbol() : base(SymbolDefinitions.ComboBox, null, null)
35 {
36 }
37
38 - public ComboBoxTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ComboBox, sourceLineNumber, id)
38 + public ComboBoxSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ComboBox, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[ComboBoxTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[ComboBoxSymbolFields index] => this.Fields[(int)index];
43
44 public string Property
45 {
46 - get => (string)this.Fields[(int)ComboBoxTupleFields.Property];
47 - set => this.Set((int)ComboBoxTupleFields.Property, value);
46 + get => (string)this.Fields[(int)ComboBoxSymbolFields.Property];
47 + set => this.Set((int)ComboBoxSymbolFields.Property, value);
48 }
49
50 public int Order
51 {
52 - get => (int)this.Fields[(int)ComboBoxTupleFields.Order];
53 - set => this.Set((int)ComboBoxTupleFields.Order, value);
52 + get => (int)this.Fields[(int)ComboBoxSymbolFields.Order];
53 + set => this.Set((int)ComboBoxSymbolFields.Order, value);
54 }
55
56 public string Value
57 {
58 - get => (string)this.Fields[(int)ComboBoxTupleFields.Value];
59 - set => this.Set((int)ComboBoxTupleFields.Value, value);
58 + get => (string)this.Fields[(int)ComboBoxSymbolFields.Value];
59 + set => this.Set((int)ComboBoxSymbolFields.Value, value);
60 }
61
62 public string Text
63 {
64 - get => (string)this.Fields[(int)ComboBoxTupleFields.Text];
65 - set => this.Set((int)ComboBoxTupleFields.Text, value);
64 + get => (string)this.Fields[(int)ComboBoxSymbolFields.Text];
65 + set => this.Set((int)ComboBoxSymbolFields.Text, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/CompLocatorTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition CompLocator = new IntermediateTupleDefinition(
10 - TupleDefinitionType.CompLocator,
9 + public static readonly IntermediateSymbolDefinition CompLocator = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.CompLocator,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.SignatureRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.ComponentId), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.Type), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(CompLocatorSymbolFields.SignatureRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(CompLocatorSymbolFields.ComponentId), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(CompLocatorSymbolFields.Type), IntermediateFieldType.Number),
16 },
17 - typeof(CompLocatorTuple));
17 + typeof(CompLocatorSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum CompLocatorTupleFields
23 + public enum CompLocatorSymbolFields
24 {
25 SignatureRef,
26 ComponentId,
27 Type,
28 }
29
30 - public class CompLocatorTuple : IntermediateTuple
30 + public class CompLocatorSymbol : IntermediateSymbol
31 {
32 - public CompLocatorTuple() : base(TupleDefinitions.CompLocator, null, null)
32 + public CompLocatorSymbol() : base(SymbolDefinitions.CompLocator, null, null)
33 {
34 }
35
36 - public CompLocatorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.CompLocator, sourceLineNumber, id)
36 + public CompLocatorSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.CompLocator, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[CompLocatorTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[CompLocatorSymbolFields index] => this.Fields[(int)index];
41
42 public string SignatureRef
43 {
44 - get => (string)this.Fields[(int)CompLocatorTupleFields.SignatureRef];
45 - set => this.Set((int)CompLocatorTupleFields.SignatureRef, value);
44 + get => (string)this.Fields[(int)CompLocatorSymbolFields.SignatureRef];
45 + set => this.Set((int)CompLocatorSymbolFields.SignatureRef, value);
46 }
47
48 public string ComponentId
49 {
50 - get => (string)this.Fields[(int)CompLocatorTupleFields.ComponentId];
51 - set => this.Set((int)CompLocatorTupleFields.ComponentId, value);
50 + get => (string)this.Fields[(int)CompLocatorSymbolFields.ComponentId];
51 + set => this.Set((int)CompLocatorSymbolFields.ComponentId, value);
52 }
53
54 public LocatorType Type
55 {
56 - get => (LocatorType)this.Fields[(int)CompLocatorTupleFields.Type].AsNumber();
57 - set => this.Set((int)CompLocatorTupleFields.Type, (int)value);
56 + get => (LocatorType)this.Fields[(int)CompLocatorSymbolFields.Type].AsNumber();
57 + set => this.Set((int)CompLocatorSymbolFields.Type, (int)value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ComplusTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Complus = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Complus,
9 + public static readonly IntermediateSymbolDefinition Complus = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Complus,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ComplusTupleFields.ComponentRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ComplusTupleFields.ExpType), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(ComplusSymbolFields.ComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComplusSymbolFields.ExpType), IntermediateFieldType.Number),
15 },
16 - typeof(ComplusTuple));
16 + typeof(ComplusSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum ComplusTupleFields
22 + public enum ComplusSymbolFields
23 {
24 ComponentRef,
25 ExpType,
26 }
27
28 - public class ComplusTuple : IntermediateTuple
28 + public class ComplusSymbol : IntermediateSymbol
29 {
30 - public ComplusTuple() : base(TupleDefinitions.Complus, null, null)
30 + public ComplusSymbol() : base(SymbolDefinitions.Complus, null, null)
31 {
32 }
33
34 - public ComplusTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Complus, sourceLineNumber, id)
34 + public ComplusSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Complus, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[ComplusTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[ComplusSymbolFields index] => this.Fields[(int)index];
39
40 public string ComponentRef
41 {
42 - get => (string)this.Fields[(int)ComplusTupleFields.ComponentRef];
43 - set => this.Set((int)ComplusTupleFields.ComponentRef, value);
42 + get => (string)this.Fields[(int)ComplusSymbolFields.ComponentRef];
43 + set => this.Set((int)ComplusSymbolFields.ComponentRef, value);
44 }
45
46 public int? ExpType
47 {
48 - get => (int?)this.Fields[(int)ComplusTupleFields.ExpType];
49 - set => this.Set((int)ComplusTupleFields.ExpType, value);
48 + get => (int?)this.Fields[(int)ComplusSymbolFields.ExpType];
49 + set => this.Set((int)ComplusSymbolFields.ExpType, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ComponentTuple.cs
+53 -53
@@ -2,36 +2,36 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Component = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Component,
9 + public static readonly IntermediateSymbolDefinition Component = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Component,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ComponentTupleFields.ComponentId), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ComponentTupleFields.DirectoryRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ComponentTupleFields.Location), IntermediateFieldType.Number),
16 - new IntermediateFieldDefinition(nameof(ComponentTupleFields.DisableRegistryReflection), IntermediateFieldType.Bool),
17 - new IntermediateFieldDefinition(nameof(ComponentTupleFields.NeverOverwrite), IntermediateFieldType.Bool),
18 - new IntermediateFieldDefinition(nameof(ComponentTupleFields.Permanent), IntermediateFieldType.Bool),
19 - new IntermediateFieldDefinition(nameof(ComponentTupleFields.SharedDllRefCount), IntermediateFieldType.Bool),
20 - new IntermediateFieldDefinition(nameof(ComponentTupleFields.Shared), IntermediateFieldType.Bool),
21 - new IntermediateFieldDefinition(nameof(ComponentTupleFields.Transitive), IntermediateFieldType.Bool),
22 - new IntermediateFieldDefinition(nameof(ComponentTupleFields.UninstallWhenSuperseded), IntermediateFieldType.Bool),
23 - new IntermediateFieldDefinition(nameof(ComponentTupleFields.Win64), IntermediateFieldType.Bool),
24 - new IntermediateFieldDefinition(nameof(ComponentTupleFields.Condition), IntermediateFieldType.String),
25 - new IntermediateFieldDefinition(nameof(ComponentTupleFields.KeyPath), IntermediateFieldType.String),
26 - new IntermediateFieldDefinition(nameof(ComponentTupleFields.KeyPathType), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(ComponentSymbolFields.ComponentId), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ComponentSymbolFields.DirectoryRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ComponentSymbolFields.Location), IntermediateFieldType.Number),
16 + new IntermediateFieldDefinition(nameof(ComponentSymbolFields.DisableRegistryReflection), IntermediateFieldType.Bool),
17 + new IntermediateFieldDefinition(nameof(ComponentSymbolFields.NeverOverwrite), IntermediateFieldType.Bool),
18 + new IntermediateFieldDefinition(nameof(ComponentSymbolFields.Permanent), IntermediateFieldType.Bool),
19 + new IntermediateFieldDefinition(nameof(ComponentSymbolFields.SharedDllRefCount), IntermediateFieldType.Bool),
20 + new IntermediateFieldDefinition(nameof(ComponentSymbolFields.Shared), IntermediateFieldType.Bool),
21 + new IntermediateFieldDefinition(nameof(ComponentSymbolFields.Transitive), IntermediateFieldType.Bool),
22 + new IntermediateFieldDefinition(nameof(ComponentSymbolFields.UninstallWhenSuperseded), IntermediateFieldType.Bool),
23 + new IntermediateFieldDefinition(nameof(ComponentSymbolFields.Win64), IntermediateFieldType.Bool),
24 + new IntermediateFieldDefinition(nameof(ComponentSymbolFields.Condition), IntermediateFieldType.String),
25 + new IntermediateFieldDefinition(nameof(ComponentSymbolFields.KeyPath), IntermediateFieldType.String),
26 + new IntermediateFieldDefinition(nameof(ComponentSymbolFields.KeyPathType), IntermediateFieldType.Number),
27 },
28 - typeof(ComponentTuple));
28 + typeof(ComponentSymbol));
29 }
30 }
31
32 -namespace WixToolset.Data.Tuples
32 +namespace WixToolset.Data.Symbols
33 {
34 - public enum ComponentTupleFields
34 + public enum ComponentSymbolFields
35 {
36 ComponentId,
37 DirectoryRef,
@@ -56,100 +56,100 @@ namespace WixToolset.Data.Tuples
56 Either
57 }
58
59 - public class ComponentTuple : IntermediateTuple
59 + public class ComponentSymbol : IntermediateSymbol
60 {
61 - public ComponentTuple() : base(TupleDefinitions.Component, null, null)
61 + public ComponentSymbol() : base(SymbolDefinitions.Component, null, null)
62 {
63 }
64
65 - public ComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Component, sourceLineNumber, id)
65 + public ComponentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Component, sourceLineNumber, id)
66 {
67 }
68
69 - public IntermediateField this[ComponentTupleFields index] => this.Fields[(int)index];
69 + public IntermediateField this[ComponentSymbolFields index] => this.Fields[(int)index];
70
71 public string ComponentId
72 {
73 - get => (string)this.Fields[(int)ComponentTupleFields.ComponentId];
74 - set => this.Set((int)ComponentTupleFields.ComponentId, value);
73 + get => (string)this.Fields[(int)ComponentSymbolFields.ComponentId];
74 + set => this.Set((int)ComponentSymbolFields.ComponentId, value);
75 }
76
77 public string DirectoryRef
78 {
79 - get => (string)this.Fields[(int)ComponentTupleFields.DirectoryRef];
80 - set => this.Set((int)ComponentTupleFields.DirectoryRef, value);
79 + get => (string)this.Fields[(int)ComponentSymbolFields.DirectoryRef];
80 + set => this.Set((int)ComponentSymbolFields.DirectoryRef, value);
81 }
82
83 public ComponentLocation Location
84 {
85 - get => (ComponentLocation)this.Fields[(int)ComponentTupleFields.Location].AsNumber();
86 - set => this.Set((int)ComponentTupleFields.Location, (int)value);
85 + get => (ComponentLocation)this.Fields[(int)ComponentSymbolFields.Location].AsNumber();
86 + set => this.Set((int)ComponentSymbolFields.Location, (int)value);
87 }
88
89 public bool DisableRegistryReflection
90 {
91 - get => this.Fields[(int)ComponentTupleFields.DisableRegistryReflection].AsBool();
92 - set => this.Set((int)ComponentTupleFields.DisableRegistryReflection, value);
91 + get => this.Fields[(int)ComponentSymbolFields.DisableRegistryReflection].AsBool();
92 + set => this.Set((int)ComponentSymbolFields.DisableRegistryReflection, value);
93 }
94
95 public bool NeverOverwrite
96 {
97 - get => this.Fields[(int)ComponentTupleFields.NeverOverwrite].AsBool();
98 - set => this.Set((int)ComponentTupleFields.NeverOverwrite, value);
97 + get => this.Fields[(int)ComponentSymbolFields.NeverOverwrite].AsBool();
98 + set => this.Set((int)ComponentSymbolFields.NeverOverwrite, value);
99 }
100
101 public bool Permanent
102 {
103 - get => this.Fields[(int)ComponentTupleFields.Permanent].AsBool();
104 - set => this.Set((int)ComponentTupleFields.Permanent, value);
103 + get => this.Fields[(int)ComponentSymbolFields.Permanent].AsBool();
104 + set => this.Set((int)ComponentSymbolFields.Permanent, value);
105 }
106
107 public bool SharedDllRefCount
108 {
109 - get => this.Fields[(int)ComponentTupleFields.SharedDllRefCount].AsBool();
110 - set => this.Set((int)ComponentTupleFields.SharedDllRefCount, value);
109 + get => this.Fields[(int)ComponentSymbolFields.SharedDllRefCount].AsBool();
110 + set => this.Set((int)ComponentSymbolFields.SharedDllRefCount, value);
111 }
112
113 public bool Shared
114 {
115 - get => this.Fields[(int)ComponentTupleFields.Shared].AsBool();
116 - set => this.Set((int)ComponentTupleFields.Shared, value);
115 + get => this.Fields[(int)ComponentSymbolFields.Shared].AsBool();
116 + set => this.Set((int)ComponentSymbolFields.Shared, value);
117 }
118
119 public bool Transitive
120 {
121 - get => this.Fields[(int)ComponentTupleFields.Transitive].AsBool();
122 - set => this.Set((int)ComponentTupleFields.Transitive, value);
121 + get => this.Fields[(int)ComponentSymbolFields.Transitive].AsBool();
122 + set => this.Set((int)ComponentSymbolFields.Transitive, value);
123 }
124
125 public bool UninstallWhenSuperseded
126 {
127 - get => this.Fields[(int)ComponentTupleFields.UninstallWhenSuperseded].AsBool();
128 - set => this.Set((int)ComponentTupleFields.UninstallWhenSuperseded, value);
127 + get => this.Fields[(int)ComponentSymbolFields.UninstallWhenSuperseded].AsBool();
128 + set => this.Set((int)ComponentSymbolFields.UninstallWhenSuperseded, value);
129 }
130
131 public bool Win64
132 {
133 - get => this.Fields[(int)ComponentTupleFields.Win64].AsBool();
134 - set => this.Set((int)ComponentTupleFields.Win64, value);
133 + get => this.Fields[(int)ComponentSymbolFields.Win64].AsBool();
134 + set => this.Set((int)ComponentSymbolFields.Win64, value);
135 }
136
137 public string Condition
138 {
139 - get => (string)this.Fields[(int)ComponentTupleFields.Condition];
140 - set => this.Set((int)ComponentTupleFields.Condition, value);
139 + get => (string)this.Fields[(int)ComponentSymbolFields.Condition];
140 + set => this.Set((int)ComponentSymbolFields.Condition, value);
141 }
142
143 public string KeyPath
144 {
145 - get => (string)this.Fields[(int)ComponentTupleFields.KeyPath];
146 - set => this.Set((int)ComponentTupleFields.KeyPath, value);
145 + get => (string)this.Fields[(int)ComponentSymbolFields.KeyPath];
146 + set => this.Set((int)ComponentSymbolFields.KeyPath, value);
147 }
148
149 public ComponentKeyPathType KeyPathType
150 {
151 - get => (ComponentKeyPathType)this.Fields[(int)ComponentTupleFields.KeyPathType].AsNumber();
152 - set => this.Set((int)ComponentTupleFields.KeyPathType, (int)value);
151 + get => (ComponentKeyPathType)this.Fields[(int)ComponentSymbolFields.KeyPathType].AsNumber();
152 + set => this.Set((int)ComponentSymbolFields.KeyPathType, (int)value);
153 }
154 }
155 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ConditionTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Condition = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Condition,
9 + public static readonly IntermediateSymbolDefinition Condition = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Condition,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ConditionTupleFields.FeatureRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ConditionTupleFields.Level), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(ConditionTupleFields.Condition), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ConditionSymbolFields.FeatureRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ConditionSymbolFields.Level), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(ConditionSymbolFields.Condition), IntermediateFieldType.String),
16 },
17 - typeof(ConditionTuple));
17 + typeof(ConditionSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum ConditionTupleFields
23 + public enum ConditionSymbolFields
24 {
25 FeatureRef,
26 Level,
27 Condition,
28 }
29
30 - public class ConditionTuple : IntermediateTuple
30 + public class ConditionSymbol : IntermediateSymbol
31 {
32 - public ConditionTuple() : base(TupleDefinitions.Condition, null, null)
32 + public ConditionSymbol() : base(SymbolDefinitions.Condition, null, null)
33 {
34 }
35
36 - public ConditionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Condition, sourceLineNumber, id)
36 + public ConditionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Condition, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[ConditionTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[ConditionSymbolFields index] => this.Fields[(int)index];
41
42 public string FeatureRef
43 {
44 - get => (string)this.Fields[(int)ConditionTupleFields.FeatureRef];
45 - set => this.Set((int)ConditionTupleFields.FeatureRef, value);
44 + get => (string)this.Fields[(int)ConditionSymbolFields.FeatureRef];
45 + set => this.Set((int)ConditionSymbolFields.FeatureRef, value);
46 }
47
48 public int Level
49 {
50 - get => (int)this.Fields[(int)ConditionTupleFields.Level];
51 - set => this.Set((int)ConditionTupleFields.Level, value);
50 + get => (int)this.Fields[(int)ConditionSymbolFields.Level];
51 + set => this.Set((int)ConditionSymbolFields.Level, value);
52 }
53
54 public string Condition
55 {
56 - get => (string)this.Fields[(int)ConditionTupleFields.Condition];
57 - set => this.Set((int)ConditionTupleFields.Condition, value);
56 + get => (string)this.Fields[(int)ConditionSymbolFields.Condition];
57 + set => this.Set((int)ConditionSymbolFields.Condition, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ControlConditionTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ControlCondition = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ControlCondition,
9 + public static readonly IntermediateSymbolDefinition ControlCondition = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ControlCondition,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.DialogRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.ControlRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Action), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Condition), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ControlConditionSymbolFields.DialogRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ControlConditionSymbolFields.ControlRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ControlConditionSymbolFields.Action), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ControlConditionSymbolFields.Condition), IntermediateFieldType.String),
17 },
18 - typeof(ControlConditionTuple));
18 + typeof(ControlConditionSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum ControlConditionTupleFields
24 + public enum ControlConditionSymbolFields
25 {
26 DialogRef,
27 ControlRef,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Condition,
30 }
31
32 - public class ControlConditionTuple : IntermediateTuple
32 + public class ControlConditionSymbol : IntermediateSymbol
33 {
34 - public ControlConditionTuple() : base(TupleDefinitions.ControlCondition, null, null)
34 + public ControlConditionSymbol() : base(SymbolDefinitions.ControlCondition, null, null)
35 {
36 }
37
38 - public ControlConditionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ControlCondition, sourceLineNumber, id)
38 + public ControlConditionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ControlCondition, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[ControlConditionTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[ControlConditionSymbolFields index] => this.Fields[(int)index];
43
44 public string DialogRef
45 {
46 - get => (string)this.Fields[(int)ControlConditionTupleFields.DialogRef];
47 - set => this.Set((int)ControlConditionTupleFields.DialogRef, value);
46 + get => (string)this.Fields[(int)ControlConditionSymbolFields.DialogRef];
47 + set => this.Set((int)ControlConditionSymbolFields.DialogRef, value);
48 }
49
50 public string ControlRef
51 {
52 - get => (string)this.Fields[(int)ControlConditionTupleFields.ControlRef];
53 - set => this.Set((int)ControlConditionTupleFields.ControlRef, value);
52 + get => (string)this.Fields[(int)ControlConditionSymbolFields.ControlRef];
53 + set => this.Set((int)ControlConditionSymbolFields.ControlRef, value);
54 }
55
56 public string Action
57 {
58 - get => (string)this.Fields[(int)ControlConditionTupleFields.Action];
59 - set => this.Set((int)ControlConditionTupleFields.Action, value);
58 + get => (string)this.Fields[(int)ControlConditionSymbolFields.Action];
59 + set => this.Set((int)ControlConditionSymbolFields.Action, value);
60 }
61
62 public string Condition
63 {
64 - get => (string)this.Fields[(int)ControlConditionTupleFields.Condition];
65 - set => this.Set((int)ControlConditionTupleFields.Condition, value);
64 + get => (string)this.Fields[(int)ControlConditionSymbolFields.Condition];
65 + set => this.Set((int)ControlConditionSymbolFields.Condition, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ControlEventTuple.cs
+29 -29
@@ -2,28 +2,28 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ControlEvent = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ControlEvent,
9 + public static readonly IntermediateSymbolDefinition ControlEvent = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ControlEvent,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ControlEventTupleFields.DialogRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ControlEventTupleFields.ControlRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Event), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Argument), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Condition), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Ordering), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(ControlEventSymbolFields.DialogRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ControlEventSymbolFields.ControlRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ControlEventSymbolFields.Event), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ControlEventSymbolFields.Argument), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(ControlEventSymbolFields.Condition), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(ControlEventSymbolFields.Ordering), IntermediateFieldType.Number),
19 },
20 - typeof(ControlEventTuple));
20 + typeof(ControlEventSymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 - public enum ControlEventTupleFields
26 + public enum ControlEventSymbolFields
27 {
28 DialogRef,
29 ControlRef,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
33 Ordering,
34 }
35
36 - public class ControlEventTuple : IntermediateTuple
36 + public class ControlEventSymbol : IntermediateSymbol
37 {
38 - public ControlEventTuple() : base(TupleDefinitions.ControlEvent, null, null)
38 + public ControlEventSymbol() : base(SymbolDefinitions.ControlEvent, null, null)
39 {
40 }
41
42 - public ControlEventTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ControlEvent, sourceLineNumber, id)
42 + public ControlEventSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ControlEvent, sourceLineNumber, id)
43 {
44 }
45
46 - public IntermediateField this[ControlEventTupleFields index] => this.Fields[(int)index];
46 + public IntermediateField this[ControlEventSymbolFields index] => this.Fields[(int)index];
47
48 public string DialogRef
49 {
50 - get => (string)this.Fields[(int)ControlEventTupleFields.DialogRef];
51 - set => this.Set((int)ControlEventTupleFields.DialogRef, value);
50 + get => (string)this.Fields[(int)ControlEventSymbolFields.DialogRef];
51 + set => this.Set((int)ControlEventSymbolFields.DialogRef, value);
52 }
53
54 public string ControlRef
55 {
56 - get => (string)this.Fields[(int)ControlEventTupleFields.ControlRef];
57 - set => this.Set((int)ControlEventTupleFields.ControlRef, value);
56 + get => (string)this.Fields[(int)ControlEventSymbolFields.ControlRef];
57 + set => this.Set((int)ControlEventSymbolFields.ControlRef, value);
58 }
59
60 public string Event
61 {
62 - get => (string)this.Fields[(int)ControlEventTupleFields.Event];
63 - set => this.Set((int)ControlEventTupleFields.Event, value);
62 + get => (string)this.Fields[(int)ControlEventSymbolFields.Event];
63 + set => this.Set((int)ControlEventSymbolFields.Event, value);
64 }
65
66 public string Argument
67 {
68 - get => (string)this.Fields[(int)ControlEventTupleFields.Argument];
69 - set => this.Set((int)ControlEventTupleFields.Argument, value);
68 + get => (string)this.Fields[(int)ControlEventSymbolFields.Argument];
69 + set => this.Set((int)ControlEventSymbolFields.Argument, value);
70 }
71
72 public string Condition
73 {
74 - get => (string)this.Fields[(int)ControlEventTupleFields.Condition];
75 - set => this.Set((int)ControlEventTupleFields.Condition, value);
74 + get => (string)this.Fields[(int)ControlEventSymbolFields.Condition];
75 + set => this.Set((int)ControlEventSymbolFields.Condition, value);
76 }
77
78 public int? Ordering
79 {
80 - get => (int?)this.Fields[(int)ControlEventTupleFields.Ordering];
81 - set => this.Set((int)ControlEventTupleFields.Ordering, value);
80 + get => (int?)this.Fields[(int)ControlEventSymbolFields.Ordering];
81 + set => this.Set((int)ControlEventSymbolFields.Ordering, value);
82 }
83 }
84 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ControlTuple.cs
+103 -103
@@ -2,44 +2,44 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Control = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Control,
9 + public static readonly IntermediateSymbolDefinition Control = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Control,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ControlTupleFields.DialogRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ControlTupleFields.Control), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ControlTupleFields.Type), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ControlTupleFields.X), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(ControlTupleFields.Y), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(ControlTupleFields.Width), IntermediateFieldType.Number),
19 - new IntermediateFieldDefinition(nameof(ControlTupleFields.Height), IntermediateFieldType.Number),
20 - new IntermediateFieldDefinition(nameof(ControlTupleFields.Attributes), IntermediateFieldType.Number),
21 - new IntermediateFieldDefinition(nameof(ControlTupleFields.Enabled), IntermediateFieldType.Bool),
22 - new IntermediateFieldDefinition(nameof(ControlTupleFields.Indirect), IntermediateFieldType.Bool),
23 - new IntermediateFieldDefinition(nameof(ControlTupleFields.Integer), IntermediateFieldType.Bool),
24 - new IntermediateFieldDefinition(nameof(ControlTupleFields.LeftScroll), IntermediateFieldType.Bool),
25 - new IntermediateFieldDefinition(nameof(ControlTupleFields.RightAligned), IntermediateFieldType.Bool),
26 - new IntermediateFieldDefinition(nameof(ControlTupleFields.RightToLeft), IntermediateFieldType.Bool),
27 - new IntermediateFieldDefinition(nameof(ControlTupleFields.Sunken), IntermediateFieldType.Bool),
28 - new IntermediateFieldDefinition(nameof(ControlTupleFields.Visible), IntermediateFieldType.Bool),
29 - new IntermediateFieldDefinition(nameof(ControlTupleFields.Property), IntermediateFieldType.String),
30 - new IntermediateFieldDefinition(nameof(ControlTupleFields.Text), IntermediateFieldType.String),
31 - new IntermediateFieldDefinition(nameof(ControlTupleFields.NextControlRef), IntermediateFieldType.String),
32 - new IntermediateFieldDefinition(nameof(ControlTupleFields.Help), IntermediateFieldType.String),
33 - new IntermediateFieldDefinition(nameof(ControlTupleFields.TrackDiskSpace), IntermediateFieldType.Bool),
34 - new IntermediateFieldDefinition(nameof(ControlTupleFields.SourceFile), IntermediateFieldType.Path),
13 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.DialogRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.Control), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.Type), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.X), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.Y), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.Width), IntermediateFieldType.Number),
19 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.Height), IntermediateFieldType.Number),
20 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.Attributes), IntermediateFieldType.Number),
21 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.Enabled), IntermediateFieldType.Bool),
22 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.Indirect), IntermediateFieldType.Bool),
23 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.Integer), IntermediateFieldType.Bool),
24 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.LeftScroll), IntermediateFieldType.Bool),
25 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.RightAligned), IntermediateFieldType.Bool),
26 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.RightToLeft), IntermediateFieldType.Bool),
27 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.Sunken), IntermediateFieldType.Bool),
28 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.Visible), IntermediateFieldType.Bool),
29 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.Property), IntermediateFieldType.String),
30 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.Text), IntermediateFieldType.String),
31 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.NextControlRef), IntermediateFieldType.String),
32 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.Help), IntermediateFieldType.String),
33 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.TrackDiskSpace), IntermediateFieldType.Bool),
34 + new IntermediateFieldDefinition(nameof(ControlSymbolFields.SourceFile), IntermediateFieldType.Path),
35 },
36 - typeof(ControlTuple));
36 + typeof(ControlSymbol));
37 }
38 }
39
40 -namespace WixToolset.Data.Tuples
40 +namespace WixToolset.Data.Symbols
41 {
42 - public enum ControlTupleFields
42 + public enum ControlSymbolFields
43 {
44 DialogRef,
45 Control,
@@ -65,239 +65,239 @@ namespace WixToolset.Data.Tuples
65 SourceFile,
66 }
67
68 - public class ControlTuple : IntermediateTuple
68 + public class ControlSymbol : IntermediateSymbol
69 {
70 - public ControlTuple() : base(TupleDefinitions.Control, null, null)
70 + public ControlSymbol() : base(SymbolDefinitions.Control, null, null)
71 {
72 }
73
74 - public ControlTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Control, sourceLineNumber, id)
74 + public ControlSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Control, sourceLineNumber, id)
75 {
76 }
77
78 - public IntermediateField this[ControlTupleFields index] => this.Fields[(int)index];
78 + public IntermediateField this[ControlSymbolFields index] => this.Fields[(int)index];
79
80 public string DialogRef
81 {
82 - get => (string)this.Fields[(int)ControlTupleFields.DialogRef];
83 - set => this.Set((int)ControlTupleFields.DialogRef, value);
82 + get => (string)this.Fields[(int)ControlSymbolFields.DialogRef];
83 + set => this.Set((int)ControlSymbolFields.DialogRef, value);
84 }
85
86 public string Control
87 {
88 - get => (string)this.Fields[(int)ControlTupleFields.Control];
89 - set => this.Set((int)ControlTupleFields.Control, value);
88 + get => (string)this.Fields[(int)ControlSymbolFields.Control];
89 + set => this.Set((int)ControlSymbolFields.Control, value);
90 }
91
92 public string Type
93 {
94 - get => (string)this.Fields[(int)ControlTupleFields.Type];
95 - set => this.Set((int)ControlTupleFields.Type, value);
94 + get => (string)this.Fields[(int)ControlSymbolFields.Type];
95 + set => this.Set((int)ControlSymbolFields.Type, value);
96 }
97
98 public int X
99 {
100 - get => (int)this.Fields[(int)ControlTupleFields.X];
101 - set => this.Set((int)ControlTupleFields.X, value);
100 + get => (int)this.Fields[(int)ControlSymbolFields.X];
101 + set => this.Set((int)ControlSymbolFields.X, value);
102 }
103
104 public int Y
105 {
106 - get => (int)this.Fields[(int)ControlTupleFields.Y];
107 - set => this.Set((int)ControlTupleFields.Y, value);
106 + get => (int)this.Fields[(int)ControlSymbolFields.Y];
107 + set => this.Set((int)ControlSymbolFields.Y, value);
108 }
109
110 public int Width
111 {
112 - get => (int)this.Fields[(int)ControlTupleFields.Width];
113 - set => this.Set((int)ControlTupleFields.Width, value);
112 + get => (int)this.Fields[(int)ControlSymbolFields.Width];
113 + set => this.Set((int)ControlSymbolFields.Width, value);
114 }
115
116 public int Height
117 {
118 - get => (int)this.Fields[(int)ControlTupleFields.Height];
119 - set => this.Set((int)ControlTupleFields.Height, value);
118 + get => (int)this.Fields[(int)ControlSymbolFields.Height];
119 + set => this.Set((int)ControlSymbolFields.Height, value);
120 }
121
122 public int? Attributes
123 {
124 - get => (int?)this.Fields[(int)ControlTupleFields.Attributes];
125 - set => this.Set((int)ControlTupleFields.Attributes, value);
124 + get => (int?)this.Fields[(int)ControlSymbolFields.Attributes];
125 + set => this.Set((int)ControlSymbolFields.Attributes, value);
126 }
127
128 public bool Enabled
129 {
130 - get => this.Fields[(int)ControlTupleFields.Enabled].AsBool();
131 - set => this.Set((int)ControlTupleFields.Enabled, value);
130 + get => this.Fields[(int)ControlSymbolFields.Enabled].AsBool();
131 + set => this.Set((int)ControlSymbolFields.Enabled, value);
132 }
133
134 public bool Indirect
135 {
136 - get => this.Fields[(int)ControlTupleFields.Indirect].AsBool();
137 - set => this.Set((int)ControlTupleFields.Indirect, value);
136 + get => this.Fields[(int)ControlSymbolFields.Indirect].AsBool();
137 + set => this.Set((int)ControlSymbolFields.Indirect, value);
138 }
139
140 public bool Integer
141 {
142 - get => this.Fields[(int)ControlTupleFields.Integer].AsBool();
143 - set => this.Set((int)ControlTupleFields.Integer, value);
142 + get => this.Fields[(int)ControlSymbolFields.Integer].AsBool();
143 + set => this.Set((int)ControlSymbolFields.Integer, value);
144 }
145 /*
146 /// <summary>PictureButton control</summary>
147 public bool Bitmap
148 {
149 - get => this.Fields[(int)ControlTupleFields.Bitmap].AsBool();
150 - set => this.Set((int)ControlTupleFields.Bitmap, value);
149 + get => this.Fields[(int)ControlSymbolFields.Bitmap].AsBool();
150 + set => this.Set((int)ControlSymbolFields.Bitmap, value);
151 }
152
153 /// <summary>RadioButton control</summary>
154 public bool Border
155 {
156 - get => this.Fields[(int)ControlTupleFields.Border].AsBool();
157 - set => this.Set((int)ControlTupleFields.Border, value);
156 + get => this.Fields[(int)ControlSymbolFields.Border].AsBool();
157 + set => this.Set((int)ControlSymbolFields.Border, value);
158 }
159
160 /// <summary>ListBox and ComboBox control</summary>
161 public bool ComboList
162 {
163 - get => this.Fields[(int)ControlTupleFields.ComboList].AsBool();
164 - set => this.Set((int)ControlTupleFields.ComboList, value);
163 + get => this.Fields[(int)ControlSymbolFields.ComboList].AsBool();
164 + set => this.Set((int)ControlSymbolFields.ComboList, value);
165 }
166
167 /// <summary>PushButton control</summary>
168 public bool ElevationShield
169 {
170 - get => this.Fields[(int)ControlTupleFields.ElevationShield].AsBool();
171 - set => this.Set((int)ControlTupleFields.ElevationShield, value);
170 + get => this.Fields[(int)ControlSymbolFields.ElevationShield].AsBool();
171 + set => this.Set((int)ControlSymbolFields.ElevationShield, value);
172 }
173
174 /// <summary>PictureButton control</summary>
175 public bool FixedSize
176 {
177 - get => this.Fields[(int)ControlTupleFields.FixedSize].AsBool();
178 - set => this.Set((int)ControlTupleFields.FixedSize, value);
177 + get => this.Fields[(int)ControlSymbolFields.FixedSize].AsBool();
178 + set => this.Set((int)ControlSymbolFields.FixedSize, value);
179 }
180
181 /// <summary>PictureButton control</summary>
182 public bool Icon
183 {
184 - get => this.Fields[(int)ControlTupleFields.Icon].AsBool();
185 - set => this.Set((int)ControlTupleFields.Icon, value);
184 + get => this.Fields[(int)ControlSymbolFields.Icon].AsBool();
185 + set => this.Set((int)ControlSymbolFields.Icon, value);
186 }
187
188 /// <summary>PictureButton control</summary>
189 public bool Icon16
190 {
191 - get => this.Fields[(int)ControlTupleFields.Icon16].AsBool();
192 - set => this.Set((int)ControlTupleFields.Icon16, value);
191 + get => this.Fields[(int)ControlSymbolFields.Icon16].AsBool();
192 + set => this.Set((int)ControlSymbolFields.Icon16, value);
193 }
194
195 /// <summary>PictureButton control</summary>
196 public bool Icon32
197 {
198 - get => this.Fields[(int)ControlTupleFields.Icon32].AsBool();
199 - set => this.Set((int)ControlTupleFields.Icon32, value);
198 + get => this.Fields[(int)ControlSymbolFields.Icon32].AsBool();
199 + set => this.Set((int)ControlSymbolFields.Icon32, value);
200 }
201
202 /// <summary>PictureButton control</summary>
203 public bool Icon48
204 {
205 - get => this.Fields[(int)ControlTupleFields.Icon48].AsBool();
206 - set => this.Set((int)ControlTupleFields.Icon48, value);
205 + get => this.Fields[(int)ControlSymbolFields.Icon48].AsBool();
206 + set => this.Set((int)ControlSymbolFields.Icon48, value);
207 }
208 */
209 public bool LeftScroll
210 {
211 - get => this.Fields[(int)ControlTupleFields.LeftScroll].AsBool();
212 - set => this.Set((int)ControlTupleFields.LeftScroll, value);
211 + get => this.Fields[(int)ControlSymbolFields.LeftScroll].AsBool();
212 + set => this.Set((int)ControlSymbolFields.LeftScroll, value);
213 }
214 /*
215 /// <summary>PictureButton control</summary>
216 public bool PushLike
217 {
218 - get => this.Fields[(int)ControlTupleFields.PushLike].AsBool();
219 - set => this.Set((int)ControlTupleFields.PushLike, value);
218 + get => this.Fields[(int)ControlSymbolFields.PushLike].AsBool();
219 + set => this.Set((int)ControlSymbolFields.PushLike, value);
220 }
221
222 /// <summary>Edit control</summary>
223 public bool Mulitline
224 {
225 - get => this.Fields[(int)ControlTupleFields.Mulitline].AsBool();
226 - set => this.Set((int)ControlTupleFields.Mulitline, value);
225 + get => this.Fields[(int)ControlSymbolFields.Mulitline].AsBool();
226 + set => this.Set((int)ControlSymbolFields.Mulitline, value);
227 }
228 */
229 public bool RightAligned
230 {
231 - get => this.Fields[(int)ControlTupleFields.RightAligned].AsBool();
232 - set => this.Set((int)ControlTupleFields.RightAligned, value);
231 + get => this.Fields[(int)ControlSymbolFields.RightAligned].AsBool();
232 + set => this.Set((int)ControlSymbolFields.RightAligned, value);
233 }
234
235 public bool RightToLeft
236 {
237 - get => this.Fields[(int)ControlTupleFields.RightToLeft].AsBool();
238 - set => this.Set((int)ControlTupleFields.RightToLeft, value);
237 + get => this.Fields[(int)ControlSymbolFields.RightToLeft].AsBool();
238 + set => this.Set((int)ControlSymbolFields.RightToLeft, value);
239 }
240 /*
241 /// <summary>VolumeCostList control</summary>
242 public bool ShowRollbackCost
243 {
244 - get => this.Fields[(int)ControlTupleFields.ShowRollbackCost].AsBool();
245 - set => this.Set((int)ControlTupleFields.ShowRollbackCost, value);
244 + get => this.Fields[(int)ControlSymbolFields.ShowRollbackCost].AsBool();
245 + set => this.Set((int)ControlSymbolFields.ShowRollbackCost, value);
246 }
247
248 /// <summary>ListBox and ComboBox control</summary>
249 public bool Sorted
250 {
251 - get => this.Fields[(int)ControlTupleFields.Sorted].AsBool();
252 - set => this.Set((int)ControlTupleFields.Sorted, value);
251 + get => this.Fields[(int)ControlSymbolFields.Sorted].AsBool();
252 + set => this.Set((int)ControlSymbolFields.Sorted, value);
253 }
254 */
255 public bool Sunken
256 {
257 - get => this.Fields[(int)ControlTupleFields.Sunken].AsBool();
258 - set => this.Set((int)ControlTupleFields.Sunken, value);
257 + get => this.Fields[(int)ControlSymbolFields.Sunken].AsBool();
258 + set => this.Set((int)ControlSymbolFields.Sunken, value);
259 }
260
261 public bool Visible
262 {
263 - get => this.Fields[(int)ControlTupleFields.Visible].AsBool();
264 - set => this.Set((int)ControlTupleFields.Visible, value);
263 + get => this.Fields[(int)ControlSymbolFields.Visible].AsBool();
264 + set => this.Set((int)ControlSymbolFields.Visible, value);
265 }
266
267 public string Property
268 {
269 - get => (string)this.Fields[(int)ControlTupleFields.Property];
270 - set => this.Set((int)ControlTupleFields.Property, value);
269 + get => (string)this.Fields[(int)ControlSymbolFields.Property];
270 + set => this.Set((int)ControlSymbolFields.Property, value);
271 }
272
273 public string Text
274 {
275 - get => (string)this.Fields[(int)ControlTupleFields.Text];
276 - set => this.Set((int)ControlTupleFields.Text, value);
275 + get => (string)this.Fields[(int)ControlSymbolFields.Text];
276 + set => this.Set((int)ControlSymbolFields.Text, value);
277 }
278
279 public string NextControlRef
280 {
281 - get => (string)this.Fields[(int)ControlTupleFields.NextControlRef];
282 - set => this.Set((int)ControlTupleFields.NextControlRef, value);
281 + get => (string)this.Fields[(int)ControlSymbolFields.NextControlRef];
282 + set => this.Set((int)ControlSymbolFields.NextControlRef, value);
283 }
284
285 public string Help
286 {
287 - get => (string)this.Fields[(int)ControlTupleFields.Help];
288 - set => this.Set((int)ControlTupleFields.Help, value);
287 + get => (string)this.Fields[(int)ControlSymbolFields.Help];
288 + set => this.Set((int)ControlSymbolFields.Help, value);
289 }
290
291 public bool TrackDiskSpace
292 {
293 - get => this.Fields[(int)ControlTupleFields.TrackDiskSpace].AsBool();
294 - set => this.Set((int)ControlTupleFields.TrackDiskSpace, value);
293 + get => this.Fields[(int)ControlSymbolFields.TrackDiskSpace].AsBool();
294 + set => this.Set((int)ControlSymbolFields.TrackDiskSpace, value);
295 }
296
297 public IntermediateFieldPathValue SourceFile
298 {
299 - get => this.Fields[(int)ControlTupleFields.SourceFile].AsPath();
300 - set => this.Set((int)ControlTupleFields.SourceFile, value);
299 + get => this.Fields[(int)ControlSymbolFields.SourceFile].AsPath();
300 + set => this.Set((int)ControlSymbolFields.SourceFile, value);
301 }
302 }
303 }
\ No newline at end of file
src/WixToolset.Data/Tuples/CreateFolderTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition CreateFolder = new IntermediateTupleDefinition(
10 - TupleDefinitionType.CreateFolder,
9 + public static readonly IntermediateSymbolDefinition CreateFolder = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.CreateFolder,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(CreateFolderTupleFields.DirectoryRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(CreateFolderTupleFields.ComponentRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(CreateFolderSymbolFields.DirectoryRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(CreateFolderSymbolFields.ComponentRef), IntermediateFieldType.String),
15 },
16 - typeof(CreateFolderTuple));
16 + typeof(CreateFolderSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum CreateFolderTupleFields
22 + public enum CreateFolderSymbolFields
23 {
24 DirectoryRef,
25 ComponentRef,
26 }
27
28 - public class CreateFolderTuple : IntermediateTuple
28 + public class CreateFolderSymbol : IntermediateSymbol
29 {
30 - public CreateFolderTuple() : base(TupleDefinitions.CreateFolder, null, null)
30 + public CreateFolderSymbol() : base(SymbolDefinitions.CreateFolder, null, null)
31 {
32 }
33
34 - public CreateFolderTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.CreateFolder, sourceLineNumber, id)
34 + public CreateFolderSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.CreateFolder, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[CreateFolderTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[CreateFolderSymbolFields index] => this.Fields[(int)index];
39
40 public string DirectoryRef
41 {
42 - get => (string)this.Fields[(int)CreateFolderTupleFields.DirectoryRef];
43 - set => this.Set((int)CreateFolderTupleFields.DirectoryRef, value);
42 + get => (string)this.Fields[(int)CreateFolderSymbolFields.DirectoryRef];
43 + set => this.Set((int)CreateFolderSymbolFields.DirectoryRef, value);
44 }
45
46 public string ComponentRef
47 {
48 - get => (string)this.Fields[(int)CreateFolderTupleFields.ComponentRef];
49 - set => this.Set((int)CreateFolderTupleFields.ComponentRef, value);
48 + get => (string)this.Fields[(int)CreateFolderSymbolFields.ComponentRef];
49 + set => this.Set((int)CreateFolderSymbolFields.ComponentRef, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/CustomActionTuple.cs
+50 -50
@@ -2,35 +2,35 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition CustomAction = new IntermediateTupleDefinition(
10 - TupleDefinitionType.CustomAction,
9 + public static readonly IntermediateSymbolDefinition CustomAction = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.CustomAction,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(CustomActionTupleFields.ExecutionType), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Source), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(CustomActionTupleFields.SourceType), IntermediateFieldType.Number),
16 - new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Target), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(CustomActionTupleFields.TargetType), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Async), IntermediateFieldType.Bool),
19 - new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Hidden), IntermediateFieldType.Bool),
20 - new IntermediateFieldDefinition(nameof(CustomActionTupleFields.IgnoreResult), IntermediateFieldType.Bool),
21 - new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Impersonate), IntermediateFieldType.Bool),
22 - new IntermediateFieldDefinition(nameof(CustomActionTupleFields.PatchUninstall), IntermediateFieldType.Bool),
23 - new IntermediateFieldDefinition(nameof(CustomActionTupleFields.TSAware), IntermediateFieldType.Bool),
24 - new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Win64), IntermediateFieldType.Bool),
25 - new IntermediateFieldDefinition(nameof(CustomActionTupleFields.ScriptFile), IntermediateFieldType.Path),
13 + new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.ExecutionType), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.Source), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.SourceType), IntermediateFieldType.Number),
16 + new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.Target), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.TargetType), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.Async), IntermediateFieldType.Bool),
19 + new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.Hidden), IntermediateFieldType.Bool),
20 + new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.IgnoreResult), IntermediateFieldType.Bool),
21 + new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.Impersonate), IntermediateFieldType.Bool),
22 + new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.PatchUninstall), IntermediateFieldType.Bool),
23 + new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.TSAware), IntermediateFieldType.Bool),
24 + new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.Win64), IntermediateFieldType.Bool),
25 + new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.ScriptFile), IntermediateFieldType.Path),
26 },
27 - typeof(CustomActionTuple));
27 + typeof(CustomActionSymbol));
28 }
29 }
30
31 -namespace WixToolset.Data.Tuples
31 +namespace WixToolset.Data.Symbols
32 {
33 - public enum CustomActionTupleFields
33 + public enum CustomActionSymbolFields
34 {
35 ExecutionType,
36 Source,
@@ -75,94 +75,94 @@ namespace WixToolset.Data.Tuples
75 VBScript = 6,
76 }
77
78 - public class CustomActionTuple : IntermediateTuple
78 + public class CustomActionSymbol : IntermediateSymbol
79 {
80 - public CustomActionTuple() : base(TupleDefinitions.CustomAction, null, null)
80 + public CustomActionSymbol() : base(SymbolDefinitions.CustomAction, null, null)
81 {
82 }
83
84 - public CustomActionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.CustomAction, sourceLineNumber, id)
84 + public CustomActionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.CustomAction, sourceLineNumber, id)
85 {
86 }
87
88 - public IntermediateField this[CustomActionTupleFields index] => this.Fields[(int)index];
88 + public IntermediateField this[CustomActionSymbolFields index] => this.Fields[(int)index];
89
90 public CustomActionExecutionType ExecutionType
91 {
92 - get => (CustomActionExecutionType)this.Fields[(int)CustomActionTupleFields.ExecutionType].AsNumber();
93 - set => this.Set((int)CustomActionTupleFields.ExecutionType, (int)value);
92 + get => (CustomActionExecutionType)this.Fields[(int)CustomActionSymbolFields.ExecutionType].AsNumber();
93 + set => this.Set((int)CustomActionSymbolFields.ExecutionType, (int)value);
94 }
95
96 public string Source
97 {
98 - get => (string)this.Fields[(int)CustomActionTupleFields.Source];
99 - set => this.Set((int)CustomActionTupleFields.Source, value);
98 + get => (string)this.Fields[(int)CustomActionSymbolFields.Source];
99 + set => this.Set((int)CustomActionSymbolFields.Source, value);
100 }
101
102 public CustomActionSourceType SourceType
103 {
104 - get => (CustomActionSourceType)this.Fields[(int)CustomActionTupleFields.SourceType].AsNumber();
105 - set => this.Set((int)CustomActionTupleFields.SourceType, (int)value);
104 + get => (CustomActionSourceType)this.Fields[(int)CustomActionSymbolFields.SourceType].AsNumber();
105 + set => this.Set((int)CustomActionSymbolFields.SourceType, (int)value);
106 }
107
108 public string Target
109 {
110 - get => (string)this.Fields[(int)CustomActionTupleFields.Target];
111 - set => this.Set((int)CustomActionTupleFields.Target, value);
110 + get => (string)this.Fields[(int)CustomActionSymbolFields.Target];
111 + set => this.Set((int)CustomActionSymbolFields.Target, value);
112 }
113
114 public CustomActionTargetType TargetType
115 {
116 - get => (CustomActionTargetType)this.Fields[(int)CustomActionTupleFields.TargetType].AsNumber();
117 - set => this.Set((int)CustomActionTupleFields.TargetType, (int)value);
116 + get => (CustomActionTargetType)this.Fields[(int)CustomActionSymbolFields.TargetType].AsNumber();
117 + set => this.Set((int)CustomActionSymbolFields.TargetType, (int)value);
118 }
119
120 public bool Async
121 {
122 - get => this.Fields[(int)CustomActionTupleFields.Async].AsBool();
123 - set => this.Set((int)CustomActionTupleFields.Async, value);
122 + get => this.Fields[(int)CustomActionSymbolFields.Async].AsBool();
123 + set => this.Set((int)CustomActionSymbolFields.Async, value);
124 }
125
126 public bool Hidden
127 {
128 - get => this.Fields[(int)CustomActionTupleFields.Hidden].AsBool();
129 - set => this.Set((int)CustomActionTupleFields.Hidden, value);
128 + get => this.Fields[(int)CustomActionSymbolFields.Hidden].AsBool();
129 + set => this.Set((int)CustomActionSymbolFields.Hidden, value);
130 }
131
132 public bool IgnoreResult
133 {
134 - get => this.Fields[(int)CustomActionTupleFields.IgnoreResult].AsBool();
135 - set => this.Set((int)CustomActionTupleFields.IgnoreResult, value);
134 + get => this.Fields[(int)CustomActionSymbolFields.IgnoreResult].AsBool();
135 + set => this.Set((int)CustomActionSymbolFields.IgnoreResult, value);
136 }
137
138 public bool Impersonate
139 {
140 - get => this.Fields[(int)CustomActionTupleFields.Impersonate].AsBool();
141 - set => this.Set((int)CustomActionTupleFields.Impersonate, value);
140 + get => this.Fields[(int)CustomActionSymbolFields.Impersonate].AsBool();
141 + set => this.Set((int)CustomActionSymbolFields.Impersonate, value);
142 }
143
144 public bool PatchUninstall
145 {
146 - get => this.Fields[(int)CustomActionTupleFields.PatchUninstall].AsBool();
147 - set => this.Set((int)CustomActionTupleFields.PatchUninstall, value);
146 + get => this.Fields[(int)CustomActionSymbolFields.PatchUninstall].AsBool();
147 + set => this.Set((int)CustomActionSymbolFields.PatchUninstall, value);
148 }
149
150 public bool TSAware
151 {
152 - get => this.Fields[(int)CustomActionTupleFields.TSAware].AsBool();
153 - set => this.Set((int)CustomActionTupleFields.TSAware, value);
152 + get => this.Fields[(int)CustomActionSymbolFields.TSAware].AsBool();
153 + set => this.Set((int)CustomActionSymbolFields.TSAware, value);
154 }
155
156 public bool Win64
157 {
158 - get => this.Fields[(int)CustomActionTupleFields.Win64].AsBool();
159 - set => this.Set((int)CustomActionTupleFields.Win64, value);
158 + get => this.Fields[(int)CustomActionSymbolFields.Win64].AsBool();
159 + set => this.Set((int)CustomActionSymbolFields.Win64, value);
160 }
161
162 public IntermediateFieldPathValue ScriptFile
163 {
164 - get => this.Fields[(int)CustomActionTupleFields.ScriptFile].AsPath();
165 - set => this.Set((int)CustomActionTupleFields.ScriptFile, value);
164 + get => this.Fields[(int)CustomActionSymbolFields.ScriptFile].AsPath();
165 + set => this.Set((int)CustomActionSymbolFields.ScriptFile, value);
166 }
167 }
168 }
src/WixToolset.Data/Tuples/DialogTuple.cs
+68 -68
@@ -2,41 +2,41 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Dialog = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Dialog,
9 + public static readonly IntermediateSymbolDefinition Dialog = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Dialog,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(DialogTupleFields.HCentering), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(DialogTupleFields.VCentering), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(DialogTupleFields.Width), IntermediateFieldType.Number),
16 - new IntermediateFieldDefinition(nameof(DialogTupleFields.Height), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(DialogTupleFields.CustomPalette), IntermediateFieldType.Bool),
18 - new IntermediateFieldDefinition(nameof(DialogTupleFields.ErrorDialog), IntermediateFieldType.Bool),
19 - new IntermediateFieldDefinition(nameof(DialogTupleFields.Visible), IntermediateFieldType.Bool),
20 - new IntermediateFieldDefinition(nameof(DialogTupleFields.Modal), IntermediateFieldType.Bool),
21 - new IntermediateFieldDefinition(nameof(DialogTupleFields.KeepModeless), IntermediateFieldType.Bool),
22 - new IntermediateFieldDefinition(nameof(DialogTupleFields.LeftScroll), IntermediateFieldType.Bool),
23 - new IntermediateFieldDefinition(nameof(DialogTupleFields.Minimize), IntermediateFieldType.Bool),
24 - new IntermediateFieldDefinition(nameof(DialogTupleFields.RightAligned), IntermediateFieldType.Bool),
25 - new IntermediateFieldDefinition(nameof(DialogTupleFields.RightToLeft), IntermediateFieldType.Bool),
26 - new IntermediateFieldDefinition(nameof(DialogTupleFields.SystemModal), IntermediateFieldType.Bool),
27 - new IntermediateFieldDefinition(nameof(DialogTupleFields.TrackDiskSpace), IntermediateFieldType.Bool),
28 - new IntermediateFieldDefinition(nameof(DialogTupleFields.Title), IntermediateFieldType.String),
29 - new IntermediateFieldDefinition(nameof(DialogTupleFields.FirstControlRef), IntermediateFieldType.String),
30 - new IntermediateFieldDefinition(nameof(DialogTupleFields.DefaultControlRef), IntermediateFieldType.String),
31 - new IntermediateFieldDefinition(nameof(DialogTupleFields.CancelControlRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.HCentering), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.VCentering), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.Width), IntermediateFieldType.Number),
16 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.Height), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.CustomPalette), IntermediateFieldType.Bool),
18 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.ErrorDialog), IntermediateFieldType.Bool),
19 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.Visible), IntermediateFieldType.Bool),
20 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.Modal), IntermediateFieldType.Bool),
21 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.KeepModeless), IntermediateFieldType.Bool),
22 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.LeftScroll), IntermediateFieldType.Bool),
23 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.Minimize), IntermediateFieldType.Bool),
24 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.RightAligned), IntermediateFieldType.Bool),
25 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.RightToLeft), IntermediateFieldType.Bool),
26 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.SystemModal), IntermediateFieldType.Bool),
27 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.TrackDiskSpace), IntermediateFieldType.Bool),
28 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.Title), IntermediateFieldType.String),
29 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.FirstControlRef), IntermediateFieldType.String),
30 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.DefaultControlRef), IntermediateFieldType.String),
31 + new IntermediateFieldDefinition(nameof(DialogSymbolFields.CancelControlRef), IntermediateFieldType.String),
32 },
33 - typeof(DialogTuple));
33 + typeof(DialogSymbol));
34 }
35 }
36
37 -namespace WixToolset.Data.Tuples
37 +namespace WixToolset.Data.Symbols
38 {
39 - public enum DialogTupleFields
39 + public enum DialogSymbolFields
40 {
41 HCentering,
42 VCentering,
@@ -59,130 +59,130 @@ namespace WixToolset.Data.Tuples
59 CancelControlRef,
60 }
61
62 - public class DialogTuple : IntermediateTuple
62 + public class DialogSymbol : IntermediateSymbol
63 {
64 - public DialogTuple() : base(TupleDefinitions.Dialog, null, null)
64 + public DialogSymbol() : base(SymbolDefinitions.Dialog, null, null)
65 {
66 }
67
68 - public DialogTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Dialog, sourceLineNumber, id)
68 + public DialogSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Dialog, sourceLineNumber, id)
69 {
70 }
71
72 - public IntermediateField this[DialogTupleFields index] => this.Fields[(int)index];
72 + public IntermediateField this[DialogSymbolFields index] => this.Fields[(int)index];
73
74 public int HCentering
75 {
76 - get => (int)this.Fields[(int)DialogTupleFields.HCentering];
77 - set => this.Set((int)DialogTupleFields.HCentering, value);
76 + get => (int)this.Fields[(int)DialogSymbolFields.HCentering];
77 + set => this.Set((int)DialogSymbolFields.HCentering, value);
78 }
79
80 public int VCentering
81 {
82 - get => (int)this.Fields[(int)DialogTupleFields.VCentering];
83 - set => this.Set((int)DialogTupleFields.VCentering, value);
82 + get => (int)this.Fields[(int)DialogSymbolFields.VCentering];
83 + set => this.Set((int)DialogSymbolFields.VCentering, value);
84 }
85
86 public int Width
87 {
88 - get => (int)this.Fields[(int)DialogTupleFields.Width];
89 - set => this.Set((int)DialogTupleFields.Width, value);
88 + get => (int)this.Fields[(int)DialogSymbolFields.Width];
89 + set => this.Set((int)DialogSymbolFields.Width, value);
90 }
91
92 public int Height
93 {
94 - get => (int)this.Fields[(int)DialogTupleFields.Height];
95 - set => this.Set((int)DialogTupleFields.Height, value);
94 + get => (int)this.Fields[(int)DialogSymbolFields.Height];
95 + set => this.Set((int)DialogSymbolFields.Height, value);
96 }
97
98 public bool CustomPalette
99 {
100 - get => this.Fields[(int)DialogTupleFields.CustomPalette].AsBool();
101 - set => this.Set((int)DialogTupleFields.CustomPalette, value);
100 + get => this.Fields[(int)DialogSymbolFields.CustomPalette].AsBool();
101 + set => this.Set((int)DialogSymbolFields.CustomPalette, value);
102 }
103
104 public bool ErrorDialog
105 {
106 - get => this.Fields[(int)DialogTupleFields.ErrorDialog].AsBool();
107 - set => this.Set((int)DialogTupleFields.ErrorDialog, value);
106 + get => this.Fields[(int)DialogSymbolFields.ErrorDialog].AsBool();
107 + set => this.Set((int)DialogSymbolFields.ErrorDialog, value);
108 }
109
110 public bool Visible
111 {
112 - get => this.Fields[(int)DialogTupleFields.Visible].AsBool();
113 - set => this.Set((int)DialogTupleFields.Visible, value);
112 + get => this.Fields[(int)DialogSymbolFields.Visible].AsBool();
113 + set => this.Set((int)DialogSymbolFields.Visible, value);
114 }
115
116 public bool Modal
117 {
118 - get => this.Fields[(int)DialogTupleFields.Modal].AsBool();
119 - set => this.Set((int)DialogTupleFields.Modal, value);
118 + get => this.Fields[(int)DialogSymbolFields.Modal].AsBool();
119 + set => this.Set((int)DialogSymbolFields.Modal, value);
120 }
121
122 public bool KeepModeless
123 {
124 - get => this.Fields[(int)DialogTupleFields.KeepModeless].AsBool();
125 - set => this.Set((int)DialogTupleFields.KeepModeless, value);
124 + get => this.Fields[(int)DialogSymbolFields.KeepModeless].AsBool();
125 + set => this.Set((int)DialogSymbolFields.KeepModeless, value);
126 }
127
128 public bool LeftScroll
129 {
130 - get => this.Fields[(int)DialogTupleFields.LeftScroll].AsBool();
131 - set => this.Set((int)DialogTupleFields.LeftScroll, value);
130 + get => this.Fields[(int)DialogSymbolFields.LeftScroll].AsBool();
131 + set => this.Set((int)DialogSymbolFields.LeftScroll, value);
132 }
133
134 public bool Minimize
135 {
136 - get => this.Fields[(int)DialogTupleFields.Minimize].AsBool();
137 - set => this.Set((int)DialogTupleFields.Minimize, value);
136 + get => this.Fields[(int)DialogSymbolFields.Minimize].AsBool();
137 + set => this.Set((int)DialogSymbolFields.Minimize, value);
138 }
139
140 public bool RightAligned
141 {
142 - get => this.Fields[(int)DialogTupleFields.RightAligned].AsBool();
143 - set => this.Set((int)DialogTupleFields.RightAligned, value);
142 + get => this.Fields[(int)DialogSymbolFields.RightAligned].AsBool();
143 + set => this.Set((int)DialogSymbolFields.RightAligned, value);
144 }
145
146 public bool RightToLeft
147 {
148 - get => this.Fields[(int)DialogTupleFields.RightToLeft].AsBool();
149 - set => this.Set((int)DialogTupleFields.RightToLeft, value);
148 + get => this.Fields[(int)DialogSymbolFields.RightToLeft].AsBool();
149 + set => this.Set((int)DialogSymbolFields.RightToLeft, value);
150 }
151
152 public bool TrackDiskSpace
153 {
154 - get => this.Fields[(int)DialogTupleFields.TrackDiskSpace].AsBool();
155 - set => this.Set((int)DialogTupleFields.TrackDiskSpace, value);
154 + get => this.Fields[(int)DialogSymbolFields.TrackDiskSpace].AsBool();
155 + set => this.Set((int)DialogSymbolFields.TrackDiskSpace, value);
156 }
157
158 public bool SystemModal
159 {
160 - get => this.Fields[(int)DialogTupleFields.SystemModal].AsBool();
161 - set => this.Set((int)DialogTupleFields.SystemModal, value);
160 + get => this.Fields[(int)DialogSymbolFields.SystemModal].AsBool();
161 + set => this.Set((int)DialogSymbolFields.SystemModal, value);
162 }
163
164 public string Title
165 {
166 - get => (string)this.Fields[(int)DialogTupleFields.Title];
167 - set => this.Set((int)DialogTupleFields.Title, value);
166 + get => (string)this.Fields[(int)DialogSymbolFields.Title];
167 + set => this.Set((int)DialogSymbolFields.Title, value);
168 }
169
170 public string FirstControlRef
171 {
172 - get => (string)this.Fields[(int)DialogTupleFields.FirstControlRef];
173 - set => this.Set((int)DialogTupleFields.FirstControlRef, value);
172 + get => (string)this.Fields[(int)DialogSymbolFields.FirstControlRef];
173 + set => this.Set((int)DialogSymbolFields.FirstControlRef, value);
174 }
175
176 public string DefaultControlRef
177 {
178 - get => (string)this.Fields[(int)DialogTupleFields.DefaultControlRef];
179 - set => this.Set((int)DialogTupleFields.DefaultControlRef, value);
178 + get => (string)this.Fields[(int)DialogSymbolFields.DefaultControlRef];
179 + set => this.Set((int)DialogSymbolFields.DefaultControlRef, value);
180 }
181
182 public string CancelControlRef
183 {
184 - get => (string)this.Fields[(int)DialogTupleFields.CancelControlRef];
185 - set => this.Set((int)DialogTupleFields.CancelControlRef, value);
184 + get => (string)this.Fields[(int)DialogSymbolFields.CancelControlRef];
185 + set => this.Set((int)DialogSymbolFields.CancelControlRef, value);
186 }
187 }
188 }
\ No newline at end of file
src/WixToolset.Data/Tuples/DirectoryTuple.cs
+29 -29
@@ -2,28 +2,28 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Directory = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Directory,
9 + public static readonly IntermediateSymbolDefinition Directory = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Directory,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ParentDirectoryRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(DirectoryTupleFields.Name), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ShortName), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(DirectoryTupleFields.SourceName), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(DirectoryTupleFields.SourceShortName), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ComponentGuidGenerationSeed), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(DirectorySymbolFields.ParentDirectoryRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(DirectorySymbolFields.Name), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(DirectorySymbolFields.ShortName), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(DirectorySymbolFields.SourceName), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(DirectorySymbolFields.SourceShortName), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(DirectorySymbolFields.ComponentGuidGenerationSeed), IntermediateFieldType.String),
19 },
20 - typeof(DirectoryTuple));
20 + typeof(DirectorySymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 - public enum DirectoryTupleFields
26 + public enum DirectorySymbolFields
27 {
28 ParentDirectoryRef,
29 Name,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
33 ComponentGuidGenerationSeed,
34 }
35
36 - public class DirectoryTuple : IntermediateTuple
36 + public class DirectorySymbol : IntermediateSymbol
37 {
38 - public DirectoryTuple() : base(TupleDefinitions.Directory, null, null)
38 + public DirectorySymbol() : base(SymbolDefinitions.Directory, null, null)
39 {
40 }
41
42 - public DirectoryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Directory, sourceLineNumber, id)
42 + public DirectorySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Directory, sourceLineNumber, id)
43 {
44 }
45
46 - public IntermediateField this[DirectoryTupleFields index] => this.Fields[(int)index];
46 + public IntermediateField this[DirectorySymbolFields index] => this.Fields[(int)index];
47
48 public string ParentDirectoryRef
49 {
50 - get => (string)this.Fields[(int)DirectoryTupleFields.ParentDirectoryRef];
51 - set => this.Set((int)DirectoryTupleFields.ParentDirectoryRef, value);
50 + get => (string)this.Fields[(int)DirectorySymbolFields.ParentDirectoryRef];
51 + set => this.Set((int)DirectorySymbolFields.ParentDirectoryRef, value);
52 }
53
54 public string Name
55 {
56 - get => (string)this.Fields[(int)DirectoryTupleFields.Name];
57 - set => this.Set((int)DirectoryTupleFields.Name, value);
56 + get => (string)this.Fields[(int)DirectorySymbolFields.Name];
57 + set => this.Set((int)DirectorySymbolFields.Name, value);
58 }
59
60 public string ShortName
61 {
62 - get => (string)this.Fields[(int)DirectoryTupleFields.ShortName];
63 - set => this.Set((int)DirectoryTupleFields.ShortName, value);
62 + get => (string)this.Fields[(int)DirectorySymbolFields.ShortName];
63 + set => this.Set((int)DirectorySymbolFields.ShortName, value);
64 }
65
66 public string SourceName
67 {
68 - get => (string)this.Fields[(int)DirectoryTupleFields.SourceName];
69 - set => this.Set((int)DirectoryTupleFields.SourceName, value);
68 + get => (string)this.Fields[(int)DirectorySymbolFields.SourceName];
69 + set => this.Set((int)DirectorySymbolFields.SourceName, value);
70 }
71
72 public string SourceShortName
73 {
74 - get => (string)this.Fields[(int)DirectoryTupleFields.SourceShortName];
75 - set => this.Set((int)DirectoryTupleFields.SourceShortName, value);
74 + get => (string)this.Fields[(int)DirectorySymbolFields.SourceShortName];
75 + set => this.Set((int)DirectorySymbolFields.SourceShortName, value);
76 }
77
78 public string ComponentGuidGenerationSeed
79 {
80 - get => (string)this.Fields[(int)DirectoryTupleFields.ComponentGuidGenerationSeed];
81 - set => this.Set((int)DirectoryTupleFields.ComponentGuidGenerationSeed, value);
80 + get => (string)this.Fields[(int)DirectorySymbolFields.ComponentGuidGenerationSeed];
81 + set => this.Set((int)DirectorySymbolFields.ComponentGuidGenerationSeed, value);
82 }
83 }
84 }
src/WixToolset.Data/Tuples/DrLocatorTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition DrLocator = new IntermediateTupleDefinition(
10 - TupleDefinitionType.DrLocator,
9 + public static readonly IntermediateSymbolDefinition DrLocator = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.DrLocator,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.SignatureRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Parent), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Path), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Depth), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(DrLocatorSymbolFields.SignatureRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(DrLocatorSymbolFields.Parent), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(DrLocatorSymbolFields.Path), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(DrLocatorSymbolFields.Depth), IntermediateFieldType.Number),
17 },
18 - typeof(DrLocatorTuple));
18 + typeof(DrLocatorSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum DrLocatorTupleFields
24 + public enum DrLocatorSymbolFields
25 {
26 SignatureRef,
27 Parent,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Depth,
30 }
31
32 - public class DrLocatorTuple : IntermediateTuple
32 + public class DrLocatorSymbol : IntermediateSymbol
33 {
34 - public DrLocatorTuple() : base(TupleDefinitions.DrLocator, null, null)
34 + public DrLocatorSymbol() : base(SymbolDefinitions.DrLocator, null, null)
35 {
36 }
37
38 - public DrLocatorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.DrLocator, sourceLineNumber, id)
38 + public DrLocatorSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.DrLocator, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[DrLocatorTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[DrLocatorSymbolFields index] => this.Fields[(int)index];
43
44 public string SignatureRef
45 {
46 - get => (string)this.Fields[(int)DrLocatorTupleFields.SignatureRef];
47 - set => this.Set((int)DrLocatorTupleFields.SignatureRef, value);
46 + get => (string)this.Fields[(int)DrLocatorSymbolFields.SignatureRef];
47 + set => this.Set((int)DrLocatorSymbolFields.SignatureRef, value);
48 }
49
50 public string Parent
51 {
52 - get => (string)this.Fields[(int)DrLocatorTupleFields.Parent];
53 - set => this.Set((int)DrLocatorTupleFields.Parent, value);
52 + get => (string)this.Fields[(int)DrLocatorSymbolFields.Parent];
53 + set => this.Set((int)DrLocatorSymbolFields.Parent, value);
54 }
55
56 public string Path
57 {
58 - get => (string)this.Fields[(int)DrLocatorTupleFields.Path];
59 - set => this.Set((int)DrLocatorTupleFields.Path, value);
58 + get => (string)this.Fields[(int)DrLocatorSymbolFields.Path];
59 + set => this.Set((int)DrLocatorSymbolFields.Path, value);
60 }
61
62 public int? Depth
63 {
64 - get => (int?)this.Fields[(int)DrLocatorTupleFields.Depth];
65 - set => this.Set((int)DrLocatorTupleFields.Depth, value);
64 + get => (int?)this.Fields[(int)DrLocatorSymbolFields.Depth];
65 + set => this.Set((int)DrLocatorSymbolFields.Depth, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/DuplicateFileTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition DuplicateFile = new IntermediateTupleDefinition(
10 - TupleDefinitionType.DuplicateFile,
9 + public static readonly IntermediateSymbolDefinition DuplicateFile = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.DuplicateFile,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.ComponentRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.FileRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.DestinationName), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.DestinationFolder), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.ComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.FileRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.DestinationName), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.DestinationFolder), IntermediateFieldType.String),
17 },
18 - typeof(DuplicateFileTuple));
18 + typeof(DuplicateFileSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum DuplicateFileTupleFields
24 + public enum DuplicateFileSymbolFields
25 {
26 ComponentRef,
27 FileRef,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 DestinationFolder,
30 }
31
32 - public class DuplicateFileTuple : IntermediateTuple
32 + public class DuplicateFileSymbol : IntermediateSymbol
33 {
34 - public DuplicateFileTuple() : base(TupleDefinitions.DuplicateFile, null, null)
34 + public DuplicateFileSymbol() : base(SymbolDefinitions.DuplicateFile, null, null)
35 {
36 }
37
38 - public DuplicateFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.DuplicateFile, sourceLineNumber, id)
38 + public DuplicateFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.DuplicateFile, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[DuplicateFileTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[DuplicateFileSymbolFields index] => this.Fields[(int)index];
43
44 public string ComponentRef
45 {
46 - get => (string)this.Fields[(int)DuplicateFileTupleFields.ComponentRef];
47 - set => this.Set((int)DuplicateFileTupleFields.ComponentRef, value);
46 + get => (string)this.Fields[(int)DuplicateFileSymbolFields.ComponentRef];
47 + set => this.Set((int)DuplicateFileSymbolFields.ComponentRef, value);
48 }
49
50 public string FileRef
51 {
52 - get => (string)this.Fields[(int)DuplicateFileTupleFields.FileRef];
53 - set => this.Set((int)DuplicateFileTupleFields.FileRef, value);
52 + get => (string)this.Fields[(int)DuplicateFileSymbolFields.FileRef];
53 + set => this.Set((int)DuplicateFileSymbolFields.FileRef, value);
54 }
55
56 public string DestinationName
57 {
58 - get => (string)this.Fields[(int)DuplicateFileTupleFields.DestinationName];
59 - set => this.Set((int)DuplicateFileTupleFields.DestinationName, value);
58 + get => (string)this.Fields[(int)DuplicateFileSymbolFields.DestinationName];
59 + set => this.Set((int)DuplicateFileSymbolFields.DestinationName, value);
60 }
61
62 public string DestinationFolder
63 {
64 - get => (string)this.Fields[(int)DuplicateFileTupleFields.DestinationFolder];
65 - set => this.Set((int)DuplicateFileTupleFields.DestinationFolder, value);
64 + get => (string)this.Fields[(int)DuplicateFileSymbolFields.DestinationFolder];
65 + set => this.Set((int)DuplicateFileSymbolFields.DestinationFolder, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/EnvironmentTuple.cs
+35 -35
@@ -2,30 +2,30 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Environment = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Environment,
9 + public static readonly IntermediateSymbolDefinition Environment = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Environment,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Name), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Value), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Separator), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Action), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Part), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Permanent), IntermediateFieldType.Bool),
19 - new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.System), IntermediateFieldType.Bool),
20 - new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.ComponentRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.Name), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.Value), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.Separator), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.Action), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.Part), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.Permanent), IntermediateFieldType.Bool),
19 + new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.System), IntermediateFieldType.Bool),
20 + new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.ComponentRef), IntermediateFieldType.String),
21 },
22 - typeof(EnvironmentTuple));
22 + typeof(EnvironmentSymbol));
23 }
24 }
25
26 -namespace WixToolset.Data.Tuples
26 +namespace WixToolset.Data.Symbols
27 {
28 - public enum EnvironmentTupleFields
28 + public enum EnvironmentSymbolFields
29 {
30 Name,
31 Value,
@@ -51,64 +51,64 @@ namespace WixToolset.Data.Tuples
51 Last
52 }
53
54 - public class EnvironmentTuple : IntermediateTuple
54 + public class EnvironmentSymbol : IntermediateSymbol
55 {
56 - public EnvironmentTuple() : base(TupleDefinitions.Environment, null, null)
56 + public EnvironmentSymbol() : base(SymbolDefinitions.Environment, null, null)
57 {
58 }
59
60 - public EnvironmentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Environment, sourceLineNumber, id)
60 + public EnvironmentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Environment, sourceLineNumber, id)
61 {
62 }
63
64 - public IntermediateField this[EnvironmentTupleFields index] => this.Fields[(int)index];
64 + public IntermediateField this[EnvironmentSymbolFields index] => this.Fields[(int)index];
65
66 public string Name
67 {
68 - get => (string)this.Fields[(int)EnvironmentTupleFields.Name];
69 - set => this.Set((int)EnvironmentTupleFields.Name, value);
68 + get => (string)this.Fields[(int)EnvironmentSymbolFields.Name];
69 + set => this.Set((int)EnvironmentSymbolFields.Name, value);
70 }
71
72 public string Value
73 {
74 - get => (string)this.Fields[(int)EnvironmentTupleFields.Value];
75 - set => this.Set((int)EnvironmentTupleFields.Value, value);
74 + get => (string)this.Fields[(int)EnvironmentSymbolFields.Value];
75 + set => this.Set((int)EnvironmentSymbolFields.Value, value);
76 }
77
78 public string Separator
79 {
80 - get => (string)this.Fields[(int)EnvironmentTupleFields.Separator];
81 - set => this.Set((int)EnvironmentTupleFields.Separator, value);
80 + get => (string)this.Fields[(int)EnvironmentSymbolFields.Separator];
81 + set => this.Set((int)EnvironmentSymbolFields.Separator, value);
82 }
83
84 public EnvironmentActionType? Action
85 {
86 - get => (EnvironmentActionType?)this.Fields[(int)EnvironmentTupleFields.Action].AsNullableNumber();
87 - set => this.Set((int)EnvironmentTupleFields.Action, (int?)value);
86 + get => (EnvironmentActionType?)this.Fields[(int)EnvironmentSymbolFields.Action].AsNullableNumber();
87 + set => this.Set((int)EnvironmentSymbolFields.Action, (int?)value);
88 }
89
90 public EnvironmentPartType? Part
91 {
92 - get => (EnvironmentPartType?)this.Fields[(int)EnvironmentTupleFields.Part].AsNullableNumber();
93 - set => this.Set((int)EnvironmentTupleFields.Part, (int?)value);
92 + get => (EnvironmentPartType?)this.Fields[(int)EnvironmentSymbolFields.Part].AsNullableNumber();
93 + set => this.Set((int)EnvironmentSymbolFields.Part, (int?)value);
94 }
95
96 public bool Permanent
97 {
98 - get => this.Fields[(int)EnvironmentTupleFields.Permanent].AsBool();
99 - set => this.Set((int)EnvironmentTupleFields.Permanent, value);
98 + get => this.Fields[(int)EnvironmentSymbolFields.Permanent].AsBool();
99 + set => this.Set((int)EnvironmentSymbolFields.Permanent, value);
100 }
101
102 public bool System
103 {
104 - get => this.Fields[(int)EnvironmentTupleFields.System].AsBool();
105 - set => this.Set((int)EnvironmentTupleFields.System, value);
104 + get => this.Fields[(int)EnvironmentSymbolFields.System].AsBool();
105 + set => this.Set((int)EnvironmentSymbolFields.System, value);
106 }
107
108 public string ComponentRef
109 {
110 - get => (string)this.Fields[(int)EnvironmentTupleFields.ComponentRef];
111 - set => this.Set((int)EnvironmentTupleFields.ComponentRef, value);
110 + get => (string)this.Fields[(int)EnvironmentSymbolFields.ComponentRef];
111 + set => this.Set((int)EnvironmentSymbolFields.ComponentRef, value);
112 }
113 }
114 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ErrorTuple.cs
+14 -14
@@ -2,43 +2,43 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Error = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Error,
9 + public static readonly IntermediateSymbolDefinition Error = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Error,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ErrorTupleFields.Message), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ErrorSymbolFields.Message), IntermediateFieldType.String),
14 },
15 - typeof(ErrorTuple));
15 + typeof(ErrorSymbol));
16 }
17 }
18
19 -namespace WixToolset.Data.Tuples
19 +namespace WixToolset.Data.Symbols
20 {
21 - public enum ErrorTupleFields
21 + public enum ErrorSymbolFields
22 {
23 Message,
24 }
25
26 - public class ErrorTuple : IntermediateTuple
26 + public class ErrorSymbol : IntermediateSymbol
27 {
28 - public ErrorTuple() : base(TupleDefinitions.Error, null, null)
28 + public ErrorSymbol() : base(SymbolDefinitions.Error, null, null)
29 {
30 }
31
32 - public ErrorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Error, sourceLineNumber, id)
32 + public ErrorSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Error, sourceLineNumber, id)
33 {
34 }
35
36 - public IntermediateField this[ErrorTupleFields index] => this.Fields[(int)index];
36 + public IntermediateField this[ErrorSymbolFields index] => this.Fields[(int)index];
37
38 public string Message
39 {
40 - get => (string)this.Fields[(int)ErrorTupleFields.Message];
41 - set => this.Set((int)ErrorTupleFields.Message, value);
40 + get => (string)this.Fields[(int)ErrorSymbolFields.Message];
41 + set => this.Set((int)ErrorSymbolFields.Message, value);
42 }
43 }
44 }
\ No newline at end of file
src/WixToolset.Data/Tuples/EventMappingTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition EventMapping = new IntermediateTupleDefinition(
10 - TupleDefinitionType.EventMapping,
9 + public static readonly IntermediateSymbolDefinition EventMapping = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.EventMapping,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(EventMappingTupleFields.DialogRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(EventMappingTupleFields.ControlRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Event), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Attribute), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(EventMappingSymbolFields.DialogRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(EventMappingSymbolFields.ControlRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(EventMappingSymbolFields.Event), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(EventMappingSymbolFields.Attribute), IntermediateFieldType.String),
17 },
18 - typeof(EventMappingTuple));
18 + typeof(EventMappingSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum EventMappingTupleFields
24 + public enum EventMappingSymbolFields
25 {
26 DialogRef,
27 ControlRef,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Attribute,
30 }
31
32 - public class EventMappingTuple : IntermediateTuple
32 + public class EventMappingSymbol : IntermediateSymbol
33 {
34 - public EventMappingTuple() : base(TupleDefinitions.EventMapping, null, null)
34 + public EventMappingSymbol() : base(SymbolDefinitions.EventMapping, null, null)
35 {
36 }
37
38 - public EventMappingTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.EventMapping, sourceLineNumber, id)
38 + public EventMappingSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.EventMapping, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[EventMappingTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[EventMappingSymbolFields index] => this.Fields[(int)index];
43
44 public string DialogRef
45 {
46 - get => (string)this.Fields[(int)EventMappingTupleFields.DialogRef];
47 - set => this.Set((int)EventMappingTupleFields.DialogRef, value);
46 + get => (string)this.Fields[(int)EventMappingSymbolFields.DialogRef];
47 + set => this.Set((int)EventMappingSymbolFields.DialogRef, value);
48 }
49
50 public string ControlRef
51 {
52 - get => (string)this.Fields[(int)EventMappingTupleFields.ControlRef];
53 - set => this.Set((int)EventMappingTupleFields.ControlRef, value);
52 + get => (string)this.Fields[(int)EventMappingSymbolFields.ControlRef];
53 + set => this.Set((int)EventMappingSymbolFields.ControlRef, value);
54 }
55
56 public string Event
57 {
58 - get => (string)this.Fields[(int)EventMappingTupleFields.Event];
59 - set => this.Set((int)EventMappingTupleFields.Event, value);
58 + get => (string)this.Fields[(int)EventMappingSymbolFields.Event];
59 + set => this.Set((int)EventMappingSymbolFields.Event, value);
60 }
61
62 public string Attribute
63 {
64 - get => (string)this.Fields[(int)EventMappingTupleFields.Attribute];
65 - set => this.Set((int)EventMappingTupleFields.Attribute, value);
64 + get => (string)this.Fields[(int)EventMappingSymbolFields.Attribute];
65 + set => this.Set((int)EventMappingSymbolFields.Attribute, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ExtensionTuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Extension = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Extension,
9 + public static readonly IntermediateSymbolDefinition Extension = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Extension,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ExtensionTupleFields.Extension), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ExtensionTupleFields.ComponentRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ExtensionTupleFields.ProgIdRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ExtensionTupleFields.MimeRef), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(ExtensionTupleFields.FeatureRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ExtensionSymbolFields.Extension), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ExtensionSymbolFields.ComponentRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ExtensionSymbolFields.ProgIdRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ExtensionSymbolFields.MimeRef), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(ExtensionSymbolFields.FeatureRef), IntermediateFieldType.String),
18 },
19 - typeof(ExtensionTuple));
19 + typeof(ExtensionSymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum ExtensionTupleFields
25 + public enum ExtensionSymbolFields
26 {
27 Extension,
28 ComponentRef,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
31 FeatureRef,
32 }
33
34 - public class ExtensionTuple : IntermediateTuple
34 + public class ExtensionSymbol : IntermediateSymbol
35 {
36 - public ExtensionTuple() : base(TupleDefinitions.Extension, null, null)
36 + public ExtensionSymbol() : base(SymbolDefinitions.Extension, null, null)
37 {
38 }
39
40 - public ExtensionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Extension, sourceLineNumber, id)
40 + public ExtensionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Extension, sourceLineNumber, id)
41 {
42 }
43
44 - public IntermediateField this[ExtensionTupleFields index] => this.Fields[(int)index];
44 + public IntermediateField this[ExtensionSymbolFields index] => this.Fields[(int)index];
45
46 public string Extension
47 {
48 - get => (string)this.Fields[(int)ExtensionTupleFields.Extension];
49 - set => this.Set((int)ExtensionTupleFields.Extension, value);
48 + get => (string)this.Fields[(int)ExtensionSymbolFields.Extension];
49 + set => this.Set((int)ExtensionSymbolFields.Extension, value);
50 }
51
52 public string ComponentRef
53 {
54 - get => (string)this.Fields[(int)ExtensionTupleFields.ComponentRef];
55 - set => this.Set((int)ExtensionTupleFields.ComponentRef, value);
54 + get => (string)this.Fields[(int)ExtensionSymbolFields.ComponentRef];
55 + set => this.Set((int)ExtensionSymbolFields.ComponentRef, value);
56 }
57
58 public string ProgIdRef
59 {
60 - get => (string)this.Fields[(int)ExtensionTupleFields.ProgIdRef];
61 - set => this.Set((int)ExtensionTupleFields.ProgIdRef, value);
60 + get => (string)this.Fields[(int)ExtensionSymbolFields.ProgIdRef];
61 + set => this.Set((int)ExtensionSymbolFields.ProgIdRef, value);
62 }
63
64 public string MimeRef
65 {
66 - get => (string)this.Fields[(int)ExtensionTupleFields.MimeRef];
67 - set => this.Set((int)ExtensionTupleFields.MimeRef, value);
66 + get => (string)this.Fields[(int)ExtensionSymbolFields.MimeRef];
67 + set => this.Set((int)ExtensionSymbolFields.MimeRef, value);
68 }
69
70 public string FeatureRef
71 {
72 - get => (string)this.Fields[(int)ExtensionTupleFields.FeatureRef];
73 - set => this.Set((int)ExtensionTupleFields.FeatureRef, value);
72 + get => (string)this.Fields[(int)ExtensionSymbolFields.FeatureRef];
73 + set => this.Set((int)ExtensionSymbolFields.FeatureRef, value);
74 }
75 }
76 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ExternalFilesTuple.cs
+35 -35
@@ -2,30 +2,30 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ExternalFiles = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ExternalFiles,
9 + public static readonly IntermediateSymbolDefinition ExternalFiles = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ExternalFiles,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.Family), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.FTK), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.FilePath), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.SymbolPaths), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.IgnoreOffsets), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.IgnoreLengths), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.RetainOffsets), IntermediateFieldType.String),
20 - new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.Order), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.Family), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.FTK), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.FilePath), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.SymbolPaths), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.IgnoreOffsets), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.IgnoreLengths), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.RetainOffsets), IntermediateFieldType.String),
20 + new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.Order), IntermediateFieldType.Number),
21 },
22 - typeof(ExternalFilesTuple));
22 + typeof(ExternalFilesSymbol));
23 }
24 }
25
26 -namespace WixToolset.Data.Tuples
26 +namespace WixToolset.Data.Symbols
27 {
28 - public enum ExternalFilesTupleFields
28 + public enum ExternalFilesSymbolFields
29 {
30 Family,
31 FTK,
@@ -37,64 +37,64 @@ namespace WixToolset.Data.Tuples
37 Order,
38 }
39
40 - public class ExternalFilesTuple : IntermediateTuple
40 + public class ExternalFilesSymbol : IntermediateSymbol
41 {
42 - public ExternalFilesTuple() : base(TupleDefinitions.ExternalFiles, null, null)
42 + public ExternalFilesSymbol() : base(SymbolDefinitions.ExternalFiles, null, null)
43 {
44 }
45
46 - public ExternalFilesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ExternalFiles, sourceLineNumber, id)
46 + public ExternalFilesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ExternalFiles, sourceLineNumber, id)
47 {
48 }
49
50 - public IntermediateField this[ExternalFilesTupleFields index] => this.Fields[(int)index];
50 + public IntermediateField this[ExternalFilesSymbolFields index] => this.Fields[(int)index];
51
52 public string Family
53 {
54 - get => (string)this.Fields[(int)ExternalFilesTupleFields.Family];
55 - set => this.Set((int)ExternalFilesTupleFields.Family, value);
54 + get => (string)this.Fields[(int)ExternalFilesSymbolFields.Family];
55 + set => this.Set((int)ExternalFilesSymbolFields.Family, value);
56 }
57
58 public string FTK
59 {
60 - get => (string)this.Fields[(int)ExternalFilesTupleFields.FTK];
61 - set => this.Set((int)ExternalFilesTupleFields.FTK, value);
60 + get => (string)this.Fields[(int)ExternalFilesSymbolFields.FTK];
61 + set => this.Set((int)ExternalFilesSymbolFields.FTK, value);
62 }
63
64 public string FilePath
65 {
66 - get => (string)this.Fields[(int)ExternalFilesTupleFields.FilePath];
67 - set => this.Set((int)ExternalFilesTupleFields.FilePath, value);
66 + get => (string)this.Fields[(int)ExternalFilesSymbolFields.FilePath];
67 + set => this.Set((int)ExternalFilesSymbolFields.FilePath, value);
68 }
69
70 public string SymbolPaths
71 {
72 - get => (string)this.Fields[(int)ExternalFilesTupleFields.SymbolPaths];
73 - set => this.Set((int)ExternalFilesTupleFields.SymbolPaths, value);
72 + get => (string)this.Fields[(int)ExternalFilesSymbolFields.SymbolPaths];
73 + set => this.Set((int)ExternalFilesSymbolFields.SymbolPaths, value);
74 }
75
76 public string IgnoreOffsets
77 {
78 - get => (string)this.Fields[(int)ExternalFilesTupleFields.IgnoreOffsets];
79 - set => this.Set((int)ExternalFilesTupleFields.IgnoreOffsets, value);
78 + get => (string)this.Fields[(int)ExternalFilesSymbolFields.IgnoreOffsets];
79 + set => this.Set((int)ExternalFilesSymbolFields.IgnoreOffsets, value);
80 }
81
82 public string IgnoreLengths
83 {
84 - get => (string)this.Fields[(int)ExternalFilesTupleFields.IgnoreLengths];
85 - set => this.Set((int)ExternalFilesTupleFields.IgnoreLengths, value);
84 + get => (string)this.Fields[(int)ExternalFilesSymbolFields.IgnoreLengths];
85 + set => this.Set((int)ExternalFilesSymbolFields.IgnoreLengths, value);
86 }
87
88 public string RetainOffsets
89 {
90 - get => (string)this.Fields[(int)ExternalFilesTupleFields.RetainOffsets];
91 - set => this.Set((int)ExternalFilesTupleFields.RetainOffsets, value);
90 + get => (string)this.Fields[(int)ExternalFilesSymbolFields.RetainOffsets];
91 + set => this.Set((int)ExternalFilesSymbolFields.RetainOffsets, value);
92 }
93
94 public int Order
95 {
96 - get => (int)this.Fields[(int)ExternalFilesTupleFields.Order];
97 - set => this.Set((int)ExternalFilesTupleFields.Order, value);
96 + get => (int)this.Fields[(int)ExternalFilesSymbolFields.Order];
97 + set => this.Set((int)ExternalFilesSymbolFields.Order, value);
98 }
99 }
100 }
\ No newline at end of file
src/WixToolset.Data/Tuples/FamilyFileRangesTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition FamilyFileRanges = new IntermediateTupleDefinition(
10 - TupleDefinitionType.FamilyFileRanges,
9 + public static readonly IntermediateSymbolDefinition FamilyFileRanges = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.FamilyFileRanges,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(FamilyFileRangesTupleFields.Family), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(FamilyFileRangesTupleFields.FTK), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(FamilyFileRangesTupleFields.RetainOffsets), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(FamilyFileRangesTupleFields.RetainLengths), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(FamilyFileRangesSymbolFields.Family), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(FamilyFileRangesSymbolFields.FTK), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(FamilyFileRangesSymbolFields.RetainOffsets), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(FamilyFileRangesSymbolFields.RetainLengths), IntermediateFieldType.String),
17 },
18 - typeof(FamilyFileRangesTuple));
18 + typeof(FamilyFileRangesSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum FamilyFileRangesTupleFields
24 + public enum FamilyFileRangesSymbolFields
25 {
26 Family,
27 FTK,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 RetainLengths,
30 }
31
32 - public class FamilyFileRangesTuple : IntermediateTuple
32 + public class FamilyFileRangesSymbol : IntermediateSymbol
33 {
34 - public FamilyFileRangesTuple() : base(TupleDefinitions.FamilyFileRanges, null, null)
34 + public FamilyFileRangesSymbol() : base(SymbolDefinitions.FamilyFileRanges, null, null)
35 {
36 }
37
38 - public FamilyFileRangesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.FamilyFileRanges, sourceLineNumber, id)
38 + public FamilyFileRangesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.FamilyFileRanges, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[FamilyFileRangesTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[FamilyFileRangesSymbolFields index] => this.Fields[(int)index];
43
44 public string Family
45 {
46 - get => (string)this.Fields[(int)FamilyFileRangesTupleFields.Family];
47 - set => this.Set((int)FamilyFileRangesTupleFields.Family, value);
46 + get => (string)this.Fields[(int)FamilyFileRangesSymbolFields.Family];
47 + set => this.Set((int)FamilyFileRangesSymbolFields.Family, value);
48 }
49
50 public string FTK
51 {
52 - get => (string)this.Fields[(int)FamilyFileRangesTupleFields.FTK];
53 - set => this.Set((int)FamilyFileRangesTupleFields.FTK, value);
52 + get => (string)this.Fields[(int)FamilyFileRangesSymbolFields.FTK];
53 + set => this.Set((int)FamilyFileRangesSymbolFields.FTK, value);
54 }
55
56 public string RetainOffsets
57 {
58 - get => (string)this.Fields[(int)FamilyFileRangesTupleFields.RetainOffsets];
59 - set => this.Set((int)FamilyFileRangesTupleFields.RetainOffsets, value);
58 + get => (string)this.Fields[(int)FamilyFileRangesSymbolFields.RetainOffsets];
59 + set => this.Set((int)FamilyFileRangesSymbolFields.RetainOffsets, value);
60 }
61
62 public string RetainLengths
63 {
64 - get => (string)this.Fields[(int)FamilyFileRangesTupleFields.RetainLengths];
65 - set => this.Set((int)FamilyFileRangesTupleFields.RetainLengths, value);
64 + get => (string)this.Fields[(int)FamilyFileRangesSymbolFields.RetainLengths];
65 + set => this.Set((int)FamilyFileRangesSymbolFields.RetainLengths, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition FeatureComponents = new IntermediateTupleDefinition(
10 - TupleDefinitionType.FeatureComponents,
9 + public static readonly IntermediateSymbolDefinition FeatureComponents = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.FeatureComponents,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(FeatureComponentsTupleFields.FeatureRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(FeatureComponentsTupleFields.ComponentRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(FeatureComponentsSymbolFields.FeatureRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(FeatureComponentsSymbolFields.ComponentRef), IntermediateFieldType.String),
15 },
16 - typeof(FeatureComponentsTuple));
16 + typeof(FeatureComponentsSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum FeatureComponentsTupleFields
22 + public enum FeatureComponentsSymbolFields
23 {
24 FeatureRef,
25 ComponentRef,
26 }
27
28 - public class FeatureComponentsTuple : IntermediateTuple
28 + public class FeatureComponentsSymbol : IntermediateSymbol
29 {
30 - public FeatureComponentsTuple() : base(TupleDefinitions.FeatureComponents, null, null)
30 + public FeatureComponentsSymbol() : base(SymbolDefinitions.FeatureComponents, null, null)
31 {
32 }
33
34 - public FeatureComponentsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.FeatureComponents, sourceLineNumber, id)
34 + public FeatureComponentsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.FeatureComponents, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[FeatureComponentsTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[FeatureComponentsSymbolFields index] => this.Fields[(int)index];
39
40 public string FeatureRef
41 {
42 - get => (string)this.Fields[(int)FeatureComponentsTupleFields.FeatureRef];
43 - set => this.Set((int)FeatureComponentsTupleFields.FeatureRef, value);
42 + get => (string)this.Fields[(int)FeatureComponentsSymbolFields.FeatureRef];
43 + set => this.Set((int)FeatureComponentsSymbolFields.FeatureRef, value);
44 }
45
46 public string ComponentRef
47 {
48 - get => (string)this.Fields[(int)FeatureComponentsTupleFields.ComponentRef];
49 - set => this.Set((int)FeatureComponentsTupleFields.ComponentRef, value);
48 + get => (string)this.Fields[(int)FeatureComponentsSymbolFields.ComponentRef];
49 + set => this.Set((int)FeatureComponentsSymbolFields.ComponentRef, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/FeatureTuple.cs
+41 -41
@@ -2,32 +2,32 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Feature = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Feature,
9 + public static readonly IntermediateSymbolDefinition Feature = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Feature,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(FeatureTupleFields.ParentFeatureRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(FeatureTupleFields.Title), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(FeatureTupleFields.Description), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(FeatureTupleFields.Display), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(FeatureTupleFields.Level), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(FeatureTupleFields.DirectoryRef), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(FeatureTupleFields.DisallowAbsent), IntermediateFieldType.Bool),
20 - new IntermediateFieldDefinition(nameof(FeatureTupleFields.DisallowAdvertise), IntermediateFieldType.Bool),
21 - new IntermediateFieldDefinition(nameof(FeatureTupleFields.InstallDefault), IntermediateFieldType.Number),
22 - new IntermediateFieldDefinition(nameof(FeatureTupleFields.TypicalDefault), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(FeatureSymbolFields.ParentFeatureRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(FeatureSymbolFields.Title), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(FeatureSymbolFields.Description), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(FeatureSymbolFields.Display), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(FeatureSymbolFields.Level), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(FeatureSymbolFields.DirectoryRef), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(FeatureSymbolFields.DisallowAbsent), IntermediateFieldType.Bool),
20 + new IntermediateFieldDefinition(nameof(FeatureSymbolFields.DisallowAdvertise), IntermediateFieldType.Bool),
21 + new IntermediateFieldDefinition(nameof(FeatureSymbolFields.InstallDefault), IntermediateFieldType.Number),
22 + new IntermediateFieldDefinition(nameof(FeatureSymbolFields.TypicalDefault), IntermediateFieldType.Number),
23 },
24 - typeof(FeatureTuple));
24 + typeof(FeatureSymbol));
25 }
26 }
27
28 -namespace WixToolset.Data.Tuples
28 +namespace WixToolset.Data.Symbols
29 {
30 - public enum FeatureTupleFields
30 + public enum FeatureSymbolFields
31 {
32 ParentFeatureRef,
33 Title,
@@ -54,76 +54,76 @@ namespace WixToolset.Data.Tuples
54 Advertise
55 }
56
57 - public class FeatureTuple : IntermediateTuple
57 + public class FeatureSymbol : IntermediateSymbol
58 {
59 - public FeatureTuple() : base(TupleDefinitions.Feature, null, null)
59 + public FeatureSymbol() : base(SymbolDefinitions.Feature, null, null)
60 {
61 }
62
63 - public FeatureTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Feature, sourceLineNumber, id)
63 + public FeatureSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Feature, sourceLineNumber, id)
64 {
65 }
66
67 - public IntermediateField this[FeatureTupleFields index] => this.Fields[(int)index];
67 + public IntermediateField this[FeatureSymbolFields index] => this.Fields[(int)index];
68
69 public string ParentFeatureRef
70 {
71 - get => (string)this.Fields[(int)FeatureTupleFields.ParentFeatureRef];
72 - set => this.Set((int)FeatureTupleFields.ParentFeatureRef, value);
71 + get => (string)this.Fields[(int)FeatureSymbolFields.ParentFeatureRef];
72 + set => this.Set((int)FeatureSymbolFields.ParentFeatureRef, value);
73 }
74
75 public string Title
76 {
77 - get => (string)this.Fields[(int)FeatureTupleFields.Title];
78 - set => this.Set((int)FeatureTupleFields.Title, value);
77 + get => (string)this.Fields[(int)FeatureSymbolFields.Title];
78 + set => this.Set((int)FeatureSymbolFields.Title, value);
79 }
80
81 public string Description
82 {
83 - get => (string)this.Fields[(int)FeatureTupleFields.Description];
84 - set => this.Set((int)FeatureTupleFields.Description, value);
83 + get => (string)this.Fields[(int)FeatureSymbolFields.Description];
84 + set => this.Set((int)FeatureSymbolFields.Description, value);
85 }
86
87 public int Display
88 {
89 - get => (int)this.Fields[(int)FeatureTupleFields.Display];
90 - set => this.Set((int)FeatureTupleFields.Display, value);
89 + get => (int)this.Fields[(int)FeatureSymbolFields.Display];
90 + set => this.Set((int)FeatureSymbolFields.Display, value);
91 }
92
93 public int Level
94 {
95 - get => (int)this.Fields[(int)FeatureTupleFields.Level];
96 - set => this.Set((int)FeatureTupleFields.Level, value);
95 + get => (int)this.Fields[(int)FeatureSymbolFields.Level];
96 + set => this.Set((int)FeatureSymbolFields.Level, value);
97 }
98
99 public string DirectoryRef
100 {
101 - get => (string)this.Fields[(int)FeatureTupleFields.DirectoryRef];
102 - set => this.Set((int)FeatureTupleFields.DirectoryRef, value);
101 + get => (string)this.Fields[(int)FeatureSymbolFields.DirectoryRef];
102 + set => this.Set((int)FeatureSymbolFields.DirectoryRef, value);
103 }
104
105 public bool DisallowAbsent
106 {
107 - get => this.Fields[(int)FeatureTupleFields.DisallowAbsent].AsBool();
108 - set => this.Set((int)FeatureTupleFields.DisallowAbsent, value);
107 + get => this.Fields[(int)FeatureSymbolFields.DisallowAbsent].AsBool();
108 + set => this.Set((int)FeatureSymbolFields.DisallowAbsent, value);
109 }
110
111 public bool DisallowAdvertise
112 {
113 - get => this.Fields[(int)FeatureTupleFields.DisallowAdvertise].AsBool();
114 - set => this.Set((int)FeatureTupleFields.DisallowAdvertise, value);
113 + get => this.Fields[(int)FeatureSymbolFields.DisallowAdvertise].AsBool();
114 + set => this.Set((int)FeatureSymbolFields.DisallowAdvertise, value);
115 }
116
117 public FeatureInstallDefault InstallDefault
118 {
119 - get => (FeatureInstallDefault)this.Fields[(int)FeatureTupleFields.InstallDefault].AsNumber();
120 - set => this.Set((int)FeatureTupleFields.InstallDefault, (int)value);
119 + get => (FeatureInstallDefault)this.Fields[(int)FeatureSymbolFields.InstallDefault].AsNumber();
120 + set => this.Set((int)FeatureSymbolFields.InstallDefault, (int)value);
121 }
122
123 public FeatureTypicalDefault TypicalDefault
124 {
125 - get => (FeatureTypicalDefault)this.Fields[(int)FeatureTupleFields.TypicalDefault].AsNumber();
126 - set => this.Set((int)FeatureTupleFields.TypicalDefault, (int)value);
125 + get => (FeatureTypicalDefault)this.Fields[(int)FeatureSymbolFields.TypicalDefault].AsNumber();
126 + set => this.Set((int)FeatureSymbolFields.TypicalDefault, (int)value);
127 }
128 }
129 }
\ No newline at end of file
src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition FileSFPCatalog = new IntermediateTupleDefinition(
10 - TupleDefinitionType.FileSFPCatalog,
9 + public static readonly IntermediateSymbolDefinition FileSFPCatalog = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.FileSFPCatalog,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(FileSFPCatalogTupleFields.FileRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(FileSFPCatalogTupleFields.SFPCatalogRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(FileSFPCatalogSymbolFields.FileRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(FileSFPCatalogSymbolFields.SFPCatalogRef), IntermediateFieldType.String),
15 },
16 - typeof(FileSFPCatalogTuple));
16 + typeof(FileSFPCatalogSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum FileSFPCatalogTupleFields
22 + public enum FileSFPCatalogSymbolFields
23 {
24 FileRef,
25 SFPCatalogRef,
26 }
27
28 - public class FileSFPCatalogTuple : IntermediateTuple
28 + public class FileSFPCatalogSymbol : IntermediateSymbol
29 {
30 - public FileSFPCatalogTuple() : base(TupleDefinitions.FileSFPCatalog, null, null)
30 + public FileSFPCatalogSymbol() : base(SymbolDefinitions.FileSFPCatalog, null, null)
31 {
32 }
33
34 - public FileSFPCatalogTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.FileSFPCatalog, sourceLineNumber, id)
34 + public FileSFPCatalogSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.FileSFPCatalog, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[FileSFPCatalogTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[FileSFPCatalogSymbolFields index] => this.Fields[(int)index];
39
40 public string FileRef
41 {
42 - get => (string)this.Fields[(int)FileSFPCatalogTupleFields.FileRef];
43 - set => this.Set((int)FileSFPCatalogTupleFields.FileRef, value);
42 + get => (string)this.Fields[(int)FileSFPCatalogSymbolFields.FileRef];
43 + set => this.Set((int)FileSFPCatalogSymbolFields.FileRef, value);
44 }
45
46 public string SFPCatalogRef
47 {
48 - get => (string)this.Fields[(int)FileSFPCatalogTupleFields.SFPCatalogRef];
49 - set => this.Set((int)FileSFPCatalogTupleFields.SFPCatalogRef, value);
48 + get => (string)this.Fields[(int)FileSFPCatalogSymbolFields.SFPCatalogRef];
49 + set => this.Set((int)FileSFPCatalogSymbolFields.SFPCatalogRef, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/FileTuple.cs
+83 -83
@@ -2,50 +2,50 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition File = new IntermediateTupleDefinition(
10 - TupleDefinitionType.File,
9 + public static readonly IntermediateSymbolDefinition File = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.File,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(FileTupleFields.ComponentRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(FileTupleFields.Name), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(FileTupleFields.ShortName), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(FileTupleFields.FileSize), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(FileTupleFields.Version), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(FileTupleFields.Language), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(FileTupleFields.Attributes), IntermediateFieldType.Number),
20 - new IntermediateFieldDefinition(nameof(FileTupleFields.DirectoryRef), IntermediateFieldType.String),
21 - new IntermediateFieldDefinition(nameof(FileTupleFields.DiskId), IntermediateFieldType.Number),
22 - new IntermediateFieldDefinition(nameof(FileTupleFields.Source), IntermediateFieldType.Path),
23 -
24 - new IntermediateFieldDefinition(nameof(FileTupleFields.FontTitle), IntermediateFieldType.String),
25 - new IntermediateFieldDefinition(nameof(FileTupleFields.SelfRegCost), IntermediateFieldType.Number),
26 - new IntermediateFieldDefinition(nameof(FileTupleFields.BindPath), IntermediateFieldType.String),
27 -
28 - new IntermediateFieldDefinition(nameof(FileTupleFields.Sequence), IntermediateFieldType.Number),
29 -
30 - new IntermediateFieldDefinition(nameof(FileTupleFields.PatchGroup), IntermediateFieldType.Number),
31 - new IntermediateFieldDefinition(nameof(FileTupleFields.PatchAttributes), IntermediateFieldType.Number),
32 - new IntermediateFieldDefinition(nameof(FileTupleFields.DeltaPatchHeaderSource), IntermediateFieldType.String),
33 -
34 - new IntermediateFieldDefinition(nameof(FileTupleFields.RetainLengths), IntermediateFieldType.String),
35 - new IntermediateFieldDefinition(nameof(FileTupleFields.IgnoreOffsets), IntermediateFieldType.String),
36 - new IntermediateFieldDefinition(nameof(FileTupleFields.IgnoreLengths), IntermediateFieldType.String),
37 - new IntermediateFieldDefinition(nameof(FileTupleFields.RetainOffsets), IntermediateFieldType.String),
38 - new IntermediateFieldDefinition(nameof(FileTupleFields.SymbolPaths), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(FileSymbolFields.ComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(FileSymbolFields.Name), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(FileSymbolFields.ShortName), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(FileSymbolFields.FileSize), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(FileSymbolFields.Version), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(FileSymbolFields.Language), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(FileSymbolFields.Attributes), IntermediateFieldType.Number),
20 + new IntermediateFieldDefinition(nameof(FileSymbolFields.DirectoryRef), IntermediateFieldType.String),
21 + new IntermediateFieldDefinition(nameof(FileSymbolFields.DiskId), IntermediateFieldType.Number),
22 + new IntermediateFieldDefinition(nameof(FileSymbolFields.Source), IntermediateFieldType.Path),
23 +
24 + new IntermediateFieldDefinition(nameof(FileSymbolFields.FontTitle), IntermediateFieldType.String),
25 + new IntermediateFieldDefinition(nameof(FileSymbolFields.SelfRegCost), IntermediateFieldType.Number),
26 + new IntermediateFieldDefinition(nameof(FileSymbolFields.BindPath), IntermediateFieldType.String),
27 +
28 + new IntermediateFieldDefinition(nameof(FileSymbolFields.Sequence), IntermediateFieldType.Number),
29 +
30 + new IntermediateFieldDefinition(nameof(FileSymbolFields.PatchGroup), IntermediateFieldType.Number),
31 + new IntermediateFieldDefinition(nameof(FileSymbolFields.PatchAttributes), IntermediateFieldType.Number),
32 + new IntermediateFieldDefinition(nameof(FileSymbolFields.DeltaPatchHeaderSource), IntermediateFieldType.String),
33 +
34 + new IntermediateFieldDefinition(nameof(FileSymbolFields.RetainLengths), IntermediateFieldType.String),
35 + new IntermediateFieldDefinition(nameof(FileSymbolFields.IgnoreOffsets), IntermediateFieldType.String),
36 + new IntermediateFieldDefinition(nameof(FileSymbolFields.IgnoreLengths), IntermediateFieldType.String),
37 + new IntermediateFieldDefinition(nameof(FileSymbolFields.RetainOffsets), IntermediateFieldType.String),
38 + new IntermediateFieldDefinition(nameof(FileSymbolFields.SymbolPaths), IntermediateFieldType.String),
39 },
40 - typeof(FileTuple));
40 + typeof(FileSymbol));
41 }
42 }
43
44 -namespace WixToolset.Data.Tuples
44 +namespace WixToolset.Data.Symbols
45 {
46 using System;
47
48 - public enum FileTupleFields
48 + public enum FileSymbolFields
49 {
50 ComponentRef,
51 Name,
@@ -76,7 +76,7 @@ namespace WixToolset.Data.Tuples
76 }
77
78 [Flags]
79 - public enum FileTupleAttributes : int
79 + public enum FileSymbolAttributes : int
80 {
81 None = 0x0,
82 ReadOnly = 0x1,
@@ -110,148 +110,148 @@ namespace WixToolset.Data.Tuples
110 Defined = Ignore | IncludeWholeFile | AllowIgnoreOnError
111 }
112
113 - public class FileTuple : IntermediateTuple
113 + public class FileSymbol : IntermediateSymbol
114 {
115 - public FileTuple() : base(TupleDefinitions.File, null, null)
115 + public FileSymbol() : base(SymbolDefinitions.File, null, null)
116 {
117 }
118
119 - public FileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.File, sourceLineNumber, id)
119 + public FileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.File, sourceLineNumber, id)
120 {
121 }
122
123 - public IntermediateField this[FileTupleFields index] => this.Fields[(int)index];
123 + public IntermediateField this[FileSymbolFields index] => this.Fields[(int)index];
124
125 public string ComponentRef
126 {
127 - get => (string)this.Fields[(int)FileTupleFields.ComponentRef];
128 - set => this.Set((int)FileTupleFields.ComponentRef, value);
127 + get => (string)this.Fields[(int)FileSymbolFields.ComponentRef];
128 + set => this.Set((int)FileSymbolFields.ComponentRef, value);
129 }
130
131 public string Name
132 {
133 - get => (string)this.Fields[(int)FileTupleFields.Name];
134 - set => this.Set((int)FileTupleFields.Name, value);
133 + get => (string)this.Fields[(int)FileSymbolFields.Name];
134 + set => this.Set((int)FileSymbolFields.Name, value);
135 }
136
137 public string ShortName
138 {
139 - get => (string)this.Fields[(int)FileTupleFields.ShortName];
140 - set => this.Set((int)FileTupleFields.ShortName, value);
139 + get => (string)this.Fields[(int)FileSymbolFields.ShortName];
140 + set => this.Set((int)FileSymbolFields.ShortName, value);
141 }
142
143 public int FileSize
144 {
145 - get => (int)this.Fields[(int)FileTupleFields.FileSize];
146 - set => this.Set((int)FileTupleFields.FileSize, value);
145 + get => (int)this.Fields[(int)FileSymbolFields.FileSize];
146 + set => this.Set((int)FileSymbolFields.FileSize, value);
147 }
148
149 public string Version
150 {
151 - get => (string)this.Fields[(int)FileTupleFields.Version];
152 - set => this.Set((int)FileTupleFields.Version, value);
151 + get => (string)this.Fields[(int)FileSymbolFields.Version];
152 + set => this.Set((int)FileSymbolFields.Version, value);
153 }
154
155 public string Language
156 {
157 - get => (string)this.Fields[(int)FileTupleFields.Language];
158 - set => this.Set((int)FileTupleFields.Language, value);
157 + get => (string)this.Fields[(int)FileSymbolFields.Language];
158 + set => this.Set((int)FileSymbolFields.Language, value);
159 }
160
161 - public FileTupleAttributes Attributes
161 + public FileSymbolAttributes Attributes
162 {
163 - get => (FileTupleAttributes)this.Fields[(int)FileTupleFields.Attributes].AsNumber();
164 - set => this.Set((int)FileTupleFields.Attributes, (int)value);
163 + get => (FileSymbolAttributes)this.Fields[(int)FileSymbolFields.Attributes].AsNumber();
164 + set => this.Set((int)FileSymbolFields.Attributes, (int)value);
165 }
166
167 public string DirectoryRef
168 {
169 - get => (string)this.Fields[(int)FileTupleFields.DirectoryRef];
170 - set => this.Set((int)FileTupleFields.DirectoryRef, value);
169 + get => (string)this.Fields[(int)FileSymbolFields.DirectoryRef];
170 + set => this.Set((int)FileSymbolFields.DirectoryRef, value);
171 }
172
173 public int? DiskId
174 {
175 - get => (int?)this.Fields[(int)FileTupleFields.DiskId];
176 - set => this.Set((int)FileTupleFields.DiskId, value);
175 + get => (int?)this.Fields[(int)FileSymbolFields.DiskId];
176 + set => this.Set((int)FileSymbolFields.DiskId, value);
177 }
178
179 public IntermediateFieldPathValue Source
180 {
181 - get => this.Fields[(int)FileTupleFields.Source].AsPath();
182 - set => this.Set((int)FileTupleFields.Source, value);
181 + get => this.Fields[(int)FileSymbolFields.Source].AsPath();
182 + set => this.Set((int)FileSymbolFields.Source, value);
183 }
184
185 public string FontTitle
186 {
187 - get => (string)this.Fields[(int)FileTupleFields.FontTitle];
188 - set => this.Set((int)FileTupleFields.FontTitle, value);
187 + get => (string)this.Fields[(int)FileSymbolFields.FontTitle];
188 + set => this.Set((int)FileSymbolFields.FontTitle, value);
189 }
190
191 public int? SelfRegCost
192 {
193 - get => (int?)this.Fields[(int)FileTupleFields.SelfRegCost];
194 - set => this.Set((int)FileTupleFields.SelfRegCost, value);
193 + get => (int?)this.Fields[(int)FileSymbolFields.SelfRegCost];
194 + set => this.Set((int)FileSymbolFields.SelfRegCost, value);
195 }
196
197 public string BindPath
198 {
199 - get => (string)this.Fields[(int)FileTupleFields.BindPath];
200 - set => this.Set((int)FileTupleFields.BindPath, value);
199 + get => (string)this.Fields[(int)FileSymbolFields.BindPath];
200 + set => this.Set((int)FileSymbolFields.BindPath, value);
201 }
202
203 public int Sequence
204 {
205 - get => (int)this.Fields[(int)FileTupleFields.Sequence];
206 - set => this.Set((int)FileTupleFields.Sequence, value);
205 + get => (int)this.Fields[(int)FileSymbolFields.Sequence];
206 + set => this.Set((int)FileSymbolFields.Sequence, value);
207 }
208
209 public int? PatchGroup
210 {
211 - get => (int?)this.Fields[(int)FileTupleFields.PatchGroup];
212 - set => this.Set((int)FileTupleFields.PatchGroup, value);
211 + get => (int?)this.Fields[(int)FileSymbolFields.PatchGroup];
212 + set => this.Set((int)FileSymbolFields.PatchGroup, value);
213 }
214
215 public PatchAttributeType? PatchAttributes
216 {
217 - get => (PatchAttributeType?)this.Fields[(int)FileTupleFields.PatchAttributes].AsNullableNumber();
218 - set => this.Set((int)FileTupleFields.PatchAttributes, (int?)value);
217 + get => (PatchAttributeType?)this.Fields[(int)FileSymbolFields.PatchAttributes].AsNullableNumber();
218 + set => this.Set((int)FileSymbolFields.PatchAttributes, (int?)value);
219 }
220
221 public string DeltaPatchHeaderSource
222 {
223 - get => (string)this.Fields[(int)FileTupleFields.DeltaPatchHeaderSource];
224 - set => this.Set((int)FileTupleFields.DeltaPatchHeaderSource, value);
223 + get => (string)this.Fields[(int)FileSymbolFields.DeltaPatchHeaderSource];
224 + set => this.Set((int)FileSymbolFields.DeltaPatchHeaderSource, value);
225 }
226
227 public string RetainLengths
228 {
229 - get => (string)this.Fields[(int)FileTupleFields.RetainLengths];
230 - set => this.Set((int)FileTupleFields.RetainLengths, value);
229 + get => (string)this.Fields[(int)FileSymbolFields.RetainLengths];
230 + set => this.Set((int)FileSymbolFields.RetainLengths, value);
231 }
232
233 public string IgnoreOffsets
234 {
235 - get => (string)this.Fields[(int)FileTupleFields.IgnoreOffsets];
236 - set => this.Set((int)FileTupleFields.IgnoreOffsets, value);
235 + get => (string)this.Fields[(int)FileSymbolFields.IgnoreOffsets];
236 + set => this.Set((int)FileSymbolFields.IgnoreOffsets, value);
237 }
238
239 public string IgnoreLengths
240 {
241 - get => (string)this.Fields[(int)FileTupleFields.IgnoreLengths];
242 - set => this.Set((int)FileTupleFields.IgnoreLengths, value);
241 + get => (string)this.Fields[(int)FileSymbolFields.IgnoreLengths];
242 + set => this.Set((int)FileSymbolFields.IgnoreLengths, value);
243 }
244
245 public string RetainOffsets
246 {
247 - get => (string)this.Fields[(int)FileTupleFields.RetainOffsets];
248 - set => this.Set((int)FileTupleFields.RetainOffsets, value);
247 + get => (string)this.Fields[(int)FileSymbolFields.RetainOffsets];
248 + set => this.Set((int)FileSymbolFields.RetainOffsets, value);
249 }
250
251 public string SymbolPaths
252 {
253 - get => (string)this.Fields[(int)FileTupleFields.SymbolPaths];
254 - set => this.Set((int)FileTupleFields.SymbolPaths, value);
253 + get => (string)this.Fields[(int)FileSymbolFields.SymbolPaths];
254 + set => this.Set((int)FileSymbolFields.SymbolPaths, value);
255 }
256 }
257 }
src/WixToolset.Data/Tuples/IconTuple.cs
+14 -14
@@ -2,43 +2,43 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Icon = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Icon,
9 + public static readonly IntermediateSymbolDefinition Icon = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Icon,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(IconTupleFields.Data), IntermediateFieldType.Path),
13 + new IntermediateFieldDefinition(nameof(IconSymbolFields.Data), IntermediateFieldType.Path),
14 },
15 - typeof(IconTuple));
15 + typeof(IconSymbol));
16 }
17 }
18
19 -namespace WixToolset.Data.Tuples
19 +namespace WixToolset.Data.Symbols
20 {
21 - public enum IconTupleFields
21 + public enum IconSymbolFields
22 {
23 Data,
24 }
25
26 - public class IconTuple : IntermediateTuple
26 + public class IconSymbol : IntermediateSymbol
27 {
28 - public IconTuple() : base(TupleDefinitions.Icon, null, null)
28 + public IconSymbol() : base(SymbolDefinitions.Icon, null, null)
29 {
30 }
31
32 - public IconTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Icon, sourceLineNumber, id)
32 + public IconSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Icon, sourceLineNumber, id)
33 {
34 }
35
36 - public IntermediateField this[IconTupleFields index] => this.Fields[(int)index];
36 + public IntermediateField this[IconSymbolFields index] => this.Fields[(int)index];
37
38 public IntermediateFieldPathValue Data
39 {
40 - get => this.Fields[(int)IconTupleFields.Data].AsPath();
41 - set => this.Set((int)IconTupleFields.Data, value);
40 + get => this.Fields[(int)IconSymbolFields.Data].AsPath();
41 + set => this.Set((int)IconSymbolFields.Data, value);
42 }
43 }
44 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs
+29 -29
@@ -2,28 +2,28 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ImageFamilies = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ImageFamilies,
9 + public static readonly IntermediateSymbolDefinition ImageFamilies = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ImageFamilies,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.Family), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.MediaSrcPropName), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.MediaDiskId), IntermediateFieldType.Number),
16 - new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.FileSequenceStart), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.DiskPrompt), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.VolumeLabel), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ImageFamiliesSymbolFields.Family), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ImageFamiliesSymbolFields.MediaSrcPropName), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ImageFamiliesSymbolFields.MediaDiskId), IntermediateFieldType.Number),
16 + new IntermediateFieldDefinition(nameof(ImageFamiliesSymbolFields.FileSequenceStart), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(ImageFamiliesSymbolFields.DiskPrompt), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(ImageFamiliesSymbolFields.VolumeLabel), IntermediateFieldType.String),
19 },
20 - typeof(ImageFamiliesTuple));
20 + typeof(ImageFamiliesSymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 - public enum ImageFamiliesTupleFields
26 + public enum ImageFamiliesSymbolFields
27 {
28 Family,
29 MediaSrcPropName,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
33 VolumeLabel,
34 }
35
36 - public class ImageFamiliesTuple : IntermediateTuple
36 + public class ImageFamiliesSymbol : IntermediateSymbol
37 {
38 - public ImageFamiliesTuple() : base(TupleDefinitions.ImageFamilies, null, null)
38 + public ImageFamiliesSymbol() : base(SymbolDefinitions.ImageFamilies, null, null)
39 {
40 }
41
42 - public ImageFamiliesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ImageFamilies, sourceLineNumber, id)
42 + public ImageFamiliesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ImageFamilies, sourceLineNumber, id)
43 {
44 }
45
46 - public IntermediateField this[ImageFamiliesTupleFields index] => this.Fields[(int)index];
46 + public IntermediateField this[ImageFamiliesSymbolFields index] => this.Fields[(int)index];
47
48 public string Family
49 {
50 - get => (string)this.Fields[(int)ImageFamiliesTupleFields.Family];
51 - set => this.Set((int)ImageFamiliesTupleFields.Family, value);
50 + get => (string)this.Fields[(int)ImageFamiliesSymbolFields.Family];
51 + set => this.Set((int)ImageFamiliesSymbolFields.Family, value);
52 }
53
54 public string MediaSrcPropName
55 {
56 - get => (string)this.Fields[(int)ImageFamiliesTupleFields.MediaSrcPropName];
57 - set => this.Set((int)ImageFamiliesTupleFields.MediaSrcPropName, value);
56 + get => (string)this.Fields[(int)ImageFamiliesSymbolFields.MediaSrcPropName];
57 + set => this.Set((int)ImageFamiliesSymbolFields.MediaSrcPropName, value);
58 }
59
60 public int? MediaDiskId
61 {
62 - get => (int?)this.Fields[(int)ImageFamiliesTupleFields.MediaDiskId];
63 - set => this.Set((int)ImageFamiliesTupleFields.MediaDiskId, value);
62 + get => (int?)this.Fields[(int)ImageFamiliesSymbolFields.MediaDiskId];
63 + set => this.Set((int)ImageFamiliesSymbolFields.MediaDiskId, value);
64 }
65
66 public int? FileSequenceStart
67 {
68 - get => (int?)this.Fields[(int)ImageFamiliesTupleFields.FileSequenceStart];
69 - set => this.Set((int)ImageFamiliesTupleFields.FileSequenceStart, value);
68 + get => (int?)this.Fields[(int)ImageFamiliesSymbolFields.FileSequenceStart];
69 + set => this.Set((int)ImageFamiliesSymbolFields.FileSequenceStart, value);
70 }
71
72 public string DiskPrompt
73 {
74 - get => (string)this.Fields[(int)ImageFamiliesTupleFields.DiskPrompt];
75 - set => this.Set((int)ImageFamiliesTupleFields.DiskPrompt, value);
74 + get => (string)this.Fields[(int)ImageFamiliesSymbolFields.DiskPrompt];
75 + set => this.Set((int)ImageFamiliesSymbolFields.DiskPrompt, value);
76 }
77
78 public string VolumeLabel
79 {
80 - get => (string)this.Fields[(int)ImageFamiliesTupleFields.VolumeLabel];
81 - set => this.Set((int)ImageFamiliesTupleFields.VolumeLabel, value);
80 + get => (string)this.Fields[(int)ImageFamiliesSymbolFields.VolumeLabel];
81 + set => this.Set((int)ImageFamiliesSymbolFields.VolumeLabel, value);
82 }
83 }
84 }
\ No newline at end of file
src/WixToolset.Data/Tuples/IniFileTuple.cs
+32 -32
@@ -2,29 +2,29 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition IniFile = new IntermediateTupleDefinition(
10 - TupleDefinitionType.IniFile,
9 + public static readonly IntermediateSymbolDefinition IniFile = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.IniFile,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(IniFileTupleFields.FileName), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(IniFileTupleFields.DirProperty), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(IniFileTupleFields.Section), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(IniFileTupleFields.Key), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(IniFileTupleFields.Value), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(IniFileTupleFields.Action), IntermediateFieldType.Number),
19 - new IntermediateFieldDefinition(nameof(IniFileTupleFields.ComponentRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(IniFileSymbolFields.FileName), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(IniFileSymbolFields.DirProperty), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(IniFileSymbolFields.Section), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(IniFileSymbolFields.Key), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(IniFileSymbolFields.Value), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(IniFileSymbolFields.Action), IntermediateFieldType.Number),
19 + new IntermediateFieldDefinition(nameof(IniFileSymbolFields.ComponentRef), IntermediateFieldType.String),
20 },
21 - typeof(IniFileTuple));
21 + typeof(IniFileSymbol));
22 }
23 }
24
25 -namespace WixToolset.Data.Tuples
25 +namespace WixToolset.Data.Symbols
26 {
27 - public enum IniFileTupleFields
27 + public enum IniFileSymbolFields
28 {
29 FileName,
30 DirProperty,
@@ -35,58 +35,58 @@ namespace WixToolset.Data.Tuples
35 ComponentRef,
36 }
37
38 - public class IniFileTuple : IntermediateTuple
38 + public class IniFileSymbol : IntermediateSymbol
39 {
40 - public IniFileTuple() : base(TupleDefinitions.IniFile, null, null)
40 + public IniFileSymbol() : base(SymbolDefinitions.IniFile, null, null)
41 {
42 }
43
44 - public IniFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.IniFile, sourceLineNumber, id)
44 + public IniFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.IniFile, sourceLineNumber, id)
45 {
46 }
47
48 - public IntermediateField this[IniFileTupleFields index] => this.Fields[(int)index];
48 + public IntermediateField this[IniFileSymbolFields index] => this.Fields[(int)index];
49
50 public string FileName
51 {
52 - get => (string)this.Fields[(int)IniFileTupleFields.FileName];
53 - set => this.Set((int)IniFileTupleFields.FileName, value);
52 + get => (string)this.Fields[(int)IniFileSymbolFields.FileName];
53 + set => this.Set((int)IniFileSymbolFields.FileName, value);
54 }
55
56 public string DirProperty
57 {
58 - get => (string)this.Fields[(int)IniFileTupleFields.DirProperty];
59 - set => this.Set((int)IniFileTupleFields.DirProperty, value);
58 + get => (string)this.Fields[(int)IniFileSymbolFields.DirProperty];
59 + set => this.Set((int)IniFileSymbolFields.DirProperty, value);
60 }
61
62 public string Section
63 {
64 - get => (string)this.Fields[(int)IniFileTupleFields.Section];
65 - set => this.Set((int)IniFileTupleFields.Section, value);
64 + get => (string)this.Fields[(int)IniFileSymbolFields.Section];
65 + set => this.Set((int)IniFileSymbolFields.Section, value);
66 }
67
68 public string Key
69 {
70 - get => (string)this.Fields[(int)IniFileTupleFields.Key];
71 - set => this.Set((int)IniFileTupleFields.Key, value);
70 + get => (string)this.Fields[(int)IniFileSymbolFields.Key];
71 + set => this.Set((int)IniFileSymbolFields.Key, value);
72 }
73
74 public string Value
75 {
76 - get => (string)this.Fields[(int)IniFileTupleFields.Value];
77 - set => this.Set((int)IniFileTupleFields.Value, value);
76 + get => (string)this.Fields[(int)IniFileSymbolFields.Value];
77 + set => this.Set((int)IniFileSymbolFields.Value, value);
78 }
79
80 public InifFileActionType Action
81 {
82 - get => (InifFileActionType)this.Fields[(int)IniFileTupleFields.Action]?.AsNumber();
83 - set => this.Set((int)IniFileTupleFields.Action, (int)value);
82 + get => (InifFileActionType)this.Fields[(int)IniFileSymbolFields.Action]?.AsNumber();
83 + set => this.Set((int)IniFileSymbolFields.Action, (int)value);
84 }
85
86 public string ComponentRef
87 {
88 - get => (string)this.Fields[(int)IniFileTupleFields.ComponentRef];
89 - set => this.Set((int)IniFileTupleFields.ComponentRef, value);
88 + get => (string)this.Fields[(int)IniFileSymbolFields.ComponentRef];
89 + set => this.Set((int)IniFileSymbolFields.ComponentRef, value);
90 }
91 }
92 }
\ No newline at end of file
src/WixToolset.Data/Tuples/IniLocatorTuple.cs
+29 -29
@@ -2,28 +2,28 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition IniLocator = new IntermediateTupleDefinition(
10 - TupleDefinitionType.IniLocator,
9 + public static readonly IntermediateSymbolDefinition IniLocator = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.IniLocator,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.SignatureRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.FileName), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Section), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Key), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Field), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Type), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.SignatureRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.FileName), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.Section), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.Key), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.Field), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.Type), IntermediateFieldType.Number),
19 },
20 - typeof(IniLocatorTuple));
20 + typeof(IniLocatorSymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 - public enum IniLocatorTupleFields
26 + public enum IniLocatorSymbolFields
27 {
28 SignatureRef,
29 FileName,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
33 Type,
34 }
35
36 - public class IniLocatorTuple : IntermediateTuple
36 + public class IniLocatorSymbol : IntermediateSymbol
37 {
38 - public IniLocatorTuple() : base(TupleDefinitions.IniLocator, null, null)
38 + public IniLocatorSymbol() : base(SymbolDefinitions.IniLocator, null, null)
39 {
40 }
41
42 - public IniLocatorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.IniLocator, sourceLineNumber, id)
42 + public IniLocatorSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.IniLocator, sourceLineNumber, id)
43 {
44 }
45
46 - public IntermediateField this[IniLocatorTupleFields index] => this.Fields[(int)index];
46 + public IntermediateField this[IniLocatorSymbolFields index] => this.Fields[(int)index];
47
48 public string SignatureRef
49 {
50 - get => (string)this.Fields[(int)IniLocatorTupleFields.SignatureRef];
51 - set => this.Set((int)IniLocatorTupleFields.SignatureRef, value);
50 + get => (string)this.Fields[(int)IniLocatorSymbolFields.SignatureRef];
51 + set => this.Set((int)IniLocatorSymbolFields.SignatureRef, value);
52 }
53
54 public string FileName
55 {
56 - get => (string)this.Fields[(int)IniLocatorTupleFields.FileName];
57 - set => this.Set((int)IniLocatorTupleFields.FileName, value);
56 + get => (string)this.Fields[(int)IniLocatorSymbolFields.FileName];
57 + set => this.Set((int)IniLocatorSymbolFields.FileName, value);
58 }
59
60 public string Section
61 {
62 - get => (string)this.Fields[(int)IniLocatorTupleFields.Section];
63 - set => this.Set((int)IniLocatorTupleFields.Section, value);
62 + get => (string)this.Fields[(int)IniLocatorSymbolFields.Section];
63 + set => this.Set((int)IniLocatorSymbolFields.Section, value);
64 }
65
66 public string Key
67 {
68 - get => (string)this.Fields[(int)IniLocatorTupleFields.Key];
69 - set => this.Set((int)IniLocatorTupleFields.Key, value);
68 + get => (string)this.Fields[(int)IniLocatorSymbolFields.Key];
69 + set => this.Set((int)IniLocatorSymbolFields.Key, value);
70 }
71
72 public int? Field
73 {
74 - get => (int?)this.Fields[(int)IniLocatorTupleFields.Field];
75 - set => this.Set((int)IniLocatorTupleFields.Field, value);
74 + get => (int?)this.Fields[(int)IniLocatorSymbolFields.Field];
75 + set => this.Set((int)IniLocatorSymbolFields.Field, value);
76 }
77
78 public int? Type
79 {
80 - get => (int?)this.Fields[(int)IniLocatorTupleFields.Type];
81 - set => this.Set((int)IniLocatorTupleFields.Type, value);
80 + get => (int?)this.Fields[(int)IniLocatorSymbolFields.Type];
81 + set => this.Set((int)IniLocatorSymbolFields.Type, value);
82 }
83 }
84 }
\ No newline at end of file
src/WixToolset.Data/Tuples/InifFileActionType.cs
+1 -1
@@ -1,6 +1,6 @@
1 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3 -namespace WixToolset.Data.Tuples
3 +namespace WixToolset.Data.Symbols
4 {
5 public enum InifFileActionType
6 {
src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition IsolatedComponent = new IntermediateTupleDefinition(
10 - TupleDefinitionType.IsolatedComponent,
9 + public static readonly IntermediateSymbolDefinition IsolatedComponent = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.IsolatedComponent,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(IsolatedComponentTupleFields.SharedComponentRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(IsolatedComponentTupleFields.ApplicationComponentRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(IsolatedComponentSymbolFields.SharedComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(IsolatedComponentSymbolFields.ApplicationComponentRef), IntermediateFieldType.String),
15 },
16 - typeof(IsolatedComponentTuple));
16 + typeof(IsolatedComponentSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum IsolatedComponentTupleFields
22 + public enum IsolatedComponentSymbolFields
23 {
24 SharedComponentRef,
25 ApplicationComponentRef,
26 }
27
28 - public class IsolatedComponentTuple : IntermediateTuple
28 + public class IsolatedComponentSymbol : IntermediateSymbol
29 {
30 - public IsolatedComponentTuple() : base(TupleDefinitions.IsolatedComponent, null, null)
30 + public IsolatedComponentSymbol() : base(SymbolDefinitions.IsolatedComponent, null, null)
31 {
32 }
33
34 - public IsolatedComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.IsolatedComponent, sourceLineNumber, id)
34 + public IsolatedComponentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.IsolatedComponent, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[IsolatedComponentTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[IsolatedComponentSymbolFields index] => this.Fields[(int)index];
39
40 public string SharedComponentRef
41 {
42 - get => (string)this.Fields[(int)IsolatedComponentTupleFields.SharedComponentRef];
43 - set => this.Set((int)IsolatedComponentTupleFields.SharedComponentRef, value);
42 + get => (string)this.Fields[(int)IsolatedComponentSymbolFields.SharedComponentRef];
43 + set => this.Set((int)IsolatedComponentSymbolFields.SharedComponentRef, value);
44 }
45
46 public string ApplicationComponentRef
47 {
48 - get => (string)this.Fields[(int)IsolatedComponentTupleFields.ApplicationComponentRef];
49 - set => this.Set((int)IsolatedComponentTupleFields.ApplicationComponentRef, value);
48 + get => (string)this.Fields[(int)IsolatedComponentSymbolFields.ApplicationComponentRef];
49 + set => this.Set((int)IsolatedComponentSymbolFields.ApplicationComponentRef, value);
50 }
51 }
52 }
src/WixToolset.Data/Tuples/LaunchConditionTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition LaunchCondition = new IntermediateTupleDefinition(
10 - TupleDefinitionType.LaunchCondition,
9 + public static readonly IntermediateSymbolDefinition LaunchCondition = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.LaunchCondition,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(LaunchConditionTupleFields.Condition), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(LaunchConditionTupleFields.Description), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(LaunchConditionSymbolFields.Condition), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(LaunchConditionSymbolFields.Description), IntermediateFieldType.String),
15 },
16 - typeof(LaunchConditionTuple));
16 + typeof(LaunchConditionSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum LaunchConditionTupleFields
22 + public enum LaunchConditionSymbolFields
23 {
24 Condition,
25 Description,
26 }
27
28 - public class LaunchConditionTuple : IntermediateTuple
28 + public class LaunchConditionSymbol : IntermediateSymbol
29 {
30 - public LaunchConditionTuple() : base(TupleDefinitions.LaunchCondition, null, null)
30 + public LaunchConditionSymbol() : base(SymbolDefinitions.LaunchCondition, null, null)
31 {
32 }
33
34 - public LaunchConditionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.LaunchCondition, sourceLineNumber, id)
34 + public LaunchConditionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.LaunchCondition, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[LaunchConditionTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[LaunchConditionSymbolFields index] => this.Fields[(int)index];
39
40 public string Condition
41 {
42 - get => (string)this.Fields[(int)LaunchConditionTupleFields.Condition];
43 - set => this.Set((int)LaunchConditionTupleFields.Condition, value);
42 + get => (string)this.Fields[(int)LaunchConditionSymbolFields.Condition];
43 + set => this.Set((int)LaunchConditionSymbolFields.Condition, value);
44 }
45
46 public string Description
47 {
48 - get => (string)this.Fields[(int)LaunchConditionTupleFields.Description];
49 - set => this.Set((int)LaunchConditionTupleFields.Description, value);
48 + get => (string)this.Fields[(int)LaunchConditionSymbolFields.Description];
49 + set => this.Set((int)LaunchConditionSymbolFields.Description, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ListBoxTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ListBox = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ListBox,
9 + public static readonly IntermediateSymbolDefinition ListBox = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ListBox,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ListBoxTupleFields.Property), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ListBoxTupleFields.Order), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(ListBoxTupleFields.Value), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ListBoxTupleFields.Text), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ListBoxSymbolFields.Property), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ListBoxSymbolFields.Order), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(ListBoxSymbolFields.Value), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ListBoxSymbolFields.Text), IntermediateFieldType.String),
17 },
18 - typeof(ListBoxTuple));
18 + typeof(ListBoxSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum ListBoxTupleFields
24 + public enum ListBoxSymbolFields
25 {
26 Property,
27 Order,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Text,
30 }
31
32 - public class ListBoxTuple : IntermediateTuple
32 + public class ListBoxSymbol : IntermediateSymbol
33 {
34 - public ListBoxTuple() : base(TupleDefinitions.ListBox, null, null)
34 + public ListBoxSymbol() : base(SymbolDefinitions.ListBox, null, null)
35 {
36 }
37
38 - public ListBoxTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ListBox, sourceLineNumber, id)
38 + public ListBoxSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ListBox, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[ListBoxTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[ListBoxSymbolFields index] => this.Fields[(int)index];
43
44 public string Property
45 {
46 - get => (string)this.Fields[(int)ListBoxTupleFields.Property];
47 - set => this.Set((int)ListBoxTupleFields.Property, value);
46 + get => (string)this.Fields[(int)ListBoxSymbolFields.Property];
47 + set => this.Set((int)ListBoxSymbolFields.Property, value);
48 }
49
50 public int Order
51 {
52 - get => (int)this.Fields[(int)ListBoxTupleFields.Order];
53 - set => this.Set((int)ListBoxTupleFields.Order, value);
52 + get => (int)this.Fields[(int)ListBoxSymbolFields.Order];
53 + set => this.Set((int)ListBoxSymbolFields.Order, value);
54 }
55
56 public string Value
57 {
58 - get => (string)this.Fields[(int)ListBoxTupleFields.Value];
59 - set => this.Set((int)ListBoxTupleFields.Value, value);
58 + get => (string)this.Fields[(int)ListBoxSymbolFields.Value];
59 + set => this.Set((int)ListBoxSymbolFields.Value, value);
60 }
61
62 public string Text
63 {
64 - get => (string)this.Fields[(int)ListBoxTupleFields.Text];
65 - set => this.Set((int)ListBoxTupleFields.Text, value);
64 + get => (string)this.Fields[(int)ListBoxSymbolFields.Text];
65 + set => this.Set((int)ListBoxSymbolFields.Text, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ListViewTuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ListView = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ListView,
9 + public static readonly IntermediateSymbolDefinition ListView = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ListView,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ListViewTupleFields.Property), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ListViewTupleFields.Order), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(ListViewTupleFields.Value), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ListViewTupleFields.Text), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(ListViewTupleFields.BinaryRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ListViewSymbolFields.Property), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ListViewSymbolFields.Order), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(ListViewSymbolFields.Value), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ListViewSymbolFields.Text), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(ListViewSymbolFields.BinaryRef), IntermediateFieldType.String),
18 },
19 - typeof(ListViewTuple));
19 + typeof(ListViewSymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum ListViewTupleFields
25 + public enum ListViewSymbolFields
26 {
27 Property,
28 Order,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
31 BinaryRef,
32 }
33
34 - public class ListViewTuple : IntermediateTuple
34 + public class ListViewSymbol : IntermediateSymbol
35 {
36 - public ListViewTuple() : base(TupleDefinitions.ListView, null, null)
36 + public ListViewSymbol() : base(SymbolDefinitions.ListView, null, null)
37 {
38 }
39
40 - public ListViewTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ListView, sourceLineNumber, id)
40 + public ListViewSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ListView, sourceLineNumber, id)
41 {
42 }
43
44 - public IntermediateField this[ListViewTupleFields index] => this.Fields[(int)index];
44 + public IntermediateField this[ListViewSymbolFields index] => this.Fields[(int)index];
45
46 public string Property
47 {
48 - get => (string)this.Fields[(int)ListViewTupleFields.Property];
49 - set => this.Set((int)ListViewTupleFields.Property, value);
48 + get => (string)this.Fields[(int)ListViewSymbolFields.Property];
49 + set => this.Set((int)ListViewSymbolFields.Property, value);
50 }
51
52 public int Order
53 {
54 - get => (int)this.Fields[(int)ListViewTupleFields.Order];
55 - set => this.Set((int)ListViewTupleFields.Order, value);
54 + get => (int)this.Fields[(int)ListViewSymbolFields.Order];
55 + set => this.Set((int)ListViewSymbolFields.Order, value);
56 }
57
58 public string Value
59 {
60 - get => (string)this.Fields[(int)ListViewTupleFields.Value];
61 - set => this.Set((int)ListViewTupleFields.Value, value);
60 + get => (string)this.Fields[(int)ListViewSymbolFields.Value];
61 + set => this.Set((int)ListViewSymbolFields.Value, value);
62 }
63
64 public string Text
65 {
66 - get => (string)this.Fields[(int)ListViewTupleFields.Text];
67 - set => this.Set((int)ListViewTupleFields.Text, value);
66 + get => (string)this.Fields[(int)ListViewSymbolFields.Text];
67 + set => this.Set((int)ListViewSymbolFields.Text, value);
68 }
69
70 public string BinaryRef
71 {
72 - get => (string)this.Fields[(int)ListViewTupleFields.BinaryRef];
73 - set => this.Set((int)ListViewTupleFields.BinaryRef, value);
72 + get => (string)this.Fields[(int)ListViewSymbolFields.BinaryRef];
73 + set => this.Set((int)ListViewSymbolFields.BinaryRef, value);
74 }
75 }
76 }
\ No newline at end of file
src/WixToolset.Data/Tuples/LocatorType.cs
+1 -1
@@ -1,6 +1,6 @@
1 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3 -namespace WixToolset.Data.Tuples
3 +namespace WixToolset.Data.Symbols
4 {
5 public enum LocatorType
6 {
src/WixToolset.Data/Tuples/LockPermissionsTuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition LockPermissions = new IntermediateTupleDefinition(
10 - TupleDefinitionType.LockPermissions,
9 + public static readonly IntermediateSymbolDefinition LockPermissions = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.LockPermissions,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(LockPermissionsTupleFields.LockObject), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(LockPermissionsTupleFields.Table), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(LockPermissionsTupleFields.Domain), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(LockPermissionsTupleFields.User), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(LockPermissionsTupleFields.Permission), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(LockPermissionsSymbolFields.LockObject), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(LockPermissionsSymbolFields.Table), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(LockPermissionsSymbolFields.Domain), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(LockPermissionsSymbolFields.User), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(LockPermissionsSymbolFields.Permission), IntermediateFieldType.Number),
18 },
19 - typeof(LockPermissionsTuple));
19 + typeof(LockPermissionsSymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum LockPermissionsTupleFields
25 + public enum LockPermissionsSymbolFields
26 {
27 LockObject,
28 Table,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
31 Permission,
32 }
33
34 - public class LockPermissionsTuple : IntermediateTuple
34 + public class LockPermissionsSymbol : IntermediateSymbol
35 {
36 - public LockPermissionsTuple() : base(TupleDefinitions.LockPermissions, null, null)
36 + public LockPermissionsSymbol() : base(SymbolDefinitions.LockPermissions, null, null)
37 {
38 }
39
40 - public LockPermissionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.LockPermissions, sourceLineNumber, id)
40 + public LockPermissionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.LockPermissions, sourceLineNumber, id)
41 {
42 }
43
44 - public IntermediateField this[LockPermissionsTupleFields index] => this.Fields[(int)index];
44 + public IntermediateField this[LockPermissionsSymbolFields index] => this.Fields[(int)index];
45
46 public string LockObject
47 {
48 - get => (string)this.Fields[(int)LockPermissionsTupleFields.LockObject];
49 - set => this.Set((int)LockPermissionsTupleFields.LockObject, value);
48 + get => (string)this.Fields[(int)LockPermissionsSymbolFields.LockObject];
49 + set => this.Set((int)LockPermissionsSymbolFields.LockObject, value);
50 }
51
52 public string Table
53 {
54 - get => (string)this.Fields[(int)LockPermissionsTupleFields.Table];
55 - set => this.Set((int)LockPermissionsTupleFields.Table, value);
54 + get => (string)this.Fields[(int)LockPermissionsSymbolFields.Table];
55 + set => this.Set((int)LockPermissionsSymbolFields.Table, value);
56 }
57
58 public string Domain
59 {
60 - get => (string)this.Fields[(int)LockPermissionsTupleFields.Domain];
61 - set => this.Set((int)LockPermissionsTupleFields.Domain, value);
60 + get => (string)this.Fields[(int)LockPermissionsSymbolFields.Domain];
61 + set => this.Set((int)LockPermissionsSymbolFields.Domain, value);
62 }
63
64 public string User
65 {
66 - get => (string)this.Fields[(int)LockPermissionsTupleFields.User];
67 - set => this.Set((int)LockPermissionsTupleFields.User, value);
66 + get => (string)this.Fields[(int)LockPermissionsSymbolFields.User];
67 + set => this.Set((int)LockPermissionsSymbolFields.User, value);
68 }
69
70 public int? Permission
71 {
72 - get => (int?)this.Fields[(int)LockPermissionsTupleFields.Permission];
73 - set => this.Set((int)LockPermissionsTupleFields.Permission, value);
72 + get => (int?)this.Fields[(int)LockPermissionsSymbolFields.Permission];
73 + set => this.Set((int)LockPermissionsSymbolFields.Permission, value);
74 }
75 }
76 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MIMETuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MIME = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MIME,
9 + public static readonly IntermediateSymbolDefinition MIME = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MIME,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MIMETupleFields.ContentType), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MIMETupleFields.ExtensionRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(MIMETupleFields.CLSID), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(MIMESymbolFields.ContentType), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MIMESymbolFields.ExtensionRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(MIMESymbolFields.CLSID), IntermediateFieldType.String),
16 },
17 - typeof(MIMETuple));
17 + typeof(MIMESymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum MIMETupleFields
23 + public enum MIMESymbolFields
24 {
25 ContentType,
26 ExtensionRef,
27 CLSID,
28 }
29
30 - public class MIMETuple : IntermediateTuple
30 + public class MIMESymbol : IntermediateSymbol
31 {
32 - public MIMETuple() : base(TupleDefinitions.MIME, null, null)
32 + public MIMESymbol() : base(SymbolDefinitions.MIME, null, null)
33 {
34 }
35
36 - public MIMETuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MIME, sourceLineNumber, id)
36 + public MIMESymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MIME, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[MIMETupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[MIMESymbolFields index] => this.Fields[(int)index];
41
42 public string ContentType
43 {
44 - get => (string)this.Fields[(int)MIMETupleFields.ContentType];
45 - set => this.Set((int)MIMETupleFields.ContentType, value);
44 + get => (string)this.Fields[(int)MIMESymbolFields.ContentType];
45 + set => this.Set((int)MIMESymbolFields.ContentType, value);
46 }
47
48 public string ExtensionRef
49 {
50 - get => (string)this.Fields[(int)MIMETupleFields.ExtensionRef];
51 - set => this.Set((int)MIMETupleFields.ExtensionRef, value);
50 + get => (string)this.Fields[(int)MIMESymbolFields.ExtensionRef];
51 + set => this.Set((int)MIMESymbolFields.ExtensionRef, value);
52 }
53
54 public string CLSID
55 {
56 - get => (string)this.Fields[(int)MIMETupleFields.CLSID];
57 - set => this.Set((int)MIMETupleFields.CLSID, value);
56 + get => (string)this.Fields[(int)MIMESymbolFields.CLSID];
57 + set => this.Set((int)MIMESymbolFields.CLSID, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MediaTuple.cs
+35 -35
@@ -2,30 +2,30 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Media = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Media,
9 + public static readonly IntermediateSymbolDefinition Media = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Media,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MediaTupleFields.DiskId), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(MediaTupleFields.LastSequence), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(MediaTupleFields.DiskPrompt), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(MediaTupleFields.Cabinet), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(MediaTupleFields.VolumeLabel), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(MediaTupleFields.Source), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(MediaTupleFields.CompressionLevel), IntermediateFieldType.Number),
20 - new IntermediateFieldDefinition(nameof(MediaTupleFields.Layout), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(MediaSymbolFields.DiskId), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(MediaSymbolFields.LastSequence), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(MediaSymbolFields.DiskPrompt), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(MediaSymbolFields.Cabinet), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(MediaSymbolFields.VolumeLabel), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(MediaSymbolFields.Source), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(MediaSymbolFields.CompressionLevel), IntermediateFieldType.Number),
20 + new IntermediateFieldDefinition(nameof(MediaSymbolFields.Layout), IntermediateFieldType.String),
21 },
22 - typeof(MediaTuple));
22 + typeof(MediaSymbol));
23 }
24 }
25
26 -namespace WixToolset.Data.Tuples
26 +namespace WixToolset.Data.Symbols
27 {
28 - public enum MediaTupleFields
28 + public enum MediaSymbolFields
29 {
30 DiskId,
31 LastSequence,
@@ -37,64 +37,64 @@ namespace WixToolset.Data.Tuples
37 Layout,
38 }
39
40 - public class MediaTuple : IntermediateTuple
40 + public class MediaSymbol : IntermediateSymbol
41 {
42 - public MediaTuple() : base(TupleDefinitions.Media, null, null)
42 + public MediaSymbol() : base(SymbolDefinitions.Media, null, null)
43 {
44 }
45
46 - public MediaTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Media, sourceLineNumber, id)
46 + public MediaSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Media, sourceLineNumber, id)
47 {
48 }
49
50 - public IntermediateField this[MediaTupleFields index] => this.Fields[(int)index];
50 + public IntermediateField this[MediaSymbolFields index] => this.Fields[(int)index];
51
52 public int DiskId
53 {
54 - get => (int)this.Fields[(int)MediaTupleFields.DiskId];
55 - set => this.Set((int)MediaTupleFields.DiskId, value);
54 + get => (int)this.Fields[(int)MediaSymbolFields.DiskId];
55 + set => this.Set((int)MediaSymbolFields.DiskId, value);
56 }
57
58 public int? LastSequence
59 {
60 - get => (int?)this.Fields[(int)MediaTupleFields.LastSequence];
61 - set => this.Set((int)MediaTupleFields.LastSequence, value);
60 + get => (int?)this.Fields[(int)MediaSymbolFields.LastSequence];
61 + set => this.Set((int)MediaSymbolFields.LastSequence, value);
62 }
63
64 public string DiskPrompt
65 {
66 - get => (string)this.Fields[(int)MediaTupleFields.DiskPrompt];
67 - set => this.Set((int)MediaTupleFields.DiskPrompt, value);
66 + get => (string)this.Fields[(int)MediaSymbolFields.DiskPrompt];
67 + set => this.Set((int)MediaSymbolFields.DiskPrompt, value);
68 }
69
70 public string Cabinet
71 {
72 - get => (string)this.Fields[(int)MediaTupleFields.Cabinet];
73 - set => this.Set((int)MediaTupleFields.Cabinet, value);
72 + get => (string)this.Fields[(int)MediaSymbolFields.Cabinet];
73 + set => this.Set((int)MediaSymbolFields.Cabinet, value);
74 }
75
76 public string VolumeLabel
77 {
78 - get => (string)this.Fields[(int)MediaTupleFields.VolumeLabel];
79 - set => this.Set((int)MediaTupleFields.VolumeLabel, value);
78 + get => (string)this.Fields[(int)MediaSymbolFields.VolumeLabel];
79 + set => this.Set((int)MediaSymbolFields.VolumeLabel, value);
80 }
81
82 public string Source
83 {
84 - get => (string)this.Fields[(int)MediaTupleFields.Source];
85 - set => this.Set((int)MediaTupleFields.Source, value);
84 + get => (string)this.Fields[(int)MediaSymbolFields.Source];
85 + set => this.Set((int)MediaSymbolFields.Source, value);
86 }
87
88 public CompressionLevel? CompressionLevel
89 {
90 - get => (CompressionLevel?)this.Fields[(int)MediaTupleFields.CompressionLevel].AsNullableNumber();
91 - set => this.Set((int)MediaTupleFields.CompressionLevel, (int?)value);
90 + get => (CompressionLevel?)this.Fields[(int)MediaSymbolFields.CompressionLevel].AsNullableNumber();
91 + set => this.Set((int)MediaSymbolFields.CompressionLevel, (int?)value);
92 }
93
94 public string Layout
95 {
96 - get => (string)this.Fields[(int)MediaTupleFields.Layout];
97 - set => this.Set((int)MediaTupleFields.Layout, value);
96 + get => (string)this.Fields[(int)MediaSymbolFields.Layout];
97 + set => this.Set((int)MediaSymbolFields.Layout, value);
98 }
99 }
100 }
src/WixToolset.Data/Tuples/ModuleComponentsTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ModuleComponents = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ModuleComponents,
9 + public static readonly IntermediateSymbolDefinition ModuleComponents = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ModuleComponents,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ModuleComponentsTupleFields.Component), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ModuleComponentsTupleFields.ModuleID), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ModuleComponentsTupleFields.Language), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(ModuleComponentsSymbolFields.Component), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ModuleComponentsSymbolFields.ModuleID), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ModuleComponentsSymbolFields.Language), IntermediateFieldType.Number),
16 },
17 - typeof(ModuleComponentsTuple));
17 + typeof(ModuleComponentsSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum ModuleComponentsTupleFields
23 + public enum ModuleComponentsSymbolFields
24 {
25 Component,
26 ModuleID,
27 Language,
28 }
29
30 - public class ModuleComponentsTuple : IntermediateTuple
30 + public class ModuleComponentsSymbol : IntermediateSymbol
31 {
32 - public ModuleComponentsTuple() : base(TupleDefinitions.ModuleComponents, null, null)
32 + public ModuleComponentsSymbol() : base(SymbolDefinitions.ModuleComponents, null, null)
33 {
34 }
35
36 - public ModuleComponentsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleComponents, sourceLineNumber, id)
36 + public ModuleComponentsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ModuleComponents, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[ModuleComponentsTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[ModuleComponentsSymbolFields index] => this.Fields[(int)index];
41
42 public string Component
43 {
44 - get => (string)this.Fields[(int)ModuleComponentsTupleFields.Component];
45 - set => this.Set((int)ModuleComponentsTupleFields.Component, value);
44 + get => (string)this.Fields[(int)ModuleComponentsSymbolFields.Component];
45 + set => this.Set((int)ModuleComponentsSymbolFields.Component, value);
46 }
47
48 public string ModuleID
49 {
50 - get => (string)this.Fields[(int)ModuleComponentsTupleFields.ModuleID];
51 - set => this.Set((int)ModuleComponentsTupleFields.ModuleID, value);
50 + get => (string)this.Fields[(int)ModuleComponentsSymbolFields.ModuleID];
51 + set => this.Set((int)ModuleComponentsSymbolFields.ModuleID, value);
52 }
53
54 public int Language
55 {
56 - get => (int)this.Fields[(int)ModuleComponentsTupleFields.Language];
57 - set => this.Set((int)ModuleComponentsTupleFields.Language, value);
56 + get => (int)this.Fields[(int)ModuleComponentsSymbolFields.Language];
57 + set => this.Set((int)ModuleComponentsSymbolFields.Language, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ModuleConfigurationTuple.cs
+41 -41
@@ -2,32 +2,32 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ModuleConfiguration = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ModuleConfiguration,
9 + public static readonly IntermediateSymbolDefinition ModuleConfiguration = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ModuleConfiguration,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.Format), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.Type), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.ContextData), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.DefaultValue), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.KeyNoOrphan), IntermediateFieldType.Bool),
18 - new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.NonNullable), IntermediateFieldType.Bool),
19 - new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.DisplayName), IntermediateFieldType.String),
20 - new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.Description), IntermediateFieldType.String),
21 - new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.HelpLocation), IntermediateFieldType.String),
22 - new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.HelpKeyword), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.Format), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.Type), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.ContextData), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.DefaultValue), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.KeyNoOrphan), IntermediateFieldType.Bool),
18 + new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.NonNullable), IntermediateFieldType.Bool),
19 + new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.DisplayName), IntermediateFieldType.String),
20 + new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.Description), IntermediateFieldType.String),
21 + new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.HelpLocation), IntermediateFieldType.String),
22 + new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.HelpKeyword), IntermediateFieldType.String),
23 },
24 - typeof(ModuleConfigurationTuple));
24 + typeof(ModuleConfigurationSymbol));
25 }
26 }
27
28 -namespace WixToolset.Data.Tuples
28 +namespace WixToolset.Data.Symbols
29 {
30 - public enum ModuleConfigurationTupleFields
30 + public enum ModuleConfigurationSymbolFields
31 {
32 Format,
33 Type,
@@ -41,76 +41,76 @@ namespace WixToolset.Data.Tuples
41 HelpKeyword,
42 }
43
44 - public class ModuleConfigurationTuple : IntermediateTuple
44 + public class ModuleConfigurationSymbol : IntermediateSymbol
45 {
46 - public ModuleConfigurationTuple() : base(TupleDefinitions.ModuleConfiguration, null, null)
46 + public ModuleConfigurationSymbol() : base(SymbolDefinitions.ModuleConfiguration, null, null)
47 {
48 }
49
50 - public ModuleConfigurationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleConfiguration, sourceLineNumber, id)
50 + public ModuleConfigurationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ModuleConfiguration, sourceLineNumber, id)
51 {
52 }
53
54 - public IntermediateField this[ModuleConfigurationTupleFields index] => this.Fields[(int)index];
54 + public IntermediateField this[ModuleConfigurationSymbolFields index] => this.Fields[(int)index];
55
56 public int Format
57 {
58 - get => (int)this.Fields[(int)ModuleConfigurationTupleFields.Format];
59 - set => this.Set((int)ModuleConfigurationTupleFields.Format, value);
58 + get => (int)this.Fields[(int)ModuleConfigurationSymbolFields.Format];
59 + set => this.Set((int)ModuleConfigurationSymbolFields.Format, value);
60 }
61
62 public string Type
63 {
64 - get => (string)this.Fields[(int)ModuleConfigurationTupleFields.Type];
65 - set => this.Set((int)ModuleConfigurationTupleFields.Type, value);
64 + get => (string)this.Fields[(int)ModuleConfigurationSymbolFields.Type];
65 + set => this.Set((int)ModuleConfigurationSymbolFields.Type, value);
66 }
67
68 public string ContextData
69 {
70 - get => (string)this.Fields[(int)ModuleConfigurationTupleFields.ContextData];
71 - set => this.Set((int)ModuleConfigurationTupleFields.ContextData, value);
70 + get => (string)this.Fields[(int)ModuleConfigurationSymbolFields.ContextData];
71 + set => this.Set((int)ModuleConfigurationSymbolFields.ContextData, value);
72 }
73
74 public string DefaultValue
75 {
76 - get => (string)this.Fields[(int)ModuleConfigurationTupleFields.DefaultValue];
77 - set => this.Set((int)ModuleConfigurationTupleFields.DefaultValue, value);
76 + get => (string)this.Fields[(int)ModuleConfigurationSymbolFields.DefaultValue];
77 + set => this.Set((int)ModuleConfigurationSymbolFields.DefaultValue, value);
78 }
79
80 public bool KeyNoOrphan
81 {
82 - get => this.Fields[(int)ModuleConfigurationTupleFields.KeyNoOrphan].AsBool();
83 - set => this.Set((int)ModuleConfigurationTupleFields.KeyNoOrphan, value);
82 + get => this.Fields[(int)ModuleConfigurationSymbolFields.KeyNoOrphan].AsBool();
83 + set => this.Set((int)ModuleConfigurationSymbolFields.KeyNoOrphan, value);
84 }
85
86 public bool NonNullable
87 {
88 - get => this.Fields[(int)ModuleConfigurationTupleFields.NonNullable].AsBool();
89 - set => this.Set((int)ModuleConfigurationTupleFields.NonNullable, value);
88 + get => this.Fields[(int)ModuleConfigurationSymbolFields.NonNullable].AsBool();
89 + set => this.Set((int)ModuleConfigurationSymbolFields.NonNullable, value);
90 }
91
92 public string DisplayName
93 {
94 - get => (string)this.Fields[(int)ModuleConfigurationTupleFields.DisplayName];
95 - set => this.Set((int)ModuleConfigurationTupleFields.DisplayName, value);
94 + get => (string)this.Fields[(int)ModuleConfigurationSymbolFields.DisplayName];
95 + set => this.Set((int)ModuleConfigurationSymbolFields.DisplayName, value);
96 }
97
98 public string Description
99 {
100 - get => (string)this.Fields[(int)ModuleConfigurationTupleFields.Description];
101 - set => this.Set((int)ModuleConfigurationTupleFields.Description, value);
100 + get => (string)this.Fields[(int)ModuleConfigurationSymbolFields.Description];
101 + set => this.Set((int)ModuleConfigurationSymbolFields.Description, value);
102 }
103
104 public string HelpLocation
105 {
106 - get => (string)this.Fields[(int)ModuleConfigurationTupleFields.HelpLocation];
107 - set => this.Set((int)ModuleConfigurationTupleFields.HelpLocation, value);
106 + get => (string)this.Fields[(int)ModuleConfigurationSymbolFields.HelpLocation];
107 + set => this.Set((int)ModuleConfigurationSymbolFields.HelpLocation, value);
108 }
109
110 public string HelpKeyword
111 {
112 - get => (string)this.Fields[(int)ModuleConfigurationTupleFields.HelpKeyword];
113 - set => this.Set((int)ModuleConfigurationTupleFields.HelpKeyword, value);
112 + get => (string)this.Fields[(int)ModuleConfigurationSymbolFields.HelpKeyword];
113 + set => this.Set((int)ModuleConfigurationSymbolFields.HelpKeyword, value);
114 }
115 }
116 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ModuleDependencyTuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ModuleDependency = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ModuleDependency,
9 + public static readonly IntermediateSymbolDefinition ModuleDependency = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ModuleDependency,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ModuleDependencyTupleFields.ModuleID), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ModuleDependencyTupleFields.ModuleLanguage), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(ModuleDependencyTupleFields.RequiredID), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ModuleDependencyTupleFields.RequiredLanguage), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(ModuleDependencyTupleFields.RequiredVersion), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ModuleDependencySymbolFields.ModuleID), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ModuleDependencySymbolFields.ModuleLanguage), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(ModuleDependencySymbolFields.RequiredID), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ModuleDependencySymbolFields.RequiredLanguage), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(ModuleDependencySymbolFields.RequiredVersion), IntermediateFieldType.String),
18 },
19 - typeof(ModuleDependencyTuple));
19 + typeof(ModuleDependencySymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum ModuleDependencyTupleFields
25 + public enum ModuleDependencySymbolFields
26 {
27 ModuleID,
28 ModuleLanguage,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
31 RequiredVersion,
32 }
33
34 - public class ModuleDependencyTuple : IntermediateTuple
34 + public class ModuleDependencySymbol : IntermediateSymbol
35 {
36 - public ModuleDependencyTuple() : base(TupleDefinitions.ModuleDependency, null, null)
36 + public ModuleDependencySymbol() : base(SymbolDefinitions.ModuleDependency, null, null)
37 {
38 }
39
40 - public ModuleDependencyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleDependency, sourceLineNumber, id)
40 + public ModuleDependencySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ModuleDependency, sourceLineNumber, id)
41 {
42 }
43
44 - public IntermediateField this[ModuleDependencyTupleFields index] => this.Fields[(int)index];
44 + public IntermediateField this[ModuleDependencySymbolFields index] => this.Fields[(int)index];
45
46 public string ModuleID
47 {
48 - get => (string)this.Fields[(int)ModuleDependencyTupleFields.ModuleID];
49 - set => this.Set((int)ModuleDependencyTupleFields.ModuleID, value);
48 + get => (string)this.Fields[(int)ModuleDependencySymbolFields.ModuleID];
49 + set => this.Set((int)ModuleDependencySymbolFields.ModuleID, value);
50 }
51
52 public int ModuleLanguage
53 {
54 - get => (int)this.Fields[(int)ModuleDependencyTupleFields.ModuleLanguage];
55 - set => this.Set((int)ModuleDependencyTupleFields.ModuleLanguage, value);
54 + get => (int)this.Fields[(int)ModuleDependencySymbolFields.ModuleLanguage];
55 + set => this.Set((int)ModuleDependencySymbolFields.ModuleLanguage, value);
56 }
57
58 public string RequiredID
59 {
60 - get => (string)this.Fields[(int)ModuleDependencyTupleFields.RequiredID];
61 - set => this.Set((int)ModuleDependencyTupleFields.RequiredID, value);
60 + get => (string)this.Fields[(int)ModuleDependencySymbolFields.RequiredID];
61 + set => this.Set((int)ModuleDependencySymbolFields.RequiredID, value);
62 }
63
64 public int RequiredLanguage
65 {
66 - get => (int)this.Fields[(int)ModuleDependencyTupleFields.RequiredLanguage];
67 - set => this.Set((int)ModuleDependencyTupleFields.RequiredLanguage, value);
66 + get => (int)this.Fields[(int)ModuleDependencySymbolFields.RequiredLanguage];
67 + set => this.Set((int)ModuleDependencySymbolFields.RequiredLanguage, value);
68 }
69
70 public string RequiredVersion
71 {
72 - get => (string)this.Fields[(int)ModuleDependencyTupleFields.RequiredVersion];
73 - set => this.Set((int)ModuleDependencyTupleFields.RequiredVersion, value);
72 + get => (string)this.Fields[(int)ModuleDependencySymbolFields.RequiredVersion];
73 + set => this.Set((int)ModuleDependencySymbolFields.RequiredVersion, value);
74 }
75 }
76 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ModuleExclusionTuple.cs
+29 -29
@@ -2,28 +2,28 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ModuleExclusion = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ModuleExclusion,
9 + public static readonly IntermediateSymbolDefinition ModuleExclusion = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ModuleExclusion,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ModuleID), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ModuleLanguage), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ExcludedID), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ExcludedLanguage), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ExcludedMinVersion), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ExcludedMaxVersion), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ModuleExclusionSymbolFields.ModuleID), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ModuleExclusionSymbolFields.ModuleLanguage), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(ModuleExclusionSymbolFields.ExcludedID), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ModuleExclusionSymbolFields.ExcludedLanguage), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(ModuleExclusionSymbolFields.ExcludedMinVersion), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(ModuleExclusionSymbolFields.ExcludedMaxVersion), IntermediateFieldType.String),
19 },
20 - typeof(ModuleExclusionTuple));
20 + typeof(ModuleExclusionSymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 - public enum ModuleExclusionTupleFields
26 + public enum ModuleExclusionSymbolFields
27 {
28 ModuleID,
29 ModuleLanguage,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
33 ExcludedMaxVersion,
34 }
35
36 - public class ModuleExclusionTuple : IntermediateTuple
36 + public class ModuleExclusionSymbol : IntermediateSymbol
37 {
38 - public ModuleExclusionTuple() : base(TupleDefinitions.ModuleExclusion, null, null)
38 + public ModuleExclusionSymbol() : base(SymbolDefinitions.ModuleExclusion, null, null)
39 {
40 }
41
42 - public ModuleExclusionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleExclusion, sourceLineNumber, id)
42 + public ModuleExclusionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ModuleExclusion, sourceLineNumber, id)
43 {
44 }
45
46 - public IntermediateField this[ModuleExclusionTupleFields index] => this.Fields[(int)index];
46 + public IntermediateField this[ModuleExclusionSymbolFields index] => this.Fields[(int)index];
47
48 public string ModuleID
49 {
50 - get => (string)this.Fields[(int)ModuleExclusionTupleFields.ModuleID];
51 - set => this.Set((int)ModuleExclusionTupleFields.ModuleID, value);
50 + get => (string)this.Fields[(int)ModuleExclusionSymbolFields.ModuleID];
51 + set => this.Set((int)ModuleExclusionSymbolFields.ModuleID, value);
52 }
53
54 public int ModuleLanguage
55 {
56 - get => (int)this.Fields[(int)ModuleExclusionTupleFields.ModuleLanguage];
57 - set => this.Set((int)ModuleExclusionTupleFields.ModuleLanguage, value);
56 + get => (int)this.Fields[(int)ModuleExclusionSymbolFields.ModuleLanguage];
57 + set => this.Set((int)ModuleExclusionSymbolFields.ModuleLanguage, value);
58 }
59
60 public string ExcludedID
61 {
62 - get => (string)this.Fields[(int)ModuleExclusionTupleFields.ExcludedID];
63 - set => this.Set((int)ModuleExclusionTupleFields.ExcludedID, value);
62 + get => (string)this.Fields[(int)ModuleExclusionSymbolFields.ExcludedID];
63 + set => this.Set((int)ModuleExclusionSymbolFields.ExcludedID, value);
64 }
65
66 public int ExcludedLanguage
67 {
68 - get => (int)this.Fields[(int)ModuleExclusionTupleFields.ExcludedLanguage];
69 - set => this.Set((int)ModuleExclusionTupleFields.ExcludedLanguage, value);
68 + get => (int)this.Fields[(int)ModuleExclusionSymbolFields.ExcludedLanguage];
69 + set => this.Set((int)ModuleExclusionSymbolFields.ExcludedLanguage, value);
70 }
71
72 public string ExcludedMinVersion
73 {
74 - get => (string)this.Fields[(int)ModuleExclusionTupleFields.ExcludedMinVersion];
75 - set => this.Set((int)ModuleExclusionTupleFields.ExcludedMinVersion, value);
74 + get => (string)this.Fields[(int)ModuleExclusionSymbolFields.ExcludedMinVersion];
75 + set => this.Set((int)ModuleExclusionSymbolFields.ExcludedMinVersion, value);
76 }
77
78 public string ExcludedMaxVersion
79 {
80 - get => (string)this.Fields[(int)ModuleExclusionTupleFields.ExcludedMaxVersion];
81 - set => this.Set((int)ModuleExclusionTupleFields.ExcludedMaxVersion, value);
80 + get => (string)this.Fields[(int)ModuleExclusionSymbolFields.ExcludedMaxVersion];
81 + set => this.Set((int)ModuleExclusionSymbolFields.ExcludedMaxVersion, value);
82 }
83 }
84 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ModuleIgnoreTableTuple.cs
+11 -11
@@ -2,35 +2,35 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ModuleIgnoreTable = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ModuleIgnoreTable,
9 + public static readonly IntermediateSymbolDefinition ModuleIgnoreTable = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ModuleIgnoreTable,
11 new IntermediateFieldDefinition[]
12 {
13 },
14 - typeof(ModuleIgnoreTableTuple));
14 + typeof(ModuleIgnoreTableSymbol));
15 }
16 }
17
18 -namespace WixToolset.Data.Tuples
18 +namespace WixToolset.Data.Symbols
19 {
20 - public enum ModuleIgnoreTableTupleFields
20 + public enum ModuleIgnoreTableSymbolFields
21 {
22 }
23
24 - public class ModuleIgnoreTableTuple : IntermediateTuple
24 + public class ModuleIgnoreTableSymbol : IntermediateSymbol
25 {
26 - public ModuleIgnoreTableTuple() : base(TupleDefinitions.ModuleIgnoreTable, null, null)
26 + public ModuleIgnoreTableSymbol() : base(SymbolDefinitions.ModuleIgnoreTable, null, null)
27 {
28 }
29
30 - public ModuleIgnoreTableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleIgnoreTable, sourceLineNumber, id)
30 + public ModuleIgnoreTableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ModuleIgnoreTable, sourceLineNumber, id)
31 {
32 }
33
34 - public IntermediateField this[ModuleIgnoreTableTupleFields index] => this.Fields[(int)index];
34 + public IntermediateField this[ModuleIgnoreTableSymbolFields index] => this.Fields[(int)index];
35 }
36 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ModuleSignatureTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ModuleSignature = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ModuleSignature,
9 + public static readonly IntermediateSymbolDefinition ModuleSignature = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ModuleSignature,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ModuleSignatureTupleFields.ModuleID), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ModuleSignatureTupleFields.Language), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(ModuleSignatureTupleFields.Version), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ModuleSignatureSymbolFields.ModuleID), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ModuleSignatureSymbolFields.Language), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(ModuleSignatureSymbolFields.Version), IntermediateFieldType.String),
16 },
17 - typeof(ModuleSignatureTuple));
17 + typeof(ModuleSignatureSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum ModuleSignatureTupleFields
23 + public enum ModuleSignatureSymbolFields
24 {
25 ModuleID,
26 Language,
27 Version,
28 }
29
30 - public class ModuleSignatureTuple : IntermediateTuple
30 + public class ModuleSignatureSymbol : IntermediateSymbol
31 {
32 - public ModuleSignatureTuple() : base(TupleDefinitions.ModuleSignature, null, null)
32 + public ModuleSignatureSymbol() : base(SymbolDefinitions.ModuleSignature, null, null)
33 {
34 }
35
36 - public ModuleSignatureTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleSignature, sourceLineNumber, id)
36 + public ModuleSignatureSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ModuleSignature, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[ModuleSignatureTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[ModuleSignatureSymbolFields index] => this.Fields[(int)index];
41
42 public string ModuleID
43 {
44 - get => (string)this.Fields[(int)ModuleSignatureTupleFields.ModuleID];
45 - set => this.Set((int)ModuleSignatureTupleFields.ModuleID, value);
44 + get => (string)this.Fields[(int)ModuleSignatureSymbolFields.ModuleID];
45 + set => this.Set((int)ModuleSignatureSymbolFields.ModuleID, value);
46 }
47
48 public int Language
49 {
50 - get => (int)this.Fields[(int)ModuleSignatureTupleFields.Language];
51 - set => this.Set((int)ModuleSignatureTupleFields.Language, value);
50 + get => (int)this.Fields[(int)ModuleSignatureSymbolFields.Language];
51 + set => this.Set((int)ModuleSignatureSymbolFields.Language, value);
52 }
53
54 public string Version
55 {
56 - get => (string)this.Fields[(int)ModuleSignatureTupleFields.Version];
57 - set => this.Set((int)ModuleSignatureTupleFields.Version, value);
56 + get => (string)this.Fields[(int)ModuleSignatureSymbolFields.Version];
57 + set => this.Set((int)ModuleSignatureSymbolFields.Version, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ModuleSubstitutionTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ModuleSubstitution = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ModuleSubstitution,
9 + public static readonly IntermediateSymbolDefinition ModuleSubstitution = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ModuleSubstitution,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ModuleSubstitutionTupleFields.Table), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ModuleSubstitutionTupleFields.Row), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ModuleSubstitutionTupleFields.Column), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ModuleSubstitutionTupleFields.Value), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ModuleSubstitutionSymbolFields.Table), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ModuleSubstitutionSymbolFields.Row), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ModuleSubstitutionSymbolFields.Column), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ModuleSubstitutionSymbolFields.Value), IntermediateFieldType.String),
17 },
18 - typeof(ModuleSubstitutionTuple));
18 + typeof(ModuleSubstitutionSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum ModuleSubstitutionTupleFields
24 + public enum ModuleSubstitutionSymbolFields
25 {
26 Table,
27 Row,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Value,
30 }
31
32 - public class ModuleSubstitutionTuple : IntermediateTuple
32 + public class ModuleSubstitutionSymbol : IntermediateSymbol
33 {
34 - public ModuleSubstitutionTuple() : base(TupleDefinitions.ModuleSubstitution, null, null)
34 + public ModuleSubstitutionSymbol() : base(SymbolDefinitions.ModuleSubstitution, null, null)
35 {
36 }
37
38 - public ModuleSubstitutionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleSubstitution, sourceLineNumber, id)
38 + public ModuleSubstitutionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ModuleSubstitution, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[ModuleSubstitutionTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[ModuleSubstitutionSymbolFields index] => this.Fields[(int)index];
43
44 public string Table
45 {
46 - get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Table];
47 - set => this.Set((int)ModuleSubstitutionTupleFields.Table, value);
46 + get => (string)this.Fields[(int)ModuleSubstitutionSymbolFields.Table];
47 + set => this.Set((int)ModuleSubstitutionSymbolFields.Table, value);
48 }
49
50 public string Row
51 {
52 - get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Row];
53 - set => this.Set((int)ModuleSubstitutionTupleFields.Row, value);
52 + get => (string)this.Fields[(int)ModuleSubstitutionSymbolFields.Row];
53 + set => this.Set((int)ModuleSubstitutionSymbolFields.Row, value);
54 }
55
56 public string Column
57 {
58 - get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Column];
59 - set => this.Set((int)ModuleSubstitutionTupleFields.Column, value);
58 + get => (string)this.Fields[(int)ModuleSubstitutionSymbolFields.Column];
59 + set => this.Set((int)ModuleSubstitutionSymbolFields.Column, value);
60 }
61
62 public string Value
63 {
64 - get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Value];
65 - set => this.Set((int)ModuleSubstitutionTupleFields.Value, value);
64 + get => (string)this.Fields[(int)ModuleSubstitutionSymbolFields.Value];
65 + set => this.Set((int)ModuleSubstitutionSymbolFields.Value, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MoveFileTuple.cs
+29 -29
@@ -2,28 +2,28 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MoveFile = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MoveFile,
9 + public static readonly IntermediateSymbolDefinition MoveFile = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MoveFile,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MoveFileTupleFields.ComponentRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MoveFileTupleFields.SourceName), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(MoveFileTupleFields.DestName), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(MoveFileTupleFields.SourceFolder), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(MoveFileTupleFields.DestFolder), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(MoveFileTupleFields.Delete), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.ComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.SourceName), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.DestName), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.SourceFolder), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.DestFolder), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.Delete), IntermediateFieldType.Bool),
19 },
20 - typeof(MoveFileTuple));
20 + typeof(MoveFileSymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 - public enum MoveFileTupleFields
26 + public enum MoveFileSymbolFields
27 {
28 ComponentRef,
29 SourceName,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
33 Delete,
34 }
35
36 - public class MoveFileTuple : IntermediateTuple
36 + public class MoveFileSymbol : IntermediateSymbol
37 {
38 - public MoveFileTuple() : base(TupleDefinitions.MoveFile, null, null)
38 + public MoveFileSymbol() : base(SymbolDefinitions.MoveFile, null, null)
39 {
40 }
41
42 - public MoveFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MoveFile, sourceLineNumber, id)
42 + public MoveFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MoveFile, sourceLineNumber, id)
43 {
44 }
45
46 - public IntermediateField this[MoveFileTupleFields index] => this.Fields[(int)index];
46 + public IntermediateField this[MoveFileSymbolFields index] => this.Fields[(int)index];
47
48 public string ComponentRef
49 {
50 - get => (string)this.Fields[(int)MoveFileTupleFields.ComponentRef];
51 - set => this.Set((int)MoveFileTupleFields.ComponentRef, value);
50 + get => (string)this.Fields[(int)MoveFileSymbolFields.ComponentRef];
51 + set => this.Set((int)MoveFileSymbolFields.ComponentRef, value);
52 }
53
54 public string SourceName
55 {
56 - get => (string)this.Fields[(int)MoveFileTupleFields.SourceName];
57 - set => this.Set((int)MoveFileTupleFields.SourceName, value);
56 + get => (string)this.Fields[(int)MoveFileSymbolFields.SourceName];
57 + set => this.Set((int)MoveFileSymbolFields.SourceName, value);
58 }
59
60 public string DestName
61 {
62 - get => (string)this.Fields[(int)MoveFileTupleFields.DestName];
63 - set => this.Set((int)MoveFileTupleFields.DestName, value);
62 + get => (string)this.Fields[(int)MoveFileSymbolFields.DestName];
63 + set => this.Set((int)MoveFileSymbolFields.DestName, value);
64 }
65
66 public string SourceFolder
67 {
68 - get => (string)this.Fields[(int)MoveFileTupleFields.SourceFolder];
69 - set => this.Set((int)MoveFileTupleFields.SourceFolder, value);
68 + get => (string)this.Fields[(int)MoveFileSymbolFields.SourceFolder];
69 + set => this.Set((int)MoveFileSymbolFields.SourceFolder, value);
70 }
71
72 public string DestFolder
73 {
74 - get => (string)this.Fields[(int)MoveFileTupleFields.DestFolder];
75 - set => this.Set((int)MoveFileTupleFields.DestFolder, value);
74 + get => (string)this.Fields[(int)MoveFileSymbolFields.DestFolder];
75 + set => this.Set((int)MoveFileSymbolFields.DestFolder, value);
76 }
77
78 public bool Delete
79 {
80 - get => (bool)this.Fields[(int)MoveFileTupleFields.Delete];
81 - set => this.Set((int)MoveFileTupleFields.Delete, value);
80 + get => (bool)this.Fields[(int)MoveFileSymbolFields.Delete];
81 + set => this.Set((int)MoveFileSymbolFields.Delete, value);
82 }
83 }
84 }
src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiAssemblyName = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiAssemblyName,
9 + public static readonly IntermediateSymbolDefinition MsiAssemblyName = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiAssemblyName,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.ComponentRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.Name), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.Value), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(MsiAssemblyNameSymbolFields.ComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MsiAssemblyNameSymbolFields.Name), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(MsiAssemblyNameSymbolFields.Value), IntermediateFieldType.String),
16 },
17 - typeof(MsiAssemblyNameTuple));
17 + typeof(MsiAssemblyNameSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum MsiAssemblyNameTupleFields
23 + public enum MsiAssemblyNameSymbolFields
24 {
25 ComponentRef,
26 Name,
27 Value,
28 }
29
30 - public class MsiAssemblyNameTuple : IntermediateTuple
30 + public class MsiAssemblyNameSymbol : IntermediateSymbol
31 {
32 - public MsiAssemblyNameTuple() : base(TupleDefinitions.MsiAssemblyName, null, null)
32 + public MsiAssemblyNameSymbol() : base(SymbolDefinitions.MsiAssemblyName, null, null)
33 {
34 }
35
36 - public MsiAssemblyNameTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiAssemblyName, sourceLineNumber, id)
36 + public MsiAssemblyNameSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiAssemblyName, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[MsiAssemblyNameTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[MsiAssemblyNameSymbolFields index] => this.Fields[(int)index];
41
42 public string ComponentRef
43 {
44 - get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.ComponentRef];
45 - set => this.Set((int)MsiAssemblyNameTupleFields.ComponentRef, value);
44 + get => (string)this.Fields[(int)MsiAssemblyNameSymbolFields.ComponentRef];
45 + set => this.Set((int)MsiAssemblyNameSymbolFields.ComponentRef, value);
46 }
47
48 public string Name
49 {
50 - get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.Name];
51 - set => this.Set((int)MsiAssemblyNameTupleFields.Name, value);
50 + get => (string)this.Fields[(int)MsiAssemblyNameSymbolFields.Name];
51 + set => this.Set((int)MsiAssemblyNameSymbolFields.Name, value);
52 }
53
54 public string Value
55 {
56 - get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.Value];
57 - set => this.Set((int)MsiAssemblyNameTupleFields.Value, value);
56 + get => (string)this.Fields[(int)MsiAssemblyNameSymbolFields.Value];
57 + set => this.Set((int)MsiAssemblyNameSymbolFields.Value, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiDigitalCertificateTuple.cs
+14 -14
@@ -2,43 +2,43 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiDigitalCertificate = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiDigitalCertificate,
9 + public static readonly IntermediateSymbolDefinition MsiDigitalCertificate = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiDigitalCertificate,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiDigitalCertificateTupleFields.CertData), IntermediateFieldType.Path),
13 + new IntermediateFieldDefinition(nameof(MsiDigitalCertificateSymbolFields.CertData), IntermediateFieldType.Path),
14 },
15 - typeof(MsiDigitalCertificateTuple));
15 + typeof(MsiDigitalCertificateSymbol));
16 }
17 }
18
19 -namespace WixToolset.Data.Tuples
19 +namespace WixToolset.Data.Symbols
20 {
21 - public enum MsiDigitalCertificateTupleFields
21 + public enum MsiDigitalCertificateSymbolFields
22 {
23 CertData,
24 }
25
26 - public class MsiDigitalCertificateTuple : IntermediateTuple
26 + public class MsiDigitalCertificateSymbol : IntermediateSymbol
27 {
28 - public MsiDigitalCertificateTuple() : base(TupleDefinitions.MsiDigitalCertificate, null, null)
28 + public MsiDigitalCertificateSymbol() : base(SymbolDefinitions.MsiDigitalCertificate, null, null)
29 {
30 }
31
32 - public MsiDigitalCertificateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiDigitalCertificate, sourceLineNumber, id)
32 + public MsiDigitalCertificateSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiDigitalCertificate, sourceLineNumber, id)
33 {
34 }
35
36 - public IntermediateField this[MsiDigitalCertificateTupleFields index] => this.Fields[(int)index];
36 + public IntermediateField this[MsiDigitalCertificateSymbolFields index] => this.Fields[(int)index];
37
38 public string CertData
39 {
40 - get => (string)this.Fields[(int)MsiDigitalCertificateTupleFields.CertData];
41 - set => this.Set((int)MsiDigitalCertificateTupleFields.CertData, value);
40 + get => (string)this.Fields[(int)MsiDigitalCertificateSymbolFields.CertData];
41 + set => this.Set((int)MsiDigitalCertificateSymbolFields.CertData, value);
42 }
43 }
44 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiDigitalSignature = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiDigitalSignature,
9 + public static readonly IntermediateSymbolDefinition MsiDigitalSignature = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiDigitalSignature,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.Table), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.SignObject), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.DigitalCertificateRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.Hash), IntermediateFieldType.Path),
13 + new IntermediateFieldDefinition(nameof(MsiDigitalSignatureSymbolFields.Table), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MsiDigitalSignatureSymbolFields.SignObject), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(MsiDigitalSignatureSymbolFields.DigitalCertificateRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(MsiDigitalSignatureSymbolFields.Hash), IntermediateFieldType.Path),
17 },
18 - typeof(MsiDigitalSignatureTuple));
18 + typeof(MsiDigitalSignatureSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum MsiDigitalSignatureTupleFields
24 + public enum MsiDigitalSignatureSymbolFields
25 {
26 Table,
27 SignObject,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Hash,
30 }
31
32 - public class MsiDigitalSignatureTuple : IntermediateTuple
32 + public class MsiDigitalSignatureSymbol : IntermediateSymbol
33 {
34 - public MsiDigitalSignatureTuple() : base(TupleDefinitions.MsiDigitalSignature, null, null)
34 + public MsiDigitalSignatureSymbol() : base(SymbolDefinitions.MsiDigitalSignature, null, null)
35 {
36 }
37
38 - public MsiDigitalSignatureTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiDigitalSignature, sourceLineNumber, id)
38 + public MsiDigitalSignatureSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiDigitalSignature, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[MsiDigitalSignatureTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[MsiDigitalSignatureSymbolFields index] => this.Fields[(int)index];
43
44 public string Table
45 {
46 - get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.Table];
47 - set => this.Set((int)MsiDigitalSignatureTupleFields.Table, value);
46 + get => (string)this.Fields[(int)MsiDigitalSignatureSymbolFields.Table];
47 + set => this.Set((int)MsiDigitalSignatureSymbolFields.Table, value);
48 }
49
50 public string SignObject
51 {
52 - get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.SignObject];
53 - set => this.Set((int)MsiDigitalSignatureTupleFields.SignObject, value);
52 + get => (string)this.Fields[(int)MsiDigitalSignatureSymbolFields.SignObject];
53 + set => this.Set((int)MsiDigitalSignatureSymbolFields.SignObject, value);
54 }
55
56 public string DigitalCertificateRef
57 {
58 - get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.DigitalCertificateRef];
59 - set => this.Set((int)MsiDigitalSignatureTupleFields.DigitalCertificateRef, value);
58 + get => (string)this.Fields[(int)MsiDigitalSignatureSymbolFields.DigitalCertificateRef];
59 + set => this.Set((int)MsiDigitalSignatureSymbolFields.DigitalCertificateRef, value);
60 }
61
62 public string Hash
63 {
64 - get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.Hash];
65 - set => this.Set((int)MsiDigitalSignatureTupleFields.Hash, value);
64 + get => (string)this.Fields[(int)MsiDigitalSignatureSymbolFields.Hash];
65 + set => this.Set((int)MsiDigitalSignatureSymbolFields.Hash, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiEmbeddedChainerTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiEmbeddedChainer = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiEmbeddedChainer,
9 + public static readonly IntermediateSymbolDefinition MsiEmbeddedChainer = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiEmbeddedChainer,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerTupleFields.Condition), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerTupleFields.CommandLine), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerTupleFields.Source), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerTupleFields.Type), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerSymbolFields.Condition), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerSymbolFields.CommandLine), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerSymbolFields.Source), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerSymbolFields.Type), IntermediateFieldType.Number),
17 },
18 - typeof(MsiEmbeddedChainerTuple));
18 + typeof(MsiEmbeddedChainerSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum MsiEmbeddedChainerTupleFields
24 + public enum MsiEmbeddedChainerSymbolFields
25 {
26 Condition,
27 CommandLine,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Type,
30 }
31
32 - public class MsiEmbeddedChainerTuple : IntermediateTuple
32 + public class MsiEmbeddedChainerSymbol : IntermediateSymbol
33 {
34 - public MsiEmbeddedChainerTuple() : base(TupleDefinitions.MsiEmbeddedChainer, null, null)
34 + public MsiEmbeddedChainerSymbol() : base(SymbolDefinitions.MsiEmbeddedChainer, null, null)
35 {
36 }
37
38 - public MsiEmbeddedChainerTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiEmbeddedChainer, sourceLineNumber, id)
38 + public MsiEmbeddedChainerSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiEmbeddedChainer, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[MsiEmbeddedChainerTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[MsiEmbeddedChainerSymbolFields index] => this.Fields[(int)index];
43
44 public string Condition
45 {
46 - get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.Condition];
47 - set => this.Set((int)MsiEmbeddedChainerTupleFields.Condition, value);
46 + get => (string)this.Fields[(int)MsiEmbeddedChainerSymbolFields.Condition];
47 + set => this.Set((int)MsiEmbeddedChainerSymbolFields.Condition, value);
48 }
49
50 public string CommandLine
51 {
52 - get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.CommandLine];
53 - set => this.Set((int)MsiEmbeddedChainerTupleFields.CommandLine, value);
52 + get => (string)this.Fields[(int)MsiEmbeddedChainerSymbolFields.CommandLine];
53 + set => this.Set((int)MsiEmbeddedChainerSymbolFields.CommandLine, value);
54 }
55
56 public string Source
57 {
58 - get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.Source];
59 - set => this.Set((int)MsiEmbeddedChainerTupleFields.Source, value);
58 + get => (string)this.Fields[(int)MsiEmbeddedChainerSymbolFields.Source];
59 + set => this.Set((int)MsiEmbeddedChainerSymbolFields.Source, value);
60 }
61
62 public int Type
63 {
64 - get => (int)this.Fields[(int)MsiEmbeddedChainerTupleFields.Type];
65 - set => this.Set((int)MsiEmbeddedChainerTupleFields.Type, value);
64 + get => (int)this.Fields[(int)MsiEmbeddedChainerSymbolFields.Type];
65 + set => this.Set((int)MsiEmbeddedChainerSymbolFields.Type, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiEmbeddedUI = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiEmbeddedUI,
9 + public static readonly IntermediateSymbolDefinition MsiEmbeddedUI = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiEmbeddedUI,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiEmbeddedUITupleFields.FileName), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MsiEmbeddedUITupleFields.EntryPoint), IntermediateFieldType.Bool),
15 - new IntermediateFieldDefinition(nameof(MsiEmbeddedUITupleFields.SupportsBasicUI), IntermediateFieldType.Bool),
16 - new IntermediateFieldDefinition(nameof(MsiEmbeddedUITupleFields.MessageFilter), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(MsiEmbeddedUITupleFields.Source), IntermediateFieldType.Path),
13 + new IntermediateFieldDefinition(nameof(MsiEmbeddedUISymbolFields.FileName), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MsiEmbeddedUISymbolFields.EntryPoint), IntermediateFieldType.Bool),
15 + new IntermediateFieldDefinition(nameof(MsiEmbeddedUISymbolFields.SupportsBasicUI), IntermediateFieldType.Bool),
16 + new IntermediateFieldDefinition(nameof(MsiEmbeddedUISymbolFields.MessageFilter), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(MsiEmbeddedUISymbolFields.Source), IntermediateFieldType.Path),
18 },
19 - typeof(MsiEmbeddedUITuple));
19 + typeof(MsiEmbeddedUISymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum MsiEmbeddedUITupleFields
25 + public enum MsiEmbeddedUISymbolFields
26 {
27 FileName,
28 EntryPoint,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
31 Source,
32 }
33
34 - public class MsiEmbeddedUITuple : IntermediateTuple
34 + public class MsiEmbeddedUISymbol : IntermediateSymbol
35 {
36 - public MsiEmbeddedUITuple() : base(TupleDefinitions.MsiEmbeddedUI, null, null)
36 + public MsiEmbeddedUISymbol() : base(SymbolDefinitions.MsiEmbeddedUI, null, null)
37 {
38 }
39
40 - public MsiEmbeddedUITuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiEmbeddedUI, sourceLineNumber, id)
40 + public MsiEmbeddedUISymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiEmbeddedUI, sourceLineNumber, id)
41 {
42 }
43
44 - public IntermediateField this[MsiEmbeddedUITupleFields index] => this.Fields[(int)index];
44 + public IntermediateField this[MsiEmbeddedUISymbolFields index] => this.Fields[(int)index];
45
46 public string FileName
47 {
48 - get => (string)this.Fields[(int)MsiEmbeddedUITupleFields.FileName];
49 - set => this.Set((int)MsiEmbeddedUITupleFields.FileName, value);
48 + get => (string)this.Fields[(int)MsiEmbeddedUISymbolFields.FileName];
49 + set => this.Set((int)MsiEmbeddedUISymbolFields.FileName, value);
50 }
51
52 public bool EntryPoint
53 {
54 - get => this.Fields[(int)MsiEmbeddedUITupleFields.EntryPoint].AsBool();
55 - set => this.Set((int)MsiEmbeddedUITupleFields.EntryPoint, value);
54 + get => this.Fields[(int)MsiEmbeddedUISymbolFields.EntryPoint].AsBool();
55 + set => this.Set((int)MsiEmbeddedUISymbolFields.EntryPoint, value);
56 }
57
58 public bool SupportsBasicUI
59 {
60 - get => this.Fields[(int)MsiEmbeddedUITupleFields.SupportsBasicUI].AsBool();
61 - set => this.Set((int)MsiEmbeddedUITupleFields.SupportsBasicUI, value);
60 + get => this.Fields[(int)MsiEmbeddedUISymbolFields.SupportsBasicUI].AsBool();
61 + set => this.Set((int)MsiEmbeddedUISymbolFields.SupportsBasicUI, value);
62 }
63
64 public int? MessageFilter
65 {
66 - get => (int?)this.Fields[(int)MsiEmbeddedUITupleFields.MessageFilter];
67 - set => this.Set((int)MsiEmbeddedUITupleFields.MessageFilter, value);
66 + get => (int?)this.Fields[(int)MsiEmbeddedUISymbolFields.MessageFilter];
67 + set => this.Set((int)MsiEmbeddedUISymbolFields.MessageFilter, value);
68 }
69
70 public string Source
71 {
72 - get => (string)this.Fields[(int)MsiEmbeddedUITupleFields.Source];
73 - set => this.Set((int)MsiEmbeddedUITupleFields.Source, value);
72 + get => (string)this.Fields[(int)MsiEmbeddedUISymbolFields.Source];
73 + set => this.Set((int)MsiEmbeddedUISymbolFields.Source, value);
74 }
75 }
76 }
src/WixToolset.Data/Tuples/MsiFileHashTuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiFileHash = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiFileHash,
9 + public static readonly IntermediateSymbolDefinition MsiFileHash = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiFileHash,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.Options), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart1), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart2), IntermediateFieldType.Number),
16 - new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart3), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart4), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(MsiFileHashSymbolFields.Options), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(MsiFileHashSymbolFields.HashPart1), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(MsiFileHashSymbolFields.HashPart2), IntermediateFieldType.Number),
16 + new IntermediateFieldDefinition(nameof(MsiFileHashSymbolFields.HashPart3), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(MsiFileHashSymbolFields.HashPart4), IntermediateFieldType.Number),
18 },
19 - typeof(MsiFileHashTuple));
19 + typeof(MsiFileHashSymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum MsiFileHashTupleFields
25 + public enum MsiFileHashSymbolFields
26 {
27 Options,
28 HashPart1,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
31 HashPart4,
32 }
33
34 - public class MsiFileHashTuple : IntermediateTuple
34 + public class MsiFileHashSymbol : IntermediateSymbol
35 {
36 - public MsiFileHashTuple() : base(TupleDefinitions.MsiFileHash, null, null)
36 + public MsiFileHashSymbol() : base(SymbolDefinitions.MsiFileHash, null, null)
37 {
38 }
39
40 - public MsiFileHashTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiFileHash, sourceLineNumber, id)
40 + public MsiFileHashSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiFileHash, sourceLineNumber, id)
41 {
42 }
43
44 - public IntermediateField this[MsiFileHashTupleFields index] => this.Fields[(int)index];
44 + public IntermediateField this[MsiFileHashSymbolFields index] => this.Fields[(int)index];
45
46 public int Options
47 {
48 - get => (int)this.Fields[(int)MsiFileHashTupleFields.Options];
49 - set => this.Set((int)MsiFileHashTupleFields.Options, value);
48 + get => (int)this.Fields[(int)MsiFileHashSymbolFields.Options];
49 + set => this.Set((int)MsiFileHashSymbolFields.Options, value);
50 }
51
52 public int HashPart1
53 {
54 - get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart1];
55 - set => this.Set((int)MsiFileHashTupleFields.HashPart1, value);
54 + get => (int)this.Fields[(int)MsiFileHashSymbolFields.HashPart1];
55 + set => this.Set((int)MsiFileHashSymbolFields.HashPart1, value);
56 }
57
58 public int HashPart2
59 {
60 - get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart2];
61 - set => this.Set((int)MsiFileHashTupleFields.HashPart2, value);
60 + get => (int)this.Fields[(int)MsiFileHashSymbolFields.HashPart2];
61 + set => this.Set((int)MsiFileHashSymbolFields.HashPart2, value);
62 }
63
64 public int HashPart3
65 {
66 - get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart3];
67 - set => this.Set((int)MsiFileHashTupleFields.HashPart3, value);
66 + get => (int)this.Fields[(int)MsiFileHashSymbolFields.HashPart3];
67 + set => this.Set((int)MsiFileHashSymbolFields.HashPart3, value);
68 }
69
70 public int HashPart4
71 {
72 - get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart4];
73 - set => this.Set((int)MsiFileHashTupleFields.HashPart4, value);
72 + get => (int)this.Fields[(int)MsiFileHashSymbolFields.HashPart4];
73 + set => this.Set((int)MsiFileHashSymbolFields.HashPart4, value);
74 }
75 }
76 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiLockPermissionsExTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiLockPermissionsEx = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiLockPermissionsEx,
9 + public static readonly IntermediateSymbolDefinition MsiLockPermissionsEx = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiLockPermissionsEx,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.LockObject), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.Table), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.SDDLText), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.Condition), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(MsiLockPermissionsExSymbolFields.LockObject), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MsiLockPermissionsExSymbolFields.Table), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(MsiLockPermissionsExSymbolFields.SDDLText), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(MsiLockPermissionsExSymbolFields.Condition), IntermediateFieldType.String),
17 },
18 - typeof(MsiLockPermissionsExTuple));
18 + typeof(MsiLockPermissionsExSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum MsiLockPermissionsExTupleFields
24 + public enum MsiLockPermissionsExSymbolFields
25 {
26 LockObject,
27 Table,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Condition,
30 }
31
32 - public class MsiLockPermissionsExTuple : IntermediateTuple
32 + public class MsiLockPermissionsExSymbol : IntermediateSymbol
33 {
34 - public MsiLockPermissionsExTuple() : base(TupleDefinitions.MsiLockPermissionsEx, null, null)
34 + public MsiLockPermissionsExSymbol() : base(SymbolDefinitions.MsiLockPermissionsEx, null, null)
35 {
36 }
37
38 - public MsiLockPermissionsExTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiLockPermissionsEx, sourceLineNumber, id)
38 + public MsiLockPermissionsExSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiLockPermissionsEx, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[MsiLockPermissionsExTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[MsiLockPermissionsExSymbolFields index] => this.Fields[(int)index];
43
44 public string LockObject
45 {
46 - get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.LockObject];
47 - set => this.Set((int)MsiLockPermissionsExTupleFields.LockObject, value);
46 + get => (string)this.Fields[(int)MsiLockPermissionsExSymbolFields.LockObject];
47 + set => this.Set((int)MsiLockPermissionsExSymbolFields.LockObject, value);
48 }
49
50 public string Table
51 {
52 - get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.Table];
53 - set => this.Set((int)MsiLockPermissionsExTupleFields.Table, value);
52 + get => (string)this.Fields[(int)MsiLockPermissionsExSymbolFields.Table];
53 + set => this.Set((int)MsiLockPermissionsExSymbolFields.Table, value);
54 }
55
56 public string SDDLText
57 {
58 - get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.SDDLText];
59 - set => this.Set((int)MsiLockPermissionsExTupleFields.SDDLText, value);
58 + get => (string)this.Fields[(int)MsiLockPermissionsExSymbolFields.SDDLText];
59 + set => this.Set((int)MsiLockPermissionsExSymbolFields.SDDLText, value);
60 }
61
62 public string Condition
63 {
64 - get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.Condition];
65 - set => this.Set((int)MsiLockPermissionsExTupleFields.Condition, value);
64 + get => (string)this.Fields[(int)MsiLockPermissionsExSymbolFields.Condition];
65 + set => this.Set((int)MsiLockPermissionsExSymbolFields.Condition, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiPackageCertificate = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiPackageCertificate,
9 + public static readonly IntermediateSymbolDefinition MsiPackageCertificate = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiPackageCertificate,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiPackageCertificateTupleFields.PackageCertificate), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MsiPackageCertificateTupleFields.DigitalCertificateRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(MsiPackageCertificateSymbolFields.PackageCertificate), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MsiPackageCertificateSymbolFields.DigitalCertificateRef), IntermediateFieldType.String),
15 },
16 - typeof(MsiPackageCertificateTuple));
16 + typeof(MsiPackageCertificateSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum MsiPackageCertificateTupleFields
22 + public enum MsiPackageCertificateSymbolFields
23 {
24 PackageCertificate,
25 DigitalCertificateRef,
26 }
27
28 - public class MsiPackageCertificateTuple : IntermediateTuple
28 + public class MsiPackageCertificateSymbol : IntermediateSymbol
29 {
30 - public MsiPackageCertificateTuple() : base(TupleDefinitions.MsiPackageCertificate, null, null)
30 + public MsiPackageCertificateSymbol() : base(SymbolDefinitions.MsiPackageCertificate, null, null)
31 {
32 }
33
34 - public MsiPackageCertificateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPackageCertificate, sourceLineNumber, id)
34 + public MsiPackageCertificateSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiPackageCertificate, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[MsiPackageCertificateTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[MsiPackageCertificateSymbolFields index] => this.Fields[(int)index];
39
40 public string PackageCertificate
41 {
42 - get => (string)this.Fields[(int)MsiPackageCertificateTupleFields.PackageCertificate];
43 - set => this.Set((int)MsiPackageCertificateTupleFields.PackageCertificate, value);
42 + get => (string)this.Fields[(int)MsiPackageCertificateSymbolFields.PackageCertificate];
43 + set => this.Set((int)MsiPackageCertificateSymbolFields.PackageCertificate, value);
44 }
45
46 public string DigitalCertificateRef
47 {
48 - get => (string)this.Fields[(int)MsiPackageCertificateTupleFields.DigitalCertificateRef];
49 - set => this.Set((int)MsiPackageCertificateTupleFields.DigitalCertificateRef, value);
48 + get => (string)this.Fields[(int)MsiPackageCertificateSymbolFields.DigitalCertificateRef];
49 + set => this.Set((int)MsiPackageCertificateSymbolFields.DigitalCertificateRef, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiPatchCertificate = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiPatchCertificate,
9 + public static readonly IntermediateSymbolDefinition MsiPatchCertificate = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiPatchCertificate,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiPatchCertificateTupleFields.PatchCertificate), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MsiPatchCertificateTupleFields.DigitalCertificateRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(MsiPatchCertificateSymbolFields.PatchCertificate), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MsiPatchCertificateSymbolFields.DigitalCertificateRef), IntermediateFieldType.String),
15 },
16 - typeof(MsiPatchCertificateTuple));
16 + typeof(MsiPatchCertificateSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum MsiPatchCertificateTupleFields
22 + public enum MsiPatchCertificateSymbolFields
23 {
24 PatchCertificate,
25 DigitalCertificateRef,
26 }
27
28 - public class MsiPatchCertificateTuple : IntermediateTuple
28 + public class MsiPatchCertificateSymbol : IntermediateSymbol
29 {
30 - public MsiPatchCertificateTuple() : base(TupleDefinitions.MsiPatchCertificate, null, null)
30 + public MsiPatchCertificateSymbol() : base(SymbolDefinitions.MsiPatchCertificate, null, null)
31 {
32 }
33
34 - public MsiPatchCertificateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchCertificate, sourceLineNumber, id)
34 + public MsiPatchCertificateSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiPatchCertificate, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[MsiPatchCertificateTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[MsiPatchCertificateSymbolFields index] => this.Fields[(int)index];
39
40 public string PatchCertificate
41 {
42 - get => (string)this.Fields[(int)MsiPatchCertificateTupleFields.PatchCertificate];
43 - set => this.Set((int)MsiPatchCertificateTupleFields.PatchCertificate, value);
42 + get => (string)this.Fields[(int)MsiPatchCertificateSymbolFields.PatchCertificate];
43 + set => this.Set((int)MsiPatchCertificateSymbolFields.PatchCertificate, value);
44 }
45
46 public string DigitalCertificateRef
47 {
48 - get => (string)this.Fields[(int)MsiPatchCertificateTupleFields.DigitalCertificateRef];
49 - set => this.Set((int)MsiPatchCertificateTupleFields.DigitalCertificateRef, value);
48 + get => (string)this.Fields[(int)MsiPatchCertificateSymbolFields.DigitalCertificateRef];
49 + set => this.Set((int)MsiPatchCertificateSymbolFields.DigitalCertificateRef, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiPatchHeadersTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiPatchHeaders = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiPatchHeaders,
9 + public static readonly IntermediateSymbolDefinition MsiPatchHeaders = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiPatchHeaders,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiPatchHeadersTupleFields.StreamRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MsiPatchHeadersTupleFields.Header), IntermediateFieldType.Path),
13 + new IntermediateFieldDefinition(nameof(MsiPatchHeadersSymbolFields.StreamRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MsiPatchHeadersSymbolFields.Header), IntermediateFieldType.Path),
15 },
16 - typeof(MsiPatchHeadersTuple));
16 + typeof(MsiPatchHeadersSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum MsiPatchHeadersTupleFields
22 + public enum MsiPatchHeadersSymbolFields
23 {
24 StreamRef,
25 Header,
26 }
27
28 - public class MsiPatchHeadersTuple : IntermediateTuple
28 + public class MsiPatchHeadersSymbol : IntermediateSymbol
29 {
30 - public MsiPatchHeadersTuple() : base(TupleDefinitions.MsiPatchHeaders, null, null)
30 + public MsiPatchHeadersSymbol() : base(SymbolDefinitions.MsiPatchHeaders, null, null)
31 {
32 }
33
34 - public MsiPatchHeadersTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchHeaders, sourceLineNumber, id)
34 + public MsiPatchHeadersSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiPatchHeaders, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[MsiPatchHeadersTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[MsiPatchHeadersSymbolFields index] => this.Fields[(int)index];
39
40 public string StreamRef
41 {
42 - get => (string)this.Fields[(int)MsiPatchHeadersTupleFields.StreamRef];
43 - set => this.Set((int)MsiPatchHeadersTupleFields.StreamRef, value);
42 + get => (string)this.Fields[(int)MsiPatchHeadersSymbolFields.StreamRef];
43 + set => this.Set((int)MsiPatchHeadersSymbolFields.StreamRef, value);
44 }
45
46 public string Header
47 {
48 - get => (string)this.Fields[(int)MsiPatchHeadersTupleFields.Header];
49 - set => this.Set((int)MsiPatchHeadersTupleFields.Header, value);
48 + get => (string)this.Fields[(int)MsiPatchHeadersSymbolFields.Header];
49 + set => this.Set((int)MsiPatchHeadersSymbolFields.Header, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiPatchMetadataTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiPatchMetadata = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiPatchMetadata,
9 + public static readonly IntermediateSymbolDefinition MsiPatchMetadata = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiPatchMetadata,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiPatchMetadataTupleFields.Company), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MsiPatchMetadataTupleFields.Property), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(MsiPatchMetadataTupleFields.Value), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(MsiPatchMetadataSymbolFields.Company), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MsiPatchMetadataSymbolFields.Property), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(MsiPatchMetadataSymbolFields.Value), IntermediateFieldType.String),
16 },
17 - typeof(MsiPatchMetadataTuple));
17 + typeof(MsiPatchMetadataSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum MsiPatchMetadataTupleFields
23 + public enum MsiPatchMetadataSymbolFields
24 {
25 Company,
26 Property,
27 Value,
28 }
29
30 - public class MsiPatchMetadataTuple : IntermediateTuple
30 + public class MsiPatchMetadataSymbol : IntermediateSymbol
31 {
32 - public MsiPatchMetadataTuple() : base(TupleDefinitions.MsiPatchMetadata, null, null)
32 + public MsiPatchMetadataSymbol() : base(SymbolDefinitions.MsiPatchMetadata, null, null)
33 {
34 }
35
36 - public MsiPatchMetadataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchMetadata, sourceLineNumber, id)
36 + public MsiPatchMetadataSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiPatchMetadata, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[MsiPatchMetadataTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[MsiPatchMetadataSymbolFields index] => this.Fields[(int)index];
41
42 public string Company
43 {
44 - get => (string)this.Fields[(int)MsiPatchMetadataTupleFields.Company];
45 - set => this.Set((int)MsiPatchMetadataTupleFields.Company, value);
44 + get => (string)this.Fields[(int)MsiPatchMetadataSymbolFields.Company];
45 + set => this.Set((int)MsiPatchMetadataSymbolFields.Company, value);
46 }
47
48 public string Property
49 {
50 - get => (string)this.Fields[(int)MsiPatchMetadataTupleFields.Property];
51 - set => this.Set((int)MsiPatchMetadataTupleFields.Property, value);
50 + get => (string)this.Fields[(int)MsiPatchMetadataSymbolFields.Property];
51 + set => this.Set((int)MsiPatchMetadataSymbolFields.Property, value);
52 }
53
54 public string Value
55 {
56 - get => (string)this.Fields[(int)MsiPatchMetadataTupleFields.Value];
57 - set => this.Set((int)MsiPatchMetadataTupleFields.Value, value);
56 + get => (string)this.Fields[(int)MsiPatchMetadataSymbolFields.Value];
57 + set => this.Set((int)MsiPatchMetadataSymbolFields.Value, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiPatchOldAssemblyFile = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiPatchOldAssemblyFile,
9 + public static readonly IntermediateSymbolDefinition MsiPatchOldAssemblyFile = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiPatchOldAssemblyFile,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileTupleFields.FileRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileTupleFields.AssemblyRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileSymbolFields.FileRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileSymbolFields.AssemblyRef), IntermediateFieldType.String),
15 },
16 - typeof(MsiPatchOldAssemblyFileTuple));
16 + typeof(MsiPatchOldAssemblyFileSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum MsiPatchOldAssemblyFileTupleFields
22 + public enum MsiPatchOldAssemblyFileSymbolFields
23 {
24 FileRef,
25 AssemblyRef,
26 }
27
28 - public class MsiPatchOldAssemblyFileTuple : IntermediateTuple
28 + public class MsiPatchOldAssemblyFileSymbol : IntermediateSymbol
29 {
30 - public MsiPatchOldAssemblyFileTuple() : base(TupleDefinitions.MsiPatchOldAssemblyFile, null, null)
30 + public MsiPatchOldAssemblyFileSymbol() : base(SymbolDefinitions.MsiPatchOldAssemblyFile, null, null)
31 {
32 }
33
34 - public MsiPatchOldAssemblyFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchOldAssemblyFile, sourceLineNumber, id)
34 + public MsiPatchOldAssemblyFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiPatchOldAssemblyFile, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[MsiPatchOldAssemblyFileTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[MsiPatchOldAssemblyFileSymbolFields index] => this.Fields[(int)index];
39
40 public string FileRef
41 {
42 - get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.FileRef];
43 - set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.FileRef, value);
42 + get => (string)this.Fields[(int)MsiPatchOldAssemblyFileSymbolFields.FileRef];
43 + set => this.Set((int)MsiPatchOldAssemblyFileSymbolFields.FileRef, value);
44 }
45
46 public string AssemblyRef
47 {
48 - get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.AssemblyRef];
49 - set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.AssemblyRef, value);
48 + get => (string)this.Fields[(int)MsiPatchOldAssemblyFileSymbolFields.AssemblyRef];
49 + set => this.Set((int)MsiPatchOldAssemblyFileSymbolFields.AssemblyRef, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiPatchOldAssemblyNameTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiPatchOldAssemblyName = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiPatchOldAssemblyName,
9 + public static readonly IntermediateSymbolDefinition MsiPatchOldAssemblyName = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiPatchOldAssemblyName,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyNameTupleFields.Assembly), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyNameTupleFields.Name), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyNameTupleFields.Value), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyNameSymbolFields.Assembly), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyNameSymbolFields.Name), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyNameSymbolFields.Value), IntermediateFieldType.String),
16 },
17 - typeof(MsiPatchOldAssemblyNameTuple));
17 + typeof(MsiPatchOldAssemblyNameSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum MsiPatchOldAssemblyNameTupleFields
23 + public enum MsiPatchOldAssemblyNameSymbolFields
24 {
25 Assembly,
26 Name,
27 Value,
28 }
29
30 - public class MsiPatchOldAssemblyNameTuple : IntermediateTuple
30 + public class MsiPatchOldAssemblyNameSymbol : IntermediateSymbol
31 {
32 - public MsiPatchOldAssemblyNameTuple() : base(TupleDefinitions.MsiPatchOldAssemblyName, null, null)
32 + public MsiPatchOldAssemblyNameSymbol() : base(SymbolDefinitions.MsiPatchOldAssemblyName, null, null)
33 {
34 }
35
36 - public MsiPatchOldAssemblyNameTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchOldAssemblyName, sourceLineNumber, id)
36 + public MsiPatchOldAssemblyNameSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiPatchOldAssemblyName, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[MsiPatchOldAssemblyNameTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[MsiPatchOldAssemblyNameSymbolFields index] => this.Fields[(int)index];
41
42 public string Assembly
43 {
44 - get => (string)this.Fields[(int)MsiPatchOldAssemblyNameTupleFields.Assembly];
45 - set => this.Set((int)MsiPatchOldAssemblyNameTupleFields.Assembly, value);
44 + get => (string)this.Fields[(int)MsiPatchOldAssemblyNameSymbolFields.Assembly];
45 + set => this.Set((int)MsiPatchOldAssemblyNameSymbolFields.Assembly, value);
46 }
47
48 public string Name
49 {
50 - get => (string)this.Fields[(int)MsiPatchOldAssemblyNameTupleFields.Name];
51 - set => this.Set((int)MsiPatchOldAssemblyNameTupleFields.Name, value);
50 + get => (string)this.Fields[(int)MsiPatchOldAssemblyNameSymbolFields.Name];
51 + set => this.Set((int)MsiPatchOldAssemblyNameSymbolFields.Name, value);
52 }
53
54 public string Value
55 {
56 - get => (string)this.Fields[(int)MsiPatchOldAssemblyNameTupleFields.Value];
57 - set => this.Set((int)MsiPatchOldAssemblyNameTupleFields.Value, value);
56 + get => (string)this.Fields[(int)MsiPatchOldAssemblyNameSymbolFields.Value];
57 + set => this.Set((int)MsiPatchOldAssemblyNameSymbolFields.Value, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiPatchSequence = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiPatchSequence,
9 + public static readonly IntermediateSymbolDefinition MsiPatchSequence = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiPatchSequence,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiPatchSequenceTupleFields.PatchFamily), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MsiPatchSequenceTupleFields.ProductCode), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(MsiPatchSequenceTupleFields.Sequence), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(MsiPatchSequenceTupleFields.Attributes), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(MsiPatchSequenceSymbolFields.PatchFamily), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MsiPatchSequenceSymbolFields.ProductCode), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(MsiPatchSequenceSymbolFields.Sequence), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(MsiPatchSequenceSymbolFields.Attributes), IntermediateFieldType.Number),
17 },
18 - typeof(MsiPatchSequenceTuple));
18 + typeof(MsiPatchSequenceSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum MsiPatchSequenceTupleFields
24 + public enum MsiPatchSequenceSymbolFields
25 {
26 PatchFamily,
27 ProductCode,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Attributes,
30 }
31
32 - public class MsiPatchSequenceTuple : IntermediateTuple
32 + public class MsiPatchSequenceSymbol : IntermediateSymbol
33 {
34 - public MsiPatchSequenceTuple() : base(TupleDefinitions.MsiPatchSequence, null, null)
34 + public MsiPatchSequenceSymbol() : base(SymbolDefinitions.MsiPatchSequence, null, null)
35 {
36 }
37
38 - public MsiPatchSequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchSequence, sourceLineNumber, id)
38 + public MsiPatchSequenceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiPatchSequence, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[MsiPatchSequenceTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[MsiPatchSequenceSymbolFields index] => this.Fields[(int)index];
43
44 public string PatchFamily
45 {
46 - get => (string)this.Fields[(int)MsiPatchSequenceTupleFields.PatchFamily];
47 - set => this.Set((int)MsiPatchSequenceTupleFields.PatchFamily, value);
46 + get => (string)this.Fields[(int)MsiPatchSequenceSymbolFields.PatchFamily];
47 + set => this.Set((int)MsiPatchSequenceSymbolFields.PatchFamily, value);
48 }
49
50 public string ProductCode
51 {
52 - get => (string)this.Fields[(int)MsiPatchSequenceTupleFields.ProductCode];
53 - set => this.Set((int)MsiPatchSequenceTupleFields.ProductCode, value);
52 + get => (string)this.Fields[(int)MsiPatchSequenceSymbolFields.ProductCode];
53 + set => this.Set((int)MsiPatchSequenceSymbolFields.ProductCode, value);
54 }
55
56 public string Sequence
57 {
58 - get => (string)this.Fields[(int)MsiPatchSequenceTupleFields.Sequence];
59 - set => this.Set((int)MsiPatchSequenceTupleFields.Sequence, value);
58 + get => (string)this.Fields[(int)MsiPatchSequenceSymbolFields.Sequence];
59 + set => this.Set((int)MsiPatchSequenceSymbolFields.Sequence, value);
60 }
61
62 public int? Attributes
63 {
64 - get => (int?)this.Fields[(int)MsiPatchSequenceTupleFields.Attributes];
65 - set => this.Set((int)MsiPatchSequenceTupleFields.Attributes, value);
64 + get => (int?)this.Fields[(int)MsiPatchSequenceSymbolFields.Attributes];
65 + set => this.Set((int)MsiPatchSequenceSymbolFields.Attributes, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs
+41 -41
@@ -2,32 +2,32 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiServiceConfigFailureActions = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiServiceConfigFailureActions,
9 + public static readonly IntermediateSymbolDefinition MsiServiceConfigFailureActions = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiServiceConfigFailureActions,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Name), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.OnInstall), IntermediateFieldType.Bool),
15 - new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.OnReinstall), IntermediateFieldType.Bool),
16 - new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.OnUninstall), IntermediateFieldType.Bool),
17 - new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.ResetPeriod), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.RebootMessage), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Command), IntermediateFieldType.String),
20 - new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Actions), IntermediateFieldType.String),
21 - new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.DelayActions), IntermediateFieldType.String),
22 - new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.ComponentRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.Name), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.OnInstall), IntermediateFieldType.Bool),
15 + new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.OnReinstall), IntermediateFieldType.Bool),
16 + new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.OnUninstall), IntermediateFieldType.Bool),
17 + new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.ResetPeriod), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.RebootMessage), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.Command), IntermediateFieldType.String),
20 + new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.Actions), IntermediateFieldType.String),
21 + new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.DelayActions), IntermediateFieldType.String),
22 + new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.ComponentRef), IntermediateFieldType.String),
23 },
24 - typeof(MsiServiceConfigFailureActionsTuple));
24 + typeof(MsiServiceConfigFailureActionsSymbol));
25 }
26 }
27
28 -namespace WixToolset.Data.Tuples
28 +namespace WixToolset.Data.Symbols
29 {
30 - public enum MsiServiceConfigFailureActionsTupleFields
30 + public enum MsiServiceConfigFailureActionsSymbolFields
31 {
32 Name,
33 OnInstall,
@@ -41,76 +41,76 @@ namespace WixToolset.Data.Tuples
41 ComponentRef,
42 }
43
44 - public class MsiServiceConfigFailureActionsTuple : IntermediateTuple
44 + public class MsiServiceConfigFailureActionsSymbol : IntermediateSymbol
45 {
46 - public MsiServiceConfigFailureActionsTuple() : base(TupleDefinitions.MsiServiceConfigFailureActions, null, null)
46 + public MsiServiceConfigFailureActionsSymbol() : base(SymbolDefinitions.MsiServiceConfigFailureActions, null, null)
47 {
48 }
49
50 - public MsiServiceConfigFailureActionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiServiceConfigFailureActions, sourceLineNumber, id)
50 + public MsiServiceConfigFailureActionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiServiceConfigFailureActions, sourceLineNumber, id)
51 {
52 }
53
54 - public IntermediateField this[MsiServiceConfigFailureActionsTupleFields index] => this.Fields[(int)index];
54 + public IntermediateField this[MsiServiceConfigFailureActionsSymbolFields index] => this.Fields[(int)index];
55
56 public string Name
57 {
58 - get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Name];
59 - set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Name, value);
58 + get => (string)this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.Name];
59 + set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.Name, value);
60 }
61
62 public bool OnInstall
63 {
64 - get => this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.OnInstall].AsBool();
65 - set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.OnInstall, value);
64 + get => this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.OnInstall].AsBool();
65 + set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.OnInstall, value);
66 }
67
68 public bool OnReinstall
69 {
70 - get => this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.OnReinstall].AsBool();
71 - set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.OnReinstall, value);
70 + get => this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.OnReinstall].AsBool();
71 + set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.OnReinstall, value);
72 }
73
74 public bool OnUninstall
75 {
76 - get => this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.OnUninstall].AsBool();
77 - set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.OnUninstall, value);
76 + get => this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.OnUninstall].AsBool();
77 + set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.OnUninstall, value);
78 }
79
80 public int? ResetPeriod
81 {
82 - get => (int?)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.ResetPeriod];
83 - set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.ResetPeriod, value);
82 + get => (int?)this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.ResetPeriod];
83 + set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.ResetPeriod, value);
84 }
85
86 public string RebootMessage
87 {
88 - get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.RebootMessage];
89 - set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.RebootMessage, value);
88 + get => (string)this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.RebootMessage];
89 + set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.RebootMessage, value);
90 }
91
92 public string Command
93 {
94 - get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Command];
95 - set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Command, value);
94 + get => (string)this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.Command];
95 + set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.Command, value);
96 }
97
98 public string Actions
99 {
100 - get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Actions];
101 - set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Actions, value);
100 + get => (string)this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.Actions];
101 + set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.Actions, value);
102 }
103
104 public string DelayActions
105 {
106 - get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.DelayActions];
107 - set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.DelayActions, value);
106 + get => (string)this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.DelayActions];
107 + set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.DelayActions, value);
108 }
109
110 public string ComponentRef
111 {
112 - get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.ComponentRef];
113 - set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.ComponentRef, value);
112 + get => (string)this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.ComponentRef];
113 + set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.ComponentRef, value);
114 }
115 }
116 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs
+32 -32
@@ -2,29 +2,29 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiServiceConfig = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiServiceConfig,
9 + public static readonly IntermediateSymbolDefinition MsiServiceConfig = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiServiceConfig,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.Name), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.OnInstall), IntermediateFieldType.Bool),
15 - new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.OnReinstall), IntermediateFieldType.Bool),
16 - new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.OnUninstall), IntermediateFieldType.Bool),
17 - new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.ConfigType), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.Argument), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.ComponentRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(MsiServiceConfigSymbolFields.Name), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.OnInstall), IntermediateFieldType.Bool),
15 + new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.OnReinstall), IntermediateFieldType.Bool),
16 + new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.OnUninstall), IntermediateFieldType.Bool),
17 + new IntermediateFieldDefinition(nameof(MsiServiceConfigSymbolFields.ConfigType), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(MsiServiceConfigSymbolFields.Argument), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(MsiServiceConfigSymbolFields.ComponentRef), IntermediateFieldType.String),
20 },
21 - typeof(MsiServiceConfigTuple));
21 + typeof(MsiServiceConfigSymbol));
22 }
23 }
24
25 -namespace WixToolset.Data.Tuples
25 +namespace WixToolset.Data.Symbols
26 {
27 - public enum MsiServiceConfigTupleFields
27 + public enum MsiServiceConfigSymbolFields
28 {
29 Name,
30 OnInstall,
@@ -44,58 +44,58 @@ namespace WixToolset.Data.Tuples
44 PreshutdownInfo,
45 }
46
47 - public class MsiServiceConfigTuple : IntermediateTuple
47 + public class MsiServiceConfigSymbol : IntermediateSymbol
48 {
49 - public MsiServiceConfigTuple() : base(TupleDefinitions.MsiServiceConfig, null, null)
49 + public MsiServiceConfigSymbol() : base(SymbolDefinitions.MsiServiceConfig, null, null)
50 {
51 }
52
53 - public MsiServiceConfigTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiServiceConfig, sourceLineNumber, id)
53 + public MsiServiceConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiServiceConfig, sourceLineNumber, id)
54 {
55 }
56
57 - public IntermediateField this[MsiServiceConfigTupleFields index] => this.Fields[(int)index];
57 + public IntermediateField this[MsiServiceConfigSymbolFields index] => this.Fields[(int)index];
58
59 public string Name
60 {
61 - get => (string)this.Fields[(int)MsiServiceConfigTupleFields.Name];
62 - set => this.Set((int)MsiServiceConfigTupleFields.Name, value);
61 + get => (string)this.Fields[(int)MsiServiceConfigSymbolFields.Name];
62 + set => this.Set((int)MsiServiceConfigSymbolFields.Name, value);
63 }
64
65 public bool OnInstall
66 {
67 - get => this.Fields[(int)MsiServiceConfigTupleFields.OnInstall].AsBool();
68 - set => this.Set((int)MsiServiceConfigTupleFields.OnInstall, value);
67 + get => this.Fields[(int)MsiServiceConfigSymbolFields.OnInstall].AsBool();
68 + set => this.Set((int)MsiServiceConfigSymbolFields.OnInstall, value);
69 }
70
71 public bool OnReinstall
72 {
73 - get => this.Fields[(int)MsiServiceConfigTupleFields.OnReinstall].AsBool();
74 - set => this.Set((int)MsiServiceConfigTupleFields.OnReinstall, value);
73 + get => this.Fields[(int)MsiServiceConfigSymbolFields.OnReinstall].AsBool();
74 + set => this.Set((int)MsiServiceConfigSymbolFields.OnReinstall, value);
75 }
76
77 public bool OnUninstall
78 {
79 - get => this.Fields[(int)MsiServiceConfigTupleFields.OnUninstall].AsBool();
80 - set => this.Set((int)MsiServiceConfigTupleFields.OnUninstall, value);
79 + get => this.Fields[(int)MsiServiceConfigSymbolFields.OnUninstall].AsBool();
80 + set => this.Set((int)MsiServiceConfigSymbolFields.OnUninstall, value);
81 }
82
83 public MsiServiceConfigType ConfigType
84 {
85 - get => (MsiServiceConfigType)this.Fields[(int)MsiServiceConfigTupleFields.ConfigType].AsNumber();
86 - set => this.Set((int)MsiServiceConfigTupleFields.ConfigType, (int)value);
85 + get => (MsiServiceConfigType)this.Fields[(int)MsiServiceConfigSymbolFields.ConfigType].AsNumber();
86 + set => this.Set((int)MsiServiceConfigSymbolFields.ConfigType, (int)value);
87 }
88
89 public string Argument
90 {
91 - get => (string)this.Fields[(int)MsiServiceConfigTupleFields.Argument];
92 - set => this.Set((int)MsiServiceConfigTupleFields.Argument, value);
91 + get => (string)this.Fields[(int)MsiServiceConfigSymbolFields.Argument];
92 + set => this.Set((int)MsiServiceConfigSymbolFields.Argument, value);
93 }
94
95 public string ComponentRef
96 {
97 - get => (string)this.Fields[(int)MsiServiceConfigTupleFields.ComponentRef];
98 - set => this.Set((int)MsiServiceConfigTupleFields.ComponentRef, value);
97 + get => (string)this.Fields[(int)MsiServiceConfigSymbolFields.ComponentRef];
98 + set => this.Set((int)MsiServiceConfigSymbolFields.ComponentRef, value);
99 }
100 }
101 }
\ No newline at end of file
src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition MsiShortcutProperty = new IntermediateTupleDefinition(
10 - TupleDefinitionType.MsiShortcutProperty,
9 + public static readonly IntermediateSymbolDefinition MsiShortcutProperty = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.MsiShortcutProperty,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.ShortcutRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.PropertyKey), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.PropVariantValue), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(MsiShortcutPropertySymbolFields.ShortcutRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(MsiShortcutPropertySymbolFields.PropertyKey), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(MsiShortcutPropertySymbolFields.PropVariantValue), IntermediateFieldType.String),
16 },
17 - typeof(MsiShortcutPropertyTuple));
17 + typeof(MsiShortcutPropertySymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum MsiShortcutPropertyTupleFields
23 + public enum MsiShortcutPropertySymbolFields
24 {
25 ShortcutRef,
26 PropertyKey,
27 PropVariantValue,
28 }
29
30 - public class MsiShortcutPropertyTuple : IntermediateTuple
30 + public class MsiShortcutPropertySymbol : IntermediateSymbol
31 {
32 - public MsiShortcutPropertyTuple() : base(TupleDefinitions.MsiShortcutProperty, null, null)
32 + public MsiShortcutPropertySymbol() : base(SymbolDefinitions.MsiShortcutProperty, null, null)
33 {
34 }
35
36 - public MsiShortcutPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiShortcutProperty, sourceLineNumber, id)
36 + public MsiShortcutPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiShortcutProperty, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[MsiShortcutPropertyTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[MsiShortcutPropertySymbolFields index] => this.Fields[(int)index];
41
42 public string ShortcutRef
43 {
44 - get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.ShortcutRef];
45 - set => this.Set((int)MsiShortcutPropertyTupleFields.ShortcutRef, value);
44 + get => (string)this.Fields[(int)MsiShortcutPropertySymbolFields.ShortcutRef];
45 + set => this.Set((int)MsiShortcutPropertySymbolFields.ShortcutRef, value);
46 }
47
48 public string PropertyKey
49 {
50 - get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.PropertyKey];
51 - set => this.Set((int)MsiShortcutPropertyTupleFields.PropertyKey, value);
50 + get => (string)this.Fields[(int)MsiShortcutPropertySymbolFields.PropertyKey];
51 + set => this.Set((int)MsiShortcutPropertySymbolFields.PropertyKey, value);
52 }
53
54 public string PropVariantValue
55 {
56 - get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.PropVariantValue];
57 - set => this.Set((int)MsiShortcutPropertyTupleFields.PropVariantValue, value);
56 + get => (string)this.Fields[(int)MsiShortcutPropertySymbolFields.PropVariantValue];
57 + set => this.Set((int)MsiShortcutPropertySymbolFields.PropVariantValue, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ODBCAttribute = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ODBCAttribute,
9 + public static readonly IntermediateSymbolDefinition ODBCAttribute = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ODBCAttribute,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.DriverRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.Attribute), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.Value), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ODBCAttributeSymbolFields.DriverRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ODBCAttributeSymbolFields.Attribute), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ODBCAttributeSymbolFields.Value), IntermediateFieldType.String),
16 },
17 - typeof(ODBCAttributeTuple));
17 + typeof(ODBCAttributeSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum ODBCAttributeTupleFields
23 + public enum ODBCAttributeSymbolFields
24 {
25 DriverRef,
26 Attribute,
27 Value,
28 }
29
30 - public class ODBCAttributeTuple : IntermediateTuple
30 + public class ODBCAttributeSymbol : IntermediateSymbol
31 {
32 - public ODBCAttributeTuple() : base(TupleDefinitions.ODBCAttribute, null, null)
32 + public ODBCAttributeSymbol() : base(SymbolDefinitions.ODBCAttribute, null, null)
33 {
34 }
35
36 - public ODBCAttributeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ODBCAttribute, sourceLineNumber, id)
36 + public ODBCAttributeSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ODBCAttribute, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[ODBCAttributeTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[ODBCAttributeSymbolFields index] => this.Fields[(int)index];
41
42 public string DriverRef
43 {
44 - get => (string)this.Fields[(int)ODBCAttributeTupleFields.DriverRef];
45 - set => this.Set((int)ODBCAttributeTupleFields.DriverRef, value);
44 + get => (string)this.Fields[(int)ODBCAttributeSymbolFields.DriverRef];
45 + set => this.Set((int)ODBCAttributeSymbolFields.DriverRef, value);
46 }
47
48 public string Attribute
49 {
50 - get => (string)this.Fields[(int)ODBCAttributeTupleFields.Attribute];
51 - set => this.Set((int)ODBCAttributeTupleFields.Attribute, value);
50 + get => (string)this.Fields[(int)ODBCAttributeSymbolFields.Attribute];
51 + set => this.Set((int)ODBCAttributeSymbolFields.Attribute, value);
52 }
53
54 public string Value
55 {
56 - get => (string)this.Fields[(int)ODBCAttributeTupleFields.Value];
57 - set => this.Set((int)ODBCAttributeTupleFields.Value, value);
56 + get => (string)this.Fields[(int)ODBCAttributeSymbolFields.Value];
57 + set => this.Set((int)ODBCAttributeSymbolFields.Value, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ODBCDataSource = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ODBCDataSource,
9 + public static readonly IntermediateSymbolDefinition ODBCDataSource = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ODBCDataSource,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.ComponentRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.Description), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.DriverDescription), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.Registration), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(ODBCDataSourceSymbolFields.ComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ODBCDataSourceSymbolFields.Description), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ODBCDataSourceSymbolFields.DriverDescription), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ODBCDataSourceSymbolFields.Registration), IntermediateFieldType.Number),
17 },
18 - typeof(ODBCDataSourceTuple));
18 + typeof(ODBCDataSourceSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum ODBCDataSourceTupleFields
24 + public enum ODBCDataSourceSymbolFields
25 {
26 ComponentRef,
27 Description,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Registration,
30 }
31
32 - public class ODBCDataSourceTuple : IntermediateTuple
32 + public class ODBCDataSourceSymbol : IntermediateSymbol
33 {
34 - public ODBCDataSourceTuple() : base(TupleDefinitions.ODBCDataSource, null, null)
34 + public ODBCDataSourceSymbol() : base(SymbolDefinitions.ODBCDataSource, null, null)
35 {
36 }
37
38 - public ODBCDataSourceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ODBCDataSource, sourceLineNumber, id)
38 + public ODBCDataSourceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ODBCDataSource, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[ODBCDataSourceTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[ODBCDataSourceSymbolFields index] => this.Fields[(int)index];
43
44 public string ComponentRef
45 {
46 - get => (string)this.Fields[(int)ODBCDataSourceTupleFields.ComponentRef];
47 - set => this.Set((int)ODBCDataSourceTupleFields.ComponentRef, value);
46 + get => (string)this.Fields[(int)ODBCDataSourceSymbolFields.ComponentRef];
47 + set => this.Set((int)ODBCDataSourceSymbolFields.ComponentRef, value);
48 }
49
50 public string Description
51 {
52 - get => (string)this.Fields[(int)ODBCDataSourceTupleFields.Description];
53 - set => this.Set((int)ODBCDataSourceTupleFields.Description, value);
52 + get => (string)this.Fields[(int)ODBCDataSourceSymbolFields.Description];
53 + set => this.Set((int)ODBCDataSourceSymbolFields.Description, value);
54 }
55
56 public string DriverDescription
57 {
58 - get => (string)this.Fields[(int)ODBCDataSourceTupleFields.DriverDescription];
59 - set => this.Set((int)ODBCDataSourceTupleFields.DriverDescription, value);
58 + get => (string)this.Fields[(int)ODBCDataSourceSymbolFields.DriverDescription];
59 + set => this.Set((int)ODBCDataSourceSymbolFields.DriverDescription, value);
60 }
61
62 public int Registration
63 {
64 - get => (int)this.Fields[(int)ODBCDataSourceTupleFields.Registration];
65 - set => this.Set((int)ODBCDataSourceTupleFields.Registration, value);
64 + get => (int)this.Fields[(int)ODBCDataSourceSymbolFields.Registration];
65 + set => this.Set((int)ODBCDataSourceSymbolFields.Registration, value);
66 }
67 }
68 }
src/WixToolset.Data/Tuples/ODBCDriverTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ODBCDriver = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ODBCDriver,
9 + public static readonly IntermediateSymbolDefinition ODBCDriver = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ODBCDriver,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.ComponentRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.Description), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.FileRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.SetupFileRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ODBCDriverSymbolFields.ComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ODBCDriverSymbolFields.Description), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ODBCDriverSymbolFields.FileRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ODBCDriverSymbolFields.SetupFileRef), IntermediateFieldType.String),
17 },
18 - typeof(ODBCDriverTuple));
18 + typeof(ODBCDriverSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum ODBCDriverTupleFields
24 + public enum ODBCDriverSymbolFields
25 {
26 ComponentRef,
27 Description,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 SetupFileRef,
30 }
31
32 - public class ODBCDriverTuple : IntermediateTuple
32 + public class ODBCDriverSymbol : IntermediateSymbol
33 {
34 - public ODBCDriverTuple() : base(TupleDefinitions.ODBCDriver, null, null)
34 + public ODBCDriverSymbol() : base(SymbolDefinitions.ODBCDriver, null, null)
35 {
36 }
37
38 - public ODBCDriverTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ODBCDriver, sourceLineNumber, id)
38 + public ODBCDriverSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ODBCDriver, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[ODBCDriverTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[ODBCDriverSymbolFields index] => this.Fields[(int)index];
43
44 public string ComponentRef
45 {
46 - get => (string)this.Fields[(int)ODBCDriverTupleFields.ComponentRef];
47 - set => this.Set((int)ODBCDriverTupleFields.ComponentRef, value);
46 + get => (string)this.Fields[(int)ODBCDriverSymbolFields.ComponentRef];
47 + set => this.Set((int)ODBCDriverSymbolFields.ComponentRef, value);
48 }
49
50 public string Description
51 {
52 - get => (string)this.Fields[(int)ODBCDriverTupleFields.Description];
53 - set => this.Set((int)ODBCDriverTupleFields.Description, value);
52 + get => (string)this.Fields[(int)ODBCDriverSymbolFields.Description];
53 + set => this.Set((int)ODBCDriverSymbolFields.Description, value);
54 }
55
56 public string FileRef
57 {
58 - get => (string)this.Fields[(int)ODBCDriverTupleFields.FileRef];
59 - set => this.Set((int)ODBCDriverTupleFields.FileRef, value);
58 + get => (string)this.Fields[(int)ODBCDriverSymbolFields.FileRef];
59 + set => this.Set((int)ODBCDriverSymbolFields.FileRef, value);
60 }
61
62 public string SetupFileRef
63 {
64 - get => (string)this.Fields[(int)ODBCDriverTupleFields.SetupFileRef];
65 - set => this.Set((int)ODBCDriverTupleFields.SetupFileRef, value);
64 + get => (string)this.Fields[(int)ODBCDriverSymbolFields.SetupFileRef];
65 + set => this.Set((int)ODBCDriverSymbolFields.SetupFileRef, value);
66 }
67 }
68 }
src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ODBCSourceAttribute = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ODBCSourceAttribute,
9 + public static readonly IntermediateSymbolDefinition ODBCSourceAttribute = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ODBCSourceAttribute,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.DataSourceRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.Attribute), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.Value), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ODBCSourceAttributeSymbolFields.DataSourceRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ODBCSourceAttributeSymbolFields.Attribute), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ODBCSourceAttributeSymbolFields.Value), IntermediateFieldType.String),
16 },
17 - typeof(ODBCSourceAttributeTuple));
17 + typeof(ODBCSourceAttributeSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum ODBCSourceAttributeTupleFields
23 + public enum ODBCSourceAttributeSymbolFields
24 {
25 DataSourceRef,
26 Attribute,
27 Value,
28 }
29
30 - public class ODBCSourceAttributeTuple : IntermediateTuple
30 + public class ODBCSourceAttributeSymbol : IntermediateSymbol
31 {
32 - public ODBCSourceAttributeTuple() : base(TupleDefinitions.ODBCSourceAttribute, null, null)
32 + public ODBCSourceAttributeSymbol() : base(SymbolDefinitions.ODBCSourceAttribute, null, null)
33 {
34 }
35
36 - public ODBCSourceAttributeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ODBCSourceAttribute, sourceLineNumber, id)
36 + public ODBCSourceAttributeSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ODBCSourceAttribute, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[ODBCSourceAttributeTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[ODBCSourceAttributeSymbolFields index] => this.Fields[(int)index];
41
42 public string DataSourceRef
43 {
44 - get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.DataSourceRef];
45 - set => this.Set((int)ODBCSourceAttributeTupleFields.DataSourceRef, value);
44 + get => (string)this.Fields[(int)ODBCSourceAttributeSymbolFields.DataSourceRef];
45 + set => this.Set((int)ODBCSourceAttributeSymbolFields.DataSourceRef, value);
46 }
47
48 public string Attribute
49 {
50 - get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.Attribute];
51 - set => this.Set((int)ODBCSourceAttributeTupleFields.Attribute, value);
50 + get => (string)this.Fields[(int)ODBCSourceAttributeSymbolFields.Attribute];
51 + set => this.Set((int)ODBCSourceAttributeSymbolFields.Attribute, value);
52 }
53
54 public string Value
55 {
56 - get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.Value];
57 - set => this.Set((int)ODBCSourceAttributeTupleFields.Value, value);
56 + get => (string)this.Fields[(int)ODBCSourceAttributeSymbolFields.Value];
57 + set => this.Set((int)ODBCSourceAttributeSymbolFields.Value, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ODBCTranslator = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ODBCTranslator,
9 + public static readonly IntermediateSymbolDefinition ODBCTranslator = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ODBCTranslator,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.ComponentRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.Description), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.FileRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.SetupFileRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ODBCTranslatorSymbolFields.ComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ODBCTranslatorSymbolFields.Description), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ODBCTranslatorSymbolFields.FileRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ODBCTranslatorSymbolFields.SetupFileRef), IntermediateFieldType.String),
17 },
18 - typeof(ODBCTranslatorTuple));
18 + typeof(ODBCTranslatorSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum ODBCTranslatorTupleFields
24 + public enum ODBCTranslatorSymbolFields
25 {
26 ComponentRef,
27 Description,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 SetupFileRef,
30 }
31
32 - public class ODBCTranslatorTuple : IntermediateTuple
32 + public class ODBCTranslatorSymbol : IntermediateSymbol
33 {
34 - public ODBCTranslatorTuple() : base(TupleDefinitions.ODBCTranslator, null, null)
34 + public ODBCTranslatorSymbol() : base(SymbolDefinitions.ODBCTranslator, null, null)
35 {
36 }
37
38 - public ODBCTranslatorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ODBCTranslator, sourceLineNumber, id)
38 + public ODBCTranslatorSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ODBCTranslator, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[ODBCTranslatorTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[ODBCTranslatorSymbolFields index] => this.Fields[(int)index];
43
44 public string ComponentRef
45 {
46 - get => (string)this.Fields[(int)ODBCTranslatorTupleFields.ComponentRef];
47 - set => this.Set((int)ODBCTranslatorTupleFields.ComponentRef, value);
46 + get => (string)this.Fields[(int)ODBCTranslatorSymbolFields.ComponentRef];
47 + set => this.Set((int)ODBCTranslatorSymbolFields.ComponentRef, value);
48 }
49
50 public string Description
51 {
52 - get => (string)this.Fields[(int)ODBCTranslatorTupleFields.Description];
53 - set => this.Set((int)ODBCTranslatorTupleFields.Description, value);
52 + get => (string)this.Fields[(int)ODBCTranslatorSymbolFields.Description];
53 + set => this.Set((int)ODBCTranslatorSymbolFields.Description, value);
54 }
55
56 public string FileRef
57 {
58 - get => (string)this.Fields[(int)ODBCTranslatorTupleFields.FileRef];
59 - set => this.Set((int)ODBCTranslatorTupleFields.FileRef, value);
58 + get => (string)this.Fields[(int)ODBCTranslatorSymbolFields.FileRef];
59 + set => this.Set((int)ODBCTranslatorSymbolFields.FileRef, value);
60 }
61
62 public string SetupFileRef
63 {
64 - get => (string)this.Fields[(int)ODBCTranslatorTupleFields.SetupFileRef];
65 - set => this.Set((int)ODBCTranslatorTupleFields.SetupFileRef, value);
64 + get => (string)this.Fields[(int)ODBCTranslatorSymbolFields.SetupFileRef];
65 + set => this.Set((int)ODBCTranslatorSymbolFields.SetupFileRef, value);
66 }
67 }
68 }
src/WixToolset.Data/Tuples/PatchMetadataTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition PatchMetadata = new IntermediateTupleDefinition(
10 - TupleDefinitionType.PatchMetadata,
9 + public static readonly IntermediateSymbolDefinition PatchMetadata = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.PatchMetadata,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(PatchMetadataTupleFields.Company), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(PatchMetadataTupleFields.Property), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(PatchMetadataTupleFields.Value), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(PatchMetadataSymbolFields.Company), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(PatchMetadataSymbolFields.Property), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(PatchMetadataSymbolFields.Value), IntermediateFieldType.String),
16 },
17 - typeof(PatchMetadataTuple));
17 + typeof(PatchMetadataSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum PatchMetadataTupleFields
23 + public enum PatchMetadataSymbolFields
24 {
25 Company,
26 Property,
27 Value,
28 }
29
30 - public class PatchMetadataTuple : IntermediateTuple
30 + public class PatchMetadataSymbol : IntermediateSymbol
31 {
32 - public PatchMetadataTuple() : base(TupleDefinitions.PatchMetadata, null, null)
32 + public PatchMetadataSymbol() : base(SymbolDefinitions.PatchMetadata, null, null)
33 {
34 }
35
36 - public PatchMetadataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.PatchMetadata, sourceLineNumber, id)
36 + public PatchMetadataSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.PatchMetadata, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[PatchMetadataTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[PatchMetadataSymbolFields index] => this.Fields[(int)index];
41
42 public string Company
43 {
44 - get => (string)this.Fields[(int)PatchMetadataTupleFields.Company];
45 - set => this.Set((int)PatchMetadataTupleFields.Company, value);
44 + get => (string)this.Fields[(int)PatchMetadataSymbolFields.Company];
45 + set => this.Set((int)PatchMetadataSymbolFields.Company, value);
46 }
47
48 public string Property
49 {
50 - get => (string)this.Fields[(int)PatchMetadataTupleFields.Property];
51 - set => this.Set((int)PatchMetadataTupleFields.Property, value);
50 + get => (string)this.Fields[(int)PatchMetadataSymbolFields.Property];
51 + set => this.Set((int)PatchMetadataSymbolFields.Property, value);
52 }
53
54 public string Value
55 {
56 - get => (string)this.Fields[(int)PatchMetadataTupleFields.Value];
57 - set => this.Set((int)PatchMetadataTupleFields.Value, value);
56 + get => (string)this.Fields[(int)PatchMetadataSymbolFields.Value];
57 + set => this.Set((int)PatchMetadataSymbolFields.Value, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/PatchPackageTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition PatchPackage = new IntermediateTupleDefinition(
10 - TupleDefinitionType.PatchPackage,
9 + public static readonly IntermediateSymbolDefinition PatchPackage = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.PatchPackage,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(PatchPackageTupleFields.PatchId), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(PatchPackageTupleFields.MediaDiskIdRef), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(PatchPackageSymbolFields.PatchId), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(PatchPackageSymbolFields.MediaDiskIdRef), IntermediateFieldType.Number),
15 },
16 - typeof(PatchPackageTuple));
16 + typeof(PatchPackageSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum PatchPackageTupleFields
22 + public enum PatchPackageSymbolFields
23 {
24 PatchId,
25 MediaDiskIdRef,
26 }
27
28 - public class PatchPackageTuple : IntermediateTuple
28 + public class PatchPackageSymbol : IntermediateSymbol
29 {
30 - public PatchPackageTuple() : base(TupleDefinitions.PatchPackage, null, null)
30 + public PatchPackageSymbol() : base(SymbolDefinitions.PatchPackage, null, null)
31 {
32 }
33
34 - public PatchPackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.PatchPackage, sourceLineNumber, id)
34 + public PatchPackageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.PatchPackage, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[PatchPackageTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[PatchPackageSymbolFields index] => this.Fields[(int)index];
39
40 public string PatchId
41 {
42 - get => (string)this.Fields[(int)PatchPackageTupleFields.PatchId];
43 - set => this.Set((int)PatchPackageTupleFields.PatchId, value);
42 + get => (string)this.Fields[(int)PatchPackageSymbolFields.PatchId];
43 + set => this.Set((int)PatchPackageSymbolFields.PatchId, value);
44 }
45
46 public int MediaDiskIdRef
47 {
48 - get => (int)this.Fields[(int)PatchPackageTupleFields.MediaDiskIdRef];
49 - set => this.Set((int)PatchPackageTupleFields.MediaDiskIdRef, value);
48 + get => (int)this.Fields[(int)PatchPackageSymbolFields.MediaDiskIdRef];
49 + set => this.Set((int)PatchPackageSymbolFields.MediaDiskIdRef, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/PatchSequenceTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition PatchSequence = new IntermediateTupleDefinition(
10 - TupleDefinitionType.PatchSequence,
9 + public static readonly IntermediateSymbolDefinition PatchSequence = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.PatchSequence,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(PatchSequenceTupleFields.PatchFamily), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(PatchSequenceTupleFields.Target), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(PatchSequenceTupleFields.Sequence), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(PatchSequenceTupleFields.Supersede), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(PatchSequenceSymbolFields.PatchFamily), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(PatchSequenceSymbolFields.Target), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(PatchSequenceSymbolFields.Sequence), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(PatchSequenceSymbolFields.Supersede), IntermediateFieldType.Number),
17 },
18 - typeof(PatchSequenceTuple));
18 + typeof(PatchSequenceSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum PatchSequenceTupleFields
24 + public enum PatchSequenceSymbolFields
25 {
26 PatchFamily,
27 Target,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Supersede,
30 }
31
32 - public class PatchSequenceTuple : IntermediateTuple
32 + public class PatchSequenceSymbol : IntermediateSymbol
33 {
34 - public PatchSequenceTuple() : base(TupleDefinitions.PatchSequence, null, null)
34 + public PatchSequenceSymbol() : base(SymbolDefinitions.PatchSequence, null, null)
35 {
36 }
37
38 - public PatchSequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.PatchSequence, sourceLineNumber, id)
38 + public PatchSequenceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.PatchSequence, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[PatchSequenceTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[PatchSequenceSymbolFields index] => this.Fields[(int)index];
43
44 public string PatchFamily
45 {
46 - get => (string)this.Fields[(int)PatchSequenceTupleFields.PatchFamily];
47 - set => this.Set((int)PatchSequenceTupleFields.PatchFamily, value);
46 + get => (string)this.Fields[(int)PatchSequenceSymbolFields.PatchFamily];
47 + set => this.Set((int)PatchSequenceSymbolFields.PatchFamily, value);
48 }
49
50 public string Target
51 {
52 - get => (string)this.Fields[(int)PatchSequenceTupleFields.Target];
53 - set => this.Set((int)PatchSequenceTupleFields.Target, value);
52 + get => (string)this.Fields[(int)PatchSequenceSymbolFields.Target];
53 + set => this.Set((int)PatchSequenceSymbolFields.Target, value);
54 }
55
56 public string Sequence
57 {
58 - get => (string)this.Fields[(int)PatchSequenceTupleFields.Sequence];
59 - set => this.Set((int)PatchSequenceTupleFields.Sequence, value);
58 + get => (string)this.Fields[(int)PatchSequenceSymbolFields.Sequence];
59 + set => this.Set((int)PatchSequenceSymbolFields.Sequence, value);
60 }
61
62 public int? Supersede
63 {
64 - get => (int?)this.Fields[(int)PatchSequenceTupleFields.Supersede];
65 - set => this.Set((int)PatchSequenceTupleFields.Supersede, value);
64 + get => (int?)this.Fields[(int)PatchSequenceSymbolFields.Supersede];
65 + set => this.Set((int)PatchSequenceSymbolFields.Supersede, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/PatchTuple.cs
+29 -29
@@ -2,28 +2,28 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Patch = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Patch,
9 + public static readonly IntermediateSymbolDefinition Patch = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Patch,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(PatchTupleFields.FileRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(PatchTupleFields.Sequence), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(PatchTupleFields.PatchSize), IntermediateFieldType.Number),
16 - new IntermediateFieldDefinition(nameof(PatchTupleFields.Attributes), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(PatchTupleFields.Header), IntermediateFieldType.Path),
18 - new IntermediateFieldDefinition(nameof(PatchTupleFields.StreamRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(PatchSymbolFields.FileRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(PatchSymbolFields.Sequence), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(PatchSymbolFields.PatchSize), IntermediateFieldType.Number),
16 + new IntermediateFieldDefinition(nameof(PatchSymbolFields.Attributes), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(PatchSymbolFields.Header), IntermediateFieldType.Path),
18 + new IntermediateFieldDefinition(nameof(PatchSymbolFields.StreamRef), IntermediateFieldType.String),
19 },
20 - typeof(PatchTuple));
20 + typeof(PatchSymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 - public enum PatchTupleFields
26 + public enum PatchSymbolFields
27 {
28 FileRef,
29 Sequence,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
33 StreamRef,
34 }
35
36 - public class PatchTuple : IntermediateTuple
36 + public class PatchSymbol : IntermediateSymbol
37 {
38 - public PatchTuple() : base(TupleDefinitions.Patch, null, null)
38 + public PatchSymbol() : base(SymbolDefinitions.Patch, null, null)
39 {
40 }
41
42 - public PatchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Patch, sourceLineNumber, id)
42 + public PatchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Patch, sourceLineNumber, id)
43 {
44 }
45
46 - public IntermediateField this[PatchTupleFields index] => this.Fields[(int)index];
46 + public IntermediateField this[PatchSymbolFields index] => this.Fields[(int)index];
47
48 public string FileRef
49 {
50 - get => (string)this.Fields[(int)PatchTupleFields.FileRef];
51 - set => this.Set((int)PatchTupleFields.FileRef, value);
50 + get => (string)this.Fields[(int)PatchSymbolFields.FileRef];
51 + set => this.Set((int)PatchSymbolFields.FileRef, value);
52 }
53
54 public int Sequence
55 {
56 - get => (int)this.Fields[(int)PatchTupleFields.Sequence];
57 - set => this.Set((int)PatchTupleFields.Sequence, value);
56 + get => (int)this.Fields[(int)PatchSymbolFields.Sequence];
57 + set => this.Set((int)PatchSymbolFields.Sequence, value);
58 }
59
60 public int PatchSize
61 {
62 - get => (int)this.Fields[(int)PatchTupleFields.PatchSize];
63 - set => this.Set((int)PatchTupleFields.PatchSize, value);
62 + get => (int)this.Fields[(int)PatchSymbolFields.PatchSize];
63 + set => this.Set((int)PatchSymbolFields.PatchSize, value);
64 }
65
66 public int Attributes
67 {
68 - get => (int)this.Fields[(int)PatchTupleFields.Attributes];
69 - set => this.Set((int)PatchTupleFields.Attributes, value);
68 + get => (int)this.Fields[(int)PatchSymbolFields.Attributes];
69 + set => this.Set((int)PatchSymbolFields.Attributes, value);
70 }
71
72 public string Header
73 {
74 - get => (string)this.Fields[(int)PatchTupleFields.Header];
75 - set => this.Set((int)PatchTupleFields.Header, value);
74 + get => (string)this.Fields[(int)PatchSymbolFields.Header];
75 + set => this.Set((int)PatchSymbolFields.Header, value);
76 }
77
78 public string StreamRef
79 {
80 - get => (string)this.Fields[(int)PatchTupleFields.StreamRef];
81 - set => this.Set((int)PatchTupleFields.StreamRef, value);
80 + get => (string)this.Fields[(int)PatchSymbolFields.StreamRef];
81 + set => this.Set((int)PatchSymbolFields.StreamRef, value);
82 }
83 }
84 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ProgIdTuple.cs
+29 -29
@@ -2,28 +2,28 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ProgId = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ProgId,
9 + public static readonly IntermediateSymbolDefinition ProgId = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ProgId,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ProgId), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ParentProgIdRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ClassRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ProgIdTupleFields.Description), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(ProgIdTupleFields.IconRef), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(ProgIdTupleFields.IconIndex), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(ProgIdSymbolFields.ProgId), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ProgIdSymbolFields.ParentProgIdRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ProgIdSymbolFields.ClassRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ProgIdSymbolFields.Description), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(ProgIdSymbolFields.IconRef), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(ProgIdSymbolFields.IconIndex), IntermediateFieldType.Number),
19 },
20 - typeof(ProgIdTuple));
20 + typeof(ProgIdSymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 - public enum ProgIdTupleFields
26 + public enum ProgIdSymbolFields
27 {
28 ProgId,
29 ParentProgIdRef,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
33 IconIndex,
34 }
35
36 - public class ProgIdTuple : IntermediateTuple
36 + public class ProgIdSymbol : IntermediateSymbol
37 {
38 - public ProgIdTuple() : base(TupleDefinitions.ProgId, null, null)
38 + public ProgIdSymbol() : base(SymbolDefinitions.ProgId, null, null)
39 {
40 }
41
42 - public ProgIdTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ProgId, sourceLineNumber, id)
42 + public ProgIdSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ProgId, sourceLineNumber, id)
43 {
44 }
45
46 - public IntermediateField this[ProgIdTupleFields index] => this.Fields[(int)index];
46 + public IntermediateField this[ProgIdSymbolFields index] => this.Fields[(int)index];
47
48 public string ProgId
49 {
50 - get => (string)this.Fields[(int)ProgIdTupleFields.ProgId];
51 - set => this.Set((int)ProgIdTupleFields.ProgId, value);
50 + get => (string)this.Fields[(int)ProgIdSymbolFields.ProgId];
51 + set => this.Set((int)ProgIdSymbolFields.ProgId, value);
52 }
53
54 public string ParentProgIdRef
55 {
56 - get => (string)this.Fields[(int)ProgIdTupleFields.ParentProgIdRef];
57 - set => this.Set((int)ProgIdTupleFields.ParentProgIdRef, value);
56 + get => (string)this.Fields[(int)ProgIdSymbolFields.ParentProgIdRef];
57 + set => this.Set((int)ProgIdSymbolFields.ParentProgIdRef, value);
58 }
59
60 public string ClassRef
61 {
62 - get => (string)this.Fields[(int)ProgIdTupleFields.ClassRef];
63 - set => this.Set((int)ProgIdTupleFields.ClassRef, value);
62 + get => (string)this.Fields[(int)ProgIdSymbolFields.ClassRef];
63 + set => this.Set((int)ProgIdSymbolFields.ClassRef, value);
64 }
65
66 public string Description
67 {
68 - get => (string)this.Fields[(int)ProgIdTupleFields.Description];
69 - set => this.Set((int)ProgIdTupleFields.Description, value);
68 + get => (string)this.Fields[(int)ProgIdSymbolFields.Description];
69 + set => this.Set((int)ProgIdSymbolFields.Description, value);
70 }
71
72 public string IconRef
73 {
74 - get => (string)this.Fields[(int)ProgIdTupleFields.IconRef];
75 - set => this.Set((int)ProgIdTupleFields.IconRef, value);
74 + get => (string)this.Fields[(int)ProgIdSymbolFields.IconRef];
75 + set => this.Set((int)ProgIdSymbolFields.IconRef, value);
76 }
77
78 public int? IconIndex
79 {
80 - get => (int?)this.Fields[(int)ProgIdTupleFields.IconIndex];
81 - set => this.Set((int)ProgIdTupleFields.IconIndex, value);
80 + get => (int?)this.Fields[(int)ProgIdSymbolFields.IconIndex];
81 + set => this.Set((int)ProgIdSymbolFields.IconIndex, value);
82 }
83 }
84 }
\ No newline at end of file
src/WixToolset.Data/Tuples/PropertiesTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Properties = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Properties,
9 + public static readonly IntermediateSymbolDefinition Properties = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Properties,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(PropertiesTupleFields.Name), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(PropertiesTupleFields.Value), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(PropertiesSymbolFields.Name), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(PropertiesSymbolFields.Value), IntermediateFieldType.String),
15 },
16 - typeof(PropertiesTuple));
16 + typeof(PropertiesSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum PropertiesTupleFields
22 + public enum PropertiesSymbolFields
23 {
24 Name,
25 Value,
26 }
27
28 - public class PropertiesTuple : IntermediateTuple
28 + public class PropertiesSymbol : IntermediateSymbol
29 {
30 - public PropertiesTuple() : base(TupleDefinitions.Properties, null, null)
30 + public PropertiesSymbol() : base(SymbolDefinitions.Properties, null, null)
31 {
32 }
33
34 - public PropertiesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Properties, sourceLineNumber, id)
34 + public PropertiesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Properties, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[PropertiesTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[PropertiesSymbolFields index] => this.Fields[(int)index];
39
40 public string Name
41 {
42 - get => (string)this.Fields[(int)PropertiesTupleFields.Name];
43 - set => this.Set((int)PropertiesTupleFields.Name, value);
42 + get => (string)this.Fields[(int)PropertiesSymbolFields.Name];
43 + set => this.Set((int)PropertiesSymbolFields.Name, value);
44 }
45
46 public string Value
47 {
48 - get => (string)this.Fields[(int)PropertiesTupleFields.Value];
49 - set => this.Set((int)PropertiesTupleFields.Value, value);
48 + get => (string)this.Fields[(int)PropertiesSymbolFields.Value];
49 + set => this.Set((int)PropertiesSymbolFields.Value, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/PropertyTuple.cs
+14 -14
@@ -2,43 +2,43 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Property = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Property,
9 + public static readonly IntermediateSymbolDefinition Property = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Property,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(PropertyTupleFields.Value), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(PropertySymbolFields.Value), IntermediateFieldType.String),
14 },
15 - typeof(PropertyTuple));
15 + typeof(PropertySymbol));
16 }
17 }
18
19 -namespace WixToolset.Data.Tuples
19 +namespace WixToolset.Data.Symbols
20 {
21 - public enum PropertyTupleFields
21 + public enum PropertySymbolFields
22 {
23 Value,
24 }
25
26 - public class PropertyTuple : IntermediateTuple
26 + public class PropertySymbol : IntermediateSymbol
27 {
28 - public PropertyTuple() : base(TupleDefinitions.Property, null, null)
28 + public PropertySymbol() : base(SymbolDefinitions.Property, null, null)
29 {
30 }
31
32 - public PropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Property, sourceLineNumber, id)
32 + public PropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Property, sourceLineNumber, id)
33 {
34 }
35
36 - public IntermediateField this[PropertyTupleFields index] => this.Fields[(int)index];
36 + public IntermediateField this[PropertySymbolFields index] => this.Fields[(int)index];
37
38 public string Value
39 {
40 - get => (string)this.Fields[(int)PropertyTupleFields.Value];
41 - set => this.Set((int)PropertyTupleFields.Value, value);
40 + get => (string)this.Fields[(int)PropertySymbolFields.Value];
41 + set => this.Set((int)PropertySymbolFields.Value, value);
42 }
43 }
44 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ProvidesDependencyTuple.cs
+29 -29
@@ -2,28 +2,28 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ProvidesDependency = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ProvidesDependency,
9 + public static readonly IntermediateSymbolDefinition ProvidesDependency = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ProvidesDependency,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ProvidesDependencyTupleFields.PackageRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ProvidesDependencyTupleFields.Key), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ProvidesDependencyTupleFields.Version), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ProvidesDependencyTupleFields.DisplayName), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(ProvidesDependencyTupleFields.Attributes), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(ProvidesDependencyTupleFields.Imported), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(ProvidesDependencySymbolFields.PackageRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ProvidesDependencySymbolFields.Key), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ProvidesDependencySymbolFields.Version), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ProvidesDependencySymbolFields.DisplayName), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(ProvidesDependencySymbolFields.Attributes), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(ProvidesDependencySymbolFields.Imported), IntermediateFieldType.Bool),
19 },
20 - typeof(ProvidesDependencyTuple));
20 + typeof(ProvidesDependencySymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 - public enum ProvidesDependencyTupleFields
26 + public enum ProvidesDependencySymbolFields
27 {
28 PackageRef,
29 Key,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
33 Imported,
34 }
35
36 - public class ProvidesDependencyTuple : IntermediateTuple
36 + public class ProvidesDependencySymbol : IntermediateSymbol
37 {
38 - public ProvidesDependencyTuple() : base(TupleDefinitions.ProvidesDependency, null, null)
38 + public ProvidesDependencySymbol() : base(SymbolDefinitions.ProvidesDependency, null, null)
39 {
40 }
41
42 - public ProvidesDependencyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ProvidesDependency, sourceLineNumber, id)
42 + public ProvidesDependencySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ProvidesDependency, sourceLineNumber, id)
43 {
44 }
45
46 - public IntermediateField this[ProvidesDependencyTupleFields index] => this.Fields[(int)index];
46 + public IntermediateField this[ProvidesDependencySymbolFields index] => this.Fields[(int)index];
47
48 public string PackageRef
49 {
50 - get => (string)this.Fields[(int)ProvidesDependencyTupleFields.PackageRef];
51 - set => this.Set((int)ProvidesDependencyTupleFields.PackageRef, value);
50 + get => (string)this.Fields[(int)ProvidesDependencySymbolFields.PackageRef];
51 + set => this.Set((int)ProvidesDependencySymbolFields.PackageRef, value);
52 }
53
54 public string Key
55 {
56 - get => (string)this.Fields[(int)ProvidesDependencyTupleFields.Key];
57 - set => this.Set((int)ProvidesDependencyTupleFields.Key, value);
56 + get => (string)this.Fields[(int)ProvidesDependencySymbolFields.Key];
57 + set => this.Set((int)ProvidesDependencySymbolFields.Key, value);
58 }
59
60 public string Version
61 {
62 - get => (string)this.Fields[(int)ProvidesDependencyTupleFields.Version];
63 - set => this.Set((int)ProvidesDependencyTupleFields.Version, value);
62 + get => (string)this.Fields[(int)ProvidesDependencySymbolFields.Version];
63 + set => this.Set((int)ProvidesDependencySymbolFields.Version, value);
64 }
65
66 public string DisplayName
67 {
68 - get => (string)this.Fields[(int)ProvidesDependencyTupleFields.DisplayName];
69 - set => this.Set((int)ProvidesDependencyTupleFields.DisplayName, value);
68 + get => (string)this.Fields[(int)ProvidesDependencySymbolFields.DisplayName];
69 + set => this.Set((int)ProvidesDependencySymbolFields.DisplayName, value);
70 }
71
72 public int? Attributes
73 {
74 - get => (int?)this.Fields[(int)ProvidesDependencyTupleFields.Attributes];
75 - set => this.Set((int)ProvidesDependencyTupleFields.Attributes, value);
74 + get => (int?)this.Fields[(int)ProvidesDependencySymbolFields.Attributes];
75 + set => this.Set((int)ProvidesDependencySymbolFields.Attributes, value);
76 }
77
78 public bool Imported
79 {
80 - get => (bool)this.Fields[(int)ProvidesDependencyTupleFields.Imported];
81 - set => this.Set((int)ProvidesDependencyTupleFields.Imported, value);
80 + get => (bool)this.Fields[(int)ProvidesDependencySymbolFields.Imported];
81 + set => this.Set((int)ProvidesDependencySymbolFields.Imported, value);
82 }
83 }
84 }
src/WixToolset.Data/Tuples/PublishComponentTuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition PublishComponent = new IntermediateTupleDefinition(
10 - TupleDefinitionType.PublishComponent,
9 + public static readonly IntermediateSymbolDefinition PublishComponent = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.PublishComponent,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.ComponentId), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.Qualifier), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.ComponentRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.AppData), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.FeatureRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(PublishComponentSymbolFields.ComponentId), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(PublishComponentSymbolFields.Qualifier), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(PublishComponentSymbolFields.ComponentRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(PublishComponentSymbolFields.AppData), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(PublishComponentSymbolFields.FeatureRef), IntermediateFieldType.String),
18 },
19 - typeof(PublishComponentTuple));
19 + typeof(PublishComponentSymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum PublishComponentTupleFields
25 + public enum PublishComponentSymbolFields
26 {
27 ComponentId,
28 Qualifier,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
31 FeatureRef,
32 }
33
34 - public class PublishComponentTuple : IntermediateTuple
34 + public class PublishComponentSymbol : IntermediateSymbol
35 {
36 - public PublishComponentTuple() : base(TupleDefinitions.PublishComponent, null, null)
36 + public PublishComponentSymbol() : base(SymbolDefinitions.PublishComponent, null, null)
37 {
38 }
39
40 - public PublishComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.PublishComponent, sourceLineNumber, id)
40 + public PublishComponentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.PublishComponent, sourceLineNumber, id)
41 {
42 }
43
44 - public IntermediateField this[PublishComponentTupleFields index] => this.Fields[(int)index];
44 + public IntermediateField this[PublishComponentSymbolFields index] => this.Fields[(int)index];
45
46 public string ComponentId
47 {
48 - get => (string)this.Fields[(int)PublishComponentTupleFields.ComponentId];
49 - set => this.Set((int)PublishComponentTupleFields.ComponentId, value);
48 + get => (string)this.Fields[(int)PublishComponentSymbolFields.ComponentId];
49 + set => this.Set((int)PublishComponentSymbolFields.ComponentId, value);
50 }
51
52 public string Qualifier
53 {
54 - get => (string)this.Fields[(int)PublishComponentTupleFields.Qualifier];
55 - set => this.Set((int)PublishComponentTupleFields.Qualifier, value);
54 + get => (string)this.Fields[(int)PublishComponentSymbolFields.Qualifier];
55 + set => this.Set((int)PublishComponentSymbolFields.Qualifier, value);
56 }
57
58 public string ComponentRef
59 {
60 - get => (string)this.Fields[(int)PublishComponentTupleFields.ComponentRef];
61 - set => this.Set((int)PublishComponentTupleFields.ComponentRef, value);
60 + get => (string)this.Fields[(int)PublishComponentSymbolFields.ComponentRef];
61 + set => this.Set((int)PublishComponentSymbolFields.ComponentRef, value);
62 }
63
64 public string AppData
65 {
66 - get => (string)this.Fields[(int)PublishComponentTupleFields.AppData];
67 - set => this.Set((int)PublishComponentTupleFields.AppData, value);
66 + get => (string)this.Fields[(int)PublishComponentSymbolFields.AppData];
67 + set => this.Set((int)PublishComponentSymbolFields.AppData, value);
68 }
69
70 public string FeatureRef
71 {
72 - get => (string)this.Fields[(int)PublishComponentTupleFields.FeatureRef];
73 - set => this.Set((int)PublishComponentTupleFields.FeatureRef, value);
72 + get => (string)this.Fields[(int)PublishComponentSymbolFields.FeatureRef];
73 + set => this.Set((int)PublishComponentSymbolFields.FeatureRef, value);
74 }
75 }
76 }
\ No newline at end of file
src/WixToolset.Data/Tuples/RadioButtonTuple.cs
+38 -38
@@ -2,31 +2,31 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition RadioButton = new IntermediateTupleDefinition(
10 - TupleDefinitionType.RadioButton,
9 + public static readonly IntermediateSymbolDefinition RadioButton = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.RadioButton,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Property), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Order), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Value), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.X), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Y), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Width), IntermediateFieldType.Number),
19 - new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Height), IntermediateFieldType.Number),
20 - new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Text), IntermediateFieldType.String),
21 - new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Help), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Property), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Order), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Value), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.X), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Y), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Width), IntermediateFieldType.Number),
19 + new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Height), IntermediateFieldType.Number),
20 + new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Text), IntermediateFieldType.String),
21 + new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Help), IntermediateFieldType.String),
22 },
23 - typeof(RadioButtonTuple));
23 + typeof(RadioButtonSymbol));
24 }
25 }
26
27 -namespace WixToolset.Data.Tuples
27 +namespace WixToolset.Data.Symbols
28 {
29 - public enum RadioButtonTupleFields
29 + public enum RadioButtonSymbolFields
30 {
31 Property,
32 Order,
@@ -39,70 +39,70 @@ namespace WixToolset.Data.Tuples
39 Help,
40 }
41
42 - public class RadioButtonTuple : IntermediateTuple
42 + public class RadioButtonSymbol : IntermediateSymbol
43 {
44 - public RadioButtonTuple() : base(TupleDefinitions.RadioButton, null, null)
44 + public RadioButtonSymbol() : base(SymbolDefinitions.RadioButton, null, null)
45 {
46 }
47
48 - public RadioButtonTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.RadioButton, sourceLineNumber, id)
48 + public RadioButtonSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.RadioButton, sourceLineNumber, id)
49 {
50 }
51
52 - public IntermediateField this[RadioButtonTupleFields index] => this.Fields[(int)index];
52 + public IntermediateField this[RadioButtonSymbolFields index] => this.Fields[(int)index];
53
54 public string Property
55 {
56 - get => (string)this.Fields[(int)RadioButtonTupleFields.Property];
57 - set => this.Set((int)RadioButtonTupleFields.Property, value);
56 + get => (string)this.Fields[(int)RadioButtonSymbolFields.Property];
57 + set => this.Set((int)RadioButtonSymbolFields.Property, value);
58 }
59
60 public int Order
61 {
62 - get => (int)this.Fields[(int)RadioButtonTupleFields.Order];
63 - set => this.Set((int)RadioButtonTupleFields.Order, value);
62 + get => (int)this.Fields[(int)RadioButtonSymbolFields.Order];
63 + set => this.Set((int)RadioButtonSymbolFields.Order, value);
64 }
65
66 public string Value
67 {
68 - get => (string)this.Fields[(int)RadioButtonTupleFields.Value];
69 - set => this.Set((int)RadioButtonTupleFields.Value, value);
68 + get => (string)this.Fields[(int)RadioButtonSymbolFields.Value];
69 + set => this.Set((int)RadioButtonSymbolFields.Value, value);
70 }
71
72 public int X
73 {
74 - get => (int)this.Fields[(int)RadioButtonTupleFields.X];
75 - set => this.Set((int)RadioButtonTupleFields.X, value);
74 + get => (int)this.Fields[(int)RadioButtonSymbolFields.X];
75 + set => this.Set((int)RadioButtonSymbolFields.X, value);
76 }
77
78 public int Y
79 {
80 - get => (int)this.Fields[(int)RadioButtonTupleFields.Y];
81 - set => this.Set((int)RadioButtonTupleFields.Y, value);
80 + get => (int)this.Fields[(int)RadioButtonSymbolFields.Y];
81 + set => this.Set((int)RadioButtonSymbolFields.Y, value);
82 }
83
84 public int Width
85 {
86 - get => (int)this.Fields[(int)RadioButtonTupleFields.Width];
87 - set => this.Set((int)RadioButtonTupleFields.Width, value);
86 + get => (int)this.Fields[(int)RadioButtonSymbolFields.Width];
87 + set => this.Set((int)RadioButtonSymbolFields.Width, value);
88 }
89
90 public int Height
91 {
92 - get => (int)this.Fields[(int)RadioButtonTupleFields.Height];
93 - set => this.Set((int)RadioButtonTupleFields.Height, value);
92 + get => (int)this.Fields[(int)RadioButtonSymbolFields.Height];
93 + set => this.Set((int)RadioButtonSymbolFields.Height, value);
94 }
95
96 public string Text
97 {
98 - get => (string)this.Fields[(int)RadioButtonTupleFields.Text];
99 - set => this.Set((int)RadioButtonTupleFields.Text, value);
98 + get => (string)this.Fields[(int)RadioButtonSymbolFields.Text];
99 + set => this.Set((int)RadioButtonSymbolFields.Text, value);
100 }
101
102 public string Help
103 {
104 - get => (string)this.Fields[(int)RadioButtonTupleFields.Help];
105 - set => this.Set((int)RadioButtonTupleFields.Help, value);
104 + get => (string)this.Fields[(int)RadioButtonSymbolFields.Help];
105 + set => this.Set((int)RadioButtonSymbolFields.Help, value);
106 }
107 }
108 }
\ No newline at end of file
src/WixToolset.Data/Tuples/RegLocatorTuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition RegLocator = new IntermediateTupleDefinition(
10 - TupleDefinitionType.RegLocator,
9 + public static readonly IntermediateSymbolDefinition RegLocator = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.RegLocator,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Root), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Key), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Name), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Type), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Win64), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(RegLocatorSymbolFields.Root), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(RegLocatorSymbolFields.Key), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(RegLocatorSymbolFields.Name), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(RegLocatorSymbolFields.Type), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(RegLocatorSymbolFields.Win64), IntermediateFieldType.Bool),
18 },
19 - typeof(RegLocatorTuple));
19 + typeof(RegLocatorSymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum RegLocatorTupleFields
25 + public enum RegLocatorSymbolFields
26 {
27 Root,
28 Key,
@@ -38,46 +38,46 @@ namespace WixToolset.Data.Tuples
38 Raw
39 };
40
41 - public class RegLocatorTuple : IntermediateTuple
41 + public class RegLocatorSymbol : IntermediateSymbol
42 {
43 - public RegLocatorTuple() : base(TupleDefinitions.RegLocator, null, null)
43 + public RegLocatorSymbol() : base(SymbolDefinitions.RegLocator, null, null)
44 {
45 }
46
47 - public RegLocatorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.RegLocator, sourceLineNumber, id)
47 + public RegLocatorSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.RegLocator, sourceLineNumber, id)
48 {
49 }
50
51 - public IntermediateField this[RegLocatorTupleFields index] => this.Fields[(int)index];
51 + public IntermediateField this[RegLocatorSymbolFields index] => this.Fields[(int)index];
52
53 public RegistryRootType Root
54 {
55 - get => (RegistryRootType)this.Fields[(int)RegLocatorTupleFields.Root].AsNumber();
56 - set => this.Set((int)RegLocatorTupleFields.Root, (int)value);
55 + get => (RegistryRootType)this.Fields[(int)RegLocatorSymbolFields.Root].AsNumber();
56 + set => this.Set((int)RegLocatorSymbolFields.Root, (int)value);
57 }
58
59 public string Key
60 {
61 - get => (string)this.Fields[(int)RegLocatorTupleFields.Key];
62 - set => this.Set((int)RegLocatorTupleFields.Key, value);
61 + get => (string)this.Fields[(int)RegLocatorSymbolFields.Key];
62 + set => this.Set((int)RegLocatorSymbolFields.Key, value);
63 }
64
65 public string Name
66 {
67 - get => (string)this.Fields[(int)RegLocatorTupleFields.Name];
68 - set => this.Set((int)RegLocatorTupleFields.Name, value);
67 + get => (string)this.Fields[(int)RegLocatorSymbolFields.Name];
68 + set => this.Set((int)RegLocatorSymbolFields.Name, value);
69 }
70
71 public RegLocatorType Type
72 {
73 - get => (RegLocatorType)this.Fields[(int)RegLocatorTupleFields.Type].AsNumber();
74 - set => this.Set((int)RegLocatorTupleFields.Type, (int)value);
73 + get => (RegLocatorType)this.Fields[(int)RegLocatorSymbolFields.Type].AsNumber();
74 + set => this.Set((int)RegLocatorSymbolFields.Type, (int)value);
75 }
76
77 public bool Win64
78 {
79 - get => this.Fields[(int)RegLocatorTupleFields.Win64].AsBool();
80 - set => this.Set((int)RegLocatorTupleFields.Win64, value);
79 + get => this.Fields[(int)RegLocatorSymbolFields.Win64].AsBool();
80 + set => this.Set((int)RegLocatorSymbolFields.Win64, value);
81 }
82 }
83 }
src/WixToolset.Data/Tuples/RegistryRootType.cs
+1 -1
@@ -1,6 +1,6 @@
1 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3 -namespace WixToolset.Data.Tuples
3 +namespace WixToolset.Data.Symbols
4 {
5 using System;
6
src/WixToolset.Data/Tuples/RegistryTuple.cs
+32 -32
@@ -2,29 +2,29 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Registry = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Registry,
9 + public static readonly IntermediateSymbolDefinition Registry = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Registry,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(RegistryTupleFields.Root), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(RegistryTupleFields.Key), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(RegistryTupleFields.Name), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(RegistryTupleFields.Value), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(RegistryTupleFields.ValueType), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(RegistryTupleFields.ValueAction), IntermediateFieldType.Number),
19 - new IntermediateFieldDefinition(nameof(RegistryTupleFields.ComponentRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(RegistrySymbolFields.Root), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(RegistrySymbolFields.Key), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(RegistrySymbolFields.Name), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(RegistrySymbolFields.Value), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(RegistrySymbolFields.ValueType), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(RegistrySymbolFields.ValueAction), IntermediateFieldType.Number),
19 + new IntermediateFieldDefinition(nameof(RegistrySymbolFields.ComponentRef), IntermediateFieldType.String),
20 },
21 - typeof(RegistryTuple));
21 + typeof(RegistrySymbol));
22 }
23 }
24
25 -namespace WixToolset.Data.Tuples
25 +namespace WixToolset.Data.Symbols
26 {
27 - public enum RegistryTupleFields
27 + public enum RegistrySymbolFields
28 {
29 Root,
30 Key,
@@ -51,58 +51,58 @@ namespace WixToolset.Data.Tuples
51 Prepend,
52 }
53
54 - public class RegistryTuple : IntermediateTuple
54 + public class RegistrySymbol : IntermediateSymbol
55 {
56 - public RegistryTuple() : base(TupleDefinitions.Registry, null, null)
56 + public RegistrySymbol() : base(SymbolDefinitions.Registry, null, null)
57 {
58 }
59
60 - public RegistryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Registry, sourceLineNumber, id)
60 + public RegistrySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Registry, sourceLineNumber, id)
61 {
62 }
63
64 - public IntermediateField this[RegistryTupleFields index] => this.Fields[(int)index];
64 + public IntermediateField this[RegistrySymbolFields index] => this.Fields[(int)index];
65
66 public RegistryRootType Root
67 {
68 - get => (RegistryRootType)this.Fields[(int)RegistryTupleFields.Root].AsNumber();
69 - set => this.Set((int)RegistryTupleFields.Root, (int)value);
68 + get => (RegistryRootType)this.Fields[(int)RegistrySymbolFields.Root].AsNumber();
69 + set => this.Set((int)RegistrySymbolFields.Root, (int)value);
70 }
71
72 public string Key
73 {
74 - get => (string)this.Fields[(int)RegistryTupleFields.Key];
75 - set => this.Set((int)RegistryTupleFields.Key, value);
74 + get => (string)this.Fields[(int)RegistrySymbolFields.Key];
75 + set => this.Set((int)RegistrySymbolFields.Key, value);
76 }
77
78 public string Name
79 {
80 - get => (string)this.Fields[(int)RegistryTupleFields.Name];
81 - set => this.Set((int)RegistryTupleFields.Name, value);
80 + get => (string)this.Fields[(int)RegistrySymbolFields.Name];
81 + set => this.Set((int)RegistrySymbolFields.Name, value);
82 }
83
84 public string Value
85 {
86 - get => this.Fields[(int)RegistryTupleFields.Value].AsString();
87 - set => this.Set((int)RegistryTupleFields.Value, value);
86 + get => this.Fields[(int)RegistrySymbolFields.Value].AsString();
87 + set => this.Set((int)RegistrySymbolFields.Value, value);
88 }
89
90 public RegistryValueType ValueType
91 {
92 - get => (RegistryValueType)this.Fields[(int)RegistryTupleFields.ValueType].AsNumber();
93 - set => this.Set((int)RegistryTupleFields.ValueType, (int)value);
92 + get => (RegistryValueType)this.Fields[(int)RegistrySymbolFields.ValueType].AsNumber();
93 + set => this.Set((int)RegistrySymbolFields.ValueType, (int)value);
94 }
95
96 public RegistryValueActionType ValueAction
97 {
98 - get => (RegistryValueActionType)this.Fields[(int)RegistryTupleFields.ValueAction].AsNumber();
99 - set => this.Set((int)RegistryTupleFields.ValueAction, (int)value);
98 + get => (RegistryValueActionType)this.Fields[(int)RegistrySymbolFields.ValueAction].AsNumber();
99 + set => this.Set((int)RegistrySymbolFields.ValueAction, (int)value);
100 }
101
102 public string ComponentRef
103 {
104 - get => (string)this.Fields[(int)RegistryTupleFields.ComponentRef];
105 - set => this.Set((int)RegistryTupleFields.ComponentRef, value);
104 + get => (string)this.Fields[(int)RegistrySymbolFields.ComponentRef];
105 + set => this.Set((int)RegistrySymbolFields.ComponentRef, value);
106 }
107 }
108 }
\ No newline at end of file
src/WixToolset.Data/Tuples/RemoveFileTuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition RemoveFile = new IntermediateTupleDefinition(
10 - TupleDefinitionType.RemoveFile,
9 + public static readonly IntermediateSymbolDefinition RemoveFile = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.RemoveFile,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.ComponentRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.FileName), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.DirProperty), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.OnInstall), IntermediateFieldType.Bool),
17 - new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.OnUninstall), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.ComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.FileName), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.DirProperty), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.OnInstall), IntermediateFieldType.Bool),
17 + new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.OnUninstall), IntermediateFieldType.Bool),
18 },
19 - typeof(RemoveFileTuple));
19 + typeof(RemoveFileSymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum RemoveFileTupleFields
25 + public enum RemoveFileSymbolFields
26 {
27 ComponentRef,
28 FileName,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
31 OnUninstall,
32 }
33
34 - public class RemoveFileTuple : IntermediateTuple
34 + public class RemoveFileSymbol : IntermediateSymbol
35 {
36 - public RemoveFileTuple() : base(TupleDefinitions.RemoveFile, null, null)
36 + public RemoveFileSymbol() : base(SymbolDefinitions.RemoveFile, null, null)
37 {
38 }
39
40 - public RemoveFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.RemoveFile, sourceLineNumber, id)
40 + public RemoveFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.RemoveFile, sourceLineNumber, id)
41 {
42 }
43
44 - public IntermediateField this[RemoveFileTupleFields index] => this.Fields[(int)index];
44 + public IntermediateField this[RemoveFileSymbolFields index] => this.Fields[(int)index];
45
46 public string ComponentRef
47 {
48 - get => (string)this.Fields[(int)RemoveFileTupleFields.ComponentRef];
49 - set => this.Set((int)RemoveFileTupleFields.ComponentRef, value);
48 + get => (string)this.Fields[(int)RemoveFileSymbolFields.ComponentRef];
49 + set => this.Set((int)RemoveFileSymbolFields.ComponentRef, value);
50 }
51
52 public string FileName
53 {
54 - get => (string)this.Fields[(int)RemoveFileTupleFields.FileName];
55 - set => this.Set((int)RemoveFileTupleFields.FileName, value);
54 + get => (string)this.Fields[(int)RemoveFileSymbolFields.FileName];
55 + set => this.Set((int)RemoveFileSymbolFields.FileName, value);
56 }
57
58 public string DirProperty
59 {
60 - get => (string)this.Fields[(int)RemoveFileTupleFields.DirProperty];
61 - set => this.Set((int)RemoveFileTupleFields.DirProperty, value);
60 + get => (string)this.Fields[(int)RemoveFileSymbolFields.DirProperty];
61 + set => this.Set((int)RemoveFileSymbolFields.DirProperty, value);
62 }
63
64 public bool? OnInstall
65 {
66 - get => (bool?)this.Fields[(int)RemoveFileTupleFields.OnInstall];
67 - set => this.Set((int)RemoveFileTupleFields.OnInstall, value);
66 + get => (bool?)this.Fields[(int)RemoveFileSymbolFields.OnInstall];
67 + set => this.Set((int)RemoveFileSymbolFields.OnInstall, value);
68 }
69
70 public bool? OnUninstall
71 {
72 - get => (bool?)this.Fields[(int)RemoveFileTupleFields.OnUninstall];
73 - set => this.Set((int)RemoveFileTupleFields.OnUninstall, value);
72 + get => (bool?)this.Fields[(int)RemoveFileSymbolFields.OnUninstall];
73 + set => this.Set((int)RemoveFileSymbolFields.OnUninstall, value);
74 }
75 }
76 }
\ No newline at end of file
src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition RemoveRegistry = new IntermediateTupleDefinition(
10 - TupleDefinitionType.RemoveRegistry,
9 + public static readonly IntermediateSymbolDefinition RemoveRegistry = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.RemoveRegistry,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Root), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Key), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Name), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Action), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.ComponentRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(RemoveRegistrySymbolFields.Root), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(RemoveRegistrySymbolFields.Key), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(RemoveRegistrySymbolFields.Name), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(RemoveRegistrySymbolFields.Action), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(RemoveRegistrySymbolFields.ComponentRef), IntermediateFieldType.String),
18 },
19 - typeof(RemoveRegistryTuple));
19 + typeof(RemoveRegistrySymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum RemoveRegistryTupleFields
25 + public enum RemoveRegistrySymbolFields
26 {
27 Root,
28 Key,
@@ -37,46 +37,46 @@ namespace WixToolset.Data.Tuples
37 RemoveOnUninstall
38 };
39
40 - public class RemoveRegistryTuple : IntermediateTuple
40 + public class RemoveRegistrySymbol : IntermediateSymbol
41 {
42 - public RemoveRegistryTuple() : base(TupleDefinitions.RemoveRegistry, null, null)
42 + public RemoveRegistrySymbol() : base(SymbolDefinitions.RemoveRegistry, null, null)
43 {
44 }
45
46 - public RemoveRegistryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.RemoveRegistry, sourceLineNumber, id)
46 + public RemoveRegistrySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.RemoveRegistry, sourceLineNumber, id)
47 {
48 }
49
50 - public IntermediateField this[RemoveRegistryTupleFields index] => this.Fields[(int)index];
50 + public IntermediateField this[RemoveRegistrySymbolFields index] => this.Fields[(int)index];
51
52 public RegistryRootType Root
53 {
54 - get => (RegistryRootType)this.Fields[(int)RemoveRegistryTupleFields.Root].AsNumber();
55 - set => this.Set((int)RemoveRegistryTupleFields.Root, (int)value);
54 + get => (RegistryRootType)this.Fields[(int)RemoveRegistrySymbolFields.Root].AsNumber();
55 + set => this.Set((int)RemoveRegistrySymbolFields.Root, (int)value);
56 }
57
58 public string Key
59 {
60 - get => (string)this.Fields[(int)RemoveRegistryTupleFields.Key];
61 - set => this.Set((int)RemoveRegistryTupleFields.Key, value);
60 + get => (string)this.Fields[(int)RemoveRegistrySymbolFields.Key];
61 + set => this.Set((int)RemoveRegistrySymbolFields.Key, value);
62 }
63
64 public string Name
65 {
66 - get => (string)this.Fields[(int)RemoveRegistryTupleFields.Name];
67 - set => this.Set((int)RemoveRegistryTupleFields.Name, value);
66 + get => (string)this.Fields[(int)RemoveRegistrySymbolFields.Name];
67 + set => this.Set((int)RemoveRegistrySymbolFields.Name, value);
68 }
69
70 public RemoveRegistryActionType Action
71 {
72 - get => (RemoveRegistryActionType)this.Fields[(int)RemoveRegistryTupleFields.Action].AsNumber();
73 - set => this.Set((int)RemoveRegistryTupleFields.Action, (int)value);
72 + get => (RemoveRegistryActionType)this.Fields[(int)RemoveRegistrySymbolFields.Action].AsNumber();
73 + set => this.Set((int)RemoveRegistrySymbolFields.Action, (int)value);
74 }
75
76 public string ComponentRef
77 {
78 - get => (string)this.Fields[(int)RemoveRegistryTupleFields.ComponentRef];
79 - set => this.Set((int)RemoveRegistryTupleFields.ComponentRef, value);
78 + get => (string)this.Fields[(int)RemoveRegistrySymbolFields.ComponentRef];
79 + set => this.Set((int)RemoveRegistrySymbolFields.ComponentRef, value);
80 }
81 }
82 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ReserveCostTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ReserveCost = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ReserveCost,
9 + public static readonly IntermediateSymbolDefinition ReserveCost = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ReserveCost,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ComponentRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveFolder), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveLocal), IntermediateFieldType.Number),
16 - new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveSource), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(ReserveCostSymbolFields.ComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ReserveCostSymbolFields.ReserveFolder), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ReserveCostSymbolFields.ReserveLocal), IntermediateFieldType.Number),
16 + new IntermediateFieldDefinition(nameof(ReserveCostSymbolFields.ReserveSource), IntermediateFieldType.Number),
17 },
18 - typeof(ReserveCostTuple));
18 + typeof(ReserveCostSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum ReserveCostTupleFields
24 + public enum ReserveCostSymbolFields
25 {
26 ComponentRef,
27 ReserveFolder,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 ReserveSource,
30 }
31
32 - public class ReserveCostTuple : IntermediateTuple
32 + public class ReserveCostSymbol : IntermediateSymbol
33 {
34 - public ReserveCostTuple() : base(TupleDefinitions.ReserveCost, null, null)
34 + public ReserveCostSymbol() : base(SymbolDefinitions.ReserveCost, null, null)
35 {
36 }
37
38 - public ReserveCostTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ReserveCost, sourceLineNumber, id)
38 + public ReserveCostSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ReserveCost, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[ReserveCostTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[ReserveCostSymbolFields index] => this.Fields[(int)index];
43
44 public string ComponentRef
45 {
46 - get => (string)this.Fields[(int)ReserveCostTupleFields.ComponentRef];
47 - set => this.Set((int)ReserveCostTupleFields.ComponentRef, value);
46 + get => (string)this.Fields[(int)ReserveCostSymbolFields.ComponentRef];
47 + set => this.Set((int)ReserveCostSymbolFields.ComponentRef, value);
48 }
49
50 public string ReserveFolder
51 {
52 - get => (string)this.Fields[(int)ReserveCostTupleFields.ReserveFolder];
53 - set => this.Set((int)ReserveCostTupleFields.ReserveFolder, value);
52 + get => (string)this.Fields[(int)ReserveCostSymbolFields.ReserveFolder];
53 + set => this.Set((int)ReserveCostSymbolFields.ReserveFolder, value);
54 }
55
56 public int ReserveLocal
57 {
58 - get => (int)this.Fields[(int)ReserveCostTupleFields.ReserveLocal];
59 - set => this.Set((int)ReserveCostTupleFields.ReserveLocal, value);
58 + get => (int)this.Fields[(int)ReserveCostSymbolFields.ReserveLocal];
59 + set => this.Set((int)ReserveCostSymbolFields.ReserveLocal, value);
60 }
61
62 public int ReserveSource
63 {
64 - get => (int)this.Fields[(int)ReserveCostTupleFields.ReserveSource];
65 - set => this.Set((int)ReserveCostTupleFields.ReserveSource, value);
64 + get => (int)this.Fields[(int)ReserveCostSymbolFields.ReserveSource];
65 + set => this.Set((int)ReserveCostSymbolFields.ReserveSource, value);
66 }
67 }
68 }
src/WixToolset.Data/Tuples/SFPCatalogTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition SFPCatalog = new IntermediateTupleDefinition(
10 - TupleDefinitionType.SFPCatalog,
9 + public static readonly IntermediateSymbolDefinition SFPCatalog = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.SFPCatalog,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(SFPCatalogTupleFields.SFPCatalog), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(SFPCatalogTupleFields.Catalog), IntermediateFieldType.Path),
15 - new IntermediateFieldDefinition(nameof(SFPCatalogTupleFields.Dependency), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(SFPCatalogSymbolFields.SFPCatalog), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(SFPCatalogSymbolFields.Catalog), IntermediateFieldType.Path),
15 + new IntermediateFieldDefinition(nameof(SFPCatalogSymbolFields.Dependency), IntermediateFieldType.String),
16 },
17 - typeof(SFPCatalogTuple));
17 + typeof(SFPCatalogSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum SFPCatalogTupleFields
23 + public enum SFPCatalogSymbolFields
24 {
25 SFPCatalog,
26 Catalog,
27 Dependency,
28 }
29
30 - public class SFPCatalogTuple : IntermediateTuple
30 + public class SFPCatalogSymbol : IntermediateSymbol
31 {
32 - public SFPCatalogTuple() : base(TupleDefinitions.SFPCatalog, null, null)
32 + public SFPCatalogSymbol() : base(SymbolDefinitions.SFPCatalog, null, null)
33 {
34 }
35
36 - public SFPCatalogTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.SFPCatalog, sourceLineNumber, id)
36 + public SFPCatalogSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.SFPCatalog, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[SFPCatalogTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[SFPCatalogSymbolFields index] => this.Fields[(int)index];
41
42 public string SFPCatalog
43 {
44 - get => (string)this.Fields[(int)SFPCatalogTupleFields.SFPCatalog];
45 - set => this.Set((int)SFPCatalogTupleFields.SFPCatalog, value);
44 + get => (string)this.Fields[(int)SFPCatalogSymbolFields.SFPCatalog];
45 + set => this.Set((int)SFPCatalogSymbolFields.SFPCatalog, value);
46 }
47
48 public string Catalog
49 {
50 - get => (string)this.Fields[(int)SFPCatalogTupleFields.Catalog];
51 - set => this.Set((int)SFPCatalogTupleFields.Catalog, value);
50 + get => (string)this.Fields[(int)SFPCatalogSymbolFields.Catalog];
51 + set => this.Set((int)SFPCatalogSymbolFields.Catalog, value);
52 }
53
54 public string Dependency
55 {
56 - get => (string)this.Fields[(int)SFPCatalogTupleFields.Dependency];
57 - set => this.Set((int)SFPCatalogTupleFields.Dependency, value);
56 + get => (string)this.Fields[(int)SFPCatalogSymbolFields.Dependency];
57 + set => this.Set((int)SFPCatalogSymbolFields.Dependency, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ServiceControlTuple.cs
+41 -41
@@ -2,32 +2,32 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ServiceControl = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ServiceControl,
9 + public static readonly IntermediateSymbolDefinition ServiceControl = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ServiceControl,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Name), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.InstallRemove), IntermediateFieldType.Bool),
15 - new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.UninstallRemove), IntermediateFieldType.Bool),
16 - new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.InstallStart), IntermediateFieldType.Bool),
17 - new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.UninstallStart), IntermediateFieldType.Bool),
18 - new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.InstallStop), IntermediateFieldType.Bool),
19 - new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.UninstallStop), IntermediateFieldType.Bool),
20 - new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Arguments), IntermediateFieldType.String),
21 - new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Wait), IntermediateFieldType.Bool),
22 - new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.ComponentRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.Name), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.InstallRemove), IntermediateFieldType.Bool),
15 + new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.UninstallRemove), IntermediateFieldType.Bool),
16 + new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.InstallStart), IntermediateFieldType.Bool),
17 + new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.UninstallStart), IntermediateFieldType.Bool),
18 + new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.InstallStop), IntermediateFieldType.Bool),
19 + new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.UninstallStop), IntermediateFieldType.Bool),
20 + new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.Arguments), IntermediateFieldType.String),
21 + new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.Wait), IntermediateFieldType.Bool),
22 + new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.ComponentRef), IntermediateFieldType.String),
23 },
24 - typeof(ServiceControlTuple));
24 + typeof(ServiceControlSymbol));
25 }
26 }
27
28 -namespace WixToolset.Data.Tuples
28 +namespace WixToolset.Data.Symbols
29 {
30 - public enum ServiceControlTupleFields
30 + public enum ServiceControlSymbolFields
31 {
32 Name,
33 InstallRemove,
@@ -41,76 +41,76 @@ namespace WixToolset.Data.Tuples
41 ComponentRef,
42 }
43
44 - public class ServiceControlTuple : IntermediateTuple
44 + public class ServiceControlSymbol : IntermediateSymbol
45 {
46 - public ServiceControlTuple() : base(TupleDefinitions.ServiceControl, null, null)
46 + public ServiceControlSymbol() : base(SymbolDefinitions.ServiceControl, null, null)
47 {
48 }
49
50 - public ServiceControlTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ServiceControl, sourceLineNumber, id)
50 + public ServiceControlSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ServiceControl, sourceLineNumber, id)
51 {
52 }
53
54 - public IntermediateField this[ServiceControlTupleFields index] => this.Fields[(int)index];
54 + public IntermediateField this[ServiceControlSymbolFields index] => this.Fields[(int)index];
55
56 public string Name
57 {
58 - get => (string)this.Fields[(int)ServiceControlTupleFields.Name];
59 - set => this.Set((int)ServiceControlTupleFields.Name, value);
58 + get => (string)this.Fields[(int)ServiceControlSymbolFields.Name];
59 + set => this.Set((int)ServiceControlSymbolFields.Name, value);
60 }
61
62 public bool InstallRemove
63 {
64 - get => this.Fields[(int)ServiceControlTupleFields.InstallRemove].AsBool();
65 - set => this.Set((int)ServiceControlTupleFields.InstallRemove, value);
64 + get => this.Fields[(int)ServiceControlSymbolFields.InstallRemove].AsBool();
65 + set => this.Set((int)ServiceControlSymbolFields.InstallRemove, value);
66 }
67
68 public bool UninstallRemove
69 {
70 - get => this.Fields[(int)ServiceControlTupleFields.UninstallRemove].AsBool();
71 - set => this.Set((int)ServiceControlTupleFields.UninstallRemove, value);
70 + get => this.Fields[(int)ServiceControlSymbolFields.UninstallRemove].AsBool();
71 + set => this.Set((int)ServiceControlSymbolFields.UninstallRemove, value);
72 }
73
74 public bool InstallStart
75 {
76 - get => this.Fields[(int)ServiceControlTupleFields.InstallStart].AsBool();
77 - set => this.Set((int)ServiceControlTupleFields.InstallStart, value);
76 + get => this.Fields[(int)ServiceControlSymbolFields.InstallStart].AsBool();
77 + set => this.Set((int)ServiceControlSymbolFields.InstallStart, value);
78 }
79
80 public bool UninstallStart
81 {
82 - get => this.Fields[(int)ServiceControlTupleFields.UninstallStart].AsBool();
83 - set => this.Set((int)ServiceControlTupleFields.UninstallStart, value);
82 + get => this.Fields[(int)ServiceControlSymbolFields.UninstallStart].AsBool();
83 + set => this.Set((int)ServiceControlSymbolFields.UninstallStart, value);
84 }
85
86 public bool InstallStop
87 {
88 - get => this.Fields[(int)ServiceControlTupleFields.InstallStop].AsBool();
89 - set => this.Set((int)ServiceControlTupleFields.InstallStop, value);
88 + get => this.Fields[(int)ServiceControlSymbolFields.InstallStop].AsBool();
89 + set => this.Set((int)ServiceControlSymbolFields.InstallStop, value);
90 }
91
92 public bool UninstallStop
93 {
94 - get => this.Fields[(int)ServiceControlTupleFields.UninstallStop].AsBool();
95 - set => this.Set((int)ServiceControlTupleFields.UninstallStop, value);
94 + get => this.Fields[(int)ServiceControlSymbolFields.UninstallStop].AsBool();
95 + set => this.Set((int)ServiceControlSymbolFields.UninstallStop, value);
96 }
97
98 public string Arguments
99 {
100 - get => (string)this.Fields[(int)ServiceControlTupleFields.Arguments];
101 - set => this.Set((int)ServiceControlTupleFields.Arguments, value);
100 + get => (string)this.Fields[(int)ServiceControlSymbolFields.Arguments];
101 + set => this.Set((int)ServiceControlSymbolFields.Arguments, value);
102 }
103
104 public bool? Wait
105 {
106 - get => this.Fields[(int)ServiceControlTupleFields.Wait].AsNullableBool();
107 - set => this.Set((int)ServiceControlTupleFields.Wait, value);
106 + get => this.Fields[(int)ServiceControlSymbolFields.Wait].AsNullableBool();
107 + set => this.Set((int)ServiceControlSymbolFields.Wait, value);
108 }
109
110 public string ComponentRef
111 {
112 - get => (string)this.Fields[(int)ServiceControlTupleFields.ComponentRef];
113 - set => this.Set((int)ServiceControlTupleFields.ComponentRef, value);
112 + get => (string)this.Fields[(int)ServiceControlSymbolFields.ComponentRef];
113 + set => this.Set((int)ServiceControlSymbolFields.ComponentRef, value);
114 }
115 }
116 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
+53 -53
@@ -2,36 +2,36 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition ServiceInstall = new IntermediateTupleDefinition(
10 - TupleDefinitionType.ServiceInstall,
9 + public static readonly IntermediateSymbolDefinition ServiceInstall = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.ServiceInstall,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Name), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.DisplayName), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.ServiceType), IntermediateFieldType.Number),
16 - new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.StartType), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.ErrorControl), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.LoadOrderGroup), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Dependencies), IntermediateFieldType.String),
20 - new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.StartName), IntermediateFieldType.String),
21 - new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Password), IntermediateFieldType.String),
22 - new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Arguments), IntermediateFieldType.String),
23 - new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.ComponentRef), IntermediateFieldType.String),
24 - new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Description), IntermediateFieldType.String),
25 - new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Interactive), IntermediateFieldType.Bool),
26 - new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Vital), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.Name), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.DisplayName), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.ServiceType), IntermediateFieldType.Number),
16 + new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.StartType), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.ErrorControl), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.LoadOrderGroup), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.Dependencies), IntermediateFieldType.String),
20 + new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.StartName), IntermediateFieldType.String),
21 + new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.Password), IntermediateFieldType.String),
22 + new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.Arguments), IntermediateFieldType.String),
23 + new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.ComponentRef), IntermediateFieldType.String),
24 + new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.Description), IntermediateFieldType.String),
25 + new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.Interactive), IntermediateFieldType.Bool),
26 + new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.Vital), IntermediateFieldType.Bool),
27 },
28 - typeof(ServiceInstallTuple));
28 + typeof(ServiceInstallSymbol));
29 }
30 }
31
32 -namespace WixToolset.Data.Tuples
32 +namespace WixToolset.Data.Symbols
33 {
34 - public enum ServiceInstallTupleFields
34 + public enum ServiceInstallSymbolFields
35 {
36 Name,
37 DisplayName,
@@ -74,100 +74,100 @@ namespace WixToolset.Data.Tuples
74 Critical = 3,
75 }
76
77 - public class ServiceInstallTuple : IntermediateTuple
77 + public class ServiceInstallSymbol : IntermediateSymbol
78 {
79 - public ServiceInstallTuple() : base(TupleDefinitions.ServiceInstall, null, null)
79 + public ServiceInstallSymbol() : base(SymbolDefinitions.ServiceInstall, null, null)
80 {
81 }
82
83 - public ServiceInstallTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ServiceInstall, sourceLineNumber, id)
83 + public ServiceInstallSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ServiceInstall, sourceLineNumber, id)
84 {
85 }
86
87 - public IntermediateField this[ServiceInstallTupleFields index] => this.Fields[(int)index];
87 + public IntermediateField this[ServiceInstallSymbolFields index] => this.Fields[(int)index];
88
89 public string Name
90 {
91 - get => (string)this.Fields[(int)ServiceInstallTupleFields.Name];
92 - set => this.Set((int)ServiceInstallTupleFields.Name, value);
91 + get => (string)this.Fields[(int)ServiceInstallSymbolFields.Name];
92 + set => this.Set((int)ServiceInstallSymbolFields.Name, value);
93 }
94
95 public string DisplayName
96 {
97 - get => (string)this.Fields[(int)ServiceInstallTupleFields.DisplayName];
98 - set => this.Set((int)ServiceInstallTupleFields.DisplayName, value);
97 + get => (string)this.Fields[(int)ServiceInstallSymbolFields.DisplayName];
98 + set => this.Set((int)ServiceInstallSymbolFields.DisplayName, value);
99 }
100
101 public ServiceType ServiceType
102 {
103 - get => (ServiceType)this.Fields[(int)ServiceInstallTupleFields.ServiceType].AsNumber();
104 - set => this.Set((int)ServiceInstallTupleFields.ServiceType, (int)value);
103 + get => (ServiceType)this.Fields[(int)ServiceInstallSymbolFields.ServiceType].AsNumber();
104 + set => this.Set((int)ServiceInstallSymbolFields.ServiceType, (int)value);
105 }
106
107 public ServiceStartType StartType
108 {
109 - get => (ServiceStartType)this.Fields[(int)ServiceInstallTupleFields.StartType].AsNumber();
110 - set => this.Set((int)ServiceInstallTupleFields.StartType, (int)value);
109 + get => (ServiceStartType)this.Fields[(int)ServiceInstallSymbolFields.StartType].AsNumber();
110 + set => this.Set((int)ServiceInstallSymbolFields.StartType, (int)value);
111 }
112
113 public ServiceErrorControl ErrorControl
114 {
115 - get => (ServiceErrorControl)this.Fields[(int)ServiceInstallTupleFields.ErrorControl].AsNumber();
116 - set => this.Set((int)ServiceInstallTupleFields.ErrorControl, (int)value);
115 + get => (ServiceErrorControl)this.Fields[(int)ServiceInstallSymbolFields.ErrorControl].AsNumber();
116 + set => this.Set((int)ServiceInstallSymbolFields.ErrorControl, (int)value);
117 }
118
119 public string LoadOrderGroup
120 {
121 - get => (string)this.Fields[(int)ServiceInstallTupleFields.LoadOrderGroup];
122 - set => this.Set((int)ServiceInstallTupleFields.LoadOrderGroup, value);
121 + get => (string)this.Fields[(int)ServiceInstallSymbolFields.LoadOrderGroup];
122 + set => this.Set((int)ServiceInstallSymbolFields.LoadOrderGroup, value);
123 }
124
125 public string Dependencies
126 {
127 - get => (string)this.Fields[(int)ServiceInstallTupleFields.Dependencies];
128 - set => this.Set((int)ServiceInstallTupleFields.Dependencies, value);
127 + get => (string)this.Fields[(int)ServiceInstallSymbolFields.Dependencies];
128 + set => this.Set((int)ServiceInstallSymbolFields.Dependencies, value);
129 }
130
131 public string StartName
132 {
133 - get => (string)this.Fields[(int)ServiceInstallTupleFields.StartName];
134 - set => this.Set((int)ServiceInstallTupleFields.StartName, value);
133 + get => (string)this.Fields[(int)ServiceInstallSymbolFields.StartName];
134 + set => this.Set((int)ServiceInstallSymbolFields.StartName, value);
135 }
136
137 public string Password
138 {
139 - get => (string)this.Fields[(int)ServiceInstallTupleFields.Password];
140 - set => this.Set((int)ServiceInstallTupleFields.Password, value);
139 + get => (string)this.Fields[(int)ServiceInstallSymbolFields.Password];
140 + set => this.Set((int)ServiceInstallSymbolFields.Password, value);
141 }
142
143 public string Arguments
144 {
145 - get => (string)this.Fields[(int)ServiceInstallTupleFields.Arguments];
146 - set => this.Set((int)ServiceInstallTupleFields.Arguments, value);
145 + get => (string)this.Fields[(int)ServiceInstallSymbolFields.Arguments];
146 + set => this.Set((int)ServiceInstallSymbolFields.Arguments, value);
147 }
148
149 public string ComponentRef
150 {
151 - get => (string)this.Fields[(int)ServiceInstallTupleFields.ComponentRef];
152 - set => this.Set((int)ServiceInstallTupleFields.ComponentRef, value);
151 + get => (string)this.Fields[(int)ServiceInstallSymbolFields.ComponentRef];
152 + set => this.Set((int)ServiceInstallSymbolFields.ComponentRef, value);
153 }
154
155 public string Description
156 {
157 - get => (string)this.Fields[(int)ServiceInstallTupleFields.Description];
158 - set => this.Set((int)ServiceInstallTupleFields.Description, value);
157 + get => (string)this.Fields[(int)ServiceInstallSymbolFields.Description];
158 + set => this.Set((int)ServiceInstallSymbolFields.Description, value);
159 }
160
161 public bool Interactive
162 {
163 - get => this.Fields[(int)ServiceInstallTupleFields.Interactive].AsBool();
164 - set => this.Set((int)ServiceInstallTupleFields.Interactive, value);
163 + get => this.Fields[(int)ServiceInstallSymbolFields.Interactive].AsBool();
164 + set => this.Set((int)ServiceInstallSymbolFields.Interactive, value);
165 }
166
167 public bool Vital
168 {
169 - get => this.Fields[(int)ServiceInstallTupleFields.Vital].AsBool();
170 - set => this.Set((int)ServiceInstallTupleFields.Vital, value);
169 + get => this.Fields[(int)ServiceInstallSymbolFields.Vital].AsBool();
170 + set => this.Set((int)ServiceInstallSymbolFields.Vital, value);
171 }
172 }
173 }
\ No newline at end of file
src/WixToolset.Data/Tuples/ShortcutTuple.cs
+59 -59
@@ -2,38 +2,38 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Shortcut = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Shortcut,
9 + public static readonly IntermediateSymbolDefinition Shortcut = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Shortcut,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DirectoryRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Name), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.ShortName), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.ComponentRef), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Target), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Arguments), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Description), IntermediateFieldType.String),
20 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Hotkey), IntermediateFieldType.Number),
21 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.IconRef), IntermediateFieldType.String),
22 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.IconIndex), IntermediateFieldType.Number),
23 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Show), IntermediateFieldType.Number),
24 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.WkDir), IntermediateFieldType.String),
25 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DisplayResourceDLL), IntermediateFieldType.String),
26 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DisplayResourceId), IntermediateFieldType.Number),
27 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DescriptionResourceDLL), IntermediateFieldType.String),
28 - new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DescriptionResourceId), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.DirectoryRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.Name), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.ShortName), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.ComponentRef), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.Target), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.Arguments), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.Description), IntermediateFieldType.String),
20 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.Hotkey), IntermediateFieldType.Number),
21 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.IconRef), IntermediateFieldType.String),
22 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.IconIndex), IntermediateFieldType.Number),
23 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.Show), IntermediateFieldType.Number),
24 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.WkDir), IntermediateFieldType.String),
25 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.DisplayResourceDLL), IntermediateFieldType.String),
26 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.DisplayResourceId), IntermediateFieldType.Number),
27 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.DescriptionResourceDLL), IntermediateFieldType.String),
28 + new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.DescriptionResourceId), IntermediateFieldType.Number),
29 },
30 - typeof(ShortcutTuple));
30 + typeof(ShortcutSymbol));
31 }
32 }
33
34 -namespace WixToolset.Data.Tuples
34 +namespace WixToolset.Data.Symbols
35 {
36 - public enum ShortcutTupleFields
36 + public enum ShortcutSymbolFields
37 {
38 DirectoryRef,
39 Name,
@@ -60,112 +60,112 @@ namespace WixToolset.Data.Tuples
60 Minimized = 7
61 }
62
63 - public class ShortcutTuple : IntermediateTuple
63 + public class ShortcutSymbol : IntermediateSymbol
64 {
65 - public ShortcutTuple() : base(TupleDefinitions.Shortcut, null, null)
65 + public ShortcutSymbol() : base(SymbolDefinitions.Shortcut, null, null)
66 {
67 }
68
69 - public ShortcutTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Shortcut, sourceLineNumber, id)
69 + public ShortcutSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Shortcut, sourceLineNumber, id)
70 {
71 }
72
73 - public IntermediateField this[ShortcutTupleFields index] => this.Fields[(int)index];
73 + public IntermediateField this[ShortcutSymbolFields index] => this.Fields[(int)index];
74
75 public string DirectoryRef
76 {
77 - get => (string)this.Fields[(int)ShortcutTupleFields.DirectoryRef];
78 - set => this.Set((int)ShortcutTupleFields.DirectoryRef, value);
77 + get => (string)this.Fields[(int)ShortcutSymbolFields.DirectoryRef];
78 + set => this.Set((int)ShortcutSymbolFields.DirectoryRef, value);
79 }
80
81 public string Name
82 {
83 - get => (string)this.Fields[(int)ShortcutTupleFields.Name];
84 - set => this.Set((int)ShortcutTupleFields.Name, value);
83 + get => (string)this.Fields[(int)ShortcutSymbolFields.Name];
84 + set => this.Set((int)ShortcutSymbolFields.Name, value);
85 }
86
87 public string ShortName
88 {
89 - get => (string)this.Fields[(int)ShortcutTupleFields.ShortName];
90 - set => this.Set((int)ShortcutTupleFields.ShortName, value);
89 + get => (string)this.Fields[(int)ShortcutSymbolFields.ShortName];
90 + set => this.Set((int)ShortcutSymbolFields.ShortName, value);
91 }
92
93 public string ComponentRef
94 {
95 - get => (string)this.Fields[(int)ShortcutTupleFields.ComponentRef];
96 - set => this.Set((int)ShortcutTupleFields.ComponentRef, value);
95 + get => (string)this.Fields[(int)ShortcutSymbolFields.ComponentRef];
96 + set => this.Set((int)ShortcutSymbolFields.ComponentRef, value);
97 }
98
99 public string Target
100 {
101 - get => (string)this.Fields[(int)ShortcutTupleFields.Target];
102 - set => this.Set((int)ShortcutTupleFields.Target, value);
101 + get => (string)this.Fields[(int)ShortcutSymbolFields.Target];
102 + set => this.Set((int)ShortcutSymbolFields.Target, value);
103 }
104
105 public string Arguments
106 {
107 - get => (string)this.Fields[(int)ShortcutTupleFields.Arguments];
108 - set => this.Set((int)ShortcutTupleFields.Arguments, value);
107 + get => (string)this.Fields[(int)ShortcutSymbolFields.Arguments];
108 + set => this.Set((int)ShortcutSymbolFields.Arguments, value);
109 }
110
111 public string Description
112 {
113 - get => (string)this.Fields[(int)ShortcutTupleFields.Description];
114 - set => this.Set((int)ShortcutTupleFields.Description, value);
113 + get => (string)this.Fields[(int)ShortcutSymbolFields.Description];
114 + set => this.Set((int)ShortcutSymbolFields.Description, value);
115 }
116
117 public int? Hotkey
118 {
119 - get => this.Fields[(int)ShortcutTupleFields.Hotkey].AsNullableNumber();
120 - set => this.Set((int)ShortcutTupleFields.Hotkey, value);
119 + get => this.Fields[(int)ShortcutSymbolFields.Hotkey].AsNullableNumber();
120 + set => this.Set((int)ShortcutSymbolFields.Hotkey, value);
121 }
122
123 public string IconRef
124 {
125 - get => (string)this.Fields[(int)ShortcutTupleFields.IconRef];
126 - set => this.Set((int)ShortcutTupleFields.IconRef, value);
125 + get => (string)this.Fields[(int)ShortcutSymbolFields.IconRef];
126 + set => this.Set((int)ShortcutSymbolFields.IconRef, value);
127 }
128
129 public int? IconIndex
130 {
131 - get => this.Fields[(int)ShortcutTupleFields.IconIndex].AsNullableNumber();
132 - set => this.Set((int)ShortcutTupleFields.IconIndex, value);
131 + get => this.Fields[(int)ShortcutSymbolFields.IconIndex].AsNullableNumber();
132 + set => this.Set((int)ShortcutSymbolFields.IconIndex, value);
133 }
134
135 public ShortcutShowType? Show
136 {
137 - get => (ShortcutShowType?)this.Fields[(int)ShortcutTupleFields.Show].AsNullableNumber();
138 - set => this.Set((int)ShortcutTupleFields.Show, (int?)value);
137 + get => (ShortcutShowType?)this.Fields[(int)ShortcutSymbolFields.Show].AsNullableNumber();
138 + set => this.Set((int)ShortcutSymbolFields.Show, (int?)value);
139 }
140
141 public string WorkingDirectory
142 {
143 - get => (string)this.Fields[(int)ShortcutTupleFields.WkDir];
144 - set => this.Set((int)ShortcutTupleFields.WkDir, value);
143 + get => (string)this.Fields[(int)ShortcutSymbolFields.WkDir];
144 + set => this.Set((int)ShortcutSymbolFields.WkDir, value);
145 }
146
147 public string DisplayResourceDll
148 {
149 - get => (string)this.Fields[(int)ShortcutTupleFields.DisplayResourceDLL];
150 - set => this.Set((int)ShortcutTupleFields.DisplayResourceDLL, value);
149 + get => (string)this.Fields[(int)ShortcutSymbolFields.DisplayResourceDLL];
150 + set => this.Set((int)ShortcutSymbolFields.DisplayResourceDLL, value);
151 }
152
153 public int? DisplayResourceId
154 {
155 - get => this.Fields[(int)ShortcutTupleFields.DisplayResourceId].AsNullableNumber();
156 - set => this.Set((int)ShortcutTupleFields.DisplayResourceId, value);
155 + get => this.Fields[(int)ShortcutSymbolFields.DisplayResourceId].AsNullableNumber();
156 + set => this.Set((int)ShortcutSymbolFields.DisplayResourceId, value);
157 }
158
159 public string DescriptionResourceDll
160 {
161 - get => (string)this.Fields[(int)ShortcutTupleFields.DescriptionResourceDLL];
162 - set => this.Set((int)ShortcutTupleFields.DescriptionResourceDLL, value);
161 + get => (string)this.Fields[(int)ShortcutSymbolFields.DescriptionResourceDLL];
162 + set => this.Set((int)ShortcutSymbolFields.DescriptionResourceDLL, value);
163 }
164
165 public int? DescriptionResourceId
166 {
167 - get => this.Fields[(int)ShortcutTupleFields.DescriptionResourceId].AsNullableNumber();
168 - set => this.Set((int)ShortcutTupleFields.DescriptionResourceId, value);
167 + get => this.Fields[(int)ShortcutSymbolFields.DescriptionResourceId].AsNullableNumber();
168 + set => this.Set((int)ShortcutSymbolFields.DescriptionResourceId, value);
169 }
170 }
171 }
src/WixToolset.Data/Tuples/SignatureTuple.cs
+35 -35
@@ -2,30 +2,30 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Signature = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Signature,
9 + public static readonly IntermediateSymbolDefinition Signature = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Signature,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(SignatureTupleFields.FileName), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(SignatureTupleFields.MinVersion), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(SignatureTupleFields.MaxVersion), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(SignatureTupleFields.MinSize), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(SignatureTupleFields.MaxSize), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(SignatureTupleFields.MinDate), IntermediateFieldType.Number),
19 - new IntermediateFieldDefinition(nameof(SignatureTupleFields.MaxDate), IntermediateFieldType.Number),
20 - new IntermediateFieldDefinition(nameof(SignatureTupleFields.Languages), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(SignatureSymbolFields.FileName), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(SignatureSymbolFields.MinVersion), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(SignatureSymbolFields.MaxVersion), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(SignatureSymbolFields.MinSize), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(SignatureSymbolFields.MaxSize), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(SignatureSymbolFields.MinDate), IntermediateFieldType.Number),
19 + new IntermediateFieldDefinition(nameof(SignatureSymbolFields.MaxDate), IntermediateFieldType.Number),
20 + new IntermediateFieldDefinition(nameof(SignatureSymbolFields.Languages), IntermediateFieldType.String),
21 },
22 - typeof(SignatureTuple));
22 + typeof(SignatureSymbol));
23 }
24 }
25
26 -namespace WixToolset.Data.Tuples
26 +namespace WixToolset.Data.Symbols
27 {
28 - public enum SignatureTupleFields
28 + public enum SignatureSymbolFields
29 {
30 FileName,
31 MinVersion,
@@ -37,64 +37,64 @@ namespace WixToolset.Data.Tuples
37 Languages,
38 }
39
40 - public class SignatureTuple : IntermediateTuple
40 + public class SignatureSymbol : IntermediateSymbol
41 {
42 - public SignatureTuple() : base(TupleDefinitions.Signature, null, null)
42 + public SignatureSymbol() : base(SymbolDefinitions.Signature, null, null)
43 {
44 }
45
46 - public SignatureTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Signature, sourceLineNumber, id)
46 + public SignatureSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Signature, sourceLineNumber, id)
47 {
48 }
49
50 - public IntermediateField this[SignatureTupleFields index] => this.Fields[(int)index];
50 + public IntermediateField this[SignatureSymbolFields index] => this.Fields[(int)index];
51
52 public string FileName
53 {
54 - get => (string)this.Fields[(int)SignatureTupleFields.FileName];
55 - set => this.Set((int)SignatureTupleFields.FileName, value);
54 + get => (string)this.Fields[(int)SignatureSymbolFields.FileName];
55 + set => this.Set((int)SignatureSymbolFields.FileName, value);
56 }
57
58 public string MinVersion
59 {
60 - get => (string)this.Fields[(int)SignatureTupleFields.MinVersion];
61 - set => this.Set((int)SignatureTupleFields.MinVersion, value);
60 + get => (string)this.Fields[(int)SignatureSymbolFields.MinVersion];
61 + set => this.Set((int)SignatureSymbolFields.MinVersion, value);
62 }
63
64 public string MaxVersion
65 {
66 - get => (string)this.Fields[(int)SignatureTupleFields.MaxVersion];
67 - set => this.Set((int)SignatureTupleFields.MaxVersion, value);
66 + get => (string)this.Fields[(int)SignatureSymbolFields.MaxVersion];
67 + set => this.Set((int)SignatureSymbolFields.MaxVersion, value);
68 }
69
70 public int? MinSize
71 {
72 - get => (int?)this.Fields[(int)SignatureTupleFields.MinSize];
73 - set => this.Set((int)SignatureTupleFields.MinSize, value);
72 + get => (int?)this.Fields[(int)SignatureSymbolFields.MinSize];
73 + set => this.Set((int)SignatureSymbolFields.MinSize, value);
74 }
75
76 public int? MaxSize
77 {
78 - get => (int?)this.Fields[(int)SignatureTupleFields.MaxSize];
79 - set => this.Set((int)SignatureTupleFields.MaxSize, value);
78 + get => (int?)this.Fields[(int)SignatureSymbolFields.MaxSize];
79 + set => this.Set((int)SignatureSymbolFields.MaxSize, value);
80 }
81
82 public int? MinDate
83 {
84 - get => (int?)this.Fields[(int)SignatureTupleFields.MinDate];
85 - set => this.Set((int)SignatureTupleFields.MinDate, value);
84 + get => (int?)this.Fields[(int)SignatureSymbolFields.MinDate];
85 + set => this.Set((int)SignatureSymbolFields.MinDate, value);
86 }
87
88 public int? MaxDate
89 {
90 - get => (int?)this.Fields[(int)SignatureTupleFields.MaxDate];
91 - set => this.Set((int)SignatureTupleFields.MaxDate, value);
90 + get => (int?)this.Fields[(int)SignatureSymbolFields.MaxDate];
91 + set => this.Set((int)SignatureSymbolFields.MaxDate, value);
92 }
93
94 public string Languages
95 {
96 - get => (string)this.Fields[(int)SignatureTupleFields.Languages];
97 - set => this.Set((int)SignatureTupleFields.Languages, value);
96 + get => (string)this.Fields[(int)SignatureSymbolFields.Languages];
97 + set => this.Set((int)SignatureSymbolFields.Languages, value);
98 }
99 }
100 }
\ No newline at end of file
src/WixToolset.Data/Tuples/SummaryInformationTuple.cs
+17 -17
@@ -2,24 +2,24 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition SummaryInformation = new IntermediateTupleDefinition(
10 - TupleDefinitionType.SummaryInformation,
9 + public static readonly IntermediateSymbolDefinition SummaryInformation = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.SummaryInformation,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(SummaryInformationTupleFields.PropertyId), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(SummaryInformationTupleFields.Value), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(SummaryInformationSymbolFields.PropertyId), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(SummaryInformationSymbolFields.Value), IntermediateFieldType.String),
15 },
16 - typeof(SummaryInformationTuple));
16 + typeof(SummaryInformationSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum SummaryInformationTupleFields
22 + public enum SummaryInformationSymbolFields
23 {
24 PropertyId,
25 Value,
@@ -75,28 +75,28 @@ namespace WixToolset.Data.Tuples
75 Version31 = 5,
76 }
77
78 - public class SummaryInformationTuple : IntermediateTuple
78 + public class SummaryInformationSymbol : IntermediateSymbol
79 {
80 - public SummaryInformationTuple() : base(TupleDefinitions.SummaryInformation, null, null)
80 + public SummaryInformationSymbol() : base(SymbolDefinitions.SummaryInformation, null, null)
81 {
82 }
83
84 - public SummaryInformationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.SummaryInformation, sourceLineNumber, id)
84 + public SummaryInformationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.SummaryInformation, sourceLineNumber, id)
85 {
86 }
87
88 - public IntermediateField this[SummaryInformationTupleFields index] => this.Fields[(int)index];
88 + public IntermediateField this[SummaryInformationSymbolFields index] => this.Fields[(int)index];
89
90 public SummaryInformationType PropertyId
91 {
92 - get => (SummaryInformationType)this.Fields[(int)SummaryInformationTupleFields.PropertyId].AsNumber();
93 - set => this.Set((int)SummaryInformationTupleFields.PropertyId, (int)value);
92 + get => (SummaryInformationType)this.Fields[(int)SummaryInformationSymbolFields.PropertyId].AsNumber();
93 + set => this.Set((int)SummaryInformationSymbolFields.PropertyId, (int)value);
94 }
95
96 public string Value
97 {
98 - get => (string)this.Fields[(int)SummaryInformationTupleFields.Value];
99 - set => this.Set((int)SummaryInformationTupleFields.Value, value);
98 + get => (string)this.Fields[(int)SummaryInformationSymbolFields.Value];
99 + set => this.Set((int)SummaryInformationSymbolFields.Value, value);
100 }
101 }
102 }
src/WixToolset.Data/Tuples/TargetFilesOptionalDataTuple.cs
+29 -29
@@ -2,28 +2,28 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition TargetFilesOptionalData = new IntermediateTupleDefinition(
10 - TupleDefinitionType.TargetFilesOptionalData,
9 + public static readonly IntermediateSymbolDefinition TargetFilesOptionalData = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.TargetFilesOptionalData,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.Target), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.FTK), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.SymbolPaths), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.IgnoreOffsets), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.IgnoreLengths), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.RetainOffsets), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataSymbolFields.Target), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataSymbolFields.FTK), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataSymbolFields.SymbolPaths), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataSymbolFields.IgnoreOffsets), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataSymbolFields.IgnoreLengths), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataSymbolFields.RetainOffsets), IntermediateFieldType.String),
19 },
20 - typeof(TargetFilesOptionalDataTuple));
20 + typeof(TargetFilesOptionalDataSymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 - public enum TargetFilesOptionalDataTupleFields
26 + public enum TargetFilesOptionalDataSymbolFields
27 {
28 Target,
29 FTK,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
33 RetainOffsets,
34 }
35
36 - public class TargetFilesOptionalDataTuple : IntermediateTuple
36 + public class TargetFilesOptionalDataSymbol : IntermediateSymbol
37 {
38 - public TargetFilesOptionalDataTuple() : base(TupleDefinitions.TargetFilesOptionalData, null, null)
38 + public TargetFilesOptionalDataSymbol() : base(SymbolDefinitions.TargetFilesOptionalData, null, null)
39 {
40 }
41
42 - public TargetFilesOptionalDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TargetFilesOptionalData, sourceLineNumber, id)
42 + public TargetFilesOptionalDataSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.TargetFilesOptionalData, sourceLineNumber, id)
43 {
44 }
45
46 - public IntermediateField this[TargetFilesOptionalDataTupleFields index] => this.Fields[(int)index];
46 + public IntermediateField this[TargetFilesOptionalDataSymbolFields index] => this.Fields[(int)index];
47
48 public string Target
49 {
50 - get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.Target];
51 - set => this.Set((int)TargetFilesOptionalDataTupleFields.Target, value);
50 + get => (string)this.Fields[(int)TargetFilesOptionalDataSymbolFields.Target];
51 + set => this.Set((int)TargetFilesOptionalDataSymbolFields.Target, value);
52 }
53
54 public string FTK
55 {
56 - get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.FTK];
57 - set => this.Set((int)TargetFilesOptionalDataTupleFields.FTK, value);
56 + get => (string)this.Fields[(int)TargetFilesOptionalDataSymbolFields.FTK];
57 + set => this.Set((int)TargetFilesOptionalDataSymbolFields.FTK, value);
58 }
59
60 public string SymbolPaths
61 {
62 - get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.SymbolPaths];
63 - set => this.Set((int)TargetFilesOptionalDataTupleFields.SymbolPaths, value);
62 + get => (string)this.Fields[(int)TargetFilesOptionalDataSymbolFields.SymbolPaths];
63 + set => this.Set((int)TargetFilesOptionalDataSymbolFields.SymbolPaths, value);
64 }
65
66 public string IgnoreOffsets
67 {
68 - get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.IgnoreOffsets];
69 - set => this.Set((int)TargetFilesOptionalDataTupleFields.IgnoreOffsets, value);
68 + get => (string)this.Fields[(int)TargetFilesOptionalDataSymbolFields.IgnoreOffsets];
69 + set => this.Set((int)TargetFilesOptionalDataSymbolFields.IgnoreOffsets, value);
70 }
71
72 public string IgnoreLengths
73 {
74 - get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.IgnoreLengths];
75 - set => this.Set((int)TargetFilesOptionalDataTupleFields.IgnoreLengths, value);
74 + get => (string)this.Fields[(int)TargetFilesOptionalDataSymbolFields.IgnoreLengths];
75 + set => this.Set((int)TargetFilesOptionalDataSymbolFields.IgnoreLengths, value);
76 }
77
78 public string RetainOffsets
79 {
80 - get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.RetainOffsets];
81 - set => this.Set((int)TargetFilesOptionalDataTupleFields.RetainOffsets, value);
80 + get => (string)this.Fields[(int)TargetFilesOptionalDataSymbolFields.RetainOffsets];
81 + set => this.Set((int)TargetFilesOptionalDataSymbolFields.RetainOffsets, value);
82 }
83 }
84 }
\ No newline at end of file
src/WixToolset.Data/Tuples/TargetImagesTuple.cs
+32 -32
@@ -2,29 +2,29 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition TargetImages = new IntermediateTupleDefinition(
10 - TupleDefinitionType.TargetImages,
9 + public static readonly IntermediateSymbolDefinition TargetImages = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.TargetImages,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.Target), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.MsiPath), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.SymbolPaths), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.Upgraded), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.Order), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.ProductValidateFlags), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.IgnoreMissingSrcFiles), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(TargetImagesSymbolFields.Target), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(TargetImagesSymbolFields.MsiPath), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(TargetImagesSymbolFields.SymbolPaths), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(TargetImagesSymbolFields.Upgraded), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(TargetImagesSymbolFields.Order), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(TargetImagesSymbolFields.ProductValidateFlags), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(TargetImagesSymbolFields.IgnoreMissingSrcFiles), IntermediateFieldType.Bool),
20 },
21 - typeof(TargetImagesTuple));
21 + typeof(TargetImagesSymbol));
22 }
23 }
24
25 -namespace WixToolset.Data.Tuples
25 +namespace WixToolset.Data.Symbols
26 {
27 - public enum TargetImagesTupleFields
27 + public enum TargetImagesSymbolFields
28 {
29 Target,
30 MsiPath,
@@ -35,58 +35,58 @@ namespace WixToolset.Data.Tuples
35 IgnoreMissingSrcFiles,
36 }
37
38 - public class TargetImagesTuple : IntermediateTuple
38 + public class TargetImagesSymbol : IntermediateSymbol
39 {
40 - public TargetImagesTuple() : base(TupleDefinitions.TargetImages, null, null)
40 + public TargetImagesSymbol() : base(SymbolDefinitions.TargetImages, null, null)
41 {
42 }
43
44 - public TargetImagesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TargetImages, sourceLineNumber, id)
44 + public TargetImagesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.TargetImages, sourceLineNumber, id)
45 {
46 }
47
48 - public IntermediateField this[TargetImagesTupleFields index] => this.Fields[(int)index];
48 + public IntermediateField this[TargetImagesSymbolFields index] => this.Fields[(int)index];
49
50 public string Target
51 {
52 - get => (string)this.Fields[(int)TargetImagesTupleFields.Target];
53 - set => this.Set((int)TargetImagesTupleFields.Target, value);
52 + get => (string)this.Fields[(int)TargetImagesSymbolFields.Target];
53 + set => this.Set((int)TargetImagesSymbolFields.Target, value);
54 }
55
56 public string MsiPath
57 {
58 - get => (string)this.Fields[(int)TargetImagesTupleFields.MsiPath];
59 - set => this.Set((int)TargetImagesTupleFields.MsiPath, value);
58 + get => (string)this.Fields[(int)TargetImagesSymbolFields.MsiPath];
59 + set => this.Set((int)TargetImagesSymbolFields.MsiPath, value);
60 }
61
62 public string SymbolPaths
63 {
64 - get => (string)this.Fields[(int)TargetImagesTupleFields.SymbolPaths];
65 - set => this.Set((int)TargetImagesTupleFields.SymbolPaths, value);
64 + get => (string)this.Fields[(int)TargetImagesSymbolFields.SymbolPaths];
65 + set => this.Set((int)TargetImagesSymbolFields.SymbolPaths, value);
66 }
67
68 public string Upgraded
69 {
70 - get => (string)this.Fields[(int)TargetImagesTupleFields.Upgraded];
71 - set => this.Set((int)TargetImagesTupleFields.Upgraded, value);
70 + get => (string)this.Fields[(int)TargetImagesSymbolFields.Upgraded];
71 + set => this.Set((int)TargetImagesSymbolFields.Upgraded, value);
72 }
73
74 public int Order
75 {
76 - get => (int)this.Fields[(int)TargetImagesTupleFields.Order];
77 - set => this.Set((int)TargetImagesTupleFields.Order, value);
76 + get => (int)this.Fields[(int)TargetImagesSymbolFields.Order];
77 + set => this.Set((int)TargetImagesSymbolFields.Order, value);
78 }
79
80 public string ProductValidateFlags
81 {
82 - get => (string)this.Fields[(int)TargetImagesTupleFields.ProductValidateFlags];
83 - set => this.Set((int)TargetImagesTupleFields.ProductValidateFlags, value);
82 + get => (string)this.Fields[(int)TargetImagesSymbolFields.ProductValidateFlags];
83 + set => this.Set((int)TargetImagesSymbolFields.ProductValidateFlags, value);
84 }
85
86 public bool IgnoreMissingSrcFiles
87 {
88 - get => (bool)this.Fields[(int)TargetImagesTupleFields.IgnoreMissingSrcFiles];
89 - set => this.Set((int)TargetImagesTupleFields.IgnoreMissingSrcFiles, value);
88 + get => (bool)this.Fields[(int)TargetImagesSymbolFields.IgnoreMissingSrcFiles];
89 + set => this.Set((int)TargetImagesSymbolFields.IgnoreMissingSrcFiles, value);
90 }
91 }
92 }
\ No newline at end of file
src/WixToolset.Data/Tuples/TextStyleTuple.cs
+38 -38
@@ -2,31 +2,31 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition TextStyle = new IntermediateTupleDefinition(
10 - TupleDefinitionType.TextStyle,
9 + public static readonly IntermediateSymbolDefinition TextStyle = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.TextStyle,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(TextStyleTupleFields.FaceName), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Size), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Red), IntermediateFieldType.Number),
16 - new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Green), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Blue), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Bold), IntermediateFieldType.Bool),
19 - new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Italic), IntermediateFieldType.Bool),
20 - new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Strike), IntermediateFieldType.Bool),
21 - new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Underline), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.FaceName), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Size), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Red), IntermediateFieldType.Number),
16 + new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Green), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Blue), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Bold), IntermediateFieldType.Bool),
19 + new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Italic), IntermediateFieldType.Bool),
20 + new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Strike), IntermediateFieldType.Bool),
21 + new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Underline), IntermediateFieldType.Bool),
22 },
23 - typeof(TextStyleTuple));
23 + typeof(TextStyleSymbol));
24 }
25 }
26
27 -namespace WixToolset.Data.Tuples
27 +namespace WixToolset.Data.Symbols
28 {
29 - public enum TextStyleTupleFields
29 + public enum TextStyleSymbolFields
30 {
31 FaceName,
32 Size,
@@ -39,70 +39,70 @@ namespace WixToolset.Data.Tuples
39 Underline,
40 }
41
42 - public class TextStyleTuple : IntermediateTuple
42 + public class TextStyleSymbol : IntermediateSymbol
43 {
44 - public TextStyleTuple() : base(TupleDefinitions.TextStyle, null, null)
44 + public TextStyleSymbol() : base(SymbolDefinitions.TextStyle, null, null)
45 {
46 }
47
48 - public TextStyleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TextStyle, sourceLineNumber, id)
48 + public TextStyleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.TextStyle, sourceLineNumber, id)
49 {
50 }
51
52 - public IntermediateField this[TextStyleTupleFields index] => this.Fields[(int)index];
52 + public IntermediateField this[TextStyleSymbolFields index] => this.Fields[(int)index];
53
54 public string FaceName
55 {
56 - get => (string)this.Fields[(int)TextStyleTupleFields.FaceName];
57 - set => this.Set((int)TextStyleTupleFields.FaceName, value);
56 + get => (string)this.Fields[(int)TextStyleSymbolFields.FaceName];
57 + set => this.Set((int)TextStyleSymbolFields.FaceName, value);
58 }
59
60 public int Size
61 {
62 - get => (int)this.Fields[(int)TextStyleTupleFields.Size];
63 - set => this.Set((int)TextStyleTupleFields.Size, value);
62 + get => (int)this.Fields[(int)TextStyleSymbolFields.Size];
63 + set => this.Set((int)TextStyleSymbolFields.Size, value);
64 }
65
66 public int? Red
67 {
68 - get => (int?)this.Fields[(int)TextStyleTupleFields.Red];
69 - set => this.Set((int)TextStyleTupleFields.Red, value);
68 + get => (int?)this.Fields[(int)TextStyleSymbolFields.Red];
69 + set => this.Set((int)TextStyleSymbolFields.Red, value);
70 }
71
72 public int? Green
73 {
74 - get => (int?)this.Fields[(int)TextStyleTupleFields.Green];
75 - set => this.Set((int)TextStyleTupleFields.Green, value);
74 + get => (int?)this.Fields[(int)TextStyleSymbolFields.Green];
75 + set => this.Set((int)TextStyleSymbolFields.Green, value);
76 }
77
78 public int? Blue
79 {
80 - get => (int?)this.Fields[(int)TextStyleTupleFields.Blue];
81 - set => this.Set((int)TextStyleTupleFields.Blue, value);
80 + get => (int?)this.Fields[(int)TextStyleSymbolFields.Blue];
81 + set => this.Set((int)TextStyleSymbolFields.Blue, value);
82 }
83
84 public bool Bold
85 {
86 - get => (bool)this.Fields[(int)TextStyleTupleFields.Bold];
87 - set => this.Set((int)TextStyleTupleFields.Bold, value);
86 + get => (bool)this.Fields[(int)TextStyleSymbolFields.Bold];
87 + set => this.Set((int)TextStyleSymbolFields.Bold, value);
88 }
89
90 public bool Italic
91 {
92 - get => (bool)this.Fields[(int)TextStyleTupleFields.Italic];
93 - set => this.Set((int)TextStyleTupleFields.Italic, value);
92 + get => (bool)this.Fields[(int)TextStyleSymbolFields.Italic];
93 + set => this.Set((int)TextStyleSymbolFields.Italic, value);
94 }
95
96 public bool Strike
97 {
98 - get => (bool)this.Fields[(int)TextStyleTupleFields.Strike];
99 - set => this.Set((int)TextStyleTupleFields.Strike, value);
98 + get => (bool)this.Fields[(int)TextStyleSymbolFields.Strike];
99 + set => this.Set((int)TextStyleSymbolFields.Strike, value);
100 }
101
102 public bool Underline
103 {
104 - get => (bool)this.Fields[(int)TextStyleTupleFields.Underline];
105 - set => this.Set((int)TextStyleTupleFields.Underline, value);
104 + get => (bool)this.Fields[(int)TextStyleSymbolFields.Underline];
105 + set => this.Set((int)TextStyleSymbolFields.Underline, value);
106 }
107 }
108 }
\ No newline at end of file
src/WixToolset.Data/Tuples/TransformsFlags.cs
+1 -1
@@ -1,6 +1,6 @@
1 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3 -namespace WixToolset.Data.Tuples
3 +namespace WixToolset.Data.Symbols
4 {
5 using System;
6
src/WixToolset.Data/Tuples/TupleDefinitions.cs
+355 -355
@@ -4,7 +4,7 @@ namespace WixToolset.Data
4 {
5 using System;
6
7 - public enum TupleDefinitionType
7 + public enum SymbolDefinitionType
8 {
9 SummaryInformation,
10 ActionText,
@@ -185,13 +185,13 @@ namespace WixToolset.Data
185 MustBeFromAnExtension,
186 }
187
188 - public static partial class TupleDefinitions
188 + public static partial class SymbolDefinitions
189 {
190 public static readonly Version Version = new Version("4.0.0");
191
192 - public static IntermediateTupleDefinition ByName(string name)
192 + public static IntermediateSymbolDefinition ByName(string name)
193 {
194 - if (!Enum.TryParse(name, out TupleDefinitionType type) || type == TupleDefinitionType.MustBeFromAnExtension)
194 + if (!Enum.TryParse(name, out SymbolDefinitionType type) || type == SymbolDefinitionType.MustBeFromAnExtension)
195 {
196 return null;
197 }
@@ -199,534 +199,534 @@ namespace WixToolset.Data
199 return ByType(type);
200 }
201
202 - public static IntermediateTupleDefinition ByType(TupleDefinitionType type)
202 + public static IntermediateSymbolDefinition ByType(SymbolDefinitionType type)
203 {
204 switch (type)
205 {
206 - case TupleDefinitionType.SummaryInformation:
207 - return TupleDefinitions.SummaryInformation;
206 + case SymbolDefinitionType.SummaryInformation:
207 + return SymbolDefinitions.SummaryInformation;
208
209 - case TupleDefinitionType.ActionText:
210 - return TupleDefinitions.ActionText;
209 + case SymbolDefinitionType.ActionText:
210 + return SymbolDefinitions.ActionText;
211
212 - case TupleDefinitionType.AppId:
213 - return TupleDefinitions.AppId;
212 + case SymbolDefinitionType.AppId:
213 + return SymbolDefinitions.AppId;
214
215 - case TupleDefinitionType.AppSearch:
216 - return TupleDefinitions.AppSearch;
215 + case SymbolDefinitionType.AppSearch:
216 + return SymbolDefinitions.AppSearch;
217
218 - case TupleDefinitionType.BBControl:
219 - return TupleDefinitions.BBControl;
218 + case SymbolDefinitionType.BBControl:
219 + return SymbolDefinitions.BBControl;
220
221 - case TupleDefinitionType.Billboard:
222 - return TupleDefinitions.Billboard;
221 + case SymbolDefinitionType.Billboard:
222 + return SymbolDefinitions.Billboard;
223
224 - case TupleDefinitionType.Binary:
225 - return TupleDefinitions.Binary;
224 + case SymbolDefinitionType.Binary:
225 + return SymbolDefinitions.Binary;
226
227 - case TupleDefinitionType.CCPSearch:
228 - return TupleDefinitions.CCPSearch;
227 + case SymbolDefinitionType.CCPSearch:
228 + return SymbolDefinitions.CCPSearch;
229
230 - case TupleDefinitionType.CheckBox:
231 - return TupleDefinitions.CheckBox;
230 + case SymbolDefinitionType.CheckBox:
231 + return SymbolDefinitions.CheckBox;
232
233 - case TupleDefinitionType.Class:
234 - return TupleDefinitions.Class;
233 + case SymbolDefinitionType.Class:
234 + return SymbolDefinitions.Class;
235
236 - case TupleDefinitionType.ComboBox:
237 - return TupleDefinitions.ComboBox;
236 + case SymbolDefinitionType.ComboBox:
237 + return SymbolDefinitions.ComboBox;
238
239 - case TupleDefinitionType.CompLocator:
240 - return TupleDefinitions.CompLocator;
239 + case SymbolDefinitionType.CompLocator:
240 + return SymbolDefinitions.CompLocator;
241
242 - case TupleDefinitionType.Complus:
243 - return TupleDefinitions.Complus;
242 + case SymbolDefinitionType.Complus:
243 + return SymbolDefinitions.Complus;
244
245 - case TupleDefinitionType.Component:
246 - return TupleDefinitions.Component;
245 + case SymbolDefinitionType.Component:
246 + return SymbolDefinitions.Component;
247
248 - case TupleDefinitionType.Condition:
249 - return TupleDefinitions.Condition;
248 + case SymbolDefinitionType.Condition:
249 + return SymbolDefinitions.Condition;
250
251 - case TupleDefinitionType.Control:
252 - return TupleDefinitions.Control;
251 + case SymbolDefinitionType.Control:
252 + return SymbolDefinitions.Control;
253
254 - case TupleDefinitionType.ControlCondition:
255 - return TupleDefinitions.ControlCondition;
254 + case SymbolDefinitionType.ControlCondition:
255 + return SymbolDefinitions.ControlCondition;
256
257 - case TupleDefinitionType.ControlEvent:
258 - return TupleDefinitions.ControlEvent;
257 + case SymbolDefinitionType.ControlEvent:
258 + return SymbolDefinitions.ControlEvent;
259
260 - case TupleDefinitionType.CreateFolder:
261 - return TupleDefinitions.CreateFolder;
260 + case SymbolDefinitionType.CreateFolder:
261 + return SymbolDefinitions.CreateFolder;
262
263 - case TupleDefinitionType.CustomAction:
264 - return TupleDefinitions.CustomAction;
263 + case SymbolDefinitionType.CustomAction:
264 + return SymbolDefinitions.CustomAction;
265
266 - case TupleDefinitionType.Dialog:
267 - return TupleDefinitions.Dialog;
266 + case SymbolDefinitionType.Dialog:
267 + return SymbolDefinitions.Dialog;
268
269 - case TupleDefinitionType.Directory:
270 - return TupleDefinitions.Directory;
269 + case SymbolDefinitionType.Directory:
270 + return SymbolDefinitions.Directory;
271
272 - case TupleDefinitionType.DrLocator:
273 - return TupleDefinitions.DrLocator;
272 + case SymbolDefinitionType.DrLocator:
273 + return SymbolDefinitions.DrLocator;
274
275 - case TupleDefinitionType.DuplicateFile:
276 - return TupleDefinitions.DuplicateFile;
275 + case SymbolDefinitionType.DuplicateFile:
276 + return SymbolDefinitions.DuplicateFile;
277
278 - case TupleDefinitionType.Environment:
279 - return TupleDefinitions.Environment;
278 + case SymbolDefinitionType.Environment:
279 + return SymbolDefinitions.Environment;
280
281 - case TupleDefinitionType.Error:
282 - return TupleDefinitions.Error;
281 + case SymbolDefinitionType.Error:
282 + return SymbolDefinitions.Error;
283
284 - case TupleDefinitionType.EventMapping:
285 - return TupleDefinitions.EventMapping;
284 + case SymbolDefinitionType.EventMapping:
285 + return SymbolDefinitions.EventMapping;
286
287 - case TupleDefinitionType.Extension:
288 - return TupleDefinitions.Extension;
287 + case SymbolDefinitionType.Extension:
288 + return SymbolDefinitions.Extension;
289
290 - case TupleDefinitionType.ExternalFiles:
291 - return TupleDefinitions.ExternalFiles;
290 + case SymbolDefinitionType.ExternalFiles:
291 + return SymbolDefinitions.ExternalFiles;
292
293 - case TupleDefinitionType.FamilyFileRanges:
294 - return TupleDefinitions.FamilyFileRanges;
293 + case SymbolDefinitionType.FamilyFileRanges:
294 + return SymbolDefinitions.FamilyFileRanges;
295
296 - case TupleDefinitionType.Feature:
297 - return TupleDefinitions.Feature;
296 + case SymbolDefinitionType.Feature:
297 + return SymbolDefinitions.Feature;
298
299 - case TupleDefinitionType.FeatureComponents:
300 - return TupleDefinitions.FeatureComponents;
299 + case SymbolDefinitionType.FeatureComponents:
300 + return SymbolDefinitions.FeatureComponents;
301
302 - case TupleDefinitionType.File:
303 - return TupleDefinitions.File;
302 + case SymbolDefinitionType.File:
303 + return SymbolDefinitions.File;
304
305 - case TupleDefinitionType.FileSFPCatalog:
306 - return TupleDefinitions.FileSFPCatalog;
305 + case SymbolDefinitionType.FileSFPCatalog:
306 + return SymbolDefinitions.FileSFPCatalog;
307
308 - case TupleDefinitionType.Icon:
309 - return TupleDefinitions.Icon;
308 + case SymbolDefinitionType.Icon:
309 + return SymbolDefinitions.Icon;
310
311 - case TupleDefinitionType.ImageFamilies:
312 - return TupleDefinitions.ImageFamilies;
311 + case SymbolDefinitionType.ImageFamilies:
312 + return SymbolDefinitions.ImageFamilies;
313
314 - case TupleDefinitionType.IniFile:
315 - return TupleDefinitions.IniFile;
314 + case SymbolDefinitionType.IniFile:
315 + return SymbolDefinitions.IniFile;
316
317 - case TupleDefinitionType.IniLocator:
318 - return TupleDefinitions.IniLocator;
317 + case SymbolDefinitionType.IniLocator:
318 + return SymbolDefinitions.IniLocator;
319
320 - case TupleDefinitionType.IsolatedComponent:
321 - return TupleDefinitions.IsolatedComponent;
320 + case SymbolDefinitionType.IsolatedComponent:
321 + return SymbolDefinitions.IsolatedComponent;
322
323 - case TupleDefinitionType.LaunchCondition:
324 - return TupleDefinitions.LaunchCondition;
323 + case SymbolDefinitionType.LaunchCondition:
324 + return SymbolDefinitions.LaunchCondition;
325
326 - case TupleDefinitionType.ListBox:
327 - return TupleDefinitions.ListBox;
326 + case SymbolDefinitionType.ListBox:
327 + return SymbolDefinitions.ListBox;
328
329 - case TupleDefinitionType.ListView:
330 - return TupleDefinitions.ListView;
329 + case SymbolDefinitionType.ListView:
330 + return SymbolDefinitions.ListView;
331
332 - case TupleDefinitionType.LockPermissions:
333 - return TupleDefinitions.LockPermissions;
332 + case SymbolDefinitionType.LockPermissions:
333 + return SymbolDefinitions.LockPermissions;
334
335 - case TupleDefinitionType.Media:
336 - return TupleDefinitions.Media;
335 + case SymbolDefinitionType.Media:
336 + return SymbolDefinitions.Media;
337
338 - case TupleDefinitionType.MIME:
339 - return TupleDefinitions.MIME;
338 + case SymbolDefinitionType.MIME:
339 + return SymbolDefinitions.MIME;
340
341 - case TupleDefinitionType.ModuleComponents:
342 - return TupleDefinitions.ModuleComponents;
341 + case SymbolDefinitionType.ModuleComponents:
342 + return SymbolDefinitions.ModuleComponents;
343
344 - case TupleDefinitionType.ModuleConfiguration:
345 - return TupleDefinitions.ModuleConfiguration;
344 + case SymbolDefinitionType.ModuleConfiguration:
345 + return SymbolDefinitions.ModuleConfiguration;
346
347 - case TupleDefinitionType.ModuleDependency:
348 - return TupleDefinitions.ModuleDependency;
347 + case SymbolDefinitionType.ModuleDependency:
348 + return SymbolDefinitions.ModuleDependency;
349
350 - case TupleDefinitionType.ModuleExclusion:
351 - return TupleDefinitions.ModuleExclusion;
350 + case SymbolDefinitionType.ModuleExclusion:
351 + return SymbolDefinitions.ModuleExclusion;
352
353 - case TupleDefinitionType.ModuleIgnoreTable:
354 - return TupleDefinitions.ModuleIgnoreTable;
353 + case SymbolDefinitionType.ModuleIgnoreTable:
354 + return SymbolDefinitions.ModuleIgnoreTable;
355
356 - case TupleDefinitionType.ModuleSignature:
357 - return TupleDefinitions.ModuleSignature;
356 + case SymbolDefinitionType.ModuleSignature:
357 + return SymbolDefinitions.ModuleSignature;
358
359 - case TupleDefinitionType.ModuleSubstitution:
360 - return TupleDefinitions.ModuleSubstitution;
359 + case SymbolDefinitionType.ModuleSubstitution:
360 + return SymbolDefinitions.ModuleSubstitution;
361
362 - case TupleDefinitionType.MoveFile:
363 - return TupleDefinitions.MoveFile;
362 + case SymbolDefinitionType.MoveFile:
363 + return SymbolDefinitions.MoveFile;
364
365 - case TupleDefinitionType.Assembly:
366 - return TupleDefinitions.Assembly;
365 + case SymbolDefinitionType.Assembly:
366 + return SymbolDefinitions.Assembly;
367
368 - case TupleDefinitionType.MsiAssemblyName:
369 - return TupleDefinitions.MsiAssemblyName;
368 + case SymbolDefinitionType.MsiAssemblyName:
369 + return SymbolDefinitions.MsiAssemblyName;
370
371 - case TupleDefinitionType.MsiDigitalCertificate:
372 - return TupleDefinitions.MsiDigitalCertificate;
371 + case SymbolDefinitionType.MsiDigitalCertificate:
372 + return SymbolDefinitions.MsiDigitalCertificate;
373
374 - case TupleDefinitionType.MsiDigitalSignature:
375 - return TupleDefinitions.MsiDigitalSignature;
374 + case SymbolDefinitionType.MsiDigitalSignature:
375 + return SymbolDefinitions.MsiDigitalSignature;
376
377 - case TupleDefinitionType.MsiEmbeddedChainer:
378 - return TupleDefinitions.MsiEmbeddedChainer;
377 + case SymbolDefinitionType.MsiEmbeddedChainer:
378 + return SymbolDefinitions.MsiEmbeddedChainer;
379
380 - case TupleDefinitionType.MsiEmbeddedUI:
381 - return TupleDefinitions.MsiEmbeddedUI;
380 + case SymbolDefinitionType.MsiEmbeddedUI:
381 + return SymbolDefinitions.MsiEmbeddedUI;
382
383 - case TupleDefinitionType.MsiFileHash:
384 - return TupleDefinitions.MsiFileHash;
383 + case SymbolDefinitionType.MsiFileHash:
384 + return SymbolDefinitions.MsiFileHash;
385
386 - case TupleDefinitionType.MsiLockPermissionsEx:
387 - return TupleDefinitions.MsiLockPermissionsEx;
386 + case SymbolDefinitionType.MsiLockPermissionsEx:
387 + return SymbolDefinitions.MsiLockPermissionsEx;
388
389 - case TupleDefinitionType.MsiPackageCertificate:
390 - return TupleDefinitions.MsiPackageCertificate;
389 + case SymbolDefinitionType.MsiPackageCertificate:
390 + return SymbolDefinitions.MsiPackageCertificate;
391
392 - case TupleDefinitionType.MsiPatchCertificate:
393 - return TupleDefinitions.MsiPatchCertificate;
392 + case SymbolDefinitionType.MsiPatchCertificate:
393 + return SymbolDefinitions.MsiPatchCertificate;
394
395 - case TupleDefinitionType.MsiPatchHeaders:
396 - return TupleDefinitions.MsiPatchHeaders;
395 + case SymbolDefinitionType.MsiPatchHeaders:
396 + return SymbolDefinitions.MsiPatchHeaders;
397
398 - case TupleDefinitionType.MsiPatchMetadata:
399 - return TupleDefinitions.MsiPatchMetadata;
398 + case SymbolDefinitionType.MsiPatchMetadata:
399 + return SymbolDefinitions.MsiPatchMetadata;
400
401 - case TupleDefinitionType.MsiPatchOldAssemblyFile:
402 - return TupleDefinitions.MsiPatchOldAssemblyFile;
401 + case SymbolDefinitionType.MsiPatchOldAssemblyFile:
402 + return SymbolDefinitions.MsiPatchOldAssemblyFile;
403
404 - case TupleDefinitionType.MsiPatchOldAssemblyName:
405 - return TupleDefinitions.MsiPatchOldAssemblyName;
404 + case SymbolDefinitionType.MsiPatchOldAssemblyName:
405 + return SymbolDefinitions.MsiPatchOldAssemblyName;
406
407 - case TupleDefinitionType.MsiPatchSequence:
408 - return TupleDefinitions.MsiPatchSequence;
407 + case SymbolDefinitionType.MsiPatchSequence:
408 + return SymbolDefinitions.MsiPatchSequence;
409
410 - case TupleDefinitionType.MsiServiceConfig:
411 - return TupleDefinitions.MsiServiceConfig;
410 + case SymbolDefinitionType.MsiServiceConfig:
411 + return SymbolDefinitions.MsiServiceConfig;
412
413 - case TupleDefinitionType.MsiServiceConfigFailureActions:
414 - return TupleDefinitions.MsiServiceConfigFailureActions;
413 + case SymbolDefinitionType.MsiServiceConfigFailureActions:
414 + return SymbolDefinitions.MsiServiceConfigFailureActions;
415
416 - case TupleDefinitionType.MsiShortcutProperty:
417 - return TupleDefinitions.MsiShortcutProperty;
416 + case SymbolDefinitionType.MsiShortcutProperty:
417 + return SymbolDefinitions.MsiShortcutProperty;
418
419 - case TupleDefinitionType.ODBCAttribute:
420 - return TupleDefinitions.ODBCAttribute;
419 + case SymbolDefinitionType.ODBCAttribute:
420 + return SymbolDefinitions.ODBCAttribute;
421
422 - case TupleDefinitionType.ODBCDataSource:
423 - return TupleDefinitions.ODBCDataSource;
422 + case SymbolDefinitionType.ODBCDataSource:
423 + return SymbolDefinitions.ODBCDataSource;
424
425 - case TupleDefinitionType.ODBCDriver:
426 - return TupleDefinitions.ODBCDriver;
425 + case SymbolDefinitionType.ODBCDriver:
426 + return SymbolDefinitions.ODBCDriver;
427
428 - case TupleDefinitionType.ODBCSourceAttribute:
429 - return TupleDefinitions.ODBCSourceAttribute;
428 + case SymbolDefinitionType.ODBCSourceAttribute:
429 + return SymbolDefinitions.ODBCSourceAttribute;
430
431 - case TupleDefinitionType.ODBCTranslator:
432 - return TupleDefinitions.ODBCTranslator;
431 + case SymbolDefinitionType.ODBCTranslator:
432 + return SymbolDefinitions.ODBCTranslator;
433
434 - case TupleDefinitionType.Patch:
435 - return TupleDefinitions.Patch;
434 + case SymbolDefinitionType.Patch:
435 + return SymbolDefinitions.Patch;
436
437 - case TupleDefinitionType.PatchMetadata:
438 - return TupleDefinitions.PatchMetadata;
437 + case SymbolDefinitionType.PatchMetadata:
438 + return SymbolDefinitions.PatchMetadata;
439
440 - case TupleDefinitionType.PatchPackage:
441 - return TupleDefinitions.PatchPackage;
440 + case SymbolDefinitionType.PatchPackage:
441 + return SymbolDefinitions.PatchPackage;
442
443 - case TupleDefinitionType.PatchSequence:
444 - return TupleDefinitions.PatchSequence;
443 + case SymbolDefinitionType.PatchSequence:
444 + return SymbolDefinitions.PatchSequence;
445
446 - case TupleDefinitionType.ProgId:
447 - return TupleDefinitions.ProgId;
446 + case SymbolDefinitionType.ProgId:
447 + return SymbolDefinitions.ProgId;
448
449 - case TupleDefinitionType.Properties:
450 - return TupleDefinitions.Properties;
449 + case SymbolDefinitionType.Properties:
450 + return SymbolDefinitions.Properties;
451
452 - case TupleDefinitionType.Property:
453 - return TupleDefinitions.Property;
452 + case SymbolDefinitionType.Property:
453 + return SymbolDefinitions.Property;
454
455 - case TupleDefinitionType.PublishComponent:
456 - return TupleDefinitions.PublishComponent;
455 + case SymbolDefinitionType.PublishComponent:
456 + return SymbolDefinitions.PublishComponent;
457
458 - case TupleDefinitionType.ProvidesDependency:
459 - return TupleDefinitions.ProvidesDependency;
458 + case SymbolDefinitionType.ProvidesDependency:
459 + return SymbolDefinitions.ProvidesDependency;
460
461 - case TupleDefinitionType.RadioButton:
462 - return TupleDefinitions.RadioButton;
461 + case SymbolDefinitionType.RadioButton:
462 + return SymbolDefinitions.RadioButton;
463
464 - case TupleDefinitionType.Registry:
465 - return TupleDefinitions.Registry;
464 + case SymbolDefinitionType.Registry:
465 + return SymbolDefinitions.Registry;
466
467 - case TupleDefinitionType.RegLocator:
468 - return TupleDefinitions.RegLocator;
467 + case SymbolDefinitionType.RegLocator:
468 + return SymbolDefinitions.RegLocator;
469
470 - case TupleDefinitionType.RemoveFile:
471 - return TupleDefinitions.RemoveFile;
470 + case SymbolDefinitionType.RemoveFile:
471 + return SymbolDefinitions.RemoveFile;
472
473 - case TupleDefinitionType.RemoveRegistry:
474 - return TupleDefinitions.RemoveRegistry;
473 + case SymbolDefinitionType.RemoveRegistry:
474 + return SymbolDefinitions.RemoveRegistry;
475
476 - case TupleDefinitionType.ReserveCost:
477 - return TupleDefinitions.ReserveCost;
476 + case SymbolDefinitionType.ReserveCost:
477 + return SymbolDefinitions.ReserveCost;
478
479 - case TupleDefinitionType.ServiceControl:
480 - return TupleDefinitions.ServiceControl;
479 + case SymbolDefinitionType.ServiceControl:
480 + return SymbolDefinitions.ServiceControl;
481
482 - case TupleDefinitionType.ServiceInstall:
483 - return TupleDefinitions.ServiceInstall;
482 + case SymbolDefinitionType.ServiceInstall:
483 + return SymbolDefinitions.ServiceInstall;
484
485 - case TupleDefinitionType.SFPCatalog:
486 - return TupleDefinitions.SFPCatalog;
485 + case SymbolDefinitionType.SFPCatalog:
486 + return SymbolDefinitions.SFPCatalog;
487
488 - case TupleDefinitionType.Shortcut:
489 - return TupleDefinitions.Shortcut;
488 + case SymbolDefinitionType.Shortcut:
489 + return SymbolDefinitions.Shortcut;
490
491 - case TupleDefinitionType.Signature:
492 - return TupleDefinitions.Signature;
491 + case SymbolDefinitionType.Signature:
492 + return SymbolDefinitions.Signature;
493
494 - case TupleDefinitionType.TargetFilesOptionalData:
495 - return TupleDefinitions.TargetFilesOptionalData;
494 + case SymbolDefinitionType.TargetFilesOptionalData:
495 + return SymbolDefinitions.TargetFilesOptionalData;
496
497 - case TupleDefinitionType.TargetImages:
498 - return TupleDefinitions.TargetImages;
497 + case SymbolDefinitionType.TargetImages:
498 + return SymbolDefinitions.TargetImages;
499
500 - case TupleDefinitionType.TextStyle:
501 - return TupleDefinitions.TextStyle;
500 + case SymbolDefinitionType.TextStyle:
501 + return SymbolDefinitions.TextStyle;
502
503 - case TupleDefinitionType.TypeLib:
504 - return TupleDefinitions.TypeLib;
503 + case SymbolDefinitionType.TypeLib:
504 + return SymbolDefinitions.TypeLib;
505
506 - case TupleDefinitionType.UIText:
507 - return TupleDefinitions.UIText;
506 + case SymbolDefinitionType.UIText:
507 + return SymbolDefinitions.UIText;
508
509 - case TupleDefinitionType.Upgrade:
510 - return TupleDefinitions.Upgrade;
509 + case SymbolDefinitionType.Upgrade:
510 + return SymbolDefinitions.Upgrade;
511
512 - case TupleDefinitionType.UpgradedFilesOptionalData:
513 - return TupleDefinitions.UpgradedFilesOptionalData;
512 + case SymbolDefinitionType.UpgradedFilesOptionalData:
513 + return SymbolDefinitions.UpgradedFilesOptionalData;
514
515 - case TupleDefinitionType.UpgradedFilesToIgnore:
516 - return TupleDefinitions.UpgradedFilesToIgnore;
515 + case SymbolDefinitionType.UpgradedFilesToIgnore:
516 + return SymbolDefinitions.UpgradedFilesToIgnore;
517
518 - case TupleDefinitionType.UpgradedImages:
519 - return TupleDefinitions.UpgradedImages;
518 + case SymbolDefinitionType.UpgradedImages:
519 + return SymbolDefinitions.UpgradedImages;
520
521 - case TupleDefinitionType.Verb:
522 - return TupleDefinitions.Verb;
521 + case SymbolDefinitionType.Verb:
522 + return SymbolDefinitions.Verb;
523
524 - case TupleDefinitionType.WixAction:
525 - return TupleDefinitions.WixAction;
524 + case SymbolDefinitionType.WixAction:
525 + return SymbolDefinitions.WixAction;
526
527 - case TupleDefinitionType.WixApprovedExeForElevation:
528 - return TupleDefinitions.WixApprovedExeForElevation;
527 + case SymbolDefinitionType.WixApprovedExeForElevation:
528 + return SymbolDefinitions.WixApprovedExeForElevation;
529
530 - case TupleDefinitionType.WixBindUpdatedFiles:
531 - return TupleDefinitions.WixBindUpdatedFiles;
530 + case SymbolDefinitionType.WixBindUpdatedFiles:
531 + return SymbolDefinitions.WixBindUpdatedFiles;
532
533 - case TupleDefinitionType.WixBootstrapperApplication:
534 - return TupleDefinitions.WixBootstrapperApplication;
533 + case SymbolDefinitionType.WixBootstrapperApplication:
534 + return SymbolDefinitions.WixBootstrapperApplication;
535
536 - case TupleDefinitionType.WixBuildInfo:
537 - return TupleDefinitions.WixBuildInfo;
536 + case SymbolDefinitionType.WixBuildInfo:
537 + return SymbolDefinitions.WixBuildInfo;
538
539 - case TupleDefinitionType.WixBundle:
540 - return TupleDefinitions.WixBundle;
539 + case SymbolDefinitionType.WixBundle:
540 + return SymbolDefinitions.WixBundle;
541
542 - case TupleDefinitionType.WixBundleCatalog:
543 - return TupleDefinitions.WixBundleCatalog;
542 + case SymbolDefinitionType.WixBundleCatalog:
543 + return SymbolDefinitions.WixBundleCatalog;
544
545 - case TupleDefinitionType.WixBundleContainer:
546 - return TupleDefinitions.WixBundleContainer;
545 + case SymbolDefinitionType.WixBundleContainer:
546 + return SymbolDefinitions.WixBundleContainer;
547
548 - case TupleDefinitionType.WixBundleCustomData:
549 - return TupleDefinitions.WixBundleCustomData;
548 + case SymbolDefinitionType.WixBundleCustomData:
549 + return SymbolDefinitions.WixBundleCustomData;
550
551 - case TupleDefinitionType.WixBundleCustomDataAttribute:
552 - return TupleDefinitions.WixBundleCustomDataAttribute;
551 + case SymbolDefinitionType.WixBundleCustomDataAttribute:
552 + return SymbolDefinitions.WixBundleCustomDataAttribute;
553
554 - case TupleDefinitionType.WixBundleCustomDataCell:
555 - return TupleDefinitions.WixBundleCustomDataCell;
554 + case SymbolDefinitionType.WixBundleCustomDataCell:
555 + return SymbolDefinitions.WixBundleCustomDataCell;
556
557 - case TupleDefinitionType.WixBundleExtension:
558 - return TupleDefinitions.WixBundleExtension;
557 + case SymbolDefinitionType.WixBundleExtension:
558 + return SymbolDefinitions.WixBundleExtension;
559
560 - case TupleDefinitionType.WixBundleExePackage:
561 - return TupleDefinitions.WixBundleExePackage;
560 + case SymbolDefinitionType.WixBundleExePackage:
561 + return SymbolDefinitions.WixBundleExePackage;
562
563 - case TupleDefinitionType.WixBundleMsiFeature:
564 - return TupleDefinitions.WixBundleMsiFeature;
563 + case SymbolDefinitionType.WixBundleMsiFeature:
564 + return SymbolDefinitions.WixBundleMsiFeature;
565
566 - case TupleDefinitionType.WixBundleMsiPackage:
567 - return TupleDefinitions.WixBundleMsiPackage;
566 + case SymbolDefinitionType.WixBundleMsiPackage:
567 + return SymbolDefinitions.WixBundleMsiPackage;
568
569 - case TupleDefinitionType.WixBundleMsiProperty:
570 - return TupleDefinitions.WixBundleMsiProperty;
569 + case SymbolDefinitionType.WixBundleMsiProperty:
570 + return SymbolDefinitions.WixBundleMsiProperty;
571
572 - case TupleDefinitionType.WixBundleMspPackage:
573 - return TupleDefinitions.WixBundleMspPackage;
572 + case SymbolDefinitionType.WixBundleMspPackage:
573 + return SymbolDefinitions.WixBundleMspPackage;
574
575 - case TupleDefinitionType.WixBundleMsuPackage:
576 - return TupleDefinitions.WixBundleMsuPackage;
575 + case SymbolDefinitionType.WixBundleMsuPackage:
576 + return SymbolDefinitions.WixBundleMsuPackage;
577
578 - case TupleDefinitionType.WixBundlePackage:
579 - return TupleDefinitions.WixBundlePackage;
578 + case SymbolDefinitionType.WixBundlePackage:
579 + return SymbolDefinitions.WixBundlePackage;
580
581 - case TupleDefinitionType.WixBundlePackageCommandLine:
582 - return TupleDefinitions.WixBundlePackageCommandLine;
581 + case SymbolDefinitionType.WixBundlePackageCommandLine:
582 + return SymbolDefinitions.WixBundlePackageCommandLine;
583
584 - case TupleDefinitionType.WixBundlePackageExitCode:
585 - return TupleDefinitions.WixBundlePackageExitCode;
584 + case SymbolDefinitionType.WixBundlePackageExitCode:
585 + return SymbolDefinitions.WixBundlePackageExitCode;
586
587 - case TupleDefinitionType.WixBundlePackageGroup:
588 - return TupleDefinitions.WixBundlePackageGroup;
587 + case SymbolDefinitionType.WixBundlePackageGroup:
588 + return SymbolDefinitions.WixBundlePackageGroup;
589
590 - case TupleDefinitionType.WixBundlePatchTargetCode:
591 - return TupleDefinitions.WixBundlePatchTargetCode;
590 + case SymbolDefinitionType.WixBundlePatchTargetCode:
591 + return SymbolDefinitions.WixBundlePatchTargetCode;
592
593 - case TupleDefinitionType.WixBundlePayload:
594 - return TupleDefinitions.WixBundlePayload;
593 + case SymbolDefinitionType.WixBundlePayload:
594 + return SymbolDefinitions.WixBundlePayload;
595
596 - case TupleDefinitionType.WixBundlePayloadGroup:
597 - return TupleDefinitions.WixBundlePayloadGroup;
596 + case SymbolDefinitionType.WixBundlePayloadGroup:
597 + return SymbolDefinitions.WixBundlePayloadGroup;
598
599 - case TupleDefinitionType.WixBundleRelatedPackage:
600 - return TupleDefinitions.WixBundleRelatedPackage;
599 + case SymbolDefinitionType.WixBundleRelatedPackage:
600 + return SymbolDefinitions.WixBundleRelatedPackage;
601
602 - case TupleDefinitionType.WixBundleRollbackBoundary:
603 - return TupleDefinitions.WixBundleRollbackBoundary;
602 + case SymbolDefinitionType.WixBundleRollbackBoundary:
603 + return SymbolDefinitions.WixBundleRollbackBoundary;
604
605 - case TupleDefinitionType.WixBundleSlipstreamMsp:
606 - return TupleDefinitions.WixBundleSlipstreamMsp;
605 + case SymbolDefinitionType.WixBundleSlipstreamMsp:
606 + return SymbolDefinitions.WixBundleSlipstreamMsp;
607
608 - case TupleDefinitionType.WixBundleUpdate:
609 - return TupleDefinitions.WixBundleUpdate;
608 + case SymbolDefinitionType.WixBundleUpdate:
609 + return SymbolDefinitions.WixBundleUpdate;
610
611 - case TupleDefinitionType.WixBundleVariable:
612 - return TupleDefinitions.WixBundleVariable;
611 + case SymbolDefinitionType.WixBundleVariable:
612 + return SymbolDefinitions.WixBundleVariable;
613
614 - case TupleDefinitionType.WixChain:
615 - return TupleDefinitions.WixChain;
614 + case SymbolDefinitionType.WixChain:
615 + return SymbolDefinitions.WixChain;
616
617 - case TupleDefinitionType.WixChainItem:
618 - return TupleDefinitions.WixChainItem;
617 + case SymbolDefinitionType.WixChainItem:
618 + return SymbolDefinitions.WixChainItem;
619
620 - case TupleDefinitionType.WixComplexReference:
621 - return TupleDefinitions.WixComplexReference;
620 + case SymbolDefinitionType.WixComplexReference:
621 + return SymbolDefinitions.WixComplexReference;
622
623 - case TupleDefinitionType.WixComponentGroup:
624 - return TupleDefinitions.WixComponentGroup;
623 + case SymbolDefinitionType.WixComponentGroup:
624 + return SymbolDefinitions.WixComponentGroup;
625
626 - case TupleDefinitionType.WixComponentSearch:
627 - return TupleDefinitions.WixComponentSearch;
626 + case SymbolDefinitionType.WixComponentSearch:
627 + return SymbolDefinitions.WixComponentSearch;
628
629 - case TupleDefinitionType.WixCustomTable:
630 - return TupleDefinitions.WixCustomTable;
629 + case SymbolDefinitionType.WixCustomTable:
630 + return SymbolDefinitions.WixCustomTable;
631
632 - case TupleDefinitionType.WixCustomTableCell:
633 - return TupleDefinitions.WixCustomTableCell;
632 + case SymbolDefinitionType.WixCustomTableCell:
633 + return SymbolDefinitions.WixCustomTableCell;
634
635 - case TupleDefinitionType.WixCustomTableColumn:
636 - return TupleDefinitions.WixCustomTableColumn;
635 + case SymbolDefinitionType.WixCustomTableColumn:
636 + return SymbolDefinitions.WixCustomTableColumn;
637
638 - case TupleDefinitionType.WixDeltaPatchFile:
639 - return TupleDefinitions.WixDeltaPatchFile;
638 + case SymbolDefinitionType.WixDeltaPatchFile:
639 + return SymbolDefinitions.WixDeltaPatchFile;
640
641 - case TupleDefinitionType.WixDeltaPatchSymbolPaths:
642 - return TupleDefinitions.WixDeltaPatchSymbolPaths;
641 + case SymbolDefinitionType.WixDeltaPatchSymbolPaths:
642 + return SymbolDefinitions.WixDeltaPatchSymbolPaths;
643
644 - case TupleDefinitionType.WixEnsureTable:
645 - return TupleDefinitions.WixEnsureTable;
644 + case SymbolDefinitionType.WixEnsureTable:
645 + return SymbolDefinitions.WixEnsureTable;
646
647 - case TupleDefinitionType.WixFeatureGroup:
648 - return TupleDefinitions.WixFeatureGroup;
647 + case SymbolDefinitionType.WixFeatureGroup:
648 + return SymbolDefinitions.WixFeatureGroup;
649
650 - case TupleDefinitionType.WixFeatureModules:
651 - return TupleDefinitions.WixFeatureModules;
650 + case SymbolDefinitionType.WixFeatureModules:
651 + return SymbolDefinitions.WixFeatureModules;
652
653 - case TupleDefinitionType.WixFileSearch:
654 - return TupleDefinitions.WixFileSearch;
653 + case SymbolDefinitionType.WixFileSearch:
654 + return SymbolDefinitions.WixFileSearch;
655
656 - case TupleDefinitionType.WixFragment:
657 - return TupleDefinitions.WixFragment;
656 + case SymbolDefinitionType.WixFragment:
657 + return SymbolDefinitions.WixFragment;
658
659 - case TupleDefinitionType.WixGroup:
660 - return TupleDefinitions.WixGroup;
659 + case SymbolDefinitionType.WixGroup:
660 + return SymbolDefinitions.WixGroup;
661
662 - case TupleDefinitionType.WixInstanceComponent:
663 - return TupleDefinitions.WixInstanceComponent;
662 + case SymbolDefinitionType.WixInstanceComponent:
663 + return SymbolDefinitions.WixInstanceComponent;
664
665 - case TupleDefinitionType.WixInstanceTransforms:
666 - return TupleDefinitions.WixInstanceTransforms;
665 + case SymbolDefinitionType.WixInstanceTransforms:
666 + return SymbolDefinitions.WixInstanceTransforms;
667
668 - case TupleDefinitionType.WixMediaTemplate:
669 - return TupleDefinitions.WixMediaTemplate;
668 + case SymbolDefinitionType.WixMediaTemplate:
669 + return SymbolDefinitions.WixMediaTemplate;
670
671 - case TupleDefinitionType.WixMerge:
672 - return TupleDefinitions.WixMerge;
671 + case SymbolDefinitionType.WixMerge:
672 + return SymbolDefinitions.WixMerge;
673
674 - case TupleDefinitionType.WixOrdering:
675 - return TupleDefinitions.WixOrdering;
674 + case SymbolDefinitionType.WixOrdering:
675 + return SymbolDefinitions.WixOrdering;
676
677 - case TupleDefinitionType.WixPatchBaseline:
678 - return TupleDefinitions.WixPatchBaseline;
677 + case SymbolDefinitionType.WixPatchBaseline:
678 + return SymbolDefinitions.WixPatchBaseline;
679
680 - case TupleDefinitionType.WixPatchFamilyGroup:
681 - return TupleDefinitions.WixPatchFamilyGroup;
680 + case SymbolDefinitionType.WixPatchFamilyGroup:
681 + return SymbolDefinitions.WixPatchFamilyGroup;
682
683 - case TupleDefinitionType.WixPatchId:
684 - return TupleDefinitions.WixPatchId;
683 + case SymbolDefinitionType.WixPatchId:
684 + return SymbolDefinitions.WixPatchId;
685
686 - case TupleDefinitionType.WixPatchRef:
687 - return TupleDefinitions.WixPatchRef;
686 + case SymbolDefinitionType.WixPatchRef:
687 + return SymbolDefinitions.WixPatchRef;
688
689 - case TupleDefinitionType.WixPatchTarget:
690 - return TupleDefinitions.WixPatchTarget;
689 + case SymbolDefinitionType.WixPatchTarget:
690 + return SymbolDefinitions.WixPatchTarget;
691
692 - case TupleDefinitionType.WixProductSearch:
693 - return TupleDefinitions.WixProductSearch;
692 + case SymbolDefinitionType.WixProductSearch:
693 + return SymbolDefinitions.WixProductSearch;
694
695 - case TupleDefinitionType.WixProperty:
696 - return TupleDefinitions.WixProperty;
695 + case SymbolDefinitionType.WixProperty:
696 + return SymbolDefinitions.WixProperty;
697
698 - case TupleDefinitionType.WixRegistrySearch:
699 - return TupleDefinitions.WixRegistrySearch;
698 + case SymbolDefinitionType.WixRegistrySearch:
699 + return SymbolDefinitions.WixRegistrySearch;
700
701 - case TupleDefinitionType.WixRelatedBundle:
702 - return TupleDefinitions.WixRelatedBundle;
701 + case SymbolDefinitionType.WixRelatedBundle:
702 + return SymbolDefinitions.WixRelatedBundle;
703
704 - case TupleDefinitionType.WixSearch:
705 - return TupleDefinitions.WixSearch;
704 + case SymbolDefinitionType.WixSearch:
705 + return SymbolDefinitions.WixSearch;
706
707 - case TupleDefinitionType.WixSearchRelation:
708 - return TupleDefinitions.WixSearchRelation;
707 + case SymbolDefinitionType.WixSearchRelation:
708 + return SymbolDefinitions.WixSearchRelation;
709
710 - case TupleDefinitionType.WixSetVariable:
711 - return TupleDefinitions.WixSetVariable;
710 + case SymbolDefinitionType.WixSetVariable:
711 + return SymbolDefinitions.WixSetVariable;
712
713 - case TupleDefinitionType.WixSimpleReference:
714 - return TupleDefinitions.WixSimpleReference;
713 + case SymbolDefinitionType.WixSimpleReference:
714 + return SymbolDefinitions.WixSimpleReference;
715
716 - case TupleDefinitionType.WixSuppressAction:
717 - return TupleDefinitions.WixSuppressAction;
716 + case SymbolDefinitionType.WixSuppressAction:
717 + return SymbolDefinitions.WixSuppressAction;
718
719 - case TupleDefinitionType.WixSuppressModularization:
720 - return TupleDefinitions.WixSuppressModularization;
719 + case SymbolDefinitionType.WixSuppressModularization:
720 + return SymbolDefinitions.WixSuppressModularization;
721
722 - case TupleDefinitionType.WixUI:
723 - return TupleDefinitions.WixUI;
722 + case SymbolDefinitionType.WixUI:
723 + return SymbolDefinitions.WixUI;
724
725 - case TupleDefinitionType.WixUpdateRegistration:
726 - return TupleDefinitions.WixUpdateRegistration;
725 + case SymbolDefinitionType.WixUpdateRegistration:
726 + return SymbolDefinitions.WixUpdateRegistration;
727
728 - case TupleDefinitionType.WixVariable:
729 - return TupleDefinitions.WixVariable;
728 + case SymbolDefinitionType.WixVariable:
729 + return SymbolDefinitions.WixVariable;
730
731 default:
732 throw new ArgumentOutOfRangeException(nameof(type));
src/WixToolset.Data/Tuples/TypeLibTuple.cs
+35 -35
@@ -2,30 +2,30 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition TypeLib = new IntermediateTupleDefinition(
10 - TupleDefinitionType.TypeLib,
9 + public static readonly IntermediateSymbolDefinition TypeLib = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.TypeLib,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(TypeLibTupleFields.LibId), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Language), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(TypeLibTupleFields.ComponentRef), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Version), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Description), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(TypeLibTupleFields.DirectoryRef), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(TypeLibTupleFields.FeatureRef), IntermediateFieldType.String),
20 - new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Cost), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.LibId), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.Language), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.ComponentRef), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.Version), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.Description), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.DirectoryRef), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.FeatureRef), IntermediateFieldType.String),
20 + new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.Cost), IntermediateFieldType.Number),
21 },
22 - typeof(TypeLibTuple));
22 + typeof(TypeLibSymbol));
23 }
24 }
25
26 -namespace WixToolset.Data.Tuples
26 +namespace WixToolset.Data.Symbols
27 {
28 - public enum TypeLibTupleFields
28 + public enum TypeLibSymbolFields
29 {
30 LibId,
31 Language,
@@ -37,64 +37,64 @@ namespace WixToolset.Data.Tuples
37 Cost,
38 }
39
40 - public class TypeLibTuple : IntermediateTuple
40 + public class TypeLibSymbol : IntermediateSymbol
41 {
42 - public TypeLibTuple() : base(TupleDefinitions.TypeLib, null, null)
42 + public TypeLibSymbol() : base(SymbolDefinitions.TypeLib, null, null)
43 {
44 }
45
46 - public TypeLibTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TypeLib, sourceLineNumber, id)
46 + public TypeLibSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.TypeLib, sourceLineNumber, id)
47 {
48 }
49
50 - public IntermediateField this[TypeLibTupleFields index] => this.Fields[(int)index];
50 + public IntermediateField this[TypeLibSymbolFields index] => this.Fields[(int)index];
51
52 public string LibId
53 {
54 - get => (string)this.Fields[(int)TypeLibTupleFields.LibId];
55 - set => this.Set((int)TypeLibTupleFields.LibId, value);
54 + get => (string)this.Fields[(int)TypeLibSymbolFields.LibId];
55 + set => this.Set((int)TypeLibSymbolFields.LibId, value);
56 }
57
58 public int Language
59 {
60 - get => (int)this.Fields[(int)TypeLibTupleFields.Language];
61 - set => this.Set((int)TypeLibTupleFields.Language, value);
60 + get => (int)this.Fields[(int)TypeLibSymbolFields.Language];
61 + set => this.Set((int)TypeLibSymbolFields.Language, value);
62 }
63
64 public string ComponentRef
65 {
66 - get => (string)this.Fields[(int)TypeLibTupleFields.ComponentRef];
67 - set => this.Set((int)TypeLibTupleFields.ComponentRef, value);
66 + get => (string)this.Fields[(int)TypeLibSymbolFields.ComponentRef];
67 + set => this.Set((int)TypeLibSymbolFields.ComponentRef, value);
68 }
69
70 public int? Version
71 {
72 - get => (int?)this.Fields[(int)TypeLibTupleFields.Version];
73 - set => this.Set((int)TypeLibTupleFields.Version, value);
72 + get => (int?)this.Fields[(int)TypeLibSymbolFields.Version];
73 + set => this.Set((int)TypeLibSymbolFields.Version, value);
74 }
75
76 public string Description
77 {
78 - get => (string)this.Fields[(int)TypeLibTupleFields.Description];
79 - set => this.Set((int)TypeLibTupleFields.Description, value);
78 + get => (string)this.Fields[(int)TypeLibSymbolFields.Description];
79 + set => this.Set((int)TypeLibSymbolFields.Description, value);
80 }
81
82 public string DirectoryRef
83 {
84 - get => (string)this.Fields[(int)TypeLibTupleFields.DirectoryRef];
85 - set => this.Set((int)TypeLibTupleFields.DirectoryRef, value);
84 + get => (string)this.Fields[(int)TypeLibSymbolFields.DirectoryRef];
85 + set => this.Set((int)TypeLibSymbolFields.DirectoryRef, value);
86 }
87
88 public string FeatureRef
89 {
90 - get => (string)this.Fields[(int)TypeLibTupleFields.FeatureRef];
91 - set => this.Set((int)TypeLibTupleFields.FeatureRef, value);
90 + get => (string)this.Fields[(int)TypeLibSymbolFields.FeatureRef];
91 + set => this.Set((int)TypeLibSymbolFields.FeatureRef, value);
92 }
93
94 public int? Cost
95 {
96 - get => (int?)this.Fields[(int)TypeLibTupleFields.Cost];
97 - set => this.Set((int)TypeLibTupleFields.Cost, value);
96 + get => (int?)this.Fields[(int)TypeLibSymbolFields.Cost];
97 + set => this.Set((int)TypeLibSymbolFields.Cost, value);
98 }
99 }
100 }
src/WixToolset.Data/Tuples/UITextTuple.cs
+14 -14
@@ -2,43 +2,43 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition UIText = new IntermediateTupleDefinition(
10 - TupleDefinitionType.UIText,
9 + public static readonly IntermediateSymbolDefinition UIText = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.UIText,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(UITextTupleFields.Text), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(UITextSymbolFields.Text), IntermediateFieldType.String),
14 },
15 - typeof(UITextTuple));
15 + typeof(UITextSymbol));
16 }
17 }
18
19 -namespace WixToolset.Data.Tuples
19 +namespace WixToolset.Data.Symbols
20 {
21 - public enum UITextTupleFields
21 + public enum UITextSymbolFields
22 {
23 Text,
24 }
25
26 - public class UITextTuple : IntermediateTuple
26 + public class UITextSymbol : IntermediateSymbol
27 {
28 - public UITextTuple() : base(TupleDefinitions.UIText, null, null)
28 + public UITextSymbol() : base(SymbolDefinitions.UIText, null, null)
29 {
30 }
31
32 - public UITextTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UIText, sourceLineNumber, id)
32 + public UITextSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.UIText, sourceLineNumber, id)
33 {
34 }
35
36 - public IntermediateField this[UITextTupleFields index] => this.Fields[(int)index];
36 + public IntermediateField this[UITextSymbolFields index] => this.Fields[(int)index];
37
38 public string Text
39 {
40 - get => (string)this.Fields[(int)UITextTupleFields.Text];
41 - set => this.Set((int)UITextTupleFields.Text, value);
40 + get => (string)this.Fields[(int)UITextSymbolFields.Text];
41 + set => this.Set((int)UITextSymbolFields.Text, value);
42 }
43 }
44 }
src/WixToolset.Data/Tuples/UpgradeTuple.cs
+47 -47
@@ -2,34 +2,34 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Upgrade = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Upgrade,
9 + public static readonly IntermediateSymbolDefinition Upgrade = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Upgrade,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(UpgradeTupleFields.UpgradeCode), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(UpgradeTupleFields.VersionMin), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(UpgradeTupleFields.VersionMax), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(UpgradeTupleFields.Language), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(UpgradeTupleFields.ExcludeLanguages), IntermediateFieldType.Bool),
18 - new IntermediateFieldDefinition(nameof(UpgradeTupleFields.IgnoreRemoveFailures), IntermediateFieldType.Bool),
19 - new IntermediateFieldDefinition(nameof(UpgradeTupleFields.MigrateFeatures), IntermediateFieldType.Bool),
20 - new IntermediateFieldDefinition(nameof(UpgradeTupleFields.OnlyDetect), IntermediateFieldType.Bool),
21 - new IntermediateFieldDefinition(nameof(UpgradeTupleFields.VersionMaxInclusive), IntermediateFieldType.Bool),
22 - new IntermediateFieldDefinition(nameof(UpgradeTupleFields.VersionMinInclusive), IntermediateFieldType.Bool),
23 - new IntermediateFieldDefinition(nameof(UpgradeTupleFields.Remove), IntermediateFieldType.String),
24 - new IntermediateFieldDefinition(nameof(UpgradeTupleFields.ActionProperty), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.UpgradeCode), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.VersionMin), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.VersionMax), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.Language), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.ExcludeLanguages), IntermediateFieldType.Bool),
18 + new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.IgnoreRemoveFailures), IntermediateFieldType.Bool),
19 + new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.MigrateFeatures), IntermediateFieldType.Bool),
20 + new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.OnlyDetect), IntermediateFieldType.Bool),
21 + new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.VersionMaxInclusive), IntermediateFieldType.Bool),
22 + new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.VersionMinInclusive), IntermediateFieldType.Bool),
23 + new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.Remove), IntermediateFieldType.String),
24 + new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.ActionProperty), IntermediateFieldType.String),
25 },
26 - typeof(UpgradeTuple));
26 + typeof(UpgradeSymbol));
27 }
28 }
29
30 -namespace WixToolset.Data.Tuples
30 +namespace WixToolset.Data.Symbols
31 {
32 - public enum UpgradeTupleFields
32 + public enum UpgradeSymbolFields
33 {
34 UpgradeCode,
35 VersionMin,
@@ -45,88 +45,88 @@ namespace WixToolset.Data.Tuples
45 ActionProperty,
46 }
47
48 - public class UpgradeTuple : IntermediateTuple
48 + public class UpgradeSymbol : IntermediateSymbol
49 {
50 - public UpgradeTuple() : base(TupleDefinitions.Upgrade, null, null)
50 + public UpgradeSymbol() : base(SymbolDefinitions.Upgrade, null, null)
51 {
52 }
53
54 - public UpgradeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Upgrade, sourceLineNumber, id)
54 + public UpgradeSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Upgrade, sourceLineNumber, id)
55 {
56 }
57
58 - public IntermediateField this[UpgradeTupleFields index] => this.Fields[(int)index];
58 + public IntermediateField this[UpgradeSymbolFields index] => this.Fields[(int)index];
59
60 public string UpgradeCode
61 {
62 - get => (string)this.Fields[(int)UpgradeTupleFields.UpgradeCode];
63 - set => this.Set((int)UpgradeTupleFields.UpgradeCode, value);
62 + get => (string)this.Fields[(int)UpgradeSymbolFields.UpgradeCode];
63 + set => this.Set((int)UpgradeSymbolFields.UpgradeCode, value);
64 }
65
66 public string VersionMin
67 {
68 - get => (string)this.Fields[(int)UpgradeTupleFields.VersionMin];
69 - set => this.Set((int)UpgradeTupleFields.VersionMin, value);
68 + get => (string)this.Fields[(int)UpgradeSymbolFields.VersionMin];
69 + set => this.Set((int)UpgradeSymbolFields.VersionMin, value);
70 }
71
72 public string VersionMax
73 {
74 - get => (string)this.Fields[(int)UpgradeTupleFields.VersionMax];
75 - set => this.Set((int)UpgradeTupleFields.VersionMax, value);
74 + get => (string)this.Fields[(int)UpgradeSymbolFields.VersionMax];
75 + set => this.Set((int)UpgradeSymbolFields.VersionMax, value);
76 }
77
78 public string Language
79 {
80 - get => (string)this.Fields[(int)UpgradeTupleFields.Language];
81 - set => this.Set((int)UpgradeTupleFields.Language, value);
80 + get => (string)this.Fields[(int)UpgradeSymbolFields.Language];
81 + set => this.Set((int)UpgradeSymbolFields.Language, value);
82 }
83
84 public bool ExcludeLanguages
85 {
86 - get => this.Fields[(int)UpgradeTupleFields.ExcludeLanguages].AsBool();
87 - set => this.Set((int)UpgradeTupleFields.ExcludeLanguages, value);
86 + get => this.Fields[(int)UpgradeSymbolFields.ExcludeLanguages].AsBool();
87 + set => this.Set((int)UpgradeSymbolFields.ExcludeLanguages, value);
88 }
89
90 public bool IgnoreRemoveFailures
91 {
92 - get => this.Fields[(int)UpgradeTupleFields.IgnoreRemoveFailures].AsBool();
93 - set => this.Set((int)UpgradeTupleFields.IgnoreRemoveFailures, value);
92 + get => this.Fields[(int)UpgradeSymbolFields.IgnoreRemoveFailures].AsBool();
93 + set => this.Set((int)UpgradeSymbolFields.IgnoreRemoveFailures, value);
94 }
95
96 public bool MigrateFeatures
97 {
98 - get => this.Fields[(int)UpgradeTupleFields.MigrateFeatures].AsBool();
99 - set => this.Set((int)UpgradeTupleFields.MigrateFeatures, value);
98 + get => this.Fields[(int)UpgradeSymbolFields.MigrateFeatures].AsBool();
99 + set => this.Set((int)UpgradeSymbolFields.MigrateFeatures, value);
100 }
101
102 public bool OnlyDetect
103 {
104 - get => this.Fields[(int)UpgradeTupleFields.OnlyDetect].AsBool();
105 - set => this.Set((int)UpgradeTupleFields.OnlyDetect, value);
104 + get => this.Fields[(int)UpgradeSymbolFields.OnlyDetect].AsBool();
105 + set => this.Set((int)UpgradeSymbolFields.OnlyDetect, value);
106 }
107
108 public bool VersionMaxInclusive
109 {
110 - get => this.Fields[(int)UpgradeTupleFields.VersionMaxInclusive].AsBool();
111 - set => this.Set((int)UpgradeTupleFields.VersionMaxInclusive, value);
110 + get => this.Fields[(int)UpgradeSymbolFields.VersionMaxInclusive].AsBool();
111 + set => this.Set((int)UpgradeSymbolFields.VersionMaxInclusive, value);
112 }
113
114 public bool VersionMinInclusive
115 {
116 - get => this.Fields[(int)UpgradeTupleFields.VersionMinInclusive].AsBool();
117 - set => this.Set((int)UpgradeTupleFields.VersionMinInclusive, value);
116 + get => this.Fields[(int)UpgradeSymbolFields.VersionMinInclusive].AsBool();
117 + set => this.Set((int)UpgradeSymbolFields.VersionMinInclusive, value);
118 }
119
120 public string Remove
121 {
122 - get => (string)this.Fields[(int)UpgradeTupleFields.Remove];
123 - set => this.Set((int)UpgradeTupleFields.Remove, value);
122 + get => (string)this.Fields[(int)UpgradeSymbolFields.Remove];
123 + set => this.Set((int)UpgradeSymbolFields.Remove, value);
124 }
125
126 public string ActionProperty
127 {
128 - get => (string)this.Fields[(int)UpgradeTupleFields.ActionProperty];
129 - set => this.Set((int)UpgradeTupleFields.ActionProperty, value);
128 + get => (string)this.Fields[(int)UpgradeSymbolFields.ActionProperty];
129 + set => this.Set((int)UpgradeSymbolFields.ActionProperty, value);
130 }
131 }
132 }
\ No newline at end of file
src/WixToolset.Data/Tuples/UpgradedFilesOptionalDataTuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition UpgradedFilesOptionalData = new IntermediateTupleDefinition(
10 - TupleDefinitionType.UpgradedFilesOptionalData,
9 + public static readonly IntermediateSymbolDefinition UpgradedFilesOptionalData = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.UpgradedFilesOptionalData,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.Upgraded), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.FTK), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.SymbolPaths), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError), IntermediateFieldType.Bool),
17 - new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.IncludeWholeFile), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataSymbolFields.Upgraded), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataSymbolFields.FTK), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataSymbolFields.SymbolPaths), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataSymbolFields.AllowIgnoreOnPatchError), IntermediateFieldType.Bool),
17 + new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataSymbolFields.IncludeWholeFile), IntermediateFieldType.Bool),
18 },
19 - typeof(UpgradedFilesOptionalDataTuple));
19 + typeof(UpgradedFilesOptionalDataSymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum UpgradedFilesOptionalDataTupleFields
25 + public enum UpgradedFilesOptionalDataSymbolFields
26 {
27 Upgraded,
28 FTK,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
31 IncludeWholeFile,
32 }
33
34 - public class UpgradedFilesOptionalDataTuple : IntermediateTuple
34 + public class UpgradedFilesOptionalDataSymbol : IntermediateSymbol
35 {
36 - public UpgradedFilesOptionalDataTuple() : base(TupleDefinitions.UpgradedFilesOptionalData, null, null)
36 + public UpgradedFilesOptionalDataSymbol() : base(SymbolDefinitions.UpgradedFilesOptionalData, null, null)
37 {
38 }
39
40 - public UpgradedFilesOptionalDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UpgradedFilesOptionalData, sourceLineNumber, id)
40 + public UpgradedFilesOptionalDataSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.UpgradedFilesOptionalData, sourceLineNumber, id)
41 {
42 }
43
44 - public IntermediateField this[UpgradedFilesOptionalDataTupleFields index] => this.Fields[(int)index];
44 + public IntermediateField this[UpgradedFilesOptionalDataSymbolFields index] => this.Fields[(int)index];
45
46 public string Upgraded
47 {
48 - get => (string)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.Upgraded];
49 - set => this.Set((int)UpgradedFilesOptionalDataTupleFields.Upgraded, value);
48 + get => (string)this.Fields[(int)UpgradedFilesOptionalDataSymbolFields.Upgraded];
49 + set => this.Set((int)UpgradedFilesOptionalDataSymbolFields.Upgraded, value);
50 }
51
52 public string FTK
53 {
54 - get => (string)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.FTK];
55 - set => this.Set((int)UpgradedFilesOptionalDataTupleFields.FTK, value);
54 + get => (string)this.Fields[(int)UpgradedFilesOptionalDataSymbolFields.FTK];
55 + set => this.Set((int)UpgradedFilesOptionalDataSymbolFields.FTK, value);
56 }
57
58 public string SymbolPaths
59 {
60 - get => (string)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.SymbolPaths];
61 - set => this.Set((int)UpgradedFilesOptionalDataTupleFields.SymbolPaths, value);
60 + get => (string)this.Fields[(int)UpgradedFilesOptionalDataSymbolFields.SymbolPaths];
61 + set => this.Set((int)UpgradedFilesOptionalDataSymbolFields.SymbolPaths, value);
62 }
63
64 public bool? AllowIgnoreOnPatchError
65 {
66 - get => (bool?)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError];
67 - set => this.Set((int)UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError, value);
66 + get => (bool?)this.Fields[(int)UpgradedFilesOptionalDataSymbolFields.AllowIgnoreOnPatchError];
67 + set => this.Set((int)UpgradedFilesOptionalDataSymbolFields.AllowIgnoreOnPatchError, value);
68 }
69
70 public bool? IncludeWholeFile
71 {
72 - get => (bool?)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.IncludeWholeFile];
73 - set => this.Set((int)UpgradedFilesOptionalDataTupleFields.IncludeWholeFile, value);
72 + get => (bool?)this.Fields[(int)UpgradedFilesOptionalDataSymbolFields.IncludeWholeFile];
73 + set => this.Set((int)UpgradedFilesOptionalDataSymbolFields.IncludeWholeFile, value);
74 }
75 }
76 }
src/WixToolset.Data/Tuples/UpgradedFilesToIgnoreTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition UpgradedFilesToIgnore = new IntermediateTupleDefinition(
10 - TupleDefinitionType.UpgradedFilesToIgnore,
9 + public static readonly IntermediateSymbolDefinition UpgradedFilesToIgnore = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.UpgradedFilesToIgnore,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(UpgradedFilesToIgnoreTupleFields.Upgraded), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(UpgradedFilesToIgnoreTupleFields.FTK), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(UpgradedFilesToIgnoreSymbolFields.Upgraded), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(UpgradedFilesToIgnoreSymbolFields.FTK), IntermediateFieldType.String),
15 },
16 - typeof(UpgradedFilesToIgnoreTuple));
16 + typeof(UpgradedFilesToIgnoreSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum UpgradedFilesToIgnoreTupleFields
22 + public enum UpgradedFilesToIgnoreSymbolFields
23 {
24 Upgraded,
25 FTK,
26 }
27
28 - public class UpgradedFilesToIgnoreTuple : IntermediateTuple
28 + public class UpgradedFilesToIgnoreSymbol : IntermediateSymbol
29 {
30 - public UpgradedFilesToIgnoreTuple() : base(TupleDefinitions.UpgradedFilesToIgnore, null, null)
30 + public UpgradedFilesToIgnoreSymbol() : base(SymbolDefinitions.UpgradedFilesToIgnore, null, null)
31 {
32 }
33
34 - public UpgradedFilesToIgnoreTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UpgradedFilesToIgnore, sourceLineNumber, id)
34 + public UpgradedFilesToIgnoreSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.UpgradedFilesToIgnore, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[UpgradedFilesToIgnoreTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[UpgradedFilesToIgnoreSymbolFields index] => this.Fields[(int)index];
39
40 public string Upgraded
41 {
42 - get => (string)this.Fields[(int)UpgradedFilesToIgnoreTupleFields.Upgraded];
43 - set => this.Set((int)UpgradedFilesToIgnoreTupleFields.Upgraded, value);
42 + get => (string)this.Fields[(int)UpgradedFilesToIgnoreSymbolFields.Upgraded];
43 + set => this.Set((int)UpgradedFilesToIgnoreSymbolFields.Upgraded, value);
44 }
45
46 public string FTK
47 {
48 - get => (string)this.Fields[(int)UpgradedFilesToIgnoreTupleFields.FTK];
49 - set => this.Set((int)UpgradedFilesToIgnoreTupleFields.FTK, value);
48 + get => (string)this.Fields[(int)UpgradedFilesToIgnoreSymbolFields.FTK];
49 + set => this.Set((int)UpgradedFilesToIgnoreSymbolFields.FTK, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/UpgradedImagesTuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition UpgradedImages = new IntermediateTupleDefinition(
10 - TupleDefinitionType.UpgradedImages,
9 + public static readonly IntermediateSymbolDefinition UpgradedImages = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.UpgradedImages,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(UpgradedImagesTupleFields.Upgraded), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(UpgradedImagesTupleFields.MsiPath), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(UpgradedImagesTupleFields.PatchMsiPath), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(UpgradedImagesTupleFields.SymbolPaths), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(UpgradedImagesTupleFields.Family), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(UpgradedImagesSymbolFields.Upgraded), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(UpgradedImagesSymbolFields.MsiPath), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(UpgradedImagesSymbolFields.PatchMsiPath), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(UpgradedImagesSymbolFields.SymbolPaths), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(UpgradedImagesSymbolFields.Family), IntermediateFieldType.String),
18 },
19 - typeof(UpgradedImagesTuple));
19 + typeof(UpgradedImagesSymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum UpgradedImagesTupleFields
25 + public enum UpgradedImagesSymbolFields
26 {
27 Upgraded,
28 MsiPath,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
31 Family,
32 }
33
34 - public class UpgradedImagesTuple : IntermediateTuple
34 + public class UpgradedImagesSymbol : IntermediateSymbol
35 {
36 - public UpgradedImagesTuple() : base(TupleDefinitions.UpgradedImages, null, null)
36 + public UpgradedImagesSymbol() : base(SymbolDefinitions.UpgradedImages, null, null)
37 {
38 }
39
40 - public UpgradedImagesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UpgradedImages, sourceLineNumber, id)
40 + public UpgradedImagesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.UpgradedImages, sourceLineNumber, id)
41 {
42 }
43
44 - public IntermediateField this[UpgradedImagesTupleFields index] => this.Fields[(int)index];
44 + public IntermediateField this[UpgradedImagesSymbolFields index] => this.Fields[(int)index];
45
46 public string Upgraded
47 {
48 - get => (string)this.Fields[(int)UpgradedImagesTupleFields.Upgraded];
49 - set => this.Set((int)UpgradedImagesTupleFields.Upgraded, value);
48 + get => (string)this.Fields[(int)UpgradedImagesSymbolFields.Upgraded];
49 + set => this.Set((int)UpgradedImagesSymbolFields.Upgraded, value);
50 }
51
52 public string MsiPath
53 {
54 - get => (string)this.Fields[(int)UpgradedImagesTupleFields.MsiPath];
55 - set => this.Set((int)UpgradedImagesTupleFields.MsiPath, value);
54 + get => (string)this.Fields[(int)UpgradedImagesSymbolFields.MsiPath];
55 + set => this.Set((int)UpgradedImagesSymbolFields.MsiPath, value);
56 }
57
58 public string PatchMsiPath
59 {
60 - get => (string)this.Fields[(int)UpgradedImagesTupleFields.PatchMsiPath];
61 - set => this.Set((int)UpgradedImagesTupleFields.PatchMsiPath, value);
60 + get => (string)this.Fields[(int)UpgradedImagesSymbolFields.PatchMsiPath];
61 + set => this.Set((int)UpgradedImagesSymbolFields.PatchMsiPath, value);
62 }
63
64 public string SymbolPaths
65 {
66 - get => (string)this.Fields[(int)UpgradedImagesTupleFields.SymbolPaths];
67 - set => this.Set((int)UpgradedImagesTupleFields.SymbolPaths, value);
66 + get => (string)this.Fields[(int)UpgradedImagesSymbolFields.SymbolPaths];
67 + set => this.Set((int)UpgradedImagesSymbolFields.SymbolPaths, value);
68 }
69
70 public string Family
71 {
72 - get => (string)this.Fields[(int)UpgradedImagesTupleFields.Family];
73 - set => this.Set((int)UpgradedImagesTupleFields.Family, value);
72 + get => (string)this.Fields[(int)UpgradedImagesSymbolFields.Family];
73 + set => this.Set((int)UpgradedImagesSymbolFields.Family, value);
74 }
75 }
76 }
\ No newline at end of file
src/WixToolset.Data/Tuples/VerbTuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition Verb = new IntermediateTupleDefinition(
10 - TupleDefinitionType.Verb,
9 + public static readonly IntermediateSymbolDefinition Verb = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.Verb,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(VerbTupleFields.ExtensionRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(VerbTupleFields.Verb), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(VerbTupleFields.Sequence), IntermediateFieldType.Number),
16 - new IntermediateFieldDefinition(nameof(VerbTupleFields.Command), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(VerbTupleFields.Argument), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(VerbSymbolFields.ExtensionRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(VerbSymbolFields.Verb), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(VerbSymbolFields.Sequence), IntermediateFieldType.Number),
16 + new IntermediateFieldDefinition(nameof(VerbSymbolFields.Command), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(VerbSymbolFields.Argument), IntermediateFieldType.String),
18 },
19 - typeof(VerbTuple));
19 + typeof(VerbSymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum VerbTupleFields
25 + public enum VerbSymbolFields
26 {
27 ExtensionRef,
28 Verb,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
31 Argument,
32 }
33
34 - public class VerbTuple : IntermediateTuple
34 + public class VerbSymbol : IntermediateSymbol
35 {
36 - public VerbTuple() : base(TupleDefinitions.Verb, null, null)
36 + public VerbSymbol() : base(SymbolDefinitions.Verb, null, null)
37 {
38 }
39
40 - public VerbTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Verb, sourceLineNumber, id)
40 + public VerbSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Verb, sourceLineNumber, id)
41 {
42 }
43
44 - public IntermediateField this[VerbTupleFields index] => this.Fields[(int)index];
44 + public IntermediateField this[VerbSymbolFields index] => this.Fields[(int)index];
45
46 public string ExtensionRef
47 {
48 - get => (string)this.Fields[(int)VerbTupleFields.ExtensionRef];
49 - set => this.Set((int)VerbTupleFields.ExtensionRef, value);
48 + get => (string)this.Fields[(int)VerbSymbolFields.ExtensionRef];
49 + set => this.Set((int)VerbSymbolFields.ExtensionRef, value);
50 }
51
52 public string Verb
53 {
54 - get => (string)this.Fields[(int)VerbTupleFields.Verb];
55 - set => this.Set((int)VerbTupleFields.Verb, value);
54 + get => (string)this.Fields[(int)VerbSymbolFields.Verb];
55 + set => this.Set((int)VerbSymbolFields.Verb, value);
56 }
57
58 public int? Sequence
59 {
60 - get => (int?)this.Fields[(int)VerbTupleFields.Sequence];
61 - set => this.Set((int)VerbTupleFields.Sequence, value);
60 + get => (int?)this.Fields[(int)VerbSymbolFields.Sequence];
61 + set => this.Set((int)VerbSymbolFields.Sequence, value);
62 }
63
64 public string Command
65 {
66 - get => (string)this.Fields[(int)VerbTupleFields.Command];
67 - set => this.Set((int)VerbTupleFields.Command, value);
66 + get => (string)this.Fields[(int)VerbSymbolFields.Command];
67 + set => this.Set((int)VerbSymbolFields.Command, value);
68 }
69
70 public string Argument
71 {
72 - get => (string)this.Fields[(int)VerbTupleFields.Argument];
73 - set => this.Set((int)VerbTupleFields.Argument, value);
72 + get => (string)this.Fields[(int)VerbSymbolFields.Argument];
73 + set => this.Set((int)VerbSymbolFields.Argument, value);
74 }
75 }
76 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixActionTuple.cs
+32 -32
@@ -2,29 +2,29 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixAction = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixAction,
9 + public static readonly IntermediateSymbolDefinition WixAction = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixAction,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixActionTupleFields.SequenceTable), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(WixActionTupleFields.Action), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixActionTupleFields.Condition), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixActionTupleFields.Sequence), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(WixActionTupleFields.Before), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(WixActionTupleFields.After), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(WixActionTupleFields.Overridable), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(WixActionSymbolFields.SequenceTable), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(WixActionSymbolFields.Action), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixActionSymbolFields.Condition), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixActionSymbolFields.Sequence), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(WixActionSymbolFields.Before), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(WixActionSymbolFields.After), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(WixActionSymbolFields.Overridable), IntermediateFieldType.Bool),
20 },
21 - typeof(WixActionTuple));
21 + typeof(WixActionSymbol));
22 }
23 }
24
25 -namespace WixToolset.Data.Tuples
25 +namespace WixToolset.Data.Symbols
26 {
27 - public enum WixActionTupleFields
27 + public enum WixActionSymbolFields
28 {
29 SequenceTable,
30 Action,
@@ -44,58 +44,58 @@ namespace WixToolset.Data.Tuples
44 InstallExecuteSequence
45 }
46
47 - public class WixActionTuple : IntermediateTuple
47 + public class WixActionSymbol : IntermediateSymbol
48 {
49 - public WixActionTuple() : base(TupleDefinitions.WixAction, null, null)
49 + public WixActionSymbol() : base(SymbolDefinitions.WixAction, null, null)
50 {
51 }
52
53 - public WixActionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixAction, sourceLineNumber, id)
53 + public WixActionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixAction, sourceLineNumber, id)
54 {
55 }
56
57 - public IntermediateField this[WixActionTupleFields index] => this.Fields[(int)index];
57 + public IntermediateField this[WixActionSymbolFields index] => this.Fields[(int)index];
58
59 public SequenceTable SequenceTable
60 {
61 - get => (SequenceTable)this.Fields[(int)WixActionTupleFields.SequenceTable].AsNumber();
62 - set => this.Set((int)WixActionTupleFields.SequenceTable, (int)value);
61 + get => (SequenceTable)this.Fields[(int)WixActionSymbolFields.SequenceTable].AsNumber();
62 + set => this.Set((int)WixActionSymbolFields.SequenceTable, (int)value);
63 }
64
65 public string Action
66 {
67 - get => (string)this.Fields[(int)WixActionTupleFields.Action];
68 - set => this.Set((int)WixActionTupleFields.Action, value);
67 + get => (string)this.Fields[(int)WixActionSymbolFields.Action];
68 + set => this.Set((int)WixActionSymbolFields.Action, value);
69 }
70
71 public string Condition
72 {
73 - get => (string)this.Fields[(int)WixActionTupleFields.Condition];
74 - set => this.Set((int)WixActionTupleFields.Condition, value);
73 + get => (string)this.Fields[(int)WixActionSymbolFields.Condition];
74 + set => this.Set((int)WixActionSymbolFields.Condition, value);
75 }
76
77 public int? Sequence
78 {
79 - get => (int?)this.Fields[(int)WixActionTupleFields.Sequence];
80 - set => this.Set((int)WixActionTupleFields.Sequence, value);
79 + get => (int?)this.Fields[(int)WixActionSymbolFields.Sequence];
80 + set => this.Set((int)WixActionSymbolFields.Sequence, value);
81 }
82
83 public string Before
84 {
85 - get => (string)this.Fields[(int)WixActionTupleFields.Before];
86 - set => this.Set((int)WixActionTupleFields.Before, value);
85 + get => (string)this.Fields[(int)WixActionSymbolFields.Before];
86 + set => this.Set((int)WixActionSymbolFields.Before, value);
87 }
88
89 public string After
90 {
91 - get => (string)this.Fields[(int)WixActionTupleFields.After];
92 - set => this.Set((int)WixActionTupleFields.After, value);
91 + get => (string)this.Fields[(int)WixActionSymbolFields.After];
92 + set => this.Set((int)WixActionSymbolFields.After, value);
93 }
94
95 public bool Overridable
96 {
97 - get => this.Fields[(int)WixActionTupleFields.Overridable].AsBool();
98 - set => this.Set((int)WixActionTupleFields.Overridable, value);
97 + get => this.Fields[(int)WixActionSymbolFields.Overridable].AsBool();
98 + set => this.Set((int)WixActionSymbolFields.Overridable, value);
99 }
100 }
101 }
src/WixToolset.Data/Tuples/WixApprovedExeForElevationTuple.cs
+20 -20
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixApprovedExeForElevation = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixApprovedExeForElevation,
9 + public static readonly IntermediateSymbolDefinition WixApprovedExeForElevation = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixApprovedExeForElevation,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationTupleFields.Key), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationTupleFields.ValueName), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationTupleFields.Attributes), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationSymbolFields.Key), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationSymbolFields.ValueName), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationSymbolFields.Attributes), IntermediateFieldType.Number),
16 },
17 - typeof(WixApprovedExeForElevationTuple));
17 + typeof(WixApprovedExeForElevationSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 using System;
24
25 - public enum WixApprovedExeForElevationTupleFields
25 + public enum WixApprovedExeForElevationSymbolFields
26 {
27 Key,
28 ValueName,
@@ -36,34 +36,34 @@ namespace WixToolset.Data.Tuples
36 Win64 = 0x1,
37 }
38
39 - public class WixApprovedExeForElevationTuple : IntermediateTuple
39 + public class WixApprovedExeForElevationSymbol : IntermediateSymbol
40 {
41 - public WixApprovedExeForElevationTuple() : base(TupleDefinitions.WixApprovedExeForElevation, null, null)
41 + public WixApprovedExeForElevationSymbol() : base(SymbolDefinitions.WixApprovedExeForElevation, null, null)
42 {
43 }
44
45 - public WixApprovedExeForElevationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixApprovedExeForElevation, sourceLineNumber, id)
45 + public WixApprovedExeForElevationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixApprovedExeForElevation, sourceLineNumber, id)
46 {
47 }
48
49 - public IntermediateField this[WixApprovedExeForElevationTupleFields index] => this.Fields[(int)index];
49 + public IntermediateField this[WixApprovedExeForElevationSymbolFields index] => this.Fields[(int)index];
50
51 public string Key
52 {
53 - get => (string)this.Fields[(int)WixApprovedExeForElevationTupleFields.Key];
54 - set => this.Set((int)WixApprovedExeForElevationTupleFields.Key, value);
53 + get => (string)this.Fields[(int)WixApprovedExeForElevationSymbolFields.Key];
54 + set => this.Set((int)WixApprovedExeForElevationSymbolFields.Key, value);
55 }
56
57 public string ValueName
58 {
59 - get => (string)this.Fields[(int)WixApprovedExeForElevationTupleFields.ValueName];
60 - set => this.Set((int)WixApprovedExeForElevationTupleFields.ValueName, value);
59 + get => (string)this.Fields[(int)WixApprovedExeForElevationSymbolFields.ValueName];
60 + set => this.Set((int)WixApprovedExeForElevationSymbolFields.ValueName, value);
61 }
62
63 public WixApprovedExeForElevationAttributes Attributes
64 {
65 - get => (WixApprovedExeForElevationAttributes)this.Fields[(int)WixApprovedExeForElevationTupleFields.Attributes].AsNumber();
66 - set => this.Set((int)WixApprovedExeForElevationTupleFields.Attributes, (int)value);
65 + get => (WixApprovedExeForElevationAttributes)this.Fields[(int)WixApprovedExeForElevationSymbolFields.Attributes].AsNumber();
66 + set => this.Set((int)WixApprovedExeForElevationSymbolFields.Attributes, (int)value);
67 }
68
69 public bool Win64 => (this.Attributes & WixApprovedExeForElevationAttributes.Win64) == WixApprovedExeForElevationAttributes.Win64;
src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs
+14 -14
@@ -2,43 +2,43 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBindUpdatedFiles = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBindUpdatedFiles,
9 + public static readonly IntermediateSymbolDefinition WixBindUpdatedFiles = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBindUpdatedFiles,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBindUpdatedFilesTupleFields.FileRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBindUpdatedFilesSymbolFields.FileRef), IntermediateFieldType.String),
14 },
15 - typeof(WixBindUpdatedFilesTuple));
15 + typeof(WixBindUpdatedFilesSymbol));
16 }
17 }
18
19 -namespace WixToolset.Data.Tuples
19 +namespace WixToolset.Data.Symbols
20 {
21 - public enum WixBindUpdatedFilesTupleFields
21 + public enum WixBindUpdatedFilesSymbolFields
22 {
23 FileRef,
24 }
25
26 - public class WixBindUpdatedFilesTuple : IntermediateTuple
26 + public class WixBindUpdatedFilesSymbol : IntermediateSymbol
27 {
28 - public WixBindUpdatedFilesTuple() : base(TupleDefinitions.WixBindUpdatedFiles, null, null)
28 + public WixBindUpdatedFilesSymbol() : base(SymbolDefinitions.WixBindUpdatedFiles, null, null)
29 {
30 }
31
32 - public WixBindUpdatedFilesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBindUpdatedFiles, sourceLineNumber, id)
32 + public WixBindUpdatedFilesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBindUpdatedFiles, sourceLineNumber, id)
33 {
34 }
35
36 - public IntermediateField this[WixBindUpdatedFilesTupleFields index] => this.Fields[(int)index];
36 + public IntermediateField this[WixBindUpdatedFilesSymbolFields index] => this.Fields[(int)index];
37
38 public string FileRef
39 {
40 - get => (string)this.Fields[(int)WixBindUpdatedFilesTupleFields.FileRef];
41 - set => this.Set((int)WixBindUpdatedFilesTupleFields.FileRef, value);
40 + get => (string)this.Fields[(int)WixBindUpdatedFilesSymbolFields.FileRef];
41 + set => this.Set((int)WixBindUpdatedFilesSymbolFields.FileRef, value);
42 }
43 }
44 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixBootstrapperApplicationTuple.cs
+11 -11
@@ -2,35 +2,35 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBootstrapperApplication = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBootstrapperApplication,
9 + public static readonly IntermediateSymbolDefinition WixBootstrapperApplication = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBootstrapperApplication,
11 new IntermediateFieldDefinition[]
12 {
13 },
14 - typeof(WixBootstrapperApplicationTuple));
14 + typeof(WixBootstrapperApplicationSymbol));
15 }
16 }
17
18 -namespace WixToolset.Data.Tuples
18 +namespace WixToolset.Data.Symbols
19 {
20 - public enum WixBootstrapperApplicationTupleFields
20 + public enum WixBootstrapperApplicationSymbolFields
21 {
22 }
23
24 - public class WixBootstrapperApplicationTuple : IntermediateTuple
24 + public class WixBootstrapperApplicationSymbol : IntermediateSymbol
25 {
26 - public WixBootstrapperApplicationTuple() : base(TupleDefinitions.WixBootstrapperApplication, null, null)
26 + public WixBootstrapperApplicationSymbol() : base(SymbolDefinitions.WixBootstrapperApplication, null, null)
27 {
28 }
29
30 - public WixBootstrapperApplicationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBootstrapperApplication, sourceLineNumber, id)
30 + public WixBootstrapperApplicationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBootstrapperApplication, sourceLineNumber, id)
31 {
32 }
33
34 - public IntermediateField this[WixBootstrapperApplicationTupleFields index] => this.Fields[(int)index];
34 + public IntermediateField this[WixBootstrapperApplicationSymbolFields index] => this.Fields[(int)index];
35 }
36 }
src/WixToolset.Data/Tuples/WixBuildInfoTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBuildInfo = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBuildInfo,
9 + public static readonly IntermediateSymbolDefinition WixBuildInfo = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBuildInfo,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBuildInfoTupleFields.WixVersion), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBuildInfoTupleFields.WixOutputFile), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixBuildInfoTupleFields.WixProjectFile), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixBuildInfoTupleFields.WixPdbFile), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBuildInfoSymbolFields.WixVersion), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBuildInfoSymbolFields.WixOutputFile), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixBuildInfoSymbolFields.WixProjectFile), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixBuildInfoSymbolFields.WixPdbFile), IntermediateFieldType.String),
17 },
18 - typeof(WixBuildInfoTuple));
18 + typeof(WixBuildInfoSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum WixBuildInfoTupleFields
24 + public enum WixBuildInfoSymbolFields
25 {
26 WixVersion,
27 WixOutputFile,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 WixPdbFile,
30 }
31
32 - public class WixBuildInfoTuple : IntermediateTuple
32 + public class WixBuildInfoSymbol : IntermediateSymbol
33 {
34 - public WixBuildInfoTuple() : base(TupleDefinitions.WixBuildInfo, null, null)
34 + public WixBuildInfoSymbol() : base(SymbolDefinitions.WixBuildInfo, null, null)
35 {
36 }
37
38 - public WixBuildInfoTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBuildInfo, sourceLineNumber, id)
38 + public WixBuildInfoSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBuildInfo, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[WixBuildInfoTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[WixBuildInfoSymbolFields index] => this.Fields[(int)index];
43
44 public string WixVersion
45 {
46 - get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixVersion];
47 - set => this.Set((int)WixBuildInfoTupleFields.WixVersion, value);
46 + get => (string)this.Fields[(int)WixBuildInfoSymbolFields.WixVersion];
47 + set => this.Set((int)WixBuildInfoSymbolFields.WixVersion, value);
48 }
49
50 public string WixOutputFile
51 {
52 - get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixOutputFile];
53 - set => this.Set((int)WixBuildInfoTupleFields.WixOutputFile, value);
52 + get => (string)this.Fields[(int)WixBuildInfoSymbolFields.WixOutputFile];
53 + set => this.Set((int)WixBuildInfoSymbolFields.WixOutputFile, value);
54 }
55
56 public string WixProjectFile
57 {
58 - get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixProjectFile];
59 - set => this.Set((int)WixBuildInfoTupleFields.WixProjectFile, value);
58 + get => (string)this.Fields[(int)WixBuildInfoSymbolFields.WixProjectFile];
59 + set => this.Set((int)WixBuildInfoSymbolFields.WixProjectFile, value);
60 }
61
62 public string WixPdbFile
63 {
64 - get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixPdbFile];
65 - set => this.Set((int)WixBuildInfoTupleFields.WixPdbFile, value);
64 + get => (string)this.Fields[(int)WixBuildInfoSymbolFields.WixPdbFile];
65 + set => this.Set((int)WixBuildInfoSymbolFields.WixPdbFile, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs
+14 -14
@@ -2,43 +2,43 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleCatalog = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleCatalog,
9 + public static readonly IntermediateSymbolDefinition WixBundleCatalog = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleCatalog,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleCatalogTupleFields.PayloadRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundleCatalogSymbolFields.PayloadRef), IntermediateFieldType.String),
14 },
15 - typeof(WixBundleCatalogTuple));
15 + typeof(WixBundleCatalogSymbol));
16 }
17 }
18
19 -namespace WixToolset.Data.Tuples
19 +namespace WixToolset.Data.Symbols
20 {
21 - public enum WixBundleCatalogTupleFields
21 + public enum WixBundleCatalogSymbolFields
22 {
23 PayloadRef,
24 }
25
26 - public class WixBundleCatalogTuple : IntermediateTuple
26 + public class WixBundleCatalogSymbol : IntermediateSymbol
27 {
28 - public WixBundleCatalogTuple() : base(TupleDefinitions.WixBundleCatalog, null, null)
28 + public WixBundleCatalogSymbol() : base(SymbolDefinitions.WixBundleCatalog, null, null)
29 {
30 }
31
32 - public WixBundleCatalogTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleCatalog, sourceLineNumber, id)
32 + public WixBundleCatalogSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleCatalog, sourceLineNumber, id)
33 {
34 }
35
36 - public IntermediateField this[WixBundleCatalogTupleFields index] => this.Fields[(int)index];
36 + public IntermediateField this[WixBundleCatalogSymbolFields index] => this.Fields[(int)index];
37
38 public string PayloadRef
39 {
40 - get => (string)this.Fields[(int)WixBundleCatalogTupleFields.PayloadRef];
41 - set => this.Set((int)WixBundleCatalogTupleFields.PayloadRef, value);
40 + get => (string)this.Fields[(int)WixBundleCatalogSymbolFields.PayloadRef];
41 + set => this.Set((int)WixBundleCatalogSymbolFields.PayloadRef, value);
42 }
43 }
44 }
src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs
+32 -32
@@ -2,31 +2,31 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleContainer = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleContainer,
9 + public static readonly IntermediateSymbolDefinition WixBundleContainer = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleContainer,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Name), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Type), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.DownloadUrl), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Size), IntermediateFieldType.LargeNumber),
17 - new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Hash), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.AttachedContainerIndex), IntermediateFieldType.Number),
19 - new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.WorkingPath), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundleContainerSymbolFields.Name), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundleContainerSymbolFields.Type), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(WixBundleContainerSymbolFields.DownloadUrl), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixBundleContainerSymbolFields.Size), IntermediateFieldType.LargeNumber),
17 + new IntermediateFieldDefinition(nameof(WixBundleContainerSymbolFields.Hash), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(WixBundleContainerSymbolFields.AttachedContainerIndex), IntermediateFieldType.Number),
19 + new IntermediateFieldDefinition(nameof(WixBundleContainerSymbolFields.WorkingPath), IntermediateFieldType.String),
20 },
21 - typeof(WixBundleContainerTuple));
21 + typeof(WixBundleContainerSymbol));
22 }
23 }
24
25 -namespace WixToolset.Data.Tuples
25 +namespace WixToolset.Data.Symbols
26 {
27 using System;
28
29 - public enum WixBundleContainerTupleFields
29 + public enum WixBundleContainerSymbolFields
30 {
31 Name,
32 Type,
@@ -46,58 +46,58 @@ namespace WixToolset.Data.Tuples
46 Detached,
47 }
48
49 - public class WixBundleContainerTuple : IntermediateTuple
49 + public class WixBundleContainerSymbol : IntermediateSymbol
50 {
51 - public WixBundleContainerTuple() : base(TupleDefinitions.WixBundleContainer, null, null)
51 + public WixBundleContainerSymbol() : base(SymbolDefinitions.WixBundleContainer, null, null)
52 {
53 }
54
55 - public WixBundleContainerTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleContainer, sourceLineNumber, id)
55 + public WixBundleContainerSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleContainer, sourceLineNumber, id)
56 {
57 }
58
59 - public IntermediateField this[WixBundleContainerTupleFields index] => this.Fields[(int)index];
59 + public IntermediateField this[WixBundleContainerSymbolFields index] => this.Fields[(int)index];
60
61 public string Name
62 {
63 - get => (string)this.Fields[(int)WixBundleContainerTupleFields.Name];
64 - set => this.Set((int)WixBundleContainerTupleFields.Name, value);
63 + get => (string)this.Fields[(int)WixBundleContainerSymbolFields.Name];
64 + set => this.Set((int)WixBundleContainerSymbolFields.Name, value);
65 }
66
67 public ContainerType Type
68 {
69 - get => (ContainerType)this.Fields[(int)WixBundleContainerTupleFields.Type].AsNumber();
70 - set => this.Set((int)WixBundleContainerTupleFields.Type, (int)value);
69 + get => (ContainerType)this.Fields[(int)WixBundleContainerSymbolFields.Type].AsNumber();
70 + set => this.Set((int)WixBundleContainerSymbolFields.Type, (int)value);
71 }
72
73 public string DownloadUrl
74 {
75 - get => (string)this.Fields[(int)WixBundleContainerTupleFields.DownloadUrl];
76 - set => this.Set((int)WixBundleContainerTupleFields.DownloadUrl, value);
75 + get => (string)this.Fields[(int)WixBundleContainerSymbolFields.DownloadUrl];
76 + set => this.Set((int)WixBundleContainerSymbolFields.DownloadUrl, value);
77 }
78
79 public long? Size
80 {
81 - get => (long?)this.Fields[(int)WixBundleContainerTupleFields.Size];
82 - set => this.Set((int)WixBundleContainerTupleFields.Size, value);
81 + get => (long?)this.Fields[(int)WixBundleContainerSymbolFields.Size];
82 + set => this.Set((int)WixBundleContainerSymbolFields.Size, value);
83 }
84
85 public string Hash
86 {
87 - get => (string)this.Fields[(int)WixBundleContainerTupleFields.Hash];
88 - set => this.Set((int)WixBundleContainerTupleFields.Hash, value);
87 + get => (string)this.Fields[(int)WixBundleContainerSymbolFields.Hash];
88 + set => this.Set((int)WixBundleContainerSymbolFields.Hash, value);
89 }
90
91 public int? AttachedContainerIndex
92 {
93 - get => (int?)this.Fields[(int)WixBundleContainerTupleFields.AttachedContainerIndex];
94 - set => this.Set((int)WixBundleContainerTupleFields.AttachedContainerIndex, value);
93 + get => (int?)this.Fields[(int)WixBundleContainerSymbolFields.AttachedContainerIndex];
94 + set => this.Set((int)WixBundleContainerSymbolFields.AttachedContainerIndex, value);
95 }
96
97 public string WorkingPath
98 {
99 - get => (string)this.Fields[(int)WixBundleContainerTupleFields.WorkingPath];
100 - set => this.Set((int)WixBundleContainerTupleFields.WorkingPath, value);
99 + get => (string)this.Fields[(int)WixBundleContainerSymbolFields.WorkingPath];
100 + set => this.Set((int)WixBundleContainerSymbolFields.WorkingPath, value);
101 }
102 }
103 }
src/WixToolset.Data/Tuples/WixBundleCustomDataAttributeTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleCustomDataAttribute = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleCustomDataAttribute,
9 + public static readonly IntermediateSymbolDefinition WixBundleCustomDataAttribute = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleCustomDataAttribute,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleCustomDataAttributeTupleFields.CustomDataRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundleCustomDataAttributeTupleFields.Name), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundleCustomDataAttributeSymbolFields.CustomDataRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundleCustomDataAttributeSymbolFields.Name), IntermediateFieldType.String),
15 },
16 - typeof(WixBundleCustomDataAttributeTuple));
16 + typeof(WixBundleCustomDataAttributeSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum WixBundleCustomDataAttributeTupleFields
22 + public enum WixBundleCustomDataAttributeSymbolFields
23 {
24 CustomDataRef,
25 Name,
26 }
27
28 - public class WixBundleCustomDataAttributeTuple : IntermediateTuple
28 + public class WixBundleCustomDataAttributeSymbol : IntermediateSymbol
29 {
30 - public WixBundleCustomDataAttributeTuple() : base(TupleDefinitions.WixBundleCustomDataAttribute, null, null)
30 + public WixBundleCustomDataAttributeSymbol() : base(SymbolDefinitions.WixBundleCustomDataAttribute, null, null)
31 {
32 }
33
34 - public WixBundleCustomDataAttributeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleCustomDataAttribute, sourceLineNumber, id)
34 + public WixBundleCustomDataAttributeSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleCustomDataAttribute, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[WixBundleCustomDataAttributeTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[WixBundleCustomDataAttributeSymbolFields index] => this.Fields[(int)index];
39
40 public string CustomDataRef
41 {
42 - get => (string)this.Fields[(int)WixBundleCustomDataAttributeTupleFields.CustomDataRef];
43 - set => this.Set((int)WixBundleCustomDataAttributeTupleFields.CustomDataRef, value);
42 + get => (string)this.Fields[(int)WixBundleCustomDataAttributeSymbolFields.CustomDataRef];
43 + set => this.Set((int)WixBundleCustomDataAttributeSymbolFields.CustomDataRef, value);
44 }
45
46 public string Name
47 {
48 - get => (string)this.Fields[(int)WixBundleCustomDataAttributeTupleFields.Name];
49 - set => this.Set((int)WixBundleCustomDataAttributeTupleFields.Name, value);
48 + get => (string)this.Fields[(int)WixBundleCustomDataAttributeSymbolFields.Name];
49 + set => this.Set((int)WixBundleCustomDataAttributeSymbolFields.Name, value);
50 }
51 }
52 }
src/WixToolset.Data/Tuples/WixBundleCustomDataCellTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleCustomDataCell = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleCustomDataCell,
9 + public static readonly IntermediateSymbolDefinition WixBundleCustomDataCell = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleCustomDataCell,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellTupleFields.CustomDataRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellTupleFields.AttributeRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellTupleFields.ElementId), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellTupleFields.Value), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellSymbolFields.CustomDataRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellSymbolFields.AttributeRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellSymbolFields.ElementId), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellSymbolFields.Value), IntermediateFieldType.String),
17 },
18 - typeof(WixBundleCustomDataCellTuple));
18 + typeof(WixBundleCustomDataCellSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum WixBundleCustomDataCellTupleFields
24 + public enum WixBundleCustomDataCellSymbolFields
25 {
26 CustomDataRef,
27 AttributeRef,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Value,
30 }
31
32 - public class WixBundleCustomDataCellTuple : IntermediateTuple
32 + public class WixBundleCustomDataCellSymbol : IntermediateSymbol
33 {
34 - public WixBundleCustomDataCellTuple() : base(TupleDefinitions.WixBundleCustomDataCell, null, null)
34 + public WixBundleCustomDataCellSymbol() : base(SymbolDefinitions.WixBundleCustomDataCell, null, null)
35 {
36 }
37
38 - public WixBundleCustomDataCellTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleCustomDataCell, sourceLineNumber, id)
38 + public WixBundleCustomDataCellSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleCustomDataCell, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[WixBundleCustomDataCellTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[WixBundleCustomDataCellSymbolFields index] => this.Fields[(int)index];
43
44 public string CustomDataRef
45 {
46 - get => (string)this.Fields[(int)WixBundleCustomDataCellTupleFields.CustomDataRef];
47 - set => this.Set((int)WixBundleCustomDataCellTupleFields.CustomDataRef, value);
46 + get => (string)this.Fields[(int)WixBundleCustomDataCellSymbolFields.CustomDataRef];
47 + set => this.Set((int)WixBundleCustomDataCellSymbolFields.CustomDataRef, value);
48 }
49
50 public string AttributeRef
51 {
52 - get => (string)this.Fields[(int)WixBundleCustomDataCellTupleFields.AttributeRef];
53 - set => this.Set((int)WixBundleCustomDataCellTupleFields.AttributeRef, value);
52 + get => (string)this.Fields[(int)WixBundleCustomDataCellSymbolFields.AttributeRef];
53 + set => this.Set((int)WixBundleCustomDataCellSymbolFields.AttributeRef, value);
54 }
55
56 public string ElementId
57 {
58 - get => (string)this.Fields[(int)WixBundleCustomDataCellTupleFields.ElementId];
59 - set => this.Set((int)WixBundleCustomDataCellTupleFields.ElementId, value);
58 + get => (string)this.Fields[(int)WixBundleCustomDataCellSymbolFields.ElementId];
59 + set => this.Set((int)WixBundleCustomDataCellSymbolFields.ElementId, value);
60 }
61
62 public string Value
63 {
64 - get => (string)this.Fields[(int)WixBundleCustomDataCellTupleFields.Value];
65 - set => this.Set((int)WixBundleCustomDataCellTupleFields.Value, value);
64 + get => (string)this.Fields[(int)WixBundleCustomDataCellSymbolFields.Value];
65 + set => this.Set((int)WixBundleCustomDataCellSymbolFields.Value, value);
66 }
67 }
68 }
src/WixToolset.Data/Tuples/WixBundleCustomDataTuple.cs
+20 -20
@@ -2,25 +2,25 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleCustomData = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleCustomData,
9 + public static readonly IntermediateSymbolDefinition WixBundleCustomData = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleCustomData,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleCustomDataTupleFields.AttributeNames), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundleCustomDataTupleFields.Type), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(WixBundleCustomDataTupleFields.BundleExtensionRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundleCustomDataSymbolFields.AttributeNames), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundleCustomDataSymbolFields.Type), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(WixBundleCustomDataSymbolFields.BundleExtensionRef), IntermediateFieldType.String),
16 },
17 - typeof(WixBundleCustomDataTuple));
17 + typeof(WixBundleCustomDataSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum WixBundleCustomDataTupleFields
23 + public enum WixBundleCustomDataSymbolFields
24 {
25 AttributeNames,
26 Type,
@@ -34,36 +34,36 @@ namespace WixToolset.Data.Tuples
34 BundleExtension,
35 }
36
37 - public class WixBundleCustomDataTuple : IntermediateTuple
37 + public class WixBundleCustomDataSymbol : IntermediateSymbol
38 {
39 public const char AttributeNamesSeparator = '\x85';
40
41 - public WixBundleCustomDataTuple() : base(TupleDefinitions.WixBundleCustomData, null, null)
41 + public WixBundleCustomDataSymbol() : base(SymbolDefinitions.WixBundleCustomData, null, null)
42 {
43 }
44
45 - public WixBundleCustomDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleCustomData, sourceLineNumber, id)
45 + public WixBundleCustomDataSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleCustomData, sourceLineNumber, id)
46 {
47 }
48
49 - public IntermediateField this[WixBundleCustomDataTupleFields index] => this.Fields[(int)index];
49 + public IntermediateField this[WixBundleCustomDataSymbolFields index] => this.Fields[(int)index];
50
51 public string AttributeNames
52 {
53 - get => (string)this.Fields[(int)WixBundleCustomDataTupleFields.AttributeNames];
54 - set => this.Set((int)WixBundleCustomDataTupleFields.AttributeNames, value);
53 + get => (string)this.Fields[(int)WixBundleCustomDataSymbolFields.AttributeNames];
54 + set => this.Set((int)WixBundleCustomDataSymbolFields.AttributeNames, value);
55 }
56
57 public WixBundleCustomDataType Type
58 {
59 - get => (WixBundleCustomDataType)this.Fields[(int)WixBundleCustomDataTupleFields.Type].AsNumber();
60 - set => this.Set((int)WixBundleCustomDataTupleFields.Type, (int)value);
59 + get => (WixBundleCustomDataType)this.Fields[(int)WixBundleCustomDataSymbolFields.Type].AsNumber();
60 + set => this.Set((int)WixBundleCustomDataSymbolFields.Type, (int)value);
61 }
62
63 public string BundleExtensionRef
64 {
65 - get => (string)this.Fields[(int)WixBundleCustomDataTupleFields.BundleExtensionRef];
66 - set => this.Set((int)WixBundleCustomDataTupleFields.BundleExtensionRef, value);
65 + get => (string)this.Fields[(int)WixBundleCustomDataSymbolFields.BundleExtensionRef];
66 + set => this.Set((int)WixBundleCustomDataSymbolFields.BundleExtensionRef, value);
67 }
68
69 public string[] AttributeNamesSeparated => this.AttributeNames.Split(AttributeNamesSeparator);
src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs
+29 -29
@@ -2,30 +2,30 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleExePackage = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleExePackage,
9 + public static readonly IntermediateSymbolDefinition WixBundleExePackage = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleExePackage,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.Attributes), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.DetectCondition), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.InstallCommand), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.RepairCommand), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.UninstallCommand), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.ExeProtocol), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.Attributes), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.DetectCondition), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.InstallCommand), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.RepairCommand), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.UninstallCommand), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.ExeProtocol), IntermediateFieldType.String),
19 },
20 - typeof(WixBundleExePackageTuple));
20 + typeof(WixBundleExePackageSymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 using System;
27
28 - public enum WixBundleExePackageTupleFields
28 + public enum WixBundleExePackageSymbolFields
29 {
30 Attributes,
31 DetectCondition,
@@ -41,52 +41,52 @@ namespace WixToolset.Data.Tuples
41 None = 0,
42 }
43
44 - public class WixBundleExePackageTuple : IntermediateTuple
44 + public class WixBundleExePackageSymbol : IntermediateSymbol
45 {
46 - public WixBundleExePackageTuple() : base(TupleDefinitions.WixBundleExePackage, null, null)
46 + public WixBundleExePackageSymbol() : base(SymbolDefinitions.WixBundleExePackage, null, null)
47 {
48 }
49
50 - public WixBundleExePackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleExePackage, sourceLineNumber, id)
50 + public WixBundleExePackageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleExePackage, sourceLineNumber, id)
51 {
52 }
53
54 - public IntermediateField this[WixBundleExePackageTupleFields index] => this.Fields[(int)index];
54 + public IntermediateField this[WixBundleExePackageSymbolFields index] => this.Fields[(int)index];
55
56 public WixBundleExePackageAttributes Attributes
57 {
58 - get => (WixBundleExePackageAttributes)(int)this.Fields[(int)WixBundleExePackageTupleFields.Attributes];
59 - set => this.Set((int)WixBundleExePackageTupleFields.Attributes, (int)value);
58 + get => (WixBundleExePackageAttributes)(int)this.Fields[(int)WixBundleExePackageSymbolFields.Attributes];
59 + set => this.Set((int)WixBundleExePackageSymbolFields.Attributes, (int)value);
60 }
61
62 public string DetectCondition
63 {
64 - get => (string)this.Fields[(int)WixBundleExePackageTupleFields.DetectCondition];
65 - set => this.Set((int)WixBundleExePackageTupleFields.DetectCondition, value);
64 + get => (string)this.Fields[(int)WixBundleExePackageSymbolFields.DetectCondition];
65 + set => this.Set((int)WixBundleExePackageSymbolFields.DetectCondition, value);
66 }
67
68 public string InstallCommand
69 {
70 - get => (string)this.Fields[(int)WixBundleExePackageTupleFields.InstallCommand];
71 - set => this.Set((int)WixBundleExePackageTupleFields.InstallCommand, value);
70 + get => (string)this.Fields[(int)WixBundleExePackageSymbolFields.InstallCommand];
71 + set => this.Set((int)WixBundleExePackageSymbolFields.InstallCommand, value);
72 }
73
74 public string RepairCommand
75 {
76 - get => (string)this.Fields[(int)WixBundleExePackageTupleFields.RepairCommand];
77 - set => this.Set((int)WixBundleExePackageTupleFields.RepairCommand, value);
76 + get => (string)this.Fields[(int)WixBundleExePackageSymbolFields.RepairCommand];
77 + set => this.Set((int)WixBundleExePackageSymbolFields.RepairCommand, value);
78 }
79
80 public string UninstallCommand
81 {
82 - get => (string)this.Fields[(int)WixBundleExePackageTupleFields.UninstallCommand];
83 - set => this.Set((int)WixBundleExePackageTupleFields.UninstallCommand, value);
82 + get => (string)this.Fields[(int)WixBundleExePackageSymbolFields.UninstallCommand];
83 + set => this.Set((int)WixBundleExePackageSymbolFields.UninstallCommand, value);
84 }
85
86 public string ExeProtocol
87 {
88 - get => (string)this.Fields[(int)WixBundleExePackageTupleFields.ExeProtocol];
89 - set => this.Set((int)WixBundleExePackageTupleFields.ExeProtocol, value);
88 + get => (string)this.Fields[(int)WixBundleExePackageSymbolFields.ExeProtocol];
89 + set => this.Set((int)WixBundleExePackageSymbolFields.ExeProtocol, value);
90 }
91
92 public bool Repairable => !String.IsNullOrEmpty(this.RepairCommand);
src/WixToolset.Data/Tuples/WixBundleExtensionTuple.cs
+14 -14
@@ -2,43 +2,43 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleExtension = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleExtension,
9 + public static readonly IntermediateSymbolDefinition WixBundleExtension = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleExtension,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleExtensionTupleFields.PayloadRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundleExtensionSymbolFields.PayloadRef), IntermediateFieldType.String),
14 },
15 - typeof(WixBundleExtensionTuple));
15 + typeof(WixBundleExtensionSymbol));
16 }
17 }
18
19 -namespace WixToolset.Data.Tuples
19 +namespace WixToolset.Data.Symbols
20 {
21 - public enum WixBundleExtensionTupleFields
21 + public enum WixBundleExtensionSymbolFields
22 {
23 PayloadRef,
24 }
25
26 - public class WixBundleExtensionTuple : IntermediateTuple
26 + public class WixBundleExtensionSymbol : IntermediateSymbol
27 {
28 - public WixBundleExtensionTuple() : base(TupleDefinitions.WixBundleExtension, null, null)
28 + public WixBundleExtensionSymbol() : base(SymbolDefinitions.WixBundleExtension, null, null)
29 {
30 }
31
32 - public WixBundleExtensionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleExtension, sourceLineNumber, id)
32 + public WixBundleExtensionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleExtension, sourceLineNumber, id)
33 {
34 }
35
36 - public IntermediateField this[WixBundleExtensionTupleFields index] => this.Fields[(int)index];
36 + public IntermediateField this[WixBundleExtensionSymbolFields index] => this.Fields[(int)index];
37
38 public string PayloadRef
39 {
40 - get => (string)this.Fields[(int)WixBundleExtensionTupleFields.PayloadRef];
41 - set => this.Set((int)WixBundleExtensionTupleFields.PayloadRef, value);
40 + get => (string)this.Fields[(int)WixBundleExtensionSymbolFields.PayloadRef];
41 + set => this.Set((int)WixBundleExtensionSymbolFields.PayloadRef, value);
42 }
43 }
44 }
src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs
+41 -41
@@ -2,32 +2,32 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleMsiFeature = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleMsiFeature,
9 + public static readonly IntermediateSymbolDefinition WixBundleMsiFeature = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleMsiFeature,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.PackageRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Name), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Size), IntermediateFieldType.LargeNumber),
16 - new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Parent), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Title), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Description), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Display), IntermediateFieldType.Number),
20 - new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Level), IntermediateFieldType.Number),
21 - new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Directory), IntermediateFieldType.String),
22 - new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Attributes), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.PackageRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Name), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Size), IntermediateFieldType.LargeNumber),
16 + new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Parent), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Title), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Description), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Display), IntermediateFieldType.Number),
20 + new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Level), IntermediateFieldType.Number),
21 + new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Directory), IntermediateFieldType.String),
22 + new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Attributes), IntermediateFieldType.Number),
23 },
24 - typeof(WixBundleMsiFeatureTuple));
24 + typeof(WixBundleMsiFeatureSymbol));
25 }
26 }
27
28 -namespace WixToolset.Data.Tuples
28 +namespace WixToolset.Data.Symbols
29 {
30 - public enum WixBundleMsiFeatureTupleFields
30 + public enum WixBundleMsiFeatureSymbolFields
31 {
32 PackageRef,
33 Name,
@@ -41,76 +41,76 @@ namespace WixToolset.Data.Tuples
41 Attributes,
42 }
43
44 - public class WixBundleMsiFeatureTuple : IntermediateTuple
44 + public class WixBundleMsiFeatureSymbol : IntermediateSymbol
45 {
46 - public WixBundleMsiFeatureTuple() : base(TupleDefinitions.WixBundleMsiFeature, null, null)
46 + public WixBundleMsiFeatureSymbol() : base(SymbolDefinitions.WixBundleMsiFeature, null, null)
47 {
48 }
49
50 - public WixBundleMsiFeatureTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleMsiFeature, sourceLineNumber, id)
50 + public WixBundleMsiFeatureSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleMsiFeature, sourceLineNumber, id)
51 {
52 }
53
54 - public IntermediateField this[WixBundleMsiFeatureTupleFields index] => this.Fields[(int)index];
54 + public IntermediateField this[WixBundleMsiFeatureSymbolFields index] => this.Fields[(int)index];
55
56 public string PackageRef
57 {
58 - get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.PackageRef];
59 - set => this.Set((int)WixBundleMsiFeatureTupleFields.PackageRef, value);
58 + get => (string)this.Fields[(int)WixBundleMsiFeatureSymbolFields.PackageRef];
59 + set => this.Set((int)WixBundleMsiFeatureSymbolFields.PackageRef, value);
60 }
61
62 public string Name
63 {
64 - get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Name];
65 - set => this.Set((int)WixBundleMsiFeatureTupleFields.Name, value);
64 + get => (string)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Name];
65 + set => this.Set((int)WixBundleMsiFeatureSymbolFields.Name, value);
66 }
67
68 public long Size
69 {
70 - get => (long)this.Fields[(int)WixBundleMsiFeatureTupleFields.Size];
71 - set => this.Set((int)WixBundleMsiFeatureTupleFields.Size, value);
70 + get => (long)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Size];
71 + set => this.Set((int)WixBundleMsiFeatureSymbolFields.Size, value);
72 }
73
74 public string Parent
75 {
76 - get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Parent];
77 - set => this.Set((int)WixBundleMsiFeatureTupleFields.Parent, value);
76 + get => (string)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Parent];
77 + set => this.Set((int)WixBundleMsiFeatureSymbolFields.Parent, value);
78 }
79
80 public string Title
81 {
82 - get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Title];
83 - set => this.Set((int)WixBundleMsiFeatureTupleFields.Title, value);
82 + get => (string)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Title];
83 + set => this.Set((int)WixBundleMsiFeatureSymbolFields.Title, value);
84 }
85
86 public string Description
87 {
88 - get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Description];
89 - set => this.Set((int)WixBundleMsiFeatureTupleFields.Description, value);
88 + get => (string)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Description];
89 + set => this.Set((int)WixBundleMsiFeatureSymbolFields.Description, value);
90 }
91
92 public int Display
93 {
94 - get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Display];
95 - set => this.Set((int)WixBundleMsiFeatureTupleFields.Display, value);
94 + get => (int)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Display];
95 + set => this.Set((int)WixBundleMsiFeatureSymbolFields.Display, value);
96 }
97
98 public int Level
99 {
100 - get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Level];
101 - set => this.Set((int)WixBundleMsiFeatureTupleFields.Level, value);
100 + get => (int)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Level];
101 + set => this.Set((int)WixBundleMsiFeatureSymbolFields.Level, value);
102 }
103
104 public string Directory
105 {
106 - get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Directory];
107 - set => this.Set((int)WixBundleMsiFeatureTupleFields.Directory, value);
106 + get => (string)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Directory];
107 + set => this.Set((int)WixBundleMsiFeatureSymbolFields.Directory, value);
108 }
109
110 public int Attributes
111 {
112 - get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Attributes];
113 - set => this.Set((int)WixBundleMsiFeatureTupleFields.Attributes, value);
112 + get => (int)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Attributes];
113 + set => this.Set((int)WixBundleMsiFeatureSymbolFields.Attributes, value);
114 }
115 }
116 }
src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs
+32 -32
@@ -2,31 +2,31 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleMsiPackage = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleMsiPackage,
9 + public static readonly IntermediateSymbolDefinition WixBundleMsiPackage = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleMsiPackage,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.Attributes), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.ProductCode), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.UpgradeCode), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.ProductVersion), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.ProductLanguage), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.ProductName), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.Manufacturer), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.Attributes), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductCode), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.UpgradeCode), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductVersion), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductLanguage), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductName), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.Manufacturer), IntermediateFieldType.String),
20 },
21 - typeof(WixBundleMsiPackageTuple));
21 + typeof(WixBundleMsiPackageSymbol));
22 }
23 }
24
25 -namespace WixToolset.Data.Tuples
25 +namespace WixToolset.Data.Symbols
26 {
27 using System;
28
29 - public enum WixBundleMsiPackageTupleFields
29 + public enum WixBundleMsiPackageSymbolFields
30 {
31 Attributes,
32 ProductCode,
@@ -44,58 +44,58 @@ namespace WixToolset.Data.Tuples
44 ForcePerMachine = 0x2,
45 }
46
47 - public class WixBundleMsiPackageTuple : IntermediateTuple
47 + public class WixBundleMsiPackageSymbol : IntermediateSymbol
48 {
49 - public WixBundleMsiPackageTuple() : base(TupleDefinitions.WixBundleMsiPackage, null, null)
49 + public WixBundleMsiPackageSymbol() : base(SymbolDefinitions.WixBundleMsiPackage, null, null)
50 {
51 }
52
53 - public WixBundleMsiPackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleMsiPackage, sourceLineNumber, id)
53 + public WixBundleMsiPackageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleMsiPackage, sourceLineNumber, id)
54 {
55 }
56
57 - public IntermediateField this[WixBundleMsiPackageTupleFields index] => this.Fields[(int)index];
57 + public IntermediateField this[WixBundleMsiPackageSymbolFields index] => this.Fields[(int)index];
58
59 public WixBundleMsiPackageAttributes Attributes
60 {
61 - get => (WixBundleMsiPackageAttributes)(int)this.Fields[(int)WixBundleMsiPackageTupleFields.Attributes];
62 - set => this.Set((int)WixBundleMsiPackageTupleFields.Attributes, (int)value);
61 + get => (WixBundleMsiPackageAttributes)(int)this.Fields[(int)WixBundleMsiPackageSymbolFields.Attributes];
62 + set => this.Set((int)WixBundleMsiPackageSymbolFields.Attributes, (int)value);
63 }
64
65 public string ProductCode
66 {
67 - get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductCode];
68 - set => this.Set((int)WixBundleMsiPackageTupleFields.ProductCode, value);
67 + get => (string)this.Fields[(int)WixBundleMsiPackageSymbolFields.ProductCode];
68 + set => this.Set((int)WixBundleMsiPackageSymbolFields.ProductCode, value);
69 }
70
71 public string UpgradeCode
72 {
73 - get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.UpgradeCode];
74 - set => this.Set((int)WixBundleMsiPackageTupleFields.UpgradeCode, value);
73 + get => (string)this.Fields[(int)WixBundleMsiPackageSymbolFields.UpgradeCode];
74 + set => this.Set((int)WixBundleMsiPackageSymbolFields.UpgradeCode, value);
75 }
76
77 public string ProductVersion
78 {
79 - get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductVersion];
80 - set => this.Set((int)WixBundleMsiPackageTupleFields.ProductVersion, value);
79 + get => (string)this.Fields[(int)WixBundleMsiPackageSymbolFields.ProductVersion];
80 + set => this.Set((int)WixBundleMsiPackageSymbolFields.ProductVersion, value);
81 }
82
83 public int ProductLanguage
84 {
85 - get => (int)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductLanguage];
86 - set => this.Set((int)WixBundleMsiPackageTupleFields.ProductLanguage, value);
85 + get => (int)this.Fields[(int)WixBundleMsiPackageSymbolFields.ProductLanguage];
86 + set => this.Set((int)WixBundleMsiPackageSymbolFields.ProductLanguage, value);
87 }
88
89 public string ProductName
90 {
91 - get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductName];
92 - set => this.Set((int)WixBundleMsiPackageTupleFields.ProductName, value);
91 + get => (string)this.Fields[(int)WixBundleMsiPackageSymbolFields.ProductName];
92 + set => this.Set((int)WixBundleMsiPackageSymbolFields.ProductName, value);
93 }
94
95 public string Manufacturer
96 {
97 - get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.Manufacturer];
98 - set => this.Set((int)WixBundleMsiPackageTupleFields.Manufacturer, value);
97 + get => (string)this.Fields[(int)WixBundleMsiPackageSymbolFields.Manufacturer];
98 + set => this.Set((int)WixBundleMsiPackageSymbolFields.Manufacturer, value);
99 }
100
101 public bool EnableFeatureSelection => (this.Attributes & WixBundleMsiPackageAttributes.EnableFeatureSelection) == WixBundleMsiPackageAttributes.EnableFeatureSelection;
src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleMsiProperty = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleMsiProperty,
9 + public static readonly IntermediateSymbolDefinition WixBundleMsiProperty = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleMsiProperty,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.PackageRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.Name), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.Value), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.Condition), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundleMsiPropertySymbolFields.PackageRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundleMsiPropertySymbolFields.Name), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixBundleMsiPropertySymbolFields.Value), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixBundleMsiPropertySymbolFields.Condition), IntermediateFieldType.String),
17 },
18 - typeof(WixBundleMsiPropertyTuple));
18 + typeof(WixBundleMsiPropertySymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum WixBundleMsiPropertyTupleFields
24 + public enum WixBundleMsiPropertySymbolFields
25 {
26 PackageRef,
27 Name,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Condition,
30 }
31
32 - public class WixBundleMsiPropertyTuple : IntermediateTuple
32 + public class WixBundleMsiPropertySymbol : IntermediateSymbol
33 {
34 - public WixBundleMsiPropertyTuple() : base(TupleDefinitions.WixBundleMsiProperty, null, null)
34 + public WixBundleMsiPropertySymbol() : base(SymbolDefinitions.WixBundleMsiProperty, null, null)
35 {
36 }
37
38 - public WixBundleMsiPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleMsiProperty, sourceLineNumber, id)
38 + public WixBundleMsiPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleMsiProperty, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[WixBundleMsiPropertyTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[WixBundleMsiPropertySymbolFields index] => this.Fields[(int)index];
43
44 public string PackageRef
45 {
46 - get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.PackageRef];
47 - set => this.Set((int)WixBundleMsiPropertyTupleFields.PackageRef, value);
46 + get => (string)this.Fields[(int)WixBundleMsiPropertySymbolFields.PackageRef];
47 + set => this.Set((int)WixBundleMsiPropertySymbolFields.PackageRef, value);
48 }
49
50 public string Name
51 {
52 - get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.Name];
53 - set => this.Set((int)WixBundleMsiPropertyTupleFields.Name, value);
52 + get => (string)this.Fields[(int)WixBundleMsiPropertySymbolFields.Name];
53 + set => this.Set((int)WixBundleMsiPropertySymbolFields.Name, value);
54 }
55
56 public string Value
57 {
58 - get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.Value];
59 - set => this.Set((int)WixBundleMsiPropertyTupleFields.Value, value);
58 + get => (string)this.Fields[(int)WixBundleMsiPropertySymbolFields.Value];
59 + set => this.Set((int)WixBundleMsiPropertySymbolFields.Value, value);
60 }
61
62 public string Condition
63 {
64 - get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.Condition];
65 - set => this.Set((int)WixBundleMsiPropertyTupleFields.Condition, value);
64 + get => (string)this.Fields[(int)WixBundleMsiPropertySymbolFields.Condition];
65 + set => this.Set((int)WixBundleMsiPropertySymbolFields.Condition, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs
+23 -23
@@ -2,28 +2,28 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleMspPackage = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleMspPackage,
9 + public static readonly IntermediateSymbolDefinition WixBundleMspPackage = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleMspPackage,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.Attributes), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.PatchCode), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.Manufacturer), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.PatchXml), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.Attributes), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.PatchCode), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.Manufacturer), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.PatchXml), IntermediateFieldType.String),
17 },
18 - typeof(WixBundleMspPackageTuple));
18 + typeof(WixBundleMspPackageSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 using System;
25
26 - public enum WixBundleMspPackageTupleFields
26 + public enum WixBundleMspPackageSymbolFields
27 {
28 Attributes,
29 PatchCode,
@@ -38,40 +38,40 @@ namespace WixToolset.Data.Tuples
38 TargetUnspecified = 0x4,
39 }
40
41 - public class WixBundleMspPackageTuple : IntermediateTuple
41 + public class WixBundleMspPackageSymbol : IntermediateSymbol
42 {
43 - public WixBundleMspPackageTuple() : base(TupleDefinitions.WixBundleMspPackage, null, null)
43 + public WixBundleMspPackageSymbol() : base(SymbolDefinitions.WixBundleMspPackage, null, null)
44 {
45 }
46
47 - public WixBundleMspPackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleMspPackage, sourceLineNumber, id)
47 + public WixBundleMspPackageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleMspPackage, sourceLineNumber, id)
48 {
49 }
50
51 - public IntermediateField this[WixBundleMspPackageTupleFields index] => this.Fields[(int)index];
51 + public IntermediateField this[WixBundleMspPackageSymbolFields index] => this.Fields[(int)index];
52
53 public WixBundleMspPackageAttributes Attributes
54 {
55 - get => (WixBundleMspPackageAttributes)(int)this.Fields[(int)WixBundleMspPackageTupleFields.Attributes];
56 - set => this.Set((int)WixBundleMspPackageTupleFields.Attributes, (int)value);
55 + get => (WixBundleMspPackageAttributes)(int)this.Fields[(int)WixBundleMspPackageSymbolFields.Attributes];
56 + set => this.Set((int)WixBundleMspPackageSymbolFields.Attributes, (int)value);
57 }
58
59 public string PatchCode
60 {
61 - get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.PatchCode];
62 - set => this.Set((int)WixBundleMspPackageTupleFields.PatchCode, value);
61 + get => (string)this.Fields[(int)WixBundleMspPackageSymbolFields.PatchCode];
62 + set => this.Set((int)WixBundleMspPackageSymbolFields.PatchCode, value);
63 }
64
65 public string Manufacturer
66 {
67 - get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.Manufacturer];
68 - set => this.Set((int)WixBundleMspPackageTupleFields.Manufacturer, value);
67 + get => (string)this.Fields[(int)WixBundleMspPackageSymbolFields.Manufacturer];
68 + set => this.Set((int)WixBundleMspPackageSymbolFields.Manufacturer, value);
69 }
70
71 public string PatchXml
72 {
73 - get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.PatchXml];
74 - set => this.Set((int)WixBundleMspPackageTupleFields.PatchXml, value);
73 + get => (string)this.Fields[(int)WixBundleMspPackageSymbolFields.PatchXml];
74 + set => this.Set((int)WixBundleMspPackageSymbolFields.PatchXml, value);
75 }
76
77 public bool Slipstream => (this.Attributes & WixBundleMspPackageAttributes.Slipstream) == WixBundleMspPackageAttributes.Slipstream;
src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleMsuPackage = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleMsuPackage,
9 + public static readonly IntermediateSymbolDefinition WixBundleMsuPackage = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleMsuPackage,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleMsuPackageTupleFields.DetectCondition), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundleMsuPackageTupleFields.MsuKB), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundleMsuPackageSymbolFields.DetectCondition), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundleMsuPackageSymbolFields.MsuKB), IntermediateFieldType.String),
15 },
16 - typeof(WixBundleMsuPackageTuple));
16 + typeof(WixBundleMsuPackageSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum WixBundleMsuPackageTupleFields
22 + public enum WixBundleMsuPackageSymbolFields
23 {
24 DetectCondition,
25 MsuKB,
26 }
27
28 - public class WixBundleMsuPackageTuple : IntermediateTuple
28 + public class WixBundleMsuPackageSymbol : IntermediateSymbol
29 {
30 - public WixBundleMsuPackageTuple() : base(TupleDefinitions.WixBundleMsuPackage, null, null)
30 + public WixBundleMsuPackageSymbol() : base(SymbolDefinitions.WixBundleMsuPackage, null, null)
31 {
32 }
33
34 - public WixBundleMsuPackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleMsuPackage, sourceLineNumber, id)
34 + public WixBundleMsuPackageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleMsuPackage, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[WixBundleMsuPackageTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[WixBundleMsuPackageSymbolFields index] => this.Fields[(int)index];
39
40 public string DetectCondition
41 {
42 - get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.DetectCondition];
43 - set => this.Set((int)WixBundleMsuPackageTupleFields.DetectCondition, value);
42 + get => (string)this.Fields[(int)WixBundleMsuPackageSymbolFields.DetectCondition];
43 + set => this.Set((int)WixBundleMsuPackageSymbolFields.DetectCondition, value);
44 }
45
46 public string MsuKB
47 {
48 - get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.MsuKB];
49 - set => this.Set((int)WixBundleMsuPackageTupleFields.MsuKB, value);
48 + get => (string)this.Fields[(int)WixBundleMsuPackageSymbolFields.MsuKB];
49 + set => this.Set((int)WixBundleMsuPackageSymbolFields.MsuKB, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundlePackageCommandLine = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundlePackageCommandLine,
9 + public static readonly IntermediateSymbolDefinition WixBundlePackageCommandLine = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundlePackageCommandLine,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.InstallArgument), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.UninstallArgument), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.RepairArgument), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.Condition), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineSymbolFields.WixBundlePackageRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineSymbolFields.InstallArgument), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineSymbolFields.UninstallArgument), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineSymbolFields.RepairArgument), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineSymbolFields.Condition), IntermediateFieldType.String),
18 },
19 - typeof(WixBundlePackageCommandLineTuple));
19 + typeof(WixBundlePackageCommandLineSymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum WixBundlePackageCommandLineTupleFields
25 + public enum WixBundlePackageCommandLineSymbolFields
26 {
27 WixBundlePackageRef,
28 InstallArgument,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
31 Condition,
32 }
33
34 - public class WixBundlePackageCommandLineTuple : IntermediateTuple
34 + public class WixBundlePackageCommandLineSymbol : IntermediateSymbol
35 {
36 - public WixBundlePackageCommandLineTuple() : base(TupleDefinitions.WixBundlePackageCommandLine, null, null)
36 + public WixBundlePackageCommandLineSymbol() : base(SymbolDefinitions.WixBundlePackageCommandLine, null, null)
37 {
38 }
39
40 - public WixBundlePackageCommandLineTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePackageCommandLine, sourceLineNumber, id)
40 + public WixBundlePackageCommandLineSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundlePackageCommandLine, sourceLineNumber, id)
41 {
42 }
43
44 - public IntermediateField this[WixBundlePackageCommandLineTupleFields index] => this.Fields[(int)index];
44 + public IntermediateField this[WixBundlePackageCommandLineSymbolFields index] => this.Fields[(int)index];
45
46 public string WixBundlePackageRef
47 {
48 - get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.WixBundlePackageRef];
49 - set => this.Set((int)WixBundlePackageCommandLineTupleFields.WixBundlePackageRef, value);
48 + get => (string)this.Fields[(int)WixBundlePackageCommandLineSymbolFields.WixBundlePackageRef];
49 + set => this.Set((int)WixBundlePackageCommandLineSymbolFields.WixBundlePackageRef, value);
50 }
51
52 public string InstallArgument
53 {
54 - get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.InstallArgument];
55 - set => this.Set((int)WixBundlePackageCommandLineTupleFields.InstallArgument, value);
54 + get => (string)this.Fields[(int)WixBundlePackageCommandLineSymbolFields.InstallArgument];
55 + set => this.Set((int)WixBundlePackageCommandLineSymbolFields.InstallArgument, value);
56 }
57
58 public string UninstallArgument
59 {
60 - get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.UninstallArgument];
61 - set => this.Set((int)WixBundlePackageCommandLineTupleFields.UninstallArgument, value);
60 + get => (string)this.Fields[(int)WixBundlePackageCommandLineSymbolFields.UninstallArgument];
61 + set => this.Set((int)WixBundlePackageCommandLineSymbolFields.UninstallArgument, value);
62 }
63
64 public string RepairArgument
65 {
66 - get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.RepairArgument];
67 - set => this.Set((int)WixBundlePackageCommandLineTupleFields.RepairArgument, value);
66 + get => (string)this.Fields[(int)WixBundlePackageCommandLineSymbolFields.RepairArgument];
67 + set => this.Set((int)WixBundlePackageCommandLineSymbolFields.RepairArgument, value);
68 }
69
70 public string Condition
71 {
72 - get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.Condition];
73 - set => this.Set((int)WixBundlePackageCommandLineTupleFields.Condition, value);
72 + get => (string)this.Fields[(int)WixBundlePackageCommandLineSymbolFields.Condition];
73 + set => this.Set((int)WixBundlePackageCommandLineSymbolFields.Condition, value);
74 }
75 }
76 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixBundlePackageExitCodeTuple.cs
+20 -20
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundlePackageExitCode = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundlePackageExitCode,
9 + public static readonly IntermediateSymbolDefinition WixBundlePackageExitCode = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundlePackageExitCode,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundlePackageExitCodeTupleFields.ChainPackageId), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundlePackageExitCodeTupleFields.Code), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(WixBundlePackageExitCodeTupleFields.Behavior), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundlePackageExitCodeSymbolFields.ChainPackageId), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundlePackageExitCodeSymbolFields.Code), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(WixBundlePackageExitCodeSymbolFields.Behavior), IntermediateFieldType.String),
16 },
17 - typeof(WixBundlePackageExitCodeTuple));
17 + typeof(WixBundlePackageExitCodeSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 using System;
24
25 - public enum WixBundlePackageExitCodeTupleFields
25 + public enum WixBundlePackageExitCodeSymbolFields
26 {
27 ChainPackageId,
28 Code,
@@ -38,34 +38,34 @@ namespace WixToolset.Data.Tuples
38 ForceReboot,
39 }
40
41 - public class WixBundlePackageExitCodeTuple : IntermediateTuple
41 + public class WixBundlePackageExitCodeSymbol : IntermediateSymbol
42 {
43 - public WixBundlePackageExitCodeTuple() : base(TupleDefinitions.WixBundlePackageExitCode, null, null)
43 + public WixBundlePackageExitCodeSymbol() : base(SymbolDefinitions.WixBundlePackageExitCode, null, null)
44 {
45 }
46
47 - public WixBundlePackageExitCodeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePackageExitCode, sourceLineNumber, id)
47 + public WixBundlePackageExitCodeSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundlePackageExitCode, sourceLineNumber, id)
48 {
49 }
50
51 - public IntermediateField this[WixBundlePackageExitCodeTupleFields index] => this.Fields[(int)index];
51 + public IntermediateField this[WixBundlePackageExitCodeSymbolFields index] => this.Fields[(int)index];
52
53 public string ChainPackageId
54 {
55 - get => (string)this.Fields[(int)WixBundlePackageExitCodeTupleFields.ChainPackageId];
56 - set => this.Set((int)WixBundlePackageExitCodeTupleFields.ChainPackageId, value);
55 + get => (string)this.Fields[(int)WixBundlePackageExitCodeSymbolFields.ChainPackageId];
56 + set => this.Set((int)WixBundlePackageExitCodeSymbolFields.ChainPackageId, value);
57 }
58
59 public int? Code
60 {
61 - get => (int?)this.Fields[(int)WixBundlePackageExitCodeTupleFields.Code];
62 - set => this.Set((int)WixBundlePackageExitCodeTupleFields.Code, value);
61 + get => (int?)this.Fields[(int)WixBundlePackageExitCodeSymbolFields.Code];
62 + set => this.Set((int)WixBundlePackageExitCodeSymbolFields.Code, value);
63 }
64
65 public ExitCodeBehaviorType Behavior
66 {
67 - get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageExitCodeTupleFields.Behavior], true, out ExitCodeBehaviorType value) ? value : ExitCodeBehaviorType.NotSet;
68 - set => this.Set((int)WixBundlePackageExitCodeTupleFields.Behavior, value.ToString());
67 + get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageExitCodeSymbolFields.Behavior], true, out ExitCodeBehaviorType value) ? value : ExitCodeBehaviorType.NotSet;
68 + set => this.Set((int)WixBundlePackageExitCodeSymbolFields.Behavior, value.ToString());
69 }
70 }
71 }
src/WixToolset.Data/Tuples/WixBundlePackageGroupTuple.cs
+11 -11
@@ -2,35 +2,35 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundlePackageGroup = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundlePackageGroup,
9 + public static readonly IntermediateSymbolDefinition WixBundlePackageGroup = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundlePackageGroup,
11 new IntermediateFieldDefinition[]
12 {
13 },
14 - typeof(WixBundlePackageGroupTuple));
14 + typeof(WixBundlePackageGroupSymbol));
15 }
16 }
17
18 -namespace WixToolset.Data.Tuples
18 +namespace WixToolset.Data.Symbols
19 {
20 - public enum WixBundlePackageGroupTupleFields
20 + public enum WixBundlePackageGroupSymbolFields
21 {
22 }
23
24 - public class WixBundlePackageGroupTuple : IntermediateTuple
24 + public class WixBundlePackageGroupSymbol : IntermediateSymbol
25 {
26 - public WixBundlePackageGroupTuple() : base(TupleDefinitions.WixBundlePackageGroup, null, null)
26 + public WixBundlePackageGroupSymbol() : base(SymbolDefinitions.WixBundlePackageGroup, null, null)
27 {
28 }
29
30 - public WixBundlePackageGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePackageGroup, sourceLineNumber, id)
30 + public WixBundlePackageGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundlePackageGroup, sourceLineNumber, id)
31 {
32 }
33
34 - public IntermediateField this[WixBundlePackageGroupTupleFields index] => this.Fields[(int)index];
34 + public IntermediateField this[WixBundlePackageGroupSymbolFields index] => this.Fields[(int)index];
35 }
36 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs
+68 -68
@@ -2,43 +2,43 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundlePackage = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundlePackage,
9 + public static readonly IntermediateSymbolDefinition WixBundlePackage = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundlePackage,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Type), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.PayloadRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Attributes), IntermediateFieldType.Number),
16 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.InstallCondition), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Cache), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.CacheId), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Vital), IntermediateFieldType.Bool),
20 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.PerMachine), IntermediateFieldType.String),
21 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.LogPathVariable), IntermediateFieldType.String),
22 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackLogPathVariable), IntermediateFieldType.String),
23 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Size), IntermediateFieldType.Number),
24 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.InstallSize), IntermediateFieldType.LargeNumber),
25 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Version), IntermediateFieldType.String),
26 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Language), IntermediateFieldType.Number),
27 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.DisplayName), IntermediateFieldType.String),
28 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Description), IntermediateFieldType.String),
29 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackBoundaryRef), IntermediateFieldType.String),
30 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackBoundaryBackwardRef), IntermediateFieldType.String),
31 - new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Win64), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Type), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.PayloadRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Attributes), IntermediateFieldType.Number),
16 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.InstallCondition), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Cache), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.CacheId), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Vital), IntermediateFieldType.Bool),
20 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.PerMachine), IntermediateFieldType.String),
21 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.LogPathVariable), IntermediateFieldType.String),
22 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.RollbackLogPathVariable), IntermediateFieldType.String),
23 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Size), IntermediateFieldType.Number),
24 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.InstallSize), IntermediateFieldType.LargeNumber),
25 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Version), IntermediateFieldType.String),
26 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Language), IntermediateFieldType.Number),
27 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.DisplayName), IntermediateFieldType.String),
28 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Description), IntermediateFieldType.String),
29 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.RollbackBoundaryRef), IntermediateFieldType.String),
30 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.RollbackBoundaryBackwardRef), IntermediateFieldType.String),
31 + new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Win64), IntermediateFieldType.Bool),
32 },
33 - typeof(WixBundlePackageTuple));
33 + typeof(WixBundlePackageSymbol));
34 }
35 }
36
37 -namespace WixToolset.Data.Tuples
37 +namespace WixToolset.Data.Symbols
38 {
39 using System;
40
41 - public enum WixBundlePackageTupleFields
41 + public enum WixBundlePackageSymbolFields
42 {
43 Type,
44 PayloadRef,
@@ -81,130 +81,130 @@ namespace WixToolset.Data.Tuples
81 Win64 = 0x8,
82 }
83
84 - public class WixBundlePackageTuple : IntermediateTuple
84 + public class WixBundlePackageSymbol : IntermediateSymbol
85 {
86 - public WixBundlePackageTuple() : base(TupleDefinitions.WixBundlePackage, null, null)
86 + public WixBundlePackageSymbol() : base(SymbolDefinitions.WixBundlePackage, null, null)
87 {
88 }
89
90 - public WixBundlePackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePackage, sourceLineNumber, id)
90 + public WixBundlePackageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundlePackage, sourceLineNumber, id)
91 {
92 }
93
94 - public IntermediateField this[WixBundlePackageTupleFields index] => this.Fields[(int)index];
94 + public IntermediateField this[WixBundlePackageSymbolFields index] => this.Fields[(int)index];
95
96 public WixBundlePackageType Type
97 {
98 - get => (WixBundlePackageType)Enum.Parse(typeof(WixBundlePackageType), (string)this.Fields[(int)WixBundlePackageTupleFields.Type], true);
99 - set => this.Set((int)WixBundlePackageTupleFields.Type, value.ToString());
98 + get => (WixBundlePackageType)Enum.Parse(typeof(WixBundlePackageType), (string)this.Fields[(int)WixBundlePackageSymbolFields.Type], true);
99 + set => this.Set((int)WixBundlePackageSymbolFields.Type, value.ToString());
100 }
101
102 public string PayloadRef
103 {
104 - get => (string)this.Fields[(int)WixBundlePackageTupleFields.PayloadRef];
105 - set => this.Set((int)WixBundlePackageTupleFields.PayloadRef, value);
104 + get => (string)this.Fields[(int)WixBundlePackageSymbolFields.PayloadRef];
105 + set => this.Set((int)WixBundlePackageSymbolFields.PayloadRef, value);
106 }
107
108 public WixBundlePackageAttributes Attributes
109 {
110 - get => (WixBundlePackageAttributes)(int)this.Fields[(int)WixBundlePackageTupleFields.Attributes];
111 - set => this.Set((int)WixBundlePackageTupleFields.Attributes, (int)value);
110 + get => (WixBundlePackageAttributes)(int)this.Fields[(int)WixBundlePackageSymbolFields.Attributes];
111 + set => this.Set((int)WixBundlePackageSymbolFields.Attributes, (int)value);
112 }
113
114 public string InstallCondition
115 {
116 - get => (string)this.Fields[(int)WixBundlePackageTupleFields.InstallCondition];
117 - set => this.Set((int)WixBundlePackageTupleFields.InstallCondition, value);
116 + get => (string)this.Fields[(int)WixBundlePackageSymbolFields.InstallCondition];
117 + set => this.Set((int)WixBundlePackageSymbolFields.InstallCondition, value);
118 }
119
120 public YesNoAlwaysType Cache
121 {
122 - get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageTupleFields.Cache], true, out YesNoAlwaysType value) ? value : YesNoAlwaysType.NotSet;
123 - set => this.Set((int)WixBundlePackageTupleFields.Cache, value.ToString().ToLowerInvariant());
122 + get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageSymbolFields.Cache], true, out YesNoAlwaysType value) ? value : YesNoAlwaysType.NotSet;
123 + set => this.Set((int)WixBundlePackageSymbolFields.Cache, value.ToString().ToLowerInvariant());
124 }
125
126 public string CacheId
127 {
128 - get => (string)this.Fields[(int)WixBundlePackageTupleFields.CacheId];
129 - set => this.Set((int)WixBundlePackageTupleFields.CacheId, value);
128 + get => (string)this.Fields[(int)WixBundlePackageSymbolFields.CacheId];
129 + set => this.Set((int)WixBundlePackageSymbolFields.CacheId, value);
130 }
131
132 public bool? Vital
133 {
134 - get => (bool?)this.Fields[(int)WixBundlePackageTupleFields.Vital];
135 - set => this.Set((int)WixBundlePackageTupleFields.Vital, value);
134 + get => (bool?)this.Fields[(int)WixBundlePackageSymbolFields.Vital];
135 + set => this.Set((int)WixBundlePackageSymbolFields.Vital, value);
136 }
137
138 public YesNoDefaultType PerMachine
139 {
140 - get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageTupleFields.PerMachine], true, out YesNoDefaultType value) ? value : YesNoDefaultType.NotSet;
141 - set => this.Set((int)WixBundlePackageTupleFields.PerMachine, value.ToString().ToLowerInvariant());
140 + get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageSymbolFields.PerMachine], true, out YesNoDefaultType value) ? value : YesNoDefaultType.NotSet;
141 + set => this.Set((int)WixBundlePackageSymbolFields.PerMachine, value.ToString().ToLowerInvariant());
142 }
143
144 public string LogPathVariable
145 {
146 - get => (string)this.Fields[(int)WixBundlePackageTupleFields.LogPathVariable];
147 - set => this.Set((int)WixBundlePackageTupleFields.LogPathVariable, value);
146 + get => (string)this.Fields[(int)WixBundlePackageSymbolFields.LogPathVariable];
147 + set => this.Set((int)WixBundlePackageSymbolFields.LogPathVariable, value);
148 }
149
150 public string RollbackLogPathVariable
151 {
152 - get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackLogPathVariable];
153 - set => this.Set((int)WixBundlePackageTupleFields.RollbackLogPathVariable, value);
152 + get => (string)this.Fields[(int)WixBundlePackageSymbolFields.RollbackLogPathVariable];
153 + set => this.Set((int)WixBundlePackageSymbolFields.RollbackLogPathVariable, value);
154 }
155
156 public int Size
157 {
158 - get => (int)this.Fields[(int)WixBundlePackageTupleFields.Size];
159 - set => this.Set((int)WixBundlePackageTupleFields.Size, value);
158 + get => (int)this.Fields[(int)WixBundlePackageSymbolFields.Size];
159 + set => this.Set((int)WixBundlePackageSymbolFields.Size, value);
160 }
161
162 public long? InstallSize
163 {
164 - get => (long?)this.Fields[(int)WixBundlePackageTupleFields.InstallSize];
165 - set => this.Set((int)WixBundlePackageTupleFields.InstallSize, value);
164 + get => (long?)this.Fields[(int)WixBundlePackageSymbolFields.InstallSize];
165 + set => this.Set((int)WixBundlePackageSymbolFields.InstallSize, value);
166 }
167
168 public string Version
169 {
170 - get => (string)this.Fields[(int)WixBundlePackageTupleFields.Version];
171 - set => this.Set((int)WixBundlePackageTupleFields.Version, value);
170 + get => (string)this.Fields[(int)WixBundlePackageSymbolFields.Version];
171 + set => this.Set((int)WixBundlePackageSymbolFields.Version, value);
172 }
173
174 public int? Language
175 {
176 - get => (int?)this.Fields[(int)WixBundlePackageTupleFields.Language];
177 - set => this.Set((int)WixBundlePackageTupleFields.Language, value);
176 + get => (int?)this.Fields[(int)WixBundlePackageSymbolFields.Language];
177 + set => this.Set((int)WixBundlePackageSymbolFields.Language, value);
178 }
179
180 public string DisplayName
181 {
182 - get => (string)this.Fields[(int)WixBundlePackageTupleFields.DisplayName];
183 - set => this.Set((int)WixBundlePackageTupleFields.DisplayName, value);
182 + get => (string)this.Fields[(int)WixBundlePackageSymbolFields.DisplayName];
183 + set => this.Set((int)WixBundlePackageSymbolFields.DisplayName, value);
184 }
185
186 public string Description
187 {
188 - get => (string)this.Fields[(int)WixBundlePackageTupleFields.Description];
189 - set => this.Set((int)WixBundlePackageTupleFields.Description, value);
188 + get => (string)this.Fields[(int)WixBundlePackageSymbolFields.Description];
189 + set => this.Set((int)WixBundlePackageSymbolFields.Description, value);
190 }
191
192 public string RollbackBoundaryRef
193 {
194 - get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundaryRef];
195 - set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundaryRef, value);
194 + get => (string)this.Fields[(int)WixBundlePackageSymbolFields.RollbackBoundaryRef];
195 + set => this.Set((int)WixBundlePackageSymbolFields.RollbackBoundaryRef, value);
196 }
197
198 public string RollbackBoundaryBackwardRef
199 {
200 - get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundaryBackwardRef];
201 - set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundaryBackwardRef, value);
200 + get => (string)this.Fields[(int)WixBundlePackageSymbolFields.RollbackBoundaryBackwardRef];
201 + set => this.Set((int)WixBundlePackageSymbolFields.RollbackBoundaryBackwardRef, value);
202 }
203
204 public bool Win64
205 {
206 - get => (bool)this.Fields[(int)WixBundlePackageTupleFields.Win64];
207 - set => this.Set((int)WixBundlePackageTupleFields.Win64, value);
206 + get => (bool)this.Fields[(int)WixBundlePackageSymbolFields.Win64];
207 + set => this.Set((int)WixBundlePackageSymbolFields.Win64, value);
208 }
209
210 public bool Permanent => (this.Attributes & WixBundlePackageAttributes.Permanent) == WixBundlePackageAttributes.Permanent;
src/WixToolset.Data/Tuples/WixBundlePatchTargetCodeTuple.cs
+20 -20
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundlePatchTargetCode = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundlePatchTargetCode,
9 + public static readonly IntermediateSymbolDefinition WixBundlePatchTargetCode = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundlePatchTargetCode,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeTupleFields.PackageRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeTupleFields.TargetCode), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeTupleFields.Attributes), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeSymbolFields.PackageRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeSymbolFields.TargetCode), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeSymbolFields.Attributes), IntermediateFieldType.Number),
16 },
17 - typeof(WixBundlePatchTargetCodeTuple));
17 + typeof(WixBundlePatchTargetCodeSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 using System;
24
25 - public enum WixBundlePatchTargetCodeTupleFields
25 + public enum WixBundlePatchTargetCodeSymbolFields
26 {
27 PackageRef,
28 TargetCode,
@@ -45,34 +45,34 @@ namespace WixToolset.Data.Tuples
45 TargetsUpgradeCode = 2,
46 }
47
48 - public class WixBundlePatchTargetCodeTuple : IntermediateTuple
48 + public class WixBundlePatchTargetCodeSymbol : IntermediateSymbol
49 {
50 - public WixBundlePatchTargetCodeTuple() : base(TupleDefinitions.WixBundlePatchTargetCode, null, null)
50 + public WixBundlePatchTargetCodeSymbol() : base(SymbolDefinitions.WixBundlePatchTargetCode, null, null)
51 {
52 }
53
54 - public WixBundlePatchTargetCodeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePatchTargetCode, sourceLineNumber, id)
54 + public WixBundlePatchTargetCodeSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundlePatchTargetCode, sourceLineNumber, id)
55 {
56 }
57
58 - public IntermediateField this[WixBundlePatchTargetCodeTupleFields index] => this.Fields[(int)index];
58 + public IntermediateField this[WixBundlePatchTargetCodeSymbolFields index] => this.Fields[(int)index];
59
60 public string PackageRef
61 {
62 - get => (string)this.Fields[(int)WixBundlePatchTargetCodeTupleFields.PackageRef];
63 - set => this.Set((int)WixBundlePatchTargetCodeTupleFields.PackageRef, value);
62 + get => (string)this.Fields[(int)WixBundlePatchTargetCodeSymbolFields.PackageRef];
63 + set => this.Set((int)WixBundlePatchTargetCodeSymbolFields.PackageRef, value);
64 }
65
66 public string TargetCode
67 {
68 - get => (string)this.Fields[(int)WixBundlePatchTargetCodeTupleFields.TargetCode];
69 - set => this.Set((int)WixBundlePatchTargetCodeTupleFields.TargetCode, value);
68 + get => (string)this.Fields[(int)WixBundlePatchTargetCodeSymbolFields.TargetCode];
69 + set => this.Set((int)WixBundlePatchTargetCodeSymbolFields.TargetCode, value);
70 }
71
72 public WixBundlePatchTargetCodeAttributes Attributes
73 {
74 - get => (WixBundlePatchTargetCodeAttributes)this.Fields[(int)WixBundlePatchTargetCodeTupleFields.Attributes].AsNumber();
75 - set => this.Set((int)WixBundlePatchTargetCodeTupleFields.Attributes, (int)value);
74 + get => (WixBundlePatchTargetCodeAttributes)this.Fields[(int)WixBundlePatchTargetCodeSymbolFields.Attributes].AsNumber();
75 + set => this.Set((int)WixBundlePatchTargetCodeSymbolFields.Attributes, (int)value);
76 }
77
78 public bool TargetsProductCode => (this.Attributes & WixBundlePatchTargetCodeAttributes.TargetsProductCode) == WixBundlePatchTargetCodeAttributes.TargetsProductCode;
src/WixToolset.Data/Tuples/WixBundlePayloadGroupTuple.cs
+11 -11
@@ -2,35 +2,35 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundlePayloadGroup = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundlePayloadGroup,
9 + public static readonly IntermediateSymbolDefinition WixBundlePayloadGroup = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundlePayloadGroup,
11 new IntermediateFieldDefinition[]
12 {
13 },
14 - typeof(WixBundlePayloadGroupTuple));
14 + typeof(WixBundlePayloadGroupSymbol));
15 }
16 }
17
18 -namespace WixToolset.Data.Tuples
18 +namespace WixToolset.Data.Symbols
19 {
20 - public enum WixBundlePayloadGroupTupleFields
20 + public enum WixBundlePayloadGroupSymbolFields
21 {
22 }
23
24 - public class WixBundlePayloadGroupTuple : IntermediateTuple
24 + public class WixBundlePayloadGroupSymbol : IntermediateSymbol
25 {
26 - public WixBundlePayloadGroupTuple() : base(TupleDefinitions.WixBundlePayloadGroup, null, null)
26 + public WixBundlePayloadGroupSymbol() : base(SymbolDefinitions.WixBundlePayloadGroup, null, null)
27 {
28 }
29
30 - public WixBundlePayloadGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePayloadGroup, sourceLineNumber, id)
30 + public WixBundlePayloadGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundlePayloadGroup, sourceLineNumber, id)
31 {
32 }
33
34 - public IntermediateField this[WixBundlePayloadGroupTupleFields index] => this.Fields[(int)index];
34 + public IntermediateField this[WixBundlePayloadGroupSymbolFields index] => this.Fields[(int)index];
35 }
36 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs
+74 -74
@@ -2,45 +2,45 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundlePayload = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundlePayload,
9 + public static readonly IntermediateSymbolDefinition WixBundlePayload = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundlePayload,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Name), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.SourceFile), IntermediateFieldType.Path),
15 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.DownloadUrl), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Compressed), IntermediateFieldType.Bool),
17 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.UnresolvedSourceFile), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.DisplayName), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Description), IntermediateFieldType.String),
20 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.EnableSignatureValidation), IntermediateFieldType.Bool),
21 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.FileSize), IntermediateFieldType.Number),
22 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Version), IntermediateFieldType.String),
23 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Hash), IntermediateFieldType.String),
24 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.PublicKey), IntermediateFieldType.String),
25 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Thumbprint), IntermediateFieldType.String),
26 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.CatalogRef), IntermediateFieldType.String),
27 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ContainerRef), IntermediateFieldType.String),
28 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.PackageRef), IntermediateFieldType.String),
29 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ContentFile), IntermediateFieldType.Bool),
30 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.EmbeddedId), IntermediateFieldType.String),
31 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.LayoutOnly), IntermediateFieldType.Bool),
32 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Packaging), IntermediateFieldType.Number),
33 - new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ParentPackagePayloadRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Name), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.SourceFile), IntermediateFieldType.Path),
15 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.DownloadUrl), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Compressed), IntermediateFieldType.Bool),
17 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.UnresolvedSourceFile), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.DisplayName), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Description), IntermediateFieldType.String),
20 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.EnableSignatureValidation), IntermediateFieldType.Bool),
21 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.FileSize), IntermediateFieldType.Number),
22 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Version), IntermediateFieldType.String),
23 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Hash), IntermediateFieldType.String),
24 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.PublicKey), IntermediateFieldType.String),
25 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Thumbprint), IntermediateFieldType.String),
26 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.CatalogRef), IntermediateFieldType.String),
27 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContainerRef), IntermediateFieldType.String),
28 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.PackageRef), IntermediateFieldType.String),
29 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContentFile), IntermediateFieldType.Bool),
30 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.EmbeddedId), IntermediateFieldType.String),
31 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.LayoutOnly), IntermediateFieldType.Bool),
32 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Packaging), IntermediateFieldType.Number),
33 + new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ParentPackagePayloadRef), IntermediateFieldType.String),
34 },
35 - typeof(WixBundlePayloadTuple));
35 + typeof(WixBundlePayloadSymbol));
36 }
37 }
38
39 -namespace WixToolset.Data.Tuples
39 +namespace WixToolset.Data.Symbols
40 {
41 using System;
42
43 - public enum WixBundlePayloadTupleFields
43 + public enum WixBundlePayloadSymbolFields
44 {
45 Name,
46 SourceFile,
@@ -65,142 +65,142 @@ namespace WixToolset.Data.Tuples
65 ParentPackagePayloadRef,
66 }
67
68 - public class WixBundlePayloadTuple : IntermediateTuple
68 + public class WixBundlePayloadSymbol : IntermediateSymbol
69 {
70 - public WixBundlePayloadTuple() : base(TupleDefinitions.WixBundlePayload, null, null)
70 + public WixBundlePayloadSymbol() : base(SymbolDefinitions.WixBundlePayload, null, null)
71 {
72 }
73
74 - public WixBundlePayloadTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePayload, sourceLineNumber, id)
74 + public WixBundlePayloadSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundlePayload, sourceLineNumber, id)
75 {
76 }
77
78 - public IntermediateField this[WixBundlePayloadTupleFields index] => this.Fields[(int)index];
78 + public IntermediateField this[WixBundlePayloadSymbolFields index] => this.Fields[(int)index];
79
80 public string Name
81 {
82 - get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Name];
83 - set => this.Set((int)WixBundlePayloadTupleFields.Name, value);
82 + get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.Name];
83 + set => this.Set((int)WixBundlePayloadSymbolFields.Name, value);
84 }
85
86 public IntermediateFieldPathValue SourceFile
87 {
88 - get => this.Fields[(int)WixBundlePayloadTupleFields.SourceFile].AsPath();
89 - set => this.Set((int)WixBundlePayloadTupleFields.SourceFile, value);
88 + get => this.Fields[(int)WixBundlePayloadSymbolFields.SourceFile].AsPath();
89 + set => this.Set((int)WixBundlePayloadSymbolFields.SourceFile, value);
90 }
91
92 public string DownloadUrl
93 {
94 - get => (string)this.Fields[(int)WixBundlePayloadTupleFields.DownloadUrl];
95 - set => this.Set((int)WixBundlePayloadTupleFields.DownloadUrl, value);
94 + get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.DownloadUrl];
95 + set => this.Set((int)WixBundlePayloadSymbolFields.DownloadUrl, value);
96 }
97
98 public bool? Compressed
99 {
100 - get => (bool?)this.Fields[(int)WixBundlePayloadTupleFields.Compressed];
101 - set => this.Set((int)WixBundlePayloadTupleFields.Compressed, value);
100 + get => (bool?)this.Fields[(int)WixBundlePayloadSymbolFields.Compressed];
101 + set => this.Set((int)WixBundlePayloadSymbolFields.Compressed, value);
102 }
103
104 public string UnresolvedSourceFile
105 {
106 - get => (string)this.Fields[(int)WixBundlePayloadTupleFields.UnresolvedSourceFile];
107 - set => this.Set((int)WixBundlePayloadTupleFields.UnresolvedSourceFile, value);
106 + get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.UnresolvedSourceFile];
107 + set => this.Set((int)WixBundlePayloadSymbolFields.UnresolvedSourceFile, value);
108 }
109
110 public string DisplayName
111 {
112 - get => (string)this.Fields[(int)WixBundlePayloadTupleFields.DisplayName];
113 - set => this.Set((int)WixBundlePayloadTupleFields.DisplayName, value);
112 + get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.DisplayName];
113 + set => this.Set((int)WixBundlePayloadSymbolFields.DisplayName, value);
114 }
115
116 public string Description
117 {
118 - get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Description];
119 - set => this.Set((int)WixBundlePayloadTupleFields.Description, value);
118 + get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.Description];
119 + set => this.Set((int)WixBundlePayloadSymbolFields.Description, value);
120 }
121
122 public bool EnableSignatureValidation
123 {
124 - get => (bool)this.Fields[(int)WixBundlePayloadTupleFields.EnableSignatureValidation];
125 - set => this.Set((int)WixBundlePayloadTupleFields.EnableSignatureValidation, value);
124 + get => (bool)this.Fields[(int)WixBundlePayloadSymbolFields.EnableSignatureValidation];
125 + set => this.Set((int)WixBundlePayloadSymbolFields.EnableSignatureValidation, value);
126 }
127
128 public int? FileSize
129 {
130 - get => (int?)this.Fields[(int)WixBundlePayloadTupleFields.FileSize];
131 - set => this.Set((int)WixBundlePayloadTupleFields.FileSize, value);
130 + get => (int?)this.Fields[(int)WixBundlePayloadSymbolFields.FileSize];
131 + set => this.Set((int)WixBundlePayloadSymbolFields.FileSize, value);
132 }
133
134 public string Version
135 {
136 - get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Version];
137 - set => this.Set((int)WixBundlePayloadTupleFields.Version, value);
136 + get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.Version];
137 + set => this.Set((int)WixBundlePayloadSymbolFields.Version, value);
138 }
139
140 public string Hash
141 {
142 - get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Hash];
143 - set => this.Set((int)WixBundlePayloadTupleFields.Hash, value);
142 + get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.Hash];
143 + set => this.Set((int)WixBundlePayloadSymbolFields.Hash, value);
144 }
145
146 public string PublicKey
147 {
148 - get => (string)this.Fields[(int)WixBundlePayloadTupleFields.PublicKey];
149 - set => this.Set((int)WixBundlePayloadTupleFields.PublicKey, value);
148 + get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.PublicKey];
149 + set => this.Set((int)WixBundlePayloadSymbolFields.PublicKey, value);
150 }
151
152 public string Thumbprint
153 {
154 - get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Thumbprint];
155 - set => this.Set((int)WixBundlePayloadTupleFields.Thumbprint, value);
154 + get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.Thumbprint];
155 + set => this.Set((int)WixBundlePayloadSymbolFields.Thumbprint, value);
156 }
157
158 public string CatalogRef
159 {
160 - get => (string)this.Fields[(int)WixBundlePayloadTupleFields.CatalogRef];
161 - set => this.Set((int)WixBundlePayloadTupleFields.CatalogRef, value);
160 + get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.CatalogRef];
161 + set => this.Set((int)WixBundlePayloadSymbolFields.CatalogRef, value);
162 }
163
164 public string ContainerRef
165 {
166 - get => (string)this.Fields[(int)WixBundlePayloadTupleFields.ContainerRef];
167 - set => this.Set((int)WixBundlePayloadTupleFields.ContainerRef, value);
166 + get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.ContainerRef];
167 + set => this.Set((int)WixBundlePayloadSymbolFields.ContainerRef, value);
168 }
169
170 public string PackageRef
171 {
172 - get => (string)this.Fields[(int)WixBundlePayloadTupleFields.PackageRef];
173 - set => this.Set((int)WixBundlePayloadTupleFields.PackageRef, value);
172 + get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.PackageRef];
173 + set => this.Set((int)WixBundlePayloadSymbolFields.PackageRef, value);
174 }
175
176 public bool ContentFile
177 {
178 - get => (bool)this.Fields[(int)WixBundlePayloadTupleFields.ContentFile];
179 - set => this.Set((int)WixBundlePayloadTupleFields.ContentFile, value);
178 + get => (bool)this.Fields[(int)WixBundlePayloadSymbolFields.ContentFile];
179 + set => this.Set((int)WixBundlePayloadSymbolFields.ContentFile, value);
180 }
181
182 public string EmbeddedId
183 {
184 - get => (string)this.Fields[(int)WixBundlePayloadTupleFields.EmbeddedId];
185 - set => this.Set((int)WixBundlePayloadTupleFields.EmbeddedId, value);
184 + get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.EmbeddedId];
185 + set => this.Set((int)WixBundlePayloadSymbolFields.EmbeddedId, value);
186 }
187
188 public bool LayoutOnly
189 {
190 - get => (bool)this.Fields[(int)WixBundlePayloadTupleFields.LayoutOnly];
191 - set => this.Set((int)WixBundlePayloadTupleFields.LayoutOnly, value);
190 + get => (bool)this.Fields[(int)WixBundlePayloadSymbolFields.LayoutOnly];
191 + set => this.Set((int)WixBundlePayloadSymbolFields.LayoutOnly, value);
192 }
193
194 public PackagingType? Packaging
195 {
196 - get => (PackagingType?)this.Fields[(int)WixBundlePayloadTupleFields.Packaging].AsNumber();
197 - set => this.Set((int)WixBundlePayloadTupleFields.Packaging, (int?)value);
196 + get => (PackagingType?)this.Fields[(int)WixBundlePayloadSymbolFields.Packaging].AsNumber();
197 + set => this.Set((int)WixBundlePayloadSymbolFields.Packaging, (int?)value);
198 }
199
200 public string ParentPackagePayloadRef
201 {
202 - get => (string)this.Fields[(int)WixBundlePayloadTupleFields.ParentPackagePayloadRef];
203 - set => this.Set((int)WixBundlePayloadTupleFields.ParentPackagePayloadRef, value);
202 + get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.ParentPackagePayloadRef];
203 + set => this.Set((int)WixBundlePayloadSymbolFields.ParentPackagePayloadRef, value);
204 }
205 }
206 }
src/WixToolset.Data/Tuples/WixBundleRelatedPackageTuple.cs
+29 -29
@@ -2,30 +2,30 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleRelatedPackage = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleRelatedPackage,
9 + public static readonly IntermediateSymbolDefinition WixBundleRelatedPackage = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleRelatedPackage,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.PackageRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.RelatedId), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.MinVersion), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.MaxVersion), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.Languages), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.Attributes), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.PackageRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.RelatedId), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.MinVersion), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.MaxVersion), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.Languages), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.Attributes), IntermediateFieldType.Number),
19 },
20 - typeof(WixBundleRelatedPackageTuple));
20 + typeof(WixBundleRelatedPackageSymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 using System;
27
28 - public enum WixBundleRelatedPackageTupleFields
28 + public enum WixBundleRelatedPackageSymbolFields
29 {
30 PackageRef,
31 RelatedId,
@@ -45,52 +45,52 @@ namespace WixToolset.Data.Tuples
45 LangInclusive = 0x8,
46 }
47
48 - public class WixBundleRelatedPackageTuple : IntermediateTuple
48 + public class WixBundleRelatedPackageSymbol : IntermediateSymbol
49 {
50 - public WixBundleRelatedPackageTuple() : base(TupleDefinitions.WixBundleRelatedPackage, null, null)
50 + public WixBundleRelatedPackageSymbol() : base(SymbolDefinitions.WixBundleRelatedPackage, null, null)
51 {
52 }
53
54 - public WixBundleRelatedPackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleRelatedPackage, sourceLineNumber, id)
54 + public WixBundleRelatedPackageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleRelatedPackage, sourceLineNumber, id)
55 {
56 }
57
58 - public IntermediateField this[WixBundleRelatedPackageTupleFields index] => this.Fields[(int)index];
58 + public IntermediateField this[WixBundleRelatedPackageSymbolFields index] => this.Fields[(int)index];
59
60 public string PackageRef
61 {
62 - get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.PackageRef];
63 - set => this.Set((int)WixBundleRelatedPackageTupleFields.PackageRef, value);
62 + get => (string)this.Fields[(int)WixBundleRelatedPackageSymbolFields.PackageRef];
63 + set => this.Set((int)WixBundleRelatedPackageSymbolFields.PackageRef, value);
64 }
65
66 public string RelatedId
67 {
68 - get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.RelatedId];
69 - set => this.Set((int)WixBundleRelatedPackageTupleFields.RelatedId, value);
68 + get => (string)this.Fields[(int)WixBundleRelatedPackageSymbolFields.RelatedId];
69 + set => this.Set((int)WixBundleRelatedPackageSymbolFields.RelatedId, value);
70 }
71
72 public string MinVersion
73 {
74 - get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.MinVersion];
75 - set => this.Set((int)WixBundleRelatedPackageTupleFields.MinVersion, value);
74 + get => (string)this.Fields[(int)WixBundleRelatedPackageSymbolFields.MinVersion];
75 + set => this.Set((int)WixBundleRelatedPackageSymbolFields.MinVersion, value);
76 }
77
78 public string MaxVersion
79 {
80 - get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.MaxVersion];
81 - set => this.Set((int)WixBundleRelatedPackageTupleFields.MaxVersion, value);
80 + get => (string)this.Fields[(int)WixBundleRelatedPackageSymbolFields.MaxVersion];
81 + set => this.Set((int)WixBundleRelatedPackageSymbolFields.MaxVersion, value);
82 }
83
84 public string Languages
85 {
86 - get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.Languages];
87 - set => this.Set((int)WixBundleRelatedPackageTupleFields.Languages, value);
86 + get => (string)this.Fields[(int)WixBundleRelatedPackageSymbolFields.Languages];
87 + set => this.Set((int)WixBundleRelatedPackageSymbolFields.Languages, value);
88 }
89
90 public WixBundleRelatedPackageAttributes Attributes
91 {
92 - get => (WixBundleRelatedPackageAttributes)this.Fields[(int)WixBundleRelatedPackageTupleFields.Attributes].AsNumber();
93 - set => this.Set((int)WixBundleRelatedPackageTupleFields.Attributes, (int)value);
92 + get => (WixBundleRelatedPackageAttributes)this.Fields[(int)WixBundleRelatedPackageSymbolFields.Attributes].AsNumber();
93 + set => this.Set((int)WixBundleRelatedPackageSymbolFields.Attributes, (int)value);
94 }
95
96 public bool MinInclusive => (this.Attributes & WixBundleRelatedPackageAttributes.MinInclusive) == WixBundleRelatedPackageAttributes.MinInclusive;
src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleRollbackBoundary = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleRollbackBoundary,
9 + public static readonly IntermediateSymbolDefinition WixBundleRollbackBoundary = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleRollbackBoundary,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundaryTupleFields.Vital), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundaryTupleFields.Transaction), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundarySymbolFields.Vital), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundarySymbolFields.Transaction), IntermediateFieldType.Number),
15 },
16 - typeof(WixBundleRollbackBoundaryTuple));
16 + typeof(WixBundleRollbackBoundarySymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum WixBundleRollbackBoundaryTupleFields
22 + public enum WixBundleRollbackBoundarySymbolFields
23 {
24 Vital,
25 Transaction,
26 }
27
28 - public class WixBundleRollbackBoundaryTuple : IntermediateTuple
28 + public class WixBundleRollbackBoundarySymbol : IntermediateSymbol
29 {
30 - public WixBundleRollbackBoundaryTuple() : base(TupleDefinitions.WixBundleRollbackBoundary, null, null)
30 + public WixBundleRollbackBoundarySymbol() : base(SymbolDefinitions.WixBundleRollbackBoundary, null, null)
31 {
32 }
33
34 - public WixBundleRollbackBoundaryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleRollbackBoundary, sourceLineNumber, id)
34 + public WixBundleRollbackBoundarySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleRollbackBoundary, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[WixBundleRollbackBoundaryTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[WixBundleRollbackBoundarySymbolFields index] => this.Fields[(int)index];
39
40 public bool? Vital
41 {
42 - get => (bool?)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.Vital];
43 - set => this.Set((int)WixBundleRollbackBoundaryTupleFields.Vital, value);
42 + get => (bool?)this.Fields[(int)WixBundleRollbackBoundarySymbolFields.Vital];
43 + set => this.Set((int)WixBundleRollbackBoundarySymbolFields.Vital, value);
44 }
45
46 public bool? Transaction
47 {
48 - get => (bool?)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.Transaction];
49 - set => this.Set((int)WixBundleRollbackBoundaryTupleFields.Transaction, value);
48 + get => (bool?)this.Fields[(int)WixBundleRollbackBoundarySymbolFields.Transaction];
49 + set => this.Set((int)WixBundleRollbackBoundarySymbolFields.Transaction, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleSlipstreamMsp = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleSlipstreamMsp,
9 + public static readonly IntermediateSymbolDefinition WixBundleSlipstreamMsp = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleSlipstreamMsp,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspTupleFields.TargetPackageRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspTupleFields.MspPackageRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspSymbolFields.TargetPackageRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspSymbolFields.MspPackageRef), IntermediateFieldType.String),
15 },
16 - typeof(WixBundleSlipstreamMspTuple));
16 + typeof(WixBundleSlipstreamMspSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum WixBundleSlipstreamMspTupleFields
22 + public enum WixBundleSlipstreamMspSymbolFields
23 {
24 TargetPackageRef,
25 MspPackageRef,
26 }
27
28 - public class WixBundleSlipstreamMspTuple : IntermediateTuple
28 + public class WixBundleSlipstreamMspSymbol : IntermediateSymbol
29 {
30 - public WixBundleSlipstreamMspTuple() : base(TupleDefinitions.WixBundleSlipstreamMsp, null, null)
30 + public WixBundleSlipstreamMspSymbol() : base(SymbolDefinitions.WixBundleSlipstreamMsp, null, null)
31 {
32 }
33
34 - public WixBundleSlipstreamMspTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleSlipstreamMsp, sourceLineNumber, id)
34 + public WixBundleSlipstreamMspSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleSlipstreamMsp, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[WixBundleSlipstreamMspTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[WixBundleSlipstreamMspSymbolFields index] => this.Fields[(int)index];
39
40 public string TargetPackageRef
41 {
42 - get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.TargetPackageRef];
43 - set => this.Set((int)WixBundleSlipstreamMspTupleFields.TargetPackageRef, value);
42 + get => (string)this.Fields[(int)WixBundleSlipstreamMspSymbolFields.TargetPackageRef];
43 + set => this.Set((int)WixBundleSlipstreamMspSymbolFields.TargetPackageRef, value);
44 }
45
46 public string MspPackageRef
47 {
48 - get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.MspPackageRef];
49 - set => this.Set((int)WixBundleSlipstreamMspTupleFields.MspPackageRef, value);
48 + get => (string)this.Fields[(int)WixBundleSlipstreamMspSymbolFields.MspPackageRef];
49 + set => this.Set((int)WixBundleSlipstreamMspSymbolFields.MspPackageRef, value);
50 }
51 }
52 }
src/WixToolset.Data/Tuples/WixBundleTuple.cs
+77 -77
@@ -2,46 +2,46 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundle = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundle,
9 + public static readonly IntermediateSymbolDefinition WixBundle = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundle,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.UpgradeCode), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Version), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Copyright), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Name), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Manufacturer), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Attributes), IntermediateFieldType.Number),
19 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.AboutUrl), IntermediateFieldType.String),
20 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.HelpUrl), IntermediateFieldType.String),
21 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.HelpTelephone), IntermediateFieldType.String),
22 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.UpdateUrl), IntermediateFieldType.String),
23 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Compressed), IntermediateFieldType.Bool),
24 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.LogPathVariable), IntermediateFieldType.String),
25 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.LogPrefix), IntermediateFieldType.String),
26 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.LogExtension), IntermediateFieldType.String),
27 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.IconSourceFile), IntermediateFieldType.Path),
28 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.SplashScreenSourceFile), IntermediateFieldType.Path),
29 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Condition), IntermediateFieldType.String),
30 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Tag), IntermediateFieldType.String),
31 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Platform), IntermediateFieldType.String),
32 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.ParentName), IntermediateFieldType.String),
33 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.BundleId), IntermediateFieldType.String),
34 - new IntermediateFieldDefinition(nameof(WixBundleTupleFields.ProviderKey), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.UpgradeCode), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Version), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Copyright), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Name), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Manufacturer), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Attributes), IntermediateFieldType.Number),
19 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.AboutUrl), IntermediateFieldType.String),
20 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.HelpUrl), IntermediateFieldType.String),
21 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.HelpTelephone), IntermediateFieldType.String),
22 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.UpdateUrl), IntermediateFieldType.String),
23 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Compressed), IntermediateFieldType.Bool),
24 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.LogPathVariable), IntermediateFieldType.String),
25 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.LogPrefix), IntermediateFieldType.String),
26 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.LogExtension), IntermediateFieldType.String),
27 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.IconSourceFile), IntermediateFieldType.Path),
28 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.SplashScreenSourceFile), IntermediateFieldType.Path),
29 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Condition), IntermediateFieldType.String),
30 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Tag), IntermediateFieldType.String),
31 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Platform), IntermediateFieldType.String),
32 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.ParentName), IntermediateFieldType.String),
33 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.BundleId), IntermediateFieldType.String),
34 + new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.ProviderKey), IntermediateFieldType.String),
35 },
36 - typeof(WixBundleTuple));
36 + typeof(WixBundleSymbol));
37 }
38 }
39
40 -namespace WixToolset.Data.Tuples
40 +namespace WixToolset.Data.Symbols
41 {
42 using System;
43
44 - public enum WixBundleTupleFields
44 + public enum WixBundleSymbolFields
45 {
46 UpgradeCode,
47 Version,
@@ -77,148 +77,148 @@ namespace WixToolset.Data.Tuples
77 PerMachine = 0x8,
78 }
79
80 - public class WixBundleTuple : IntermediateTuple
80 + public class WixBundleSymbol : IntermediateSymbol
81 {
82 - public WixBundleTuple() : base(TupleDefinitions.WixBundle, null, null)
82 + public WixBundleSymbol() : base(SymbolDefinitions.WixBundle, null, null)
83 {
84 }
85
86 - public WixBundleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundle, sourceLineNumber, id)
86 + public WixBundleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundle, sourceLineNumber, id)
87 {
88 }
89
90 - public IntermediateField this[WixBundleTupleFields index] => this.Fields[(int)index];
90 + public IntermediateField this[WixBundleSymbolFields index] => this.Fields[(int)index];
91
92 public string UpgradeCode
93 {
94 - get => (string)this.Fields[(int)WixBundleTupleFields.UpgradeCode];
95 - set => this.Set((int)WixBundleTupleFields.UpgradeCode, value);
94 + get => (string)this.Fields[(int)WixBundleSymbolFields.UpgradeCode];
95 + set => this.Set((int)WixBundleSymbolFields.UpgradeCode, value);
96 }
97
98 public string Version
99 {
100 - get => (string)this.Fields[(int)WixBundleTupleFields.Version];
101 - set => this.Set((int)WixBundleTupleFields.Version, value);
100 + get => (string)this.Fields[(int)WixBundleSymbolFields.Version];
101 + set => this.Set((int)WixBundleSymbolFields.Version, value);
102 }
103
104 public string Copyright
105 {
106 - get => (string)this.Fields[(int)WixBundleTupleFields.Copyright];
107 - set => this.Set((int)WixBundleTupleFields.Copyright, value);
106 + get => (string)this.Fields[(int)WixBundleSymbolFields.Copyright];
107 + set => this.Set((int)WixBundleSymbolFields.Copyright, value);
108 }
109
110 public string Name
111 {
112 - get => (string)this.Fields[(int)WixBundleTupleFields.Name];
113 - set => this.Set((int)WixBundleTupleFields.Name, value);
112 + get => (string)this.Fields[(int)WixBundleSymbolFields.Name];
113 + set => this.Set((int)WixBundleSymbolFields.Name, value);
114 }
115
116 public string Manufacturer
117 {
118 - get => (string)this.Fields[(int)WixBundleTupleFields.Manufacturer];
119 - set => this.Set((int)WixBundleTupleFields.Manufacturer, value);
118 + get => (string)this.Fields[(int)WixBundleSymbolFields.Manufacturer];
119 + set => this.Set((int)WixBundleSymbolFields.Manufacturer, value);
120 }
121
122 public WixBundleAttributes Attributes
123 {
124 - get => (WixBundleAttributes)this.Fields[(int)WixBundleTupleFields.Attributes].AsNumber();
125 - set => this.Set((int)WixBundleTupleFields.Attributes, (int)value);
124 + get => (WixBundleAttributes)this.Fields[(int)WixBundleSymbolFields.Attributes].AsNumber();
125 + set => this.Set((int)WixBundleSymbolFields.Attributes, (int)value);
126 }
127
128 public string AboutUrl
129 {
130 - get => (string)this.Fields[(int)WixBundleTupleFields.AboutUrl];
131 - set => this.Set((int)WixBundleTupleFields.AboutUrl, value);
130 + get => (string)this.Fields[(int)WixBundleSymbolFields.AboutUrl];
131 + set => this.Set((int)WixBundleSymbolFields.AboutUrl, value);
132 }
133
134 public string HelpTelephone
135 {
136 - get => (string)this.Fields[(int)WixBundleTupleFields.HelpTelephone];
137 - set => this.Set((int)WixBundleTupleFields.HelpTelephone, value);
136 + get => (string)this.Fields[(int)WixBundleSymbolFields.HelpTelephone];
137 + set => this.Set((int)WixBundleSymbolFields.HelpTelephone, value);
138 }
139
140 public string HelpUrl
141 {
142 - get => (string)this.Fields[(int)WixBundleTupleFields.HelpUrl];
143 - set => this.Set((int)WixBundleTupleFields.HelpUrl, value);
142 + get => (string)this.Fields[(int)WixBundleSymbolFields.HelpUrl];
143 + set => this.Set((int)WixBundleSymbolFields.HelpUrl, value);
144 }
145
146 public string UpdateUrl
147 {
148 - get => (string)this.Fields[(int)WixBundleTupleFields.UpdateUrl];
149 - set => this.Set((int)WixBundleTupleFields.UpdateUrl, value);
148 + get => (string)this.Fields[(int)WixBundleSymbolFields.UpdateUrl];
149 + set => this.Set((int)WixBundleSymbolFields.UpdateUrl, value);
150 }
151
152 public bool? Compressed
153 {
154 - get => (bool?)this.Fields[(int)WixBundleTupleFields.Compressed];
155 - set => this.Set((int)WixBundleTupleFields.Compressed, value);
154 + get => (bool?)this.Fields[(int)WixBundleSymbolFields.Compressed];
155 + set => this.Set((int)WixBundleSymbolFields.Compressed, value);
156 }
157
158 public string LogPathVariable
159 {
160 - get => (string)this.Fields[(int)WixBundleTupleFields.LogPathVariable];
161 - set => this.Set((int)WixBundleTupleFields.LogPathVariable, value);
160 + get => (string)this.Fields[(int)WixBundleSymbolFields.LogPathVariable];
161 + set => this.Set((int)WixBundleSymbolFields.LogPathVariable, value);
162 }
163
164 public string LogPrefix
165 {
166 - get => (string)this.Fields[(int)WixBundleTupleFields.LogPrefix];
167 - set => this.Set((int)WixBundleTupleFields.LogPrefix, value);
166 + get => (string)this.Fields[(int)WixBundleSymbolFields.LogPrefix];
167 + set => this.Set((int)WixBundleSymbolFields.LogPrefix, value);
168 }
169
170 public string LogExtension
171 {
172 - get => (string)this.Fields[(int)WixBundleTupleFields.LogExtension];
173 - set => this.Set((int)WixBundleTupleFields.LogExtension, value);
172 + get => (string)this.Fields[(int)WixBundleSymbolFields.LogExtension];
173 + set => this.Set((int)WixBundleSymbolFields.LogExtension, value);
174 }
175
176 public string IconSourceFile
177 {
178 - get => (string)this.Fields[(int)WixBundleTupleFields.IconSourceFile];
179 - set => this.Set((int)WixBundleTupleFields.IconSourceFile, value);
178 + get => (string)this.Fields[(int)WixBundleSymbolFields.IconSourceFile];
179 + set => this.Set((int)WixBundleSymbolFields.IconSourceFile, value);
180 }
181
182 public string SplashScreenSourceFile
183 {
184 - get => (string)this.Fields[(int)WixBundleTupleFields.SplashScreenSourceFile];
185 - set => this.Set((int)WixBundleTupleFields.SplashScreenSourceFile, value);
184 + get => (string)this.Fields[(int)WixBundleSymbolFields.SplashScreenSourceFile];
185 + set => this.Set((int)WixBundleSymbolFields.SplashScreenSourceFile, value);
186 }
187
188 public string Condition
189 {
190 - get => (string)this.Fields[(int)WixBundleTupleFields.Condition];
191 - set => this.Set((int)WixBundleTupleFields.Condition, value);
190 + get => (string)this.Fields[(int)WixBundleSymbolFields.Condition];
191 + set => this.Set((int)WixBundleSymbolFields.Condition, value);
192 }
193
194 public string Tag
195 {
196 - get => (string)this.Fields[(int)WixBundleTupleFields.Tag];
197 - set => this.Set((int)WixBundleTupleFields.Tag, value);
196 + get => (string)this.Fields[(int)WixBundleSymbolFields.Tag];
197 + set => this.Set((int)WixBundleSymbolFields.Tag, value);
198 }
199
200 public Platform Platform
201 {
202 - get => (Platform)this.Fields[(int)WixBundleTupleFields.Platform].AsNumber();
203 - set => this.Set((int)WixBundleTupleFields.Platform, (int)value);
202 + get => (Platform)this.Fields[(int)WixBundleSymbolFields.Platform].AsNumber();
203 + set => this.Set((int)WixBundleSymbolFields.Platform, (int)value);
204 }
205
206 public string ParentName
207 {
208 - get => (string)this.Fields[(int)WixBundleTupleFields.ParentName];
209 - set => this.Set((int)WixBundleTupleFields.ParentName, value);
208 + get => (string)this.Fields[(int)WixBundleSymbolFields.ParentName];
209 + set => this.Set((int)WixBundleSymbolFields.ParentName, value);
210 }
211
212 public string BundleId
213 {
214 - get => (string)this.Fields[(int)WixBundleTupleFields.BundleId];
215 - set => this.Set((int)WixBundleTupleFields.BundleId, value);
214 + get => (string)this.Fields[(int)WixBundleSymbolFields.BundleId];
215 + set => this.Set((int)WixBundleSymbolFields.BundleId, value);
216 }
217
218 public string ProviderKey
219 {
220 - get => (string)this.Fields[(int)WixBundleTupleFields.ProviderKey];
221 - set => this.Set((int)WixBundleTupleFields.ProviderKey, value);
220 + get => (string)this.Fields[(int)WixBundleSymbolFields.ProviderKey];
221 + set => this.Set((int)WixBundleSymbolFields.ProviderKey, value);
222 }
223
224 public PackagingType DefaultPackagingType => (this.Compressed.HasValue && !this.Compressed.Value) ? PackagingType.External : PackagingType.Embedded;
src/WixToolset.Data/Tuples/WixBundleUpdateTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleUpdate = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleUpdate,
9 + public static readonly IntermediateSymbolDefinition WixBundleUpdate = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleUpdate,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleUpdateTupleFields.Location), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundleUpdateTupleFields.Attributes), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixBundleUpdateSymbolFields.Location), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundleUpdateSymbolFields.Attributes), IntermediateFieldType.Number),
15 },
16 - typeof(WixBundleUpdateTuple));
16 + typeof(WixBundleUpdateSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum WixBundleUpdateTupleFields
22 + public enum WixBundleUpdateSymbolFields
23 {
24 Location,
25 Attributes,
26 }
27
28 - public class WixBundleUpdateTuple : IntermediateTuple
28 + public class WixBundleUpdateSymbol : IntermediateSymbol
29 {
30 - public WixBundleUpdateTuple() : base(TupleDefinitions.WixBundleUpdate, null, null)
30 + public WixBundleUpdateSymbol() : base(SymbolDefinitions.WixBundleUpdate, null, null)
31 {
32 }
33
34 - public WixBundleUpdateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleUpdate, sourceLineNumber, id)
34 + public WixBundleUpdateSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleUpdate, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[WixBundleUpdateTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[WixBundleUpdateSymbolFields index] => this.Fields[(int)index];
39
40 public string Location
41 {
42 - get => (string)this.Fields[(int)WixBundleUpdateTupleFields.Location];
43 - set => this.Set((int)WixBundleUpdateTupleFields.Location, value);
42 + get => (string)this.Fields[(int)WixBundleUpdateSymbolFields.Location];
43 + set => this.Set((int)WixBundleUpdateSymbolFields.Location, value);
44 }
45
46 public int Attributes
47 {
48 - get => (int)this.Fields[(int)WixBundleUpdateTupleFields.Attributes];
49 - set => this.Set((int)WixBundleUpdateTupleFields.Attributes, value);
48 + get => (int)this.Fields[(int)WixBundleUpdateSymbolFields.Attributes];
49 + set => this.Set((int)WixBundleUpdateSymbolFields.Attributes, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixBundleVariableTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixBundleVariable = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixBundleVariable,
9 + public static readonly IntermediateSymbolDefinition WixBundleVariable = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixBundleVariable,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.Value), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.Type), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.Hidden), IntermediateFieldType.Bool),
16 - new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.Persisted), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(WixBundleVariableSymbolFields.Value), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixBundleVariableSymbolFields.Type), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixBundleVariableSymbolFields.Hidden), IntermediateFieldType.Bool),
16 + new IntermediateFieldDefinition(nameof(WixBundleVariableSymbolFields.Persisted), IntermediateFieldType.Bool),
17 },
18 - typeof(WixBundleVariableTuple));
18 + typeof(WixBundleVariableSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum WixBundleVariableTupleFields
24 + public enum WixBundleVariableSymbolFields
25 {
26 Value,
27 Type,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Persisted,
30 }
31
32 - public class WixBundleVariableTuple : IntermediateTuple
32 + public class WixBundleVariableSymbol : IntermediateSymbol
33 {
34 - public WixBundleVariableTuple() : base(TupleDefinitions.WixBundleVariable, null, null)
34 + public WixBundleVariableSymbol() : base(SymbolDefinitions.WixBundleVariable, null, null)
35 {
36 }
37
38 - public WixBundleVariableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleVariable, sourceLineNumber, id)
38 + public WixBundleVariableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleVariable, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[WixBundleVariableTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[WixBundleVariableSymbolFields index] => this.Fields[(int)index];
43
44 public string Value
45 {
46 - get => (string)this.Fields[(int)WixBundleVariableTupleFields.Value];
47 - set => this.Set((int)WixBundleVariableTupleFields.Value, value);
46 + get => (string)this.Fields[(int)WixBundleVariableSymbolFields.Value];
47 + set => this.Set((int)WixBundleVariableSymbolFields.Value, value);
48 }
49
50 public string Type
51 {
52 - get => (string)this.Fields[(int)WixBundleVariableTupleFields.Type];
53 - set => this.Set((int)WixBundleVariableTupleFields.Type, value);
52 + get => (string)this.Fields[(int)WixBundleVariableSymbolFields.Type];
53 + set => this.Set((int)WixBundleVariableSymbolFields.Type, value);
54 }
55
56 public bool Hidden
57 {
58 - get => (bool)this.Fields[(int)WixBundleVariableTupleFields.Hidden];
59 - set => this.Set((int)WixBundleVariableTupleFields.Hidden, value);
58 + get => (bool)this.Fields[(int)WixBundleVariableSymbolFields.Hidden];
59 + set => this.Set((int)WixBundleVariableSymbolFields.Hidden, value);
60 }
61
62 public bool Persisted
63 {
64 - get => (bool)this.Fields[(int)WixBundleVariableTupleFields.Persisted];
65 - set => this.Set((int)WixBundleVariableTupleFields.Persisted, value);
64 + get => (bool)this.Fields[(int)WixBundleVariableSymbolFields.Persisted];
65 + set => this.Set((int)WixBundleVariableSymbolFields.Persisted, value);
66 }
67 }
68 }
src/WixToolset.Data/Tuples/WixChainItemTuple.cs
+11 -11
@@ -2,35 +2,35 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixChainItem = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixChainItem,
9 + public static readonly IntermediateSymbolDefinition WixChainItem = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixChainItem,
11 new IntermediateFieldDefinition[]
12 {
13 },
14 - typeof(WixChainItemTuple));
14 + typeof(WixChainItemSymbol));
15 }
16 }
17
18 -namespace WixToolset.Data.Tuples
18 +namespace WixToolset.Data.Symbols
19 {
20 - public enum WixChainItemTupleFields
20 + public enum WixChainItemSymbolFields
21 {
22 }
23
24 - public class WixChainItemTuple : IntermediateTuple
24 + public class WixChainItemSymbol : IntermediateSymbol
25 {
26 - public WixChainItemTuple() : base(TupleDefinitions.WixChainItem, null, null)
26 + public WixChainItemSymbol() : base(SymbolDefinitions.WixChainItem, null, null)
27 {
28 }
29
30 - public WixChainItemTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixChainItem, sourceLineNumber, id)
30 + public WixChainItemSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixChainItem, sourceLineNumber, id)
31 {
32 }
33
34 - public IntermediateField this[WixChainItemTupleFields index] => this.Fields[(int)index];
34 + public IntermediateField this[WixChainItemSymbolFields index] => this.Fields[(int)index];
35 }
36 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixChainTuple.cs
+14 -14
@@ -2,25 +2,25 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixChain = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixChain,
9 + public static readonly IntermediateSymbolDefinition WixChain = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixChain,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixChainTupleFields.Attributes), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixChainSymbolFields.Attributes), IntermediateFieldType.Number),
14 },
15 - typeof(WixChainTuple));
15 + typeof(WixChainSymbol));
16 }
17 }
18
19 -namespace WixToolset.Data.Tuples
19 +namespace WixToolset.Data.Symbols
20 {
21 using System;
22
23 - public enum WixChainTupleFields
23 + public enum WixChainSymbolFields
24 {
25 Attributes,
26 }
@@ -34,22 +34,22 @@ namespace WixToolset.Data.Tuples
34 ParallelCache = 0x4,
35 }
36
37 - public class WixChainTuple : IntermediateTuple
37 + public class WixChainSymbol : IntermediateSymbol
38 {
39 - public WixChainTuple() : base(TupleDefinitions.WixChain, null, null)
39 + public WixChainSymbol() : base(SymbolDefinitions.WixChain, null, null)
40 {
41 }
42
43 - public WixChainTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixChain, sourceLineNumber, id)
43 + public WixChainSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixChain, sourceLineNumber, id)
44 {
45 }
46
47 - public IntermediateField this[WixChainTupleFields index] => this.Fields[(int)index];
47 + public IntermediateField this[WixChainSymbolFields index] => this.Fields[(int)index];
48
49 public WixChainAttributes Attributes
50 {
51 - get => (WixChainAttributes)(int)this.Fields[(int)WixChainTupleFields.Attributes];
52 - set => this.Set((int)WixChainTupleFields.Attributes, (int)value);
51 + get => (WixChainAttributes)(int)this.Fields[(int)WixChainSymbolFields.Attributes];
52 + set => this.Set((int)WixChainSymbolFields.Attributes, (int)value);
53 }
54
55 public bool DisableRollback => (this.Attributes & WixChainAttributes.DisableRollback) == WixChainAttributes.DisableRollback;
src/WixToolset.Data/Tuples/WixComplexReferenceTuple.cs
+29 -29
@@ -2,30 +2,30 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixComplexReference = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixComplexReference,
9 + public static readonly IntermediateSymbolDefinition WixComplexReference = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixComplexReference,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.Parent), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.ParentAttributes), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.ParentLanguage), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.Child), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.ChildAttributes), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.Attributes), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(WixComplexReferenceSymbolFields.Parent), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixComplexReferenceSymbolFields.ParentAttributes), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixComplexReferenceSymbolFields.ParentLanguage), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixComplexReferenceSymbolFields.Child), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(WixComplexReferenceSymbolFields.ChildAttributes), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(WixComplexReferenceSymbolFields.Attributes), IntermediateFieldType.Bool),
19 },
20 - typeof(WixComplexReferenceTuple));
20 + typeof(WixComplexReferenceSymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 using System;
27
28 - public enum WixComplexReferenceTupleFields
28 + public enum WixComplexReferenceSymbolFields
29 {
30 Parent,
31 ParentAttributes,
@@ -35,52 +35,52 @@ namespace WixToolset.Data.Tuples
35 Attributes,
36 }
37
38 - public class WixComplexReferenceTuple : IntermediateTuple
38 + public class WixComplexReferenceSymbol : IntermediateSymbol
39 {
40 - public WixComplexReferenceTuple() : base(TupleDefinitions.WixComplexReference, null, null)
40 + public WixComplexReferenceSymbol() : base(SymbolDefinitions.WixComplexReference, null, null)
41 {
42 }
43
44 - public WixComplexReferenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixComplexReference, sourceLineNumber, id)
44 + public WixComplexReferenceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixComplexReference, sourceLineNumber, id)
45 {
46 }
47
48 - public IntermediateField this[WixComplexReferenceTupleFields index] => this.Fields[(int)index];
48 + public IntermediateField this[WixComplexReferenceSymbolFields index] => this.Fields[(int)index];
49
50 public string Parent
51 {
52 - get => (string)this.Fields[(int)WixComplexReferenceTupleFields.Parent];
53 - set => this.Set((int)WixComplexReferenceTupleFields.Parent, value);
52 + get => (string)this.Fields[(int)WixComplexReferenceSymbolFields.Parent];
53 + set => this.Set((int)WixComplexReferenceSymbolFields.Parent, value);
54 }
55
56 public ComplexReferenceParentType ParentType
57 {
58 - get => (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[(int)WixComplexReferenceTupleFields.ParentAttributes], true);
59 - set => this.Set((int)WixComplexReferenceTupleFields.ParentAttributes, value.ToString());
58 + get => (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[(int)WixComplexReferenceSymbolFields.ParentAttributes], true);
59 + set => this.Set((int)WixComplexReferenceSymbolFields.ParentAttributes, value.ToString());
60 }
61
62 public string ParentLanguage
63 {
64 - get => (string)this.Fields[(int)WixComplexReferenceTupleFields.ParentLanguage];
65 - set => this.Set((int)WixComplexReferenceTupleFields.ParentLanguage, value);
64 + get => (string)this.Fields[(int)WixComplexReferenceSymbolFields.ParentLanguage];
65 + set => this.Set((int)WixComplexReferenceSymbolFields.ParentLanguage, value);
66 }
67
68 public string Child
69 {
70 - get => (string)this.Fields[(int)WixComplexReferenceTupleFields.Child];
71 - set => this.Set((int)WixComplexReferenceTupleFields.Child, value);
70 + get => (string)this.Fields[(int)WixComplexReferenceSymbolFields.Child];
71 + set => this.Set((int)WixComplexReferenceSymbolFields.Child, value);
72 }
73
74 public ComplexReferenceChildType ChildType
75 {
76 - get => (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[(int)WixComplexReferenceTupleFields.ChildAttributes], true);
77 - set => this.Set((int)WixComplexReferenceTupleFields.ChildAttributes, value.ToString());
76 + get => (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[(int)WixComplexReferenceSymbolFields.ChildAttributes], true);
77 + set => this.Set((int)WixComplexReferenceSymbolFields.ChildAttributes, value.ToString());
78 }
79
80 public bool IsPrimary
81 {
82 - get => (bool)this.Fields[(int)WixComplexReferenceTupleFields.Attributes];
83 - set => this.Set((int)WixComplexReferenceTupleFields.Attributes, value);
82 + get => (bool)this.Fields[(int)WixComplexReferenceSymbolFields.Attributes];
83 + set => this.Set((int)WixComplexReferenceSymbolFields.Attributes, value);
84 }
85 }
86 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixComponentGroupTuple.cs
+14 -14
@@ -2,43 +2,43 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixComponentGroup = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixComponentGroup,
9 + public static readonly IntermediateSymbolDefinition WixComponentGroup = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixComponentGroup,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixComponentGroupTupleFields.WixComponentGroup), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixComponentGroupSymbolFields.WixComponentGroup), IntermediateFieldType.String),
14 },
15 - typeof(WixComponentGroupTuple));
15 + typeof(WixComponentGroupSymbol));
16 }
17 }
18
19 -namespace WixToolset.Data.Tuples
19 +namespace WixToolset.Data.Symbols
20 {
21 - public enum WixComponentGroupTupleFields
21 + public enum WixComponentGroupSymbolFields
22 {
23 WixComponentGroup,
24 }
25
26 - public class WixComponentGroupTuple : IntermediateTuple
26 + public class WixComponentGroupSymbol : IntermediateSymbol
27 {
28 - public WixComponentGroupTuple() : base(TupleDefinitions.WixComponentGroup, null, null)
28 + public WixComponentGroupSymbol() : base(SymbolDefinitions.WixComponentGroup, null, null)
29 {
30 }
31
32 - public WixComponentGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixComponentGroup, sourceLineNumber, id)
32 + public WixComponentGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixComponentGroup, sourceLineNumber, id)
33 {
34 }
35
36 - public IntermediateField this[WixComponentGroupTupleFields index] => this.Fields[(int)index];
36 + public IntermediateField this[WixComponentGroupSymbolFields index] => this.Fields[(int)index];
37
38 public string WixComponentGroup
39 {
40 - get => (string)this.Fields[(int)WixComponentGroupTupleFields.WixComponentGroup];
41 - set => this.Set((int)WixComponentGroupTupleFields.WixComponentGroup, value);
40 + get => (string)this.Fields[(int)WixComponentGroupSymbolFields.WixComponentGroup];
41 + set => this.Set((int)WixComponentGroupSymbolFields.WixComponentGroup, value);
42 }
43 }
44 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs
+20 -20
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixComponentSearch = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixComponentSearch,
9 + public static readonly IntermediateSymbolDefinition WixComponentSearch = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixComponentSearch,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.Guid), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.ProductCode), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.Attributes), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixComponentSearchSymbolFields.Guid), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixComponentSearchSymbolFields.ProductCode), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixComponentSearchSymbolFields.Attributes), IntermediateFieldType.Number),
16 },
17 - typeof(WixComponentSearchTuple));
17 + typeof(WixComponentSearchSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 using System;
24
25 - public enum WixComponentSearchTupleFields
25 + public enum WixComponentSearchSymbolFields
26 {
27 Guid,
28 ProductCode,
@@ -37,34 +37,34 @@ namespace WixToolset.Data.Tuples
37 WantDirectory = 0x4,
38 }
39
40 - public class WixComponentSearchTuple : IntermediateTuple
40 + public class WixComponentSearchSymbol : IntermediateSymbol
41 {
42 - public WixComponentSearchTuple() : base(TupleDefinitions.WixComponentSearch, null, null)
42 + public WixComponentSearchSymbol() : base(SymbolDefinitions.WixComponentSearch, null, null)
43 {
44 }
45
46 - public WixComponentSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixComponentSearch, sourceLineNumber, id)
46 + public WixComponentSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixComponentSearch, sourceLineNumber, id)
47 {
48 }
49
50 - public IntermediateField this[WixComponentSearchTupleFields index] => this.Fields[(int)index];
50 + public IntermediateField this[WixComponentSearchSymbolFields index] => this.Fields[(int)index];
51
52 public string Guid
53 {
54 - get => (string)this.Fields[(int)WixComponentSearchTupleFields.Guid];
55 - set => this.Set((int)WixComponentSearchTupleFields.Guid, value);
54 + get => (string)this.Fields[(int)WixComponentSearchSymbolFields.Guid];
55 + set => this.Set((int)WixComponentSearchSymbolFields.Guid, value);
56 }
57
58 public string ProductCode
59 {
60 - get => (string)this.Fields[(int)WixComponentSearchTupleFields.ProductCode];
61 - set => this.Set((int)WixComponentSearchTupleFields.ProductCode, value);
60 + get => (string)this.Fields[(int)WixComponentSearchSymbolFields.ProductCode];
61 + set => this.Set((int)WixComponentSearchSymbolFields.ProductCode, value);
62 }
63
64 public WixComponentSearchAttributes Attributes
65 {
66 - get => (WixComponentSearchAttributes)this.Fields[(int)WixComponentSearchTupleFields.Attributes].AsNumber();
67 - set => this.Set((int)WixComponentSearchTupleFields.Attributes, (int)value);
66 + get => (WixComponentSearchAttributes)this.Fields[(int)WixComponentSearchSymbolFields.Attributes].AsNumber();
67 + set => this.Set((int)WixComponentSearchSymbolFields.Attributes, (int)value);
68 }
69 }
70 }
src/WixToolset.Data/Tuples/WixCustomTableCellTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixCustomTableCell = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixCustomTableCell,
9 + public static readonly IntermediateSymbolDefinition WixCustomTableCell = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixCustomTableCell,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixCustomTableCellTupleFields.TableRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixCustomTableCellTupleFields.ColumnRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixCustomTableCellTupleFields.RowId), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixCustomTableCellTupleFields.Data), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixCustomTableCellSymbolFields.TableRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixCustomTableCellSymbolFields.ColumnRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixCustomTableCellSymbolFields.RowId), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixCustomTableCellSymbolFields.Data), IntermediateFieldType.String),
17 },
18 - typeof(WixCustomTableCellTuple));
18 + typeof(WixCustomTableCellSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum WixCustomTableCellTupleFields
24 + public enum WixCustomTableCellSymbolFields
25 {
26 TableRef,
27 ColumnRef,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Data,
30 }
31
32 - public class WixCustomTableCellTuple : IntermediateTuple
32 + public class WixCustomTableCellSymbol : IntermediateSymbol
33 {
34 - public WixCustomTableCellTuple() : base(TupleDefinitions.WixCustomTableCell, null, null)
34 + public WixCustomTableCellSymbol() : base(SymbolDefinitions.WixCustomTableCell, null, null)
35 {
36 }
37
38 - public WixCustomTableCellTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixCustomTableCell, sourceLineNumber, id)
38 + public WixCustomTableCellSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixCustomTableCell, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[WixCustomTableCellTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[WixCustomTableCellSymbolFields index] => this.Fields[(int)index];
43
44 public string TableRef
45 {
46 - get => (string)this.Fields[(int)WixCustomTableCellTupleFields.TableRef];
47 - set => this.Set((int)WixCustomTableCellTupleFields.TableRef, value);
46 + get => (string)this.Fields[(int)WixCustomTableCellSymbolFields.TableRef];
47 + set => this.Set((int)WixCustomTableCellSymbolFields.TableRef, value);
48 }
49
50 public string ColumnRef
51 {
52 - get => (string)this.Fields[(int)WixCustomTableCellTupleFields.ColumnRef];
53 - set => this.Set((int)WixCustomTableCellTupleFields.ColumnRef, value);
52 + get => (string)this.Fields[(int)WixCustomTableCellSymbolFields.ColumnRef];
53 + set => this.Set((int)WixCustomTableCellSymbolFields.ColumnRef, value);
54 }
55
56 public string RowId
57 {
58 - get => (string)this.Fields[(int)WixCustomTableCellTupleFields.RowId];
59 - set => this.Set((int)WixCustomTableCellTupleFields.RowId, value);
58 + get => (string)this.Fields[(int)WixCustomTableCellSymbolFields.RowId];
59 + set => this.Set((int)WixCustomTableCellSymbolFields.RowId, value);
60 }
61
62 public string Data
63 {
64 - get => (string)this.Fields[(int)WixCustomTableCellTupleFields.Data];
65 - set => this.Set((int)WixCustomTableCellTupleFields.Data, value);
64 + get => (string)this.Fields[(int)WixCustomTableCellSymbolFields.Data];
65 + set => this.Set((int)WixCustomTableCellSymbolFields.Data, value);
66 }
67 }
68 }
src/WixToolset.Data/Tuples/WixCustomTableColumnTuple.cs
+56 -56
@@ -2,37 +2,37 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixCustomTableColumn = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixCustomTableColumn,
9 + public static readonly IntermediateSymbolDefinition WixCustomTableColumn = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixCustomTableColumn,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.TableRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Name), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Type), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Attributes), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Width), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.MinValue), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.MaxValue), IntermediateFieldType.String),
20 - new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.KeyTable), IntermediateFieldType.String),
21 - new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.KeyColumn), IntermediateFieldType.String),
22 - new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Category), IntermediateFieldType.String),
23 - new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Set), IntermediateFieldType.String),
24 - new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Description), IntermediateFieldType.String),
25 - new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Modularize), IntermediateFieldType.Number)
13 + new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.TableRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Name), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Type), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Attributes), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Width), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.MinValue), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.MaxValue), IntermediateFieldType.String),
20 + new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.KeyTable), IntermediateFieldType.String),
21 + new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.KeyColumn), IntermediateFieldType.String),
22 + new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Category), IntermediateFieldType.String),
23 + new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Set), IntermediateFieldType.String),
24 + new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Description), IntermediateFieldType.String),
25 + new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Modularize), IntermediateFieldType.Number)
26 },
27 - typeof(WixCustomTableColumnTuple));
27 + typeof(WixCustomTableColumnSymbol));
28 }
29 }
30
31 -namespace WixToolset.Data.Tuples
31 +namespace WixToolset.Data.Symbols
32 {
33 using System;
34
35 - public enum WixCustomTableColumnTupleFields
35 + public enum WixCustomTableColumnSymbolFields
36 {
37 TableRef,
38 Name,
@@ -50,7 +50,7 @@ namespace WixToolset.Data.Tuples
50 }
51
52 [Flags]
53 - public enum WixCustomTableColumnTupleAttributes
53 + public enum WixCustomTableColumnSymbolAttributes
54 {
55 None = 0x0,
56 PrimaryKey = 0x1,
@@ -102,102 +102,102 @@ namespace WixToolset.Data.Tuples
102 SemicolonDelimited,
103 }
104
105 - public class WixCustomTableColumnTuple : IntermediateTuple
105 + public class WixCustomTableColumnSymbol : IntermediateSymbol
106 {
107 - public WixCustomTableColumnTuple() : base(TupleDefinitions.WixCustomTableColumn, null, null)
107 + public WixCustomTableColumnSymbol() : base(SymbolDefinitions.WixCustomTableColumn, null, null)
108 {
109 }
110
111 - public WixCustomTableColumnTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixCustomTableColumn, sourceLineNumber, id)
111 + public WixCustomTableColumnSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixCustomTableColumn, sourceLineNumber, id)
112 {
113 }
114
115 - public IntermediateField this[WixCustomTableColumnTupleFields index] => this.Fields[(int)index];
115 + public IntermediateField this[WixCustomTableColumnSymbolFields index] => this.Fields[(int)index];
116
117 public string TableRef
118 {
119 - get => (string)this.Fields[(int)WixCustomTableColumnTupleFields.TableRef];
120 - set => this.Set((int)WixCustomTableColumnTupleFields.TableRef, value);
119 + get => (string)this.Fields[(int)WixCustomTableColumnSymbolFields.TableRef];
120 + set => this.Set((int)WixCustomTableColumnSymbolFields.TableRef, value);
121 }
122
123 public string Name
124 {
125 - get => (string)this.Fields[(int)WixCustomTableColumnTupleFields.Name];
126 - set => this.Set((int)WixCustomTableColumnTupleFields.Name, value);
125 + get => (string)this.Fields[(int)WixCustomTableColumnSymbolFields.Name];
126 + set => this.Set((int)WixCustomTableColumnSymbolFields.Name, value);
127 }
128
129 public IntermediateFieldType Type
130 {
131 - get => (IntermediateFieldType)this.Fields[(int)WixCustomTableColumnTupleFields.Type].AsNumber();
132 - set => this.Set((int)WixCustomTableColumnTupleFields.Type, (int)value);
131 + get => (IntermediateFieldType)this.Fields[(int)WixCustomTableColumnSymbolFields.Type].AsNumber();
132 + set => this.Set((int)WixCustomTableColumnSymbolFields.Type, (int)value);
133 }
134
135 - public WixCustomTableColumnTupleAttributes Attributes
135 + public WixCustomTableColumnSymbolAttributes Attributes
136 {
137 - get => (WixCustomTableColumnTupleAttributes)this.Fields[(int)WixCustomTableColumnTupleFields.Attributes].AsNumber();
138 - set => this.Set((int)WixCustomTableColumnTupleFields.Attributes, (int)value);
137 + get => (WixCustomTableColumnSymbolAttributes)this.Fields[(int)WixCustomTableColumnSymbolFields.Attributes].AsNumber();
138 + set => this.Set((int)WixCustomTableColumnSymbolFields.Attributes, (int)value);
139 }
140
141 public int Width
142 {
143 - get => (int)this.Fields[(int)WixCustomTableColumnTupleFields.Width];
144 - set => this.Set((int)WixCustomTableColumnTupleFields.Width, value);
143 + get => (int)this.Fields[(int)WixCustomTableColumnSymbolFields.Width];
144 + set => this.Set((int)WixCustomTableColumnSymbolFields.Width, value);
145 }
146
147 public long? MinValue
148 {
149 - get => (long?)this.Fields[(int)WixCustomTableColumnTupleFields.MinValue];
150 - set => this.Set((int)WixCustomTableColumnTupleFields.MinValue, value);
149 + get => (long?)this.Fields[(int)WixCustomTableColumnSymbolFields.MinValue];
150 + set => this.Set((int)WixCustomTableColumnSymbolFields.MinValue, value);
151 }
152
153 public long? MaxValue
154 {
155 - get => (long?)this.Fields[(int)WixCustomTableColumnTupleFields.MaxValue];
156 - set => this.Set((int)WixCustomTableColumnTupleFields.MaxValue, value);
155 + get => (long?)this.Fields[(int)WixCustomTableColumnSymbolFields.MaxValue];
156 + set => this.Set((int)WixCustomTableColumnSymbolFields.MaxValue, value);
157 }
158
159 public string KeyTable
160 {
161 - get => (string)this.Fields[(int)WixCustomTableColumnTupleFields.KeyTable];
162 - set => this.Set((int)WixCustomTableColumnTupleFields.KeyTable, value);
161 + get => (string)this.Fields[(int)WixCustomTableColumnSymbolFields.KeyTable];
162 + set => this.Set((int)WixCustomTableColumnSymbolFields.KeyTable, value);
163 }
164
165 public int? KeyColumn
166 {
167 - get => (int?)this.Fields[(int)WixCustomTableColumnTupleFields.KeyColumn];
168 - set => this.Set((int)WixCustomTableColumnTupleFields.KeyColumn, value);
167 + get => (int?)this.Fields[(int)WixCustomTableColumnSymbolFields.KeyColumn];
168 + set => this.Set((int)WixCustomTableColumnSymbolFields.KeyColumn, value);
169 }
170
171 public WixCustomTableColumnCategoryType? Category
172 {
173 - get => (WixCustomTableColumnCategoryType?)this.Fields[(int)WixCustomTableColumnTupleFields.Category].AsNullableNumber();
174 - set => this.Set((int)WixCustomTableColumnTupleFields.Category, (int?)value);
173 + get => (WixCustomTableColumnCategoryType?)this.Fields[(int)WixCustomTableColumnSymbolFields.Category].AsNullableNumber();
174 + set => this.Set((int)WixCustomTableColumnSymbolFields.Category, (int?)value);
175 }
176
177 public string Set
178 {
179 - get => (string)this.Fields[(int)WixCustomTableColumnTupleFields.Set];
180 - set => this.Set((int)WixCustomTableColumnTupleFields.Set, value);
179 + get => (string)this.Fields[(int)WixCustomTableColumnSymbolFields.Set];
180 + set => this.Set((int)WixCustomTableColumnSymbolFields.Set, value);
181 }
182
183 public string Description
184 {
185 - get => (string)this.Fields[(int)WixCustomTableColumnTupleFields.Description];
186 - set => this.Set((int)WixCustomTableColumnTupleFields.Description, value);
185 + get => (string)this.Fields[(int)WixCustomTableColumnSymbolFields.Description];
186 + set => this.Set((int)WixCustomTableColumnSymbolFields.Description, value);
187 }
188
189 public WixCustomTableColumnModularizeType? Modularize
190 {
191 - get => (WixCustomTableColumnModularizeType?)this.Fields[(int)WixCustomTableColumnTupleFields.Modularize].AsNullableNumber();
192 - set => this.Set((int)WixCustomTableColumnTupleFields.Modularize, (int?)value);
191 + get => (WixCustomTableColumnModularizeType?)this.Fields[(int)WixCustomTableColumnSymbolFields.Modularize].AsNullableNumber();
192 + set => this.Set((int)WixCustomTableColumnSymbolFields.Modularize, (int?)value);
193 }
194
195 - public bool PrimaryKey => (this.Attributes & WixCustomTableColumnTupleAttributes.PrimaryKey) == WixCustomTableColumnTupleAttributes.PrimaryKey;
195 + public bool PrimaryKey => (this.Attributes & WixCustomTableColumnSymbolAttributes.PrimaryKey) == WixCustomTableColumnSymbolAttributes.PrimaryKey;
196
197 - public bool Localizable => (this.Attributes & WixCustomTableColumnTupleAttributes.Localizable) == WixCustomTableColumnTupleAttributes.Localizable;
197 + public bool Localizable => (this.Attributes & WixCustomTableColumnSymbolAttributes.Localizable) == WixCustomTableColumnSymbolAttributes.Localizable;
198
199 - public bool Nullable => (this.Attributes & WixCustomTableColumnTupleAttributes.Nullable) == WixCustomTableColumnTupleAttributes.Nullable;
199 + public bool Nullable => (this.Attributes & WixCustomTableColumnSymbolAttributes.Nullable) == WixCustomTableColumnSymbolAttributes.Nullable;
200
201 - public bool Unreal => (this.Attributes & WixCustomTableColumnTupleAttributes.Unreal) == WixCustomTableColumnTupleAttributes.Unreal;
201 + public bool Unreal => (this.Attributes & WixCustomTableColumnSymbolAttributes.Unreal) == WixCustomTableColumnSymbolAttributes.Unreal;
202 }
203 }
src/WixToolset.Data/Tuples/WixCustomTableTuple.cs
+17 -17
@@ -2,53 +2,53 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixCustomTable = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixCustomTable,
9 + public static readonly IntermediateSymbolDefinition WixCustomTable = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixCustomTable,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.ColumnNames), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Unreal), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(WixCustomTableSymbolFields.ColumnNames), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixCustomTableSymbolFields.Unreal), IntermediateFieldType.Bool),
15 },
16 - typeof(WixCustomTableTuple));
16 + typeof(WixCustomTableSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum WixCustomTableTupleFields
22 + public enum WixCustomTableSymbolFields
23 {
24 ColumnNames,
25 Unreal,
26 }
27
28 - public class WixCustomTableTuple : IntermediateTuple
28 + public class WixCustomTableSymbol : IntermediateSymbol
29 {
30 public const char ColumnNamesSeparator = '\x85';
31
32 - public WixCustomTableTuple() : base(TupleDefinitions.WixCustomTable, null, null)
32 + public WixCustomTableSymbol() : base(SymbolDefinitions.WixCustomTable, null, null)
33 {
34 }
35
36 - public WixCustomTableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixCustomTable, sourceLineNumber, id)
36 + public WixCustomTableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixCustomTable, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[WixCustomTableTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[WixCustomTableSymbolFields index] => this.Fields[(int)index];
41
42 public string ColumnNames
43 {
44 - get => (string)this.Fields[(int)WixCustomTableTupleFields.ColumnNames];
45 - set => this.Set((int)WixCustomTableTupleFields.ColumnNames, value);
44 + get => (string)this.Fields[(int)WixCustomTableSymbolFields.ColumnNames];
45 + set => this.Set((int)WixCustomTableSymbolFields.ColumnNames, value);
46 }
47
48 public bool Unreal
49 {
50 - get => (bool)this.Fields[(int)WixCustomTableTupleFields.Unreal];
51 - set => this.Set((int)WixCustomTableTupleFields.Unreal, value);
50 + get => (bool)this.Fields[(int)WixCustomTableSymbolFields.Unreal];
51 + set => this.Set((int)WixCustomTableSymbolFields.Unreal, value);
52 }
53
54 public string[] ColumnNamesSeparated => this.ColumnNames.Split(ColumnNamesSeparator);
src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs
+29 -29
@@ -2,28 +2,28 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixDeltaPatchFile = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixDeltaPatchFile,
9 + public static readonly IntermediateSymbolDefinition WixDeltaPatchFile = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixDeltaPatchFile,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.FileRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.RetainLengths), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.IgnoreOffsets), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.IgnoreLengths), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.RetainOffsets), IntermediateFieldType.String),
18 - new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.SymbolPaths), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixDeltaPatchFileSymbolFields.FileRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixDeltaPatchFileSymbolFields.RetainLengths), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixDeltaPatchFileSymbolFields.IgnoreOffsets), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixDeltaPatchFileSymbolFields.IgnoreLengths), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(WixDeltaPatchFileSymbolFields.RetainOffsets), IntermediateFieldType.String),
18 + new IntermediateFieldDefinition(nameof(WixDeltaPatchFileSymbolFields.SymbolPaths), IntermediateFieldType.String),
19 },
20 - typeof(WixDeltaPatchFileTuple));
20 + typeof(WixDeltaPatchFileSymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 - public enum WixDeltaPatchFileTupleFields
26 + public enum WixDeltaPatchFileSymbolFields
27 {
28 FileRef,
29 RetainLengths,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
33 SymbolPaths,
34 }
35
36 - public class WixDeltaPatchFileTuple : IntermediateTuple
36 + public class WixDeltaPatchFileSymbol : IntermediateSymbol
37 {
38 - public WixDeltaPatchFileTuple() : base(TupleDefinitions.WixDeltaPatchFile, null, null)
38 + public WixDeltaPatchFileSymbol() : base(SymbolDefinitions.WixDeltaPatchFile, null, null)
39 {
40 }
41
42 - public WixDeltaPatchFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDeltaPatchFile, sourceLineNumber, id)
42 + public WixDeltaPatchFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixDeltaPatchFile, sourceLineNumber, id)
43 {
44 }
45
46 - public IntermediateField this[WixDeltaPatchFileTupleFields index] => this.Fields[(int)index];
46 + public IntermediateField this[WixDeltaPatchFileSymbolFields index] => this.Fields[(int)index];
47
48 public string FileRef
49 {
50 - get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.FileRef];
51 - set => this.Set((int)WixDeltaPatchFileTupleFields.FileRef, value);
50 + get => (string)this.Fields[(int)WixDeltaPatchFileSymbolFields.FileRef];
51 + set => this.Set((int)WixDeltaPatchFileSymbolFields.FileRef, value);
52 }
53
54 public string RetainLengths
55 {
56 - get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.RetainLengths];
57 - set => this.Set((int)WixDeltaPatchFileTupleFields.RetainLengths, value);
56 + get => (string)this.Fields[(int)WixDeltaPatchFileSymbolFields.RetainLengths];
57 + set => this.Set((int)WixDeltaPatchFileSymbolFields.RetainLengths, value);
58 }
59
60 public string IgnoreOffsets
61 {
62 - get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.IgnoreOffsets];
63 - set => this.Set((int)WixDeltaPatchFileTupleFields.IgnoreOffsets, value);
62 + get => (string)this.Fields[(int)WixDeltaPatchFileSymbolFields.IgnoreOffsets];
63 + set => this.Set((int)WixDeltaPatchFileSymbolFields.IgnoreOffsets, value);
64 }
65
66 public string IgnoreLengths
67 {
68 - get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.IgnoreLengths];
69 - set => this.Set((int)WixDeltaPatchFileTupleFields.IgnoreLengths, value);
68 + get => (string)this.Fields[(int)WixDeltaPatchFileSymbolFields.IgnoreLengths];
69 + set => this.Set((int)WixDeltaPatchFileSymbolFields.IgnoreLengths, value);
70 }
71
72 public string RetainOffsets
73 {
74 - get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.RetainOffsets];
75 - set => this.Set((int)WixDeltaPatchFileTupleFields.RetainOffsets, value);
74 + get => (string)this.Fields[(int)WixDeltaPatchFileSymbolFields.RetainOffsets];
75 + set => this.Set((int)WixDeltaPatchFileSymbolFields.RetainOffsets, value);
76 }
77
78 public string SymbolPaths
79 {
80 - get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.SymbolPaths];
81 - set => this.Set((int)WixDeltaPatchFileTupleFields.SymbolPaths, value);
80 + get => (string)this.Fields[(int)WixDeltaPatchFileSymbolFields.SymbolPaths];
81 + set => this.Set((int)WixDeltaPatchFileSymbolFields.SymbolPaths, value);
82 }
83 }
84 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs
+20 -20
@@ -4,25 +4,25 @@ using System;
4
5 namespace WixToolset.Data
6 {
7 - using WixToolset.Data.Tuples;
7 + using WixToolset.Data.Symbols;
8
9 - public static partial class TupleDefinitions
9 + public static partial class SymbolDefinitions
10 {
11 - public static readonly IntermediateTupleDefinition WixDeltaPatchSymbolPaths = new IntermediateTupleDefinition(
12 - TupleDefinitionType.WixDeltaPatchSymbolPaths,
11 + public static readonly IntermediateSymbolDefinition WixDeltaPatchSymbolPaths = new IntermediateSymbolDefinition(
12 + SymbolDefinitionType.WixDeltaPatchSymbolPaths,
13 new[]
14 {
15 - new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsTupleFields.SymbolType), IntermediateFieldType.Number),
16 - new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsTupleFields.SymbolId), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsTupleFields.SymbolPaths), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsSymbolFields.SymbolType), IntermediateFieldType.Number),
16 + new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsSymbolFields.SymbolId), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsSymbolFields.SymbolPaths), IntermediateFieldType.String),
18 },
19 - typeof(WixDeltaPatchSymbolPathsTuple));
19 + typeof(WixDeltaPatchSymbolPathsSymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum WixDeltaPatchSymbolPathsTupleFields
25 + public enum WixDeltaPatchSymbolPathsSymbolFields
26 {
27 SymbolType,
28 SymbolId,
@@ -42,34 +42,34 @@ namespace WixToolset.Data.Tuples
42 Product
43 };
44
45 - public class WixDeltaPatchSymbolPathsTuple : IntermediateTuple
45 + public class WixDeltaPatchSymbolPathsSymbol : IntermediateSymbol
46 {
47 - public WixDeltaPatchSymbolPathsTuple() : base(TupleDefinitions.WixDeltaPatchSymbolPaths, null, null)
47 + public WixDeltaPatchSymbolPathsSymbol() : base(SymbolDefinitions.WixDeltaPatchSymbolPaths, null, null)
48 {
49 }
50
51 - public WixDeltaPatchSymbolPathsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDeltaPatchSymbolPaths, sourceLineNumber, id)
51 + public WixDeltaPatchSymbolPathsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixDeltaPatchSymbolPaths, sourceLineNumber, id)
52 {
53 }
54
55 - public IntermediateField this[WixDeltaPatchSymbolPathsTupleFields index] => this.Fields[(int)index];
55 + public IntermediateField this[WixDeltaPatchSymbolPathsSymbolFields index] => this.Fields[(int)index];
56
57 public SymbolPathType SymbolType
58 {
59 - get => (SymbolPathType)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.SymbolType].AsNumber();
60 - set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.SymbolType, (int)value);
59 + get => (SymbolPathType)this.Fields[(int)WixDeltaPatchSymbolPathsSymbolFields.SymbolType].AsNumber();
60 + set => this.Set((int)WixDeltaPatchSymbolPathsSymbolFields.SymbolType, (int)value);
61 }
62
63 public string SymbolId
64 {
65 - get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.SymbolId];
66 - set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.SymbolId, value);
65 + get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsSymbolFields.SymbolId];
66 + set => this.Set((int)WixDeltaPatchSymbolPathsSymbolFields.SymbolId, value);
67 }
68
69 public string SymbolPaths
70 {
71 - get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.SymbolPaths];
72 - set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.SymbolPaths, value);
71 + get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsSymbolFields.SymbolPaths];
72 + set => this.Set((int)WixDeltaPatchSymbolPathsSymbolFields.SymbolPaths, value);
73 }
74 }
75 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixDependencyProviderTuple.cs
+26 -26
@@ -2,30 +2,30 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixDependencyProvider = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixDependencyProvider.ToString(),
9 + public static readonly IntermediateSymbolDefinition WixDependencyProvider = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixDependencyProvider.ToString(),
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixDependencyProviderTupleFields.ComponentRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixDependencyProviderTupleFields.ProviderKey), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixDependencyProviderTupleFields.Version), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixDependencyProviderTupleFields.DisplayName), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(WixDependencyProviderTupleFields.Attributes), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixDependencyProviderSymbolFields.ComponentRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixDependencyProviderSymbolFields.ProviderKey), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixDependencyProviderSymbolFields.Version), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixDependencyProviderSymbolFields.DisplayName), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(WixDependencyProviderSymbolFields.Attributes), IntermediateFieldType.Number),
18 },
19 - typeof(WixDependencyProviderTuple));
19 + typeof(WixDependencyProviderSymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 using System;
26 using WixToolset.Data;
27
28 - public enum WixDependencyProviderTupleFields
28 + public enum WixDependencyProviderSymbolFields
29 {
30 ComponentRef,
31 ProviderKey,
@@ -40,46 +40,46 @@ namespace WixToolset.Data.Tuples
40 ProvidesAttributesBundle = 0x10000
41 }
42
43 - public class WixDependencyProviderTuple : IntermediateTuple
43 + public class WixDependencyProviderSymbol : IntermediateSymbol
44 {
45 - public WixDependencyProviderTuple() : base(TupleDefinitions.WixDependencyProvider, null, null)
45 + public WixDependencyProviderSymbol() : base(SymbolDefinitions.WixDependencyProvider, null, null)
46 {
47 }
48
49 - public WixDependencyProviderTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDependencyProvider, sourceLineNumber, id)
49 + public WixDependencyProviderSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixDependencyProvider, sourceLineNumber, id)
50 {
51 }
52
53 - public IntermediateField this[WixDependencyProviderTupleFields index] => this.Fields[(int)index];
53 + public IntermediateField this[WixDependencyProviderSymbolFields index] => this.Fields[(int)index];
54
55 public string ComponentRef
56 {
57 - get => this.Fields[(int)WixDependencyProviderTupleFields.ComponentRef].AsString();
58 - set => this.Set((int)WixDependencyProviderTupleFields.ComponentRef, value);
57 + get => this.Fields[(int)WixDependencyProviderSymbolFields.ComponentRef].AsString();
58 + set => this.Set((int)WixDependencyProviderSymbolFields.ComponentRef, value);
59 }
60
61 public string ProviderKey
62 {
63 - get => this.Fields[(int)WixDependencyProviderTupleFields.ProviderKey].AsString();
64 - set => this.Set((int)WixDependencyProviderTupleFields.ProviderKey, value);
63 + get => this.Fields[(int)WixDependencyProviderSymbolFields.ProviderKey].AsString();
64 + set => this.Set((int)WixDependencyProviderSymbolFields.ProviderKey, value);
65 }
66
67 public string Version
68 {
69 - get => this.Fields[(int)WixDependencyProviderTupleFields.Version].AsString();
70 - set => this.Set((int)WixDependencyProviderTupleFields.Version, value);
69 + get => this.Fields[(int)WixDependencyProviderSymbolFields.Version].AsString();
70 + set => this.Set((int)WixDependencyProviderSymbolFields.Version, value);
71 }
72
73 public string DisplayName
74 {
75 - get => this.Fields[(int)WixDependencyProviderTupleFields.DisplayName].AsString();
76 - set => this.Set((int)WixDependencyProviderTupleFields.DisplayName, value);
75 + get => this.Fields[(int)WixDependencyProviderSymbolFields.DisplayName].AsString();
76 + set => this.Set((int)WixDependencyProviderSymbolFields.DisplayName, value);
77 }
78
79 public WixDependencyProviderAttributes Attributes
80 {
81 - get => (WixDependencyProviderAttributes)(int)this.Fields[(int)WixDependencyProviderTupleFields.Attributes];
82 - set => this.Set((int)WixDependencyProviderTupleFields.Attributes, (int)value);
81 + get => (WixDependencyProviderAttributes)(int)this.Fields[(int)WixDependencyProviderSymbolFields.Attributes];
82 + set => this.Set((int)WixDependencyProviderSymbolFields.Attributes, (int)value);
83 }
84
85 public bool Bundle => (this.Attributes & WixDependencyProviderAttributes.ProvidesAttributesBundle) == WixDependencyProviderAttributes.ProvidesAttributesBundle;
src/WixToolset.Data/Tuples/WixEnsureTableTuple.cs
+14 -14
@@ -2,43 +2,43 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixEnsureTable = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixEnsureTable,
9 + public static readonly IntermediateSymbolDefinition WixEnsureTable = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixEnsureTable,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixEnsureTableTupleFields.Table), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixEnsureTableSymbolFields.Table), IntermediateFieldType.String),
14 },
15 - typeof(WixEnsureTableTuple));
15 + typeof(WixEnsureTableSymbol));
16 }
17 }
18
19 -namespace WixToolset.Data.Tuples
19 +namespace WixToolset.Data.Symbols
20 {
21 - public enum WixEnsureTableTupleFields
21 + public enum WixEnsureTableSymbolFields
22 {
23 Table,
24 }
25
26 - public class WixEnsureTableTuple : IntermediateTuple
26 + public class WixEnsureTableSymbol : IntermediateSymbol
27 {
28 - public WixEnsureTableTuple() : base(TupleDefinitions.WixEnsureTable, null, null)
28 + public WixEnsureTableSymbol() : base(SymbolDefinitions.WixEnsureTable, null, null)
29 {
30 }
31
32 - public WixEnsureTableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixEnsureTable, sourceLineNumber, id)
32 + public WixEnsureTableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixEnsureTable, sourceLineNumber, id)
33 {
34 }
35
36 - public IntermediateField this[WixEnsureTableTupleFields index] => this.Fields[(int)index];
36 + public IntermediateField this[WixEnsureTableSymbolFields index] => this.Fields[(int)index];
37
38 public string Table
39 {
40 - get => (string)this.Fields[(int)WixEnsureTableTupleFields.Table];
41 - set => this.Set((int)WixEnsureTableTupleFields.Table, value);
40 + get => (string)this.Fields[(int)WixEnsureTableSymbolFields.Table];
41 + set => this.Set((int)WixEnsureTableSymbolFields.Table, value);
42 }
43 }
44 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixFeatureGroupTuple.cs
+11 -11
@@ -2,35 +2,35 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixFeatureGroup = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixFeatureGroup,
9 + public static readonly IntermediateSymbolDefinition WixFeatureGroup = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixFeatureGroup,
11 new IntermediateFieldDefinition[]
12 {
13 },
14 - typeof(WixFeatureGroupTuple));
14 + typeof(WixFeatureGroupSymbol));
15 }
16 }
17
18 -namespace WixToolset.Data.Tuples
18 +namespace WixToolset.Data.Symbols
19 {
20 - public enum WixFeatureGroupTupleFields
20 + public enum WixFeatureGroupSymbolFields
21 {
22 }
23
24 - public class WixFeatureGroupTuple : IntermediateTuple
24 + public class WixFeatureGroupSymbol : IntermediateSymbol
25 {
26 - public WixFeatureGroupTuple() : base(TupleDefinitions.WixFeatureGroup, null, null)
26 + public WixFeatureGroupSymbol() : base(SymbolDefinitions.WixFeatureGroup, null, null)
27 {
28 }
29
30 - public WixFeatureGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixFeatureGroup, sourceLineNumber, id)
30 + public WixFeatureGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixFeatureGroup, sourceLineNumber, id)
31 {
32 }
33
34 - public IntermediateField this[WixFeatureGroupTupleFields index] => this.Fields[(int)index];
34 + public IntermediateField this[WixFeatureGroupSymbolFields index] => this.Fields[(int)index];
35 }
36 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixFeatureModules = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixFeatureModules,
9 + public static readonly IntermediateSymbolDefinition WixFeatureModules = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixFeatureModules,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixFeatureModulesTupleFields.FeatureRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixFeatureModulesTupleFields.WixMergeRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixFeatureModulesSymbolFields.FeatureRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixFeatureModulesSymbolFields.WixMergeRef), IntermediateFieldType.String),
15 },
16 - typeof(WixFeatureModulesTuple));
16 + typeof(WixFeatureModulesSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum WixFeatureModulesTupleFields
22 + public enum WixFeatureModulesSymbolFields
23 {
24 FeatureRef,
25 WixMergeRef,
26 }
27
28 - public class WixFeatureModulesTuple : IntermediateTuple
28 + public class WixFeatureModulesSymbol : IntermediateSymbol
29 {
30 - public WixFeatureModulesTuple() : base(TupleDefinitions.WixFeatureModules, null, null)
30 + public WixFeatureModulesSymbol() : base(SymbolDefinitions.WixFeatureModules, null, null)
31 {
32 }
33
34 - public WixFeatureModulesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixFeatureModules, sourceLineNumber, id)
34 + public WixFeatureModulesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixFeatureModules, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[WixFeatureModulesTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[WixFeatureModulesSymbolFields index] => this.Fields[(int)index];
39
40 public string FeatureRef
41 {
42 - get => (string)this.Fields[(int)WixFeatureModulesTupleFields.FeatureRef];
43 - set => this.Set((int)WixFeatureModulesTupleFields.FeatureRef, value);
42 + get => (string)this.Fields[(int)WixFeatureModulesSymbolFields.FeatureRef];
43 + set => this.Set((int)WixFeatureModulesSymbolFields.FeatureRef, value);
44 }
45
46 public string WixMergeRef
47 {
48 - get => (string)this.Fields[(int)WixFeatureModulesTupleFields.WixMergeRef];
49 - set => this.Set((int)WixFeatureModulesTupleFields.WixMergeRef, value);
48 + get => (string)this.Fields[(int)WixFeatureModulesSymbolFields.WixMergeRef];
49 + set => this.Set((int)WixFeatureModulesSymbolFields.WixMergeRef, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixFileSearchTuple.cs
+38 -38
@@ -2,33 +2,33 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixFileSearch = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixFileSearch,
9 + public static readonly IntermediateSymbolDefinition WixFileSearch = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixFileSearch,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.Path), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MinVersion), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MaxVersion), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MinSize), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MaxSize), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MinDate), IntermediateFieldType.Number),
19 - new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MaxDate), IntermediateFieldType.Number),
20 - new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.Languages), IntermediateFieldType.String),
21 - new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.Attributes), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.Path), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.MinVersion), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.MaxVersion), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.MinSize), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.MaxSize), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.MinDate), IntermediateFieldType.Number),
19 + new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.MaxDate), IntermediateFieldType.Number),
20 + new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.Languages), IntermediateFieldType.String),
21 + new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.Attributes), IntermediateFieldType.Number),
22 },
23 - typeof(WixFileSearchTuple));
23 + typeof(WixFileSearchSymbol));
24 }
25 }
26
27 -namespace WixToolset.Data.Tuples
27 +namespace WixToolset.Data.Symbols
28 {
29 using System;
30
31 - public enum WixFileSearchTupleFields
31 + public enum WixFileSearchSymbolFields
32 {
33 Path,
34 MinVersion,
@@ -56,70 +56,70 @@ namespace WixToolset.Data.Tuples
56 IsDirectory = 0x200,
57 }
58
59 - public class WixFileSearchTuple : IntermediateTuple
59 + public class WixFileSearchSymbol : IntermediateSymbol
60 {
61 - public WixFileSearchTuple() : base(TupleDefinitions.WixFileSearch, null, null)
61 + public WixFileSearchSymbol() : base(SymbolDefinitions.WixFileSearch, null, null)
62 {
63 }
64
65 - public WixFileSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixFileSearch, sourceLineNumber, id)
65 + public WixFileSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixFileSearch, sourceLineNumber, id)
66 {
67 }
68
69 - public IntermediateField this[WixFileSearchTupleFields index] => this.Fields[(int)index];
69 + public IntermediateField this[WixFileSearchSymbolFields index] => this.Fields[(int)index];
70
71 public string Path
72 {
73 - get => (string)this.Fields[(int)WixFileSearchTupleFields.Path];
74 - set => this.Set((int)WixFileSearchTupleFields.Path, value);
73 + get => (string)this.Fields[(int)WixFileSearchSymbolFields.Path];
74 + set => this.Set((int)WixFileSearchSymbolFields.Path, value);
75 }
76
77 public string MinVersion
78 {
79 - get => (string)this.Fields[(int)WixFileSearchTupleFields.MinVersion];
80 - set => this.Set((int)WixFileSearchTupleFields.MinVersion, value);
79 + get => (string)this.Fields[(int)WixFileSearchSymbolFields.MinVersion];
80 + set => this.Set((int)WixFileSearchSymbolFields.MinVersion, value);
81 }
82
83 public string MaxVersion
84 {
85 - get => (string)this.Fields[(int)WixFileSearchTupleFields.MaxVersion];
86 - set => this.Set((int)WixFileSearchTupleFields.MaxVersion, value);
85 + get => (string)this.Fields[(int)WixFileSearchSymbolFields.MaxVersion];
86 + set => this.Set((int)WixFileSearchSymbolFields.MaxVersion, value);
87 }
88
89 public int? MinSize
90 {
91 - get => (int?)this.Fields[(int)WixFileSearchTupleFields.MinSize];
92 - set => this.Set((int)WixFileSearchTupleFields.MinSize, value);
91 + get => (int?)this.Fields[(int)WixFileSearchSymbolFields.MinSize];
92 + set => this.Set((int)WixFileSearchSymbolFields.MinSize, value);
93 }
94
95 public int? MaxSize
96 {
97 - get => (int?)this.Fields[(int)WixFileSearchTupleFields.MaxSize];
98 - set => this.Set((int)WixFileSearchTupleFields.MaxSize, value);
97 + get => (int?)this.Fields[(int)WixFileSearchSymbolFields.MaxSize];
98 + set => this.Set((int)WixFileSearchSymbolFields.MaxSize, value);
99 }
100
101 public int? MinDate
102 {
103 - get => (int?)this.Fields[(int)WixFileSearchTupleFields.MinDate];
104 - set => this.Set((int)WixFileSearchTupleFields.MinDate, value);
103 + get => (int?)this.Fields[(int)WixFileSearchSymbolFields.MinDate];
104 + set => this.Set((int)WixFileSearchSymbolFields.MinDate, value);
105 }
106
107 public int? MaxDate
108 {
109 - get => (int?)this.Fields[(int)WixFileSearchTupleFields.MaxDate];
110 - set => this.Set((int)WixFileSearchTupleFields.MaxDate, value);
109 + get => (int?)this.Fields[(int)WixFileSearchSymbolFields.MaxDate];
110 + set => this.Set((int)WixFileSearchSymbolFields.MaxDate, value);
111 }
112
113 public string Languages
114 {
115 - get => (string)this.Fields[(int)WixFileSearchTupleFields.Languages];
116 - set => this.Set((int)WixFileSearchTupleFields.Languages, value);
115 + get => (string)this.Fields[(int)WixFileSearchSymbolFields.Languages];
116 + set => this.Set((int)WixFileSearchSymbolFields.Languages, value);
117 }
118
119 public WixFileSearchAttributes Attributes
120 {
121 - get => (WixFileSearchAttributes)this.Fields[(int)WixFileSearchTupleFields.Attributes].AsNumber();
122 - set => this.Set((int)WixFileSearchTupleFields.Attributes, (int)value);
121 + get => (WixFileSearchAttributes)this.Fields[(int)WixFileSearchSymbolFields.Attributes].AsNumber();
122 + set => this.Set((int)WixFileSearchSymbolFields.Attributes, (int)value);
123 }
124 }
125 }
src/WixToolset.Data/Tuples/WixFragmentTuple.cs
+11 -11
@@ -2,35 +2,35 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixFragment = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixFragment,
9 + public static readonly IntermediateSymbolDefinition WixFragment = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixFragment,
11 new IntermediateFieldDefinition[]
12 {
13 },
14 - typeof(WixFragmentTuple));
14 + typeof(WixFragmentSymbol));
15 }
16 }
17
18 -namespace WixToolset.Data.Tuples
18 +namespace WixToolset.Data.Symbols
19 {
20 - public enum WixFragmentTupleFields
20 + public enum WixFragmentSymbolFields
21 {
22 }
23
24 - public class WixFragmentTuple : IntermediateTuple
24 + public class WixFragmentSymbol : IntermediateSymbol
25 {
26 - public WixFragmentTuple() : base(TupleDefinitions.WixFragment, null, null)
26 + public WixFragmentSymbol() : base(SymbolDefinitions.WixFragment, null, null)
27 {
28 }
29
30 - public WixFragmentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixFragment, sourceLineNumber, id)
30 + public WixFragmentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixFragment, sourceLineNumber, id)
31 {
32 }
33
34 - public IntermediateField this[WixFragmentTupleFields index] => this.Fields[(int)index];
34 + public IntermediateField this[WixFragmentSymbolFields index] => this.Fields[(int)index];
35 }
36 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixGroupTuple.cs
+23 -23
@@ -2,28 +2,28 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixGroup = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixGroup,
9 + public static readonly IntermediateSymbolDefinition WixGroup = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixGroup,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixGroupTupleFields.ParentId), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixGroupTupleFields.ParentType), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixGroupTupleFields.ChildId), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixGroupTupleFields.ChildType), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixGroupSymbolFields.ParentId), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixGroupSymbolFields.ParentType), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixGroupSymbolFields.ChildId), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixGroupSymbolFields.ChildType), IntermediateFieldType.String),
17 },
18 - typeof(WixGroupTuple));
18 + typeof(WixGroupSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 using System;
25
26 - public enum WixGroupTupleFields
26 + public enum WixGroupSymbolFields
27 {
28 ParentId,
29 ParentType,
@@ -31,40 +31,40 @@ namespace WixToolset.Data.Tuples
31 ChildType,
32 }
33
34 - public class WixGroupTuple : IntermediateTuple
34 + public class WixGroupSymbol : IntermediateSymbol
35 {
36 - public WixGroupTuple() : base(TupleDefinitions.WixGroup, null, null)
36 + public WixGroupSymbol() : base(SymbolDefinitions.WixGroup, null, null)
37 {
38 }
39
40 - public WixGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixGroup, sourceLineNumber, id)
40 + public WixGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixGroup, sourceLineNumber, id)
41 {
42 }
43
44 - public IntermediateField this[WixGroupTupleFields index] => this.Fields[(int)index];
44 + public IntermediateField this[WixGroupSymbolFields index] => this.Fields[(int)index];
45
46 public string ParentId
47 {
48 - get => (string)this.Fields[(int)WixGroupTupleFields.ParentId];
49 - set => this.Set((int)WixGroupTupleFields.ParentId, value);
48 + get => (string)this.Fields[(int)WixGroupSymbolFields.ParentId];
49 + set => this.Set((int)WixGroupSymbolFields.ParentId, value);
50 }
51
52 public ComplexReferenceParentType ParentType
53 {
54 - get => (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[(int)WixGroupTupleFields.ParentType], true);
55 - set => this.Set((int)WixGroupTupleFields.ParentType, value.ToString());
54 + get => (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[(int)WixGroupSymbolFields.ParentType], true);
55 + set => this.Set((int)WixGroupSymbolFields.ParentType, value.ToString());
56 }
57
58 public string ChildId
59 {
60 - get => (string)this.Fields[(int)WixGroupTupleFields.ChildId];
61 - set => this.Set((int)WixGroupTupleFields.ChildId, value);
60 + get => (string)this.Fields[(int)WixGroupSymbolFields.ChildId];
61 + set => this.Set((int)WixGroupSymbolFields.ChildId, value);
62 }
63
64 public ComplexReferenceChildType ChildType
65 {
66 - get => (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[(int)WixGroupTupleFields.ChildType], true);
67 - set => this.Set((int)WixGroupTupleFields.ChildType, value.ToString());
66 + get => (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[(int)WixGroupSymbolFields.ChildType], true);
67 + set => this.Set((int)WixGroupSymbolFields.ChildType, value.ToString());
68 }
69 }
70 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs
+14 -14
@@ -2,43 +2,43 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixInstanceComponent = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixInstanceComponent,
9 + public static readonly IntermediateSymbolDefinition WixInstanceComponent = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixInstanceComponent,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixInstanceComponentTupleFields.ComponentRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixInstanceComponentSymbolFields.ComponentRef), IntermediateFieldType.String),
14 },
15 - typeof(WixInstanceComponentTuple));
15 + typeof(WixInstanceComponentSymbol));
16 }
17 }
18
19 -namespace WixToolset.Data.Tuples
19 +namespace WixToolset.Data.Symbols
20 {
21 - public enum WixInstanceComponentTupleFields
21 + public enum WixInstanceComponentSymbolFields
22 {
23 ComponentRef,
24 }
25
26 - public class WixInstanceComponentTuple : IntermediateTuple
26 + public class WixInstanceComponentSymbol : IntermediateSymbol
27 {
28 - public WixInstanceComponentTuple() : base(TupleDefinitions.WixInstanceComponent, null, null)
28 + public WixInstanceComponentSymbol() : base(SymbolDefinitions.WixInstanceComponent, null, null)
29 {
30 }
31
32 - public WixInstanceComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixInstanceComponent, sourceLineNumber, id)
32 + public WixInstanceComponentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixInstanceComponent, sourceLineNumber, id)
33 {
34 }
35
36 - public IntermediateField this[WixInstanceComponentTupleFields index] => this.Fields[(int)index];
36 + public IntermediateField this[WixInstanceComponentSymbolFields index] => this.Fields[(int)index];
37
38 public string ComponentRef
39 {
40 - get => (string)this.Fields[(int)WixInstanceComponentTupleFields.ComponentRef];
41 - set => this.Set((int)WixInstanceComponentTupleFields.ComponentRef, value);
40 + get => (string)this.Fields[(int)WixInstanceComponentSymbolFields.ComponentRef];
41 + set => this.Set((int)WixInstanceComponentSymbolFields.ComponentRef, value);
42 }
43 }
44 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixInstanceTransformsTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixInstanceTransforms = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixInstanceTransforms,
9 + public static readonly IntermediateSymbolDefinition WixInstanceTransforms = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixInstanceTransforms,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.PropertyId), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.ProductCode), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.ProductName), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.UpgradeCode), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixInstanceTransformsSymbolFields.PropertyId), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixInstanceTransformsSymbolFields.ProductCode), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixInstanceTransformsSymbolFields.ProductName), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixInstanceTransformsSymbolFields.UpgradeCode), IntermediateFieldType.String),
17 },
18 - typeof(WixInstanceTransformsTuple));
18 + typeof(WixInstanceTransformsSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum WixInstanceTransformsTupleFields
24 + public enum WixInstanceTransformsSymbolFields
25 {
26 PropertyId,
27 ProductCode,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 UpgradeCode,
30 }
31
32 - public class WixInstanceTransformsTuple : IntermediateTuple
32 + public class WixInstanceTransformsSymbol : IntermediateSymbol
33 {
34 - public WixInstanceTransformsTuple() : base(TupleDefinitions.WixInstanceTransforms, null, null)
34 + public WixInstanceTransformsSymbol() : base(SymbolDefinitions.WixInstanceTransforms, null, null)
35 {
36 }
37
38 - public WixInstanceTransformsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixInstanceTransforms, sourceLineNumber, id)
38 + public WixInstanceTransformsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixInstanceTransforms, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[WixInstanceTransformsTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[WixInstanceTransformsSymbolFields index] => this.Fields[(int)index];
43
44 public string PropertyId
45 {
46 - get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.PropertyId];
47 - set => this.Set((int)WixInstanceTransformsTupleFields.PropertyId, value);
46 + get => (string)this.Fields[(int)WixInstanceTransformsSymbolFields.PropertyId];
47 + set => this.Set((int)WixInstanceTransformsSymbolFields.PropertyId, value);
48 }
49
50 public string ProductCode
51 {
52 - get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.ProductCode];
53 - set => this.Set((int)WixInstanceTransformsTupleFields.ProductCode, value);
52 + get => (string)this.Fields[(int)WixInstanceTransformsSymbolFields.ProductCode];
53 + set => this.Set((int)WixInstanceTransformsSymbolFields.ProductCode, value);
54 }
55
56 public string ProductName
57 {
58 - get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.ProductName];
59 - set => this.Set((int)WixInstanceTransformsTupleFields.ProductName, value);
58 + get => (string)this.Fields[(int)WixInstanceTransformsSymbolFields.ProductName];
59 + set => this.Set((int)WixInstanceTransformsSymbolFields.ProductName, value);
60 }
61
62 public string UpgradeCode
63 {
64 - get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.UpgradeCode];
65 - set => this.Set((int)WixInstanceTransformsTupleFields.UpgradeCode, value);
64 + get => (string)this.Fields[(int)WixInstanceTransformsSymbolFields.UpgradeCode];
65 + set => this.Set((int)WixInstanceTransformsSymbolFields.UpgradeCode, value);
66 }
67 }
68 }
src/WixToolset.Data/Tuples/WixMediaTemplateTuple.cs
+29 -29
@@ -2,30 +2,30 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixMediaTemplate = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixMediaTemplate,
9 + public static readonly IntermediateSymbolDefinition WixMediaTemplate = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixMediaTemplate,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.CabinetTemplate), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.CompressionLevel), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.DiskPrompt), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.VolumeLabel), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.MaximumUncompressedMediaSize), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.MaximumCabinetSizeForLargeFileSplitting), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixMediaTemplateSymbolFields.CabinetTemplate), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixMediaTemplateSymbolFields.CompressionLevel), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(WixMediaTemplateSymbolFields.DiskPrompt), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixMediaTemplateSymbolFields.VolumeLabel), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(WixMediaTemplateSymbolFields.MaximumUncompressedMediaSize), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(WixMediaTemplateSymbolFields.MaximumCabinetSizeForLargeFileSplitting), IntermediateFieldType.Number),
19 },
20 - typeof(WixMediaTemplateTuple));
20 + typeof(WixMediaTemplateSymbol));
21 }
22 }
23
24 -namespace WixToolset.Data.Tuples
24 +namespace WixToolset.Data.Symbols
25 {
26 using System;
27
28 - public enum WixMediaTemplateTupleFields
28 + public enum WixMediaTemplateSymbolFields
29 {
30 CabinetTemplate,
31 CompressionLevel,
@@ -35,52 +35,52 @@ namespace WixToolset.Data.Tuples
35 MaximumCabinetSizeForLargeFileSplitting,
36 }
37
38 - public class WixMediaTemplateTuple : IntermediateTuple
38 + public class WixMediaTemplateSymbol : IntermediateSymbol
39 {
40 - public WixMediaTemplateTuple() : base(TupleDefinitions.WixMediaTemplate, null, null)
40 + public WixMediaTemplateSymbol() : base(SymbolDefinitions.WixMediaTemplate, null, null)
41 {
42 }
43
44 - public WixMediaTemplateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixMediaTemplate, sourceLineNumber, id)
44 + public WixMediaTemplateSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixMediaTemplate, sourceLineNumber, id)
45 {
46 }
47
48 - public IntermediateField this[WixMediaTemplateTupleFields index] => this.Fields[(int)index];
48 + public IntermediateField this[WixMediaTemplateSymbolFields index] => this.Fields[(int)index];
49
50 public string CabinetTemplate
51 {
52 - get => (string)this.Fields[(int)WixMediaTemplateTupleFields.CabinetTemplate];
53 - set => this.Set((int)WixMediaTemplateTupleFields.CabinetTemplate, value);
52 + get => (string)this.Fields[(int)WixMediaTemplateSymbolFields.CabinetTemplate];
53 + set => this.Set((int)WixMediaTemplateSymbolFields.CabinetTemplate, value);
54 }
55
56 public CompressionLevel? CompressionLevel
57 {
58 - get => (CompressionLevel?)this.Fields[(int)WixMediaTemplateTupleFields.CompressionLevel].AsNullableNumber();
59 - set => this.Set((int)WixMediaTemplateTupleFields.CompressionLevel, (int?)value);
58 + get => (CompressionLevel?)this.Fields[(int)WixMediaTemplateSymbolFields.CompressionLevel].AsNullableNumber();
59 + set => this.Set((int)WixMediaTemplateSymbolFields.CompressionLevel, (int?)value);
60 }
61
62 public string DiskPrompt
63 {
64 - get => (string)this.Fields[(int)WixMediaTemplateTupleFields.DiskPrompt];
65 - set => this.Set((int)WixMediaTemplateTupleFields.DiskPrompt, value);
64 + get => (string)this.Fields[(int)WixMediaTemplateSymbolFields.DiskPrompt];
65 + set => this.Set((int)WixMediaTemplateSymbolFields.DiskPrompt, value);
66 }
67
68 public string VolumeLabel
69 {
70 - get => (string)this.Fields[(int)WixMediaTemplateTupleFields.VolumeLabel];
71 - set => this.Set((int)WixMediaTemplateTupleFields.VolumeLabel, value);
70 + get => (string)this.Fields[(int)WixMediaTemplateSymbolFields.VolumeLabel];
71 + set => this.Set((int)WixMediaTemplateSymbolFields.VolumeLabel, value);
72 }
73
74 public int? MaximumUncompressedMediaSize
75 {
76 - get => (int?)this.Fields[(int)WixMediaTemplateTupleFields.MaximumUncompressedMediaSize];
77 - set => this.Set((int)WixMediaTemplateTupleFields.MaximumUncompressedMediaSize, value);
76 + get => (int?)this.Fields[(int)WixMediaTemplateSymbolFields.MaximumUncompressedMediaSize];
77 + set => this.Set((int)WixMediaTemplateSymbolFields.MaximumUncompressedMediaSize, value);
78 }
79
80 public int? MaximumCabinetSizeForLargeFileSplitting
81 {
82 - get => (int?)this.Fields[(int)WixMediaTemplateTupleFields.MaximumCabinetSizeForLargeFileSplitting];
83 - set => this.Set((int)WixMediaTemplateTupleFields.MaximumCabinetSizeForLargeFileSplitting, value);
82 + get => (int?)this.Fields[(int)WixMediaTemplateSymbolFields.MaximumCabinetSizeForLargeFileSplitting];
83 + set => this.Set((int)WixMediaTemplateSymbolFields.MaximumCabinetSizeForLargeFileSplitting, value);
84 }
85 }
86 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixMergeTuple.cs
+33 -33
@@ -2,29 +2,29 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixMerge = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixMerge,
9 + public static readonly IntermediateSymbolDefinition WixMerge = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixMerge,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Language), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(WixMergeTupleFields.DirectoryRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixMergeTupleFields.SourceFile), IntermediateFieldType.Path),
16 - new IntermediateFieldDefinition(nameof(WixMergeTupleFields.DiskId), IntermediateFieldType.Number),
17 - new IntermediateFieldDefinition(nameof(WixMergeTupleFields.FileAttributes), IntermediateFieldType.Number),
18 - new IntermediateFieldDefinition(nameof(WixMergeTupleFields.ConfigurationData), IntermediateFieldType.String),
19 - new IntermediateFieldDefinition(nameof(WixMergeTupleFields.FeatureRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixMergeSymbolFields.Language), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(WixMergeSymbolFields.DirectoryRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixMergeSymbolFields.SourceFile), IntermediateFieldType.Path),
16 + new IntermediateFieldDefinition(nameof(WixMergeSymbolFields.DiskId), IntermediateFieldType.Number),
17 + new IntermediateFieldDefinition(nameof(WixMergeSymbolFields.FileAttributes), IntermediateFieldType.Number),
18 + new IntermediateFieldDefinition(nameof(WixMergeSymbolFields.ConfigurationData), IntermediateFieldType.String),
19 + new IntermediateFieldDefinition(nameof(WixMergeSymbolFields.FeatureRef), IntermediateFieldType.String),
20 },
21 - typeof(WixMergeTuple));
21 + typeof(WixMergeSymbol));
22 }
23 }
24
25 -namespace WixToolset.Data.Tuples
25 +namespace WixToolset.Data.Symbols
26 {
27 - public enum WixMergeTupleFields
27 + public enum WixMergeSymbolFields
28 {
29 Language,
30 DirectoryRef,
@@ -35,58 +35,58 @@ namespace WixToolset.Data.Tuples
35 FeatureRef,
36 }
37
38 - public class WixMergeTuple : IntermediateTuple
38 + public class WixMergeSymbol : IntermediateSymbol
39 {
40 - public WixMergeTuple() : base(TupleDefinitions.WixMerge, null, null)
40 + public WixMergeSymbol() : base(SymbolDefinitions.WixMerge, null, null)
41 {
42 }
43
44 - public WixMergeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixMerge, sourceLineNumber, id)
44 + public WixMergeSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixMerge, sourceLineNumber, id)
45 {
46 }
47
48 - public IntermediateField this[WixMergeTupleFields index] => this.Fields[(int)index];
48 + public IntermediateField this[WixMergeSymbolFields index] => this.Fields[(int)index];
49
50 public int Language
51 {
52 - get => (int)this.Fields[(int)WixMergeTupleFields.Language];
53 - set => this.Set((int)WixMergeTupleFields.Language, value);
52 + get => (int)this.Fields[(int)WixMergeSymbolFields.Language];
53 + set => this.Set((int)WixMergeSymbolFields.Language, value);
54 }
55
56 public string DirectoryRef
57 {
58 - get => (string)this.Fields[(int)WixMergeTupleFields.DirectoryRef];
59 - set => this.Set((int)WixMergeTupleFields.DirectoryRef, value);
58 + get => (string)this.Fields[(int)WixMergeSymbolFields.DirectoryRef];
59 + set => this.Set((int)WixMergeSymbolFields.DirectoryRef, value);
60 }
61
62 public string SourceFile
63 {
64 - get => (string)this.Fields[(int)WixMergeTupleFields.SourceFile];
65 - set => this.Set((int)WixMergeTupleFields.SourceFile, value);
64 + get => (string)this.Fields[(int)WixMergeSymbolFields.SourceFile];
65 + set => this.Set((int)WixMergeSymbolFields.SourceFile, value);
66 }
67
68 public int DiskId
69 {
70 - get => (int)this.Fields[(int)WixMergeTupleFields.DiskId];
71 - set => this.Set((int)WixMergeTupleFields.DiskId, value);
70 + get => (int)this.Fields[(int)WixMergeSymbolFields.DiskId];
71 + set => this.Set((int)WixMergeSymbolFields.DiskId, value);
72 }
73
74 - public FileTupleAttributes FileAttributes
74 + public FileSymbolAttributes FileAttributes
75 {
76 - get => (FileTupleAttributes)this.Fields[(int)WixMergeTupleFields.FileAttributes].AsNumber();
77 - set => this.Set((int)WixMergeTupleFields.FileAttributes, (int)value);
76 + get => (FileSymbolAttributes)this.Fields[(int)WixMergeSymbolFields.FileAttributes].AsNumber();
77 + set => this.Set((int)WixMergeSymbolFields.FileAttributes, (int)value);
78 }
79
80 public string ConfigurationData
81 {
82 - get => (string)this.Fields[(int)WixMergeTupleFields.ConfigurationData];
83 - set => this.Set((int)WixMergeTupleFields.ConfigurationData, value);
82 + get => (string)this.Fields[(int)WixMergeSymbolFields.ConfigurationData];
83 + set => this.Set((int)WixMergeSymbolFields.ConfigurationData, value);
84 }
85
86 public string FeatureRef
87 {
88 - get => (string)this.Fields[(int)WixMergeTupleFields.FeatureRef];
89 - set => this.Set((int)WixMergeTupleFields.FeatureRef, value);
88 + get => (string)this.Fields[(int)WixMergeSymbolFields.FeatureRef];
89 + set => this.Set((int)WixMergeSymbolFields.FeatureRef, value);
90 }
91 }
92 }
src/WixToolset.Data/Tuples/WixOrderingTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixOrdering = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixOrdering,
9 + public static readonly IntermediateSymbolDefinition WixOrdering = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixOrdering,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.ItemType), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.ItemIdRef), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.DependsOnType), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.DependsOnIdRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixOrderingSymbolFields.ItemType), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixOrderingSymbolFields.ItemIdRef), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixOrderingSymbolFields.DependsOnType), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixOrderingSymbolFields.DependsOnIdRef), IntermediateFieldType.String),
17 },
18 - typeof(WixOrderingTuple));
18 + typeof(WixOrderingSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum WixOrderingTupleFields
24 + public enum WixOrderingSymbolFields
25 {
26 ItemType,
27 ItemIdRef,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 DependsOnIdRef,
30 }
31
32 - public class WixOrderingTuple : IntermediateTuple
32 + public class WixOrderingSymbol : IntermediateSymbol
33 {
34 - public WixOrderingTuple() : base(TupleDefinitions.WixOrdering, null, null)
34 + public WixOrderingSymbol() : base(SymbolDefinitions.WixOrdering, null, null)
35 {
36 }
37
38 - public WixOrderingTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixOrdering, sourceLineNumber, id)
38 + public WixOrderingSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixOrdering, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[WixOrderingTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[WixOrderingSymbolFields index] => this.Fields[(int)index];
43
44 public ComplexReferenceChildType ItemType
45 {
46 - get => (ComplexReferenceChildType)this.Fields[(int)WixOrderingTupleFields.ItemType].AsNumber();
47 - set => this.Set((int)WixOrderingTupleFields.ItemType, (int)value);
46 + get => (ComplexReferenceChildType)this.Fields[(int)WixOrderingSymbolFields.ItemType].AsNumber();
47 + set => this.Set((int)WixOrderingSymbolFields.ItemType, (int)value);
48 }
49
50 public string ItemIdRef
51 {
52 - get => (string)this.Fields[(int)WixOrderingTupleFields.ItemIdRef];
53 - set => this.Set((int)WixOrderingTupleFields.ItemIdRef, value);
52 + get => (string)this.Fields[(int)WixOrderingSymbolFields.ItemIdRef];
53 + set => this.Set((int)WixOrderingSymbolFields.ItemIdRef, value);
54 }
55
56 public ComplexReferenceChildType DependsOnType
57 {
58 - get => (ComplexReferenceChildType)this.Fields[(int)WixOrderingTupleFields.DependsOnType].AsNumber();
59 - set => this.Set((int)WixOrderingTupleFields.DependsOnType, (int)value);
58 + get => (ComplexReferenceChildType)this.Fields[(int)WixOrderingSymbolFields.DependsOnType].AsNumber();
59 + set => this.Set((int)WixOrderingSymbolFields.DependsOnType, (int)value);
60 }
61
62 public string DependsOnIdRef
63 {
64 - get => (string)this.Fields[(int)WixOrderingTupleFields.DependsOnIdRef];
65 - set => this.Set((int)WixOrderingTupleFields.DependsOnIdRef, value);
64 + get => (string)this.Fields[(int)WixOrderingSymbolFields.DependsOnIdRef];
65 + set => this.Set((int)WixOrderingSymbolFields.DependsOnIdRef, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixPatchBaseline = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixPatchBaseline,
9 + public static readonly IntermediateSymbolDefinition WixPatchBaseline = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixPatchBaseline,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.DiskId), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.ValidationFlags), IntermediateFieldType.Number),
15 - new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.BaselineFile), IntermediateFieldType.Path),
16 - new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.UpdateFile), IntermediateFieldType.Path),
17 - new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.TransformFile), IntermediateFieldType.Path),
13 + new IntermediateFieldDefinition(nameof(WixPatchBaselineSymbolFields.DiskId), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(WixPatchBaselineSymbolFields.ValidationFlags), IntermediateFieldType.Number),
15 + new IntermediateFieldDefinition(nameof(WixPatchBaselineSymbolFields.BaselineFile), IntermediateFieldType.Path),
16 + new IntermediateFieldDefinition(nameof(WixPatchBaselineSymbolFields.UpdateFile), IntermediateFieldType.Path),
17 + new IntermediateFieldDefinition(nameof(WixPatchBaselineSymbolFields.TransformFile), IntermediateFieldType.Path),
18 },
19 - typeof(WixPatchBaselineTuple));
19 + typeof(WixPatchBaselineSymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum WixPatchBaselineTupleFields
25 + public enum WixPatchBaselineSymbolFields
26 {
27 DiskId,
28 ValidationFlags,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
31 TransformFile,
32 }
33
34 - public class WixPatchBaselineTuple : IntermediateTuple
34 + public class WixPatchBaselineSymbol : IntermediateSymbol
35 {
36 - public WixPatchBaselineTuple() : base(TupleDefinitions.WixPatchBaseline, null, null)
36 + public WixPatchBaselineSymbol() : base(SymbolDefinitions.WixPatchBaseline, null, null)
37 {
38 }
39
40 - public WixPatchBaselineTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchBaseline, sourceLineNumber, id)
40 + public WixPatchBaselineSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixPatchBaseline, sourceLineNumber, id)
41 {
42 }
43
44 - public IntermediateField this[WixPatchBaselineTupleFields index] => this.Fields[(int)index];
44 + public IntermediateField this[WixPatchBaselineSymbolFields index] => this.Fields[(int)index];
45
46 public int DiskId
47 {
48 - get => (int)this.Fields[(int)WixPatchBaselineTupleFields.DiskId];
49 - set => this.Set((int)WixPatchBaselineTupleFields.DiskId, value);
48 + get => (int)this.Fields[(int)WixPatchBaselineSymbolFields.DiskId];
49 + set => this.Set((int)WixPatchBaselineSymbolFields.DiskId, value);
50 }
51
52 public TransformFlags ValidationFlags
53 {
54 - get => (TransformFlags)this.Fields[(int)WixPatchBaselineTupleFields.ValidationFlags].AsNumber();
55 - set => this.Set((int)WixPatchBaselineTupleFields.ValidationFlags, (int)value);
54 + get => (TransformFlags)this.Fields[(int)WixPatchBaselineSymbolFields.ValidationFlags].AsNumber();
55 + set => this.Set((int)WixPatchBaselineSymbolFields.ValidationFlags, (int)value);
56 }
57
58 public IntermediateFieldPathValue BaselineFile
59 {
60 - get => this.Fields[(int)WixPatchBaselineTupleFields.BaselineFile].AsPath();
61 - set => this.Set((int)WixPatchBaselineTupleFields.BaselineFile, value);
60 + get => this.Fields[(int)WixPatchBaselineSymbolFields.BaselineFile].AsPath();
61 + set => this.Set((int)WixPatchBaselineSymbolFields.BaselineFile, value);
62 }
63
64 public IntermediateFieldPathValue UpdateFile
65 {
66 - get => this.Fields[(int)WixPatchBaselineTupleFields.UpdateFile].AsPath();
67 - set => this.Set((int)WixPatchBaselineTupleFields.UpdateFile, value);
66 + get => this.Fields[(int)WixPatchBaselineSymbolFields.UpdateFile].AsPath();
67 + set => this.Set((int)WixPatchBaselineSymbolFields.UpdateFile, value);
68 }
69
70 public IntermediateFieldPathValue TransformFile
71 {
72 - get => this.Fields[(int)WixPatchBaselineTupleFields.TransformFile].AsPath();
73 - set => this.Set((int)WixPatchBaselineTupleFields.TransformFile, value);
72 + get => this.Fields[(int)WixPatchBaselineSymbolFields.TransformFile].AsPath();
73 + set => this.Set((int)WixPatchBaselineSymbolFields.TransformFile, value);
74 }
75 }
76 }
src/WixToolset.Data/Tuples/WixPatchFamilyGroupTuple.cs
+14 -14
@@ -2,43 +2,43 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixPatchFamilyGroup = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixPatchFamilyGroup,
9 + public static readonly IntermediateSymbolDefinition WixPatchFamilyGroup = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixPatchFamilyGroup,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixPatchFamilyGroupTupleFields.WixPatchFamilyGroup), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixPatchFamilyGroupSymbolFields.WixPatchFamilyGroup), IntermediateFieldType.String),
14 },
15 - typeof(WixPatchFamilyGroupTuple));
15 + typeof(WixPatchFamilyGroupSymbol));
16 }
17 }
18
19 -namespace WixToolset.Data.Tuples
19 +namespace WixToolset.Data.Symbols
20 {
21 - public enum WixPatchFamilyGroupTupleFields
21 + public enum WixPatchFamilyGroupSymbolFields
22 {
23 WixPatchFamilyGroup,
24 }
25
26 - public class WixPatchFamilyGroupTuple : IntermediateTuple
26 + public class WixPatchFamilyGroupSymbol : IntermediateSymbol
27 {
28 - public WixPatchFamilyGroupTuple() : base(TupleDefinitions.WixPatchFamilyGroup, null, null)
28 + public WixPatchFamilyGroupSymbol() : base(SymbolDefinitions.WixPatchFamilyGroup, null, null)
29 {
30 }
31
32 - public WixPatchFamilyGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchFamilyGroup, sourceLineNumber, id)
32 + public WixPatchFamilyGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixPatchFamilyGroup, sourceLineNumber, id)
33 {
34 }
35
36 - public IntermediateField this[WixPatchFamilyGroupTupleFields index] => this.Fields[(int)index];
36 + public IntermediateField this[WixPatchFamilyGroupSymbolFields index] => this.Fields[(int)index];
37
38 public string WixPatchFamilyGroup
39 {
40 - get => (string)this.Fields[(int)WixPatchFamilyGroupTupleFields.WixPatchFamilyGroup];
41 - set => this.Set((int)WixPatchFamilyGroupTupleFields.WixPatchFamilyGroup, value);
40 + get => (string)this.Fields[(int)WixPatchFamilyGroupSymbolFields.WixPatchFamilyGroup];
41 + set => this.Set((int)WixPatchFamilyGroupSymbolFields.WixPatchFamilyGroup, value);
42 }
43 }
44 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixPatchIdTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixPatchId = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixPatchId,
9 + public static readonly IntermediateSymbolDefinition WixPatchId = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixPatchId,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.ClientPatchId), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles), IntermediateFieldType.Bool),
15 - new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.ApiPatchingSymbolFlags), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixPatchIdSymbolFields.ClientPatchId), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixPatchIdSymbolFields.OptimizePatchSizeForLargeFiles), IntermediateFieldType.Bool),
15 + new IntermediateFieldDefinition(nameof(WixPatchIdSymbolFields.ApiPatchingSymbolFlags), IntermediateFieldType.Number),
16 },
17 - typeof(WixPatchIdTuple));
17 + typeof(WixPatchIdSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum WixPatchIdTupleFields
23 + public enum WixPatchIdSymbolFields
24 {
25 ClientPatchId,
26 OptimizePatchSizeForLargeFiles,
27 ApiPatchingSymbolFlags,
28 }
29
30 - public class WixPatchIdTuple : IntermediateTuple
30 + public class WixPatchIdSymbol : IntermediateSymbol
31 {
32 - public WixPatchIdTuple() : base(TupleDefinitions.WixPatchId, null, null)
32 + public WixPatchIdSymbol() : base(SymbolDefinitions.WixPatchId, null, null)
33 {
34 }
35
36 - public WixPatchIdTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchId, sourceLineNumber, id)
36 + public WixPatchIdSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixPatchId, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[WixPatchIdTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[WixPatchIdSymbolFields index] => this.Fields[(int)index];
41
42 public string ClientPatchId
43 {
44 - get => (string)this.Fields[(int)WixPatchIdTupleFields.ClientPatchId];
45 - set => this.Set((int)WixPatchIdTupleFields.ClientPatchId, value);
44 + get => (string)this.Fields[(int)WixPatchIdSymbolFields.ClientPatchId];
45 + set => this.Set((int)WixPatchIdSymbolFields.ClientPatchId, value);
46 }
47
48 public bool? OptimizePatchSizeForLargeFiles
49 {
50 - get => (bool?)this.Fields[(int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles];
51 - set => this.Set((int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles, value);
50 + get => (bool?)this.Fields[(int)WixPatchIdSymbolFields.OptimizePatchSizeForLargeFiles];
51 + set => this.Set((int)WixPatchIdSymbolFields.OptimizePatchSizeForLargeFiles, value);
52 }
53
54 public int? ApiPatchingSymbolFlags
55 {
56 - get => (int?)this.Fields[(int)WixPatchIdTupleFields.ApiPatchingSymbolFlags];
57 - set => this.Set((int)WixPatchIdTupleFields.ApiPatchingSymbolFlags, value);
56 + get => (int?)this.Fields[(int)WixPatchIdSymbolFields.ApiPatchingSymbolFlags];
57 + set => this.Set((int)WixPatchIdSymbolFields.ApiPatchingSymbolFlags, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixPatchRefTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixPatchRef = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixPatchRef,
9 + public static readonly IntermediateSymbolDefinition WixPatchRef = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixPatchRef,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixPatchRefTupleFields.Table), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixPatchRefTupleFields.PrimaryKeys), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixPatchRefSymbolFields.Table), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixPatchRefSymbolFields.PrimaryKeys), IntermediateFieldType.String),
15 },
16 - typeof(WixPatchRefTuple));
16 + typeof(WixPatchRefSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum WixPatchRefTupleFields
22 + public enum WixPatchRefSymbolFields
23 {
24 Table,
25 PrimaryKeys,
26 }
27
28 - public class WixPatchRefTuple : IntermediateTuple
28 + public class WixPatchRefSymbol : IntermediateSymbol
29 {
30 - public WixPatchRefTuple() : base(TupleDefinitions.WixPatchRef, null, null)
30 + public WixPatchRefSymbol() : base(SymbolDefinitions.WixPatchRef, null, null)
31 {
32 }
33
34 - public WixPatchRefTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchRef, sourceLineNumber, id)
34 + public WixPatchRefSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixPatchRef, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[WixPatchRefTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[WixPatchRefSymbolFields index] => this.Fields[(int)index];
39
40 public string Table
41 {
42 - get => (string)this.Fields[(int)WixPatchRefTupleFields.Table];
43 - set => this.Set((int)WixPatchRefTupleFields.Table, value);
42 + get => (string)this.Fields[(int)WixPatchRefSymbolFields.Table];
43 + set => this.Set((int)WixPatchRefSymbolFields.Table, value);
44 }
45
46 public string PrimaryKeys
47 {
48 - get => (string)this.Fields[(int)WixPatchRefTupleFields.PrimaryKeys];
49 - set => this.Set((int)WixPatchRefTupleFields.PrimaryKeys, value);
48 + get => (string)this.Fields[(int)WixPatchRefSymbolFields.PrimaryKeys];
49 + set => this.Set((int)WixPatchRefSymbolFields.PrimaryKeys, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixPatchTargetTuple.cs
+14 -14
@@ -2,43 +2,43 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixPatchTarget = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixPatchTarget,
9 + public static readonly IntermediateSymbolDefinition WixPatchTarget = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixPatchTarget,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixPatchTargetTupleFields.ProductCode), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixPatchTargetSymbolFields.ProductCode), IntermediateFieldType.String),
14 },
15 - typeof(WixPatchTargetTuple));
15 + typeof(WixPatchTargetSymbol));
16 }
17 }
18
19 -namespace WixToolset.Data.Tuples
19 +namespace WixToolset.Data.Symbols
20 {
21 - public enum WixPatchTargetTupleFields
21 + public enum WixPatchTargetSymbolFields
22 {
23 ProductCode,
24 }
25
26 - public class WixPatchTargetTuple : IntermediateTuple
26 + public class WixPatchTargetSymbol : IntermediateSymbol
27 {
28 - public WixPatchTargetTuple() : base(TupleDefinitions.WixPatchTarget, null, null)
28 + public WixPatchTargetSymbol() : base(SymbolDefinitions.WixPatchTarget, null, null)
29 {
30 }
31
32 - public WixPatchTargetTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchTarget, sourceLineNumber, id)
32 + public WixPatchTargetSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixPatchTarget, sourceLineNumber, id)
33 {
34 }
35
36 - public IntermediateField this[WixPatchTargetTupleFields index] => this.Fields[(int)index];
36 + public IntermediateField this[WixPatchTargetSymbolFields index] => this.Fields[(int)index];
37
38 public string ProductCode
39 {
40 - get => (string)this.Fields[(int)WixPatchTargetTupleFields.ProductCode];
41 - set => this.Set((int)WixPatchTargetTupleFields.ProductCode, value);
40 + get => (string)this.Fields[(int)WixPatchTargetSymbolFields.ProductCode];
41 + set => this.Set((int)WixPatchTargetSymbolFields.ProductCode, value);
42 }
43 }
44 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixProductSearchTuple.cs
+17 -17
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixProductSearch = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixProductSearch,
9 + public static readonly IntermediateSymbolDefinition WixProductSearch = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixProductSearch,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixProductSearchTupleFields.Guid), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixProductSearchTupleFields.Attributes), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixProductSearchSymbolFields.Guid), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixProductSearchSymbolFields.Attributes), IntermediateFieldType.Number),
15 },
16 - typeof(WixProductSearchTuple));
16 + typeof(WixProductSearchSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 using System;
23
24 - public enum WixProductSearchTupleFields
24 + public enum WixProductSearchSymbolFields
25 {
26 Guid,
27 Attributes,
@@ -37,28 +37,28 @@ namespace WixToolset.Data.Tuples
37 UpgradeCode = 0x10,
38 }
39
40 - public class WixProductSearchTuple : IntermediateTuple
40 + public class WixProductSearchSymbol : IntermediateSymbol
41 {
42 - public WixProductSearchTuple() : base(TupleDefinitions.WixProductSearch, null, null)
42 + public WixProductSearchSymbol() : base(SymbolDefinitions.WixProductSearch, null, null)
43 {
44 }
45
46 - public WixProductSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixProductSearch, sourceLineNumber, id)
46 + public WixProductSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixProductSearch, sourceLineNumber, id)
47 {
48 }
49
50 - public IntermediateField this[WixProductSearchTupleFields index] => this.Fields[(int)index];
50 + public IntermediateField this[WixProductSearchSymbolFields index] => this.Fields[(int)index];
51
52 public string Guid
53 {
54 - get => (string)this.Fields[(int)WixProductSearchTupleFields.Guid];
55 - set => this.Set((int)WixProductSearchTupleFields.Guid, value);
54 + get => (string)this.Fields[(int)WixProductSearchSymbolFields.Guid];
55 + set => this.Set((int)WixProductSearchSymbolFields.Guid, value);
56 }
57
58 public WixProductSearchAttributes Attributes
59 {
60 - get => (WixProductSearchAttributes)this.Fields[(int)WixProductSearchTupleFields.Attributes].AsNumber();
61 - set => this.Set((int)WixProductSearchTupleFields.Attributes, (int)value);
60 + get => (WixProductSearchAttributes)this.Fields[(int)WixProductSearchSymbolFields.Attributes].AsNumber();
61 + set => this.Set((int)WixProductSearchSymbolFields.Attributes, (int)value);
62 }
63 }
64 }
src/WixToolset.Data/Tuples/WixPropertyTuple.cs
+23 -23
@@ -2,26 +2,26 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixProperty = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixProperty,
9 + public static readonly IntermediateSymbolDefinition WixProperty = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixProperty,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.PropertyRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Admin), IntermediateFieldType.Bool),
15 - new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Hidden), IntermediateFieldType.Bool),
16 - new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Secure), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(WixPropertySymbolFields.PropertyRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixPropertySymbolFields.Admin), IntermediateFieldType.Bool),
15 + new IntermediateFieldDefinition(nameof(WixPropertySymbolFields.Hidden), IntermediateFieldType.Bool),
16 + new IntermediateFieldDefinition(nameof(WixPropertySymbolFields.Secure), IntermediateFieldType.Bool),
17 },
18 - typeof(WixPropertyTuple));
18 + typeof(WixPropertySymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 - public enum WixPropertyTupleFields
24 + public enum WixPropertySymbolFields
25 {
26 PropertyRef,
27 Admin,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
29 Secure,
30 }
31
32 - public class WixPropertyTuple : IntermediateTuple
32 + public class WixPropertySymbol : IntermediateSymbol
33 {
34 - public WixPropertyTuple() : base(TupleDefinitions.WixProperty, null, null)
34 + public WixPropertySymbol() : base(SymbolDefinitions.WixProperty, null, null)
35 {
36 }
37
38 - public WixPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixProperty, sourceLineNumber, id)
38 + public WixPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixProperty, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[WixPropertyTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[WixPropertySymbolFields index] => this.Fields[(int)index];
43
44 public string PropertyRef
45 {
46 - get => (string)this.Fields[(int)WixPropertyTupleFields.PropertyRef];
47 - set => this.Set((int)WixPropertyTupleFields.PropertyRef, value);
46 + get => (string)this.Fields[(int)WixPropertySymbolFields.PropertyRef];
47 + set => this.Set((int)WixPropertySymbolFields.PropertyRef, value);
48 }
49
50 public bool Admin
51 {
52 - get => (bool)this.Fields[(int)WixPropertyTupleFields.Admin];
53 - set => this.Set((int)WixPropertyTupleFields.Admin, value);
52 + get => (bool)this.Fields[(int)WixPropertySymbolFields.Admin];
53 + set => this.Set((int)WixPropertySymbolFields.Admin, value);
54 }
55
56 public bool Hidden
57 {
58 - get => (bool)this.Fields[(int)WixPropertyTupleFields.Hidden];
59 - set => this.Set((int)WixPropertyTupleFields.Hidden, value);
58 + get => (bool)this.Fields[(int)WixPropertySymbolFields.Hidden];
59 + set => this.Set((int)WixPropertySymbolFields.Hidden, value);
60 }
61
62 public bool Secure
63 {
64 - get => (bool)this.Fields[(int)WixPropertyTupleFields.Secure];
65 - set => this.Set((int)WixPropertyTupleFields.Secure, value);
64 + get => (bool)this.Fields[(int)WixPropertySymbolFields.Secure];
65 + set => this.Set((int)WixPropertySymbolFields.Secure, value);
66 }
67 }
68 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs
+23 -23
@@ -2,28 +2,28 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixRegistrySearch = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixRegistrySearch,
9 + public static readonly IntermediateSymbolDefinition WixRegistrySearch = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixRegistrySearch,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Root), IntermediateFieldType.Number),
14 - new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Key), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Value), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Attributes), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixRegistrySearchSymbolFields.Root), IntermediateFieldType.Number),
14 + new IntermediateFieldDefinition(nameof(WixRegistrySearchSymbolFields.Key), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixRegistrySearchSymbolFields.Value), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixRegistrySearchSymbolFields.Attributes), IntermediateFieldType.Number),
17 },
18 - typeof(WixRegistrySearchTuple));
18 + typeof(WixRegistrySearchSymbol));
19 }
20 }
21
22 -namespace WixToolset.Data.Tuples
22 +namespace WixToolset.Data.Symbols
23 {
24 using System;
25
26 - public enum WixRegistrySearchTupleFields
26 + public enum WixRegistrySearchSymbolFields
27 {
28 Root,
29 Key,
@@ -42,40 +42,40 @@ namespace WixToolset.Data.Tuples
42 Win64 = 0x20,
43 }
44
45 - public class WixRegistrySearchTuple : IntermediateTuple
45 + public class WixRegistrySearchSymbol : IntermediateSymbol
46 {
47 - public WixRegistrySearchTuple() : base(TupleDefinitions.WixRegistrySearch, null, null)
47 + public WixRegistrySearchSymbol() : base(SymbolDefinitions.WixRegistrySearch, null, null)
48 {
49 }
50
51 - public WixRegistrySearchTuple(SourceLineNumber sourceLineNumber , Identifier id = null) : base(TupleDefinitions.WixRegistrySearch, sourceLineNumber, id)
51 + public WixRegistrySearchSymbol(SourceLineNumber sourceLineNumber , Identifier id = null) : base(SymbolDefinitions.WixRegistrySearch, sourceLineNumber, id)
52 {
53 }
54
55 - public IntermediateField this[WixRegistrySearchTupleFields index] => this.Fields[(int)index];
55 + public IntermediateField this[WixRegistrySearchSymbolFields index] => this.Fields[(int)index];
56
57 public RegistryRootType Root
58 {
59 - get => (RegistryRootType)this.Fields[(int)WixRegistrySearchTupleFields.Root].AsNumber();
60 - set => this.Set((int)WixRegistrySearchTupleFields.Root, (int)value);
59 + get => (RegistryRootType)this.Fields[(int)WixRegistrySearchSymbolFields.Root].AsNumber();
60 + set => this.Set((int)WixRegistrySearchSymbolFields.Root, (int)value);
61 }
62
63 public string Key
64 {
65 - get => (string)this.Fields[(int)WixRegistrySearchTupleFields.Key];
66 - set => this.Set((int)WixRegistrySearchTupleFields.Key, value);
65 + get => (string)this.Fields[(int)WixRegistrySearchSymbolFields.Key];
66 + set => this.Set((int)WixRegistrySearchSymbolFields.Key, value);
67 }
68
69 public string Value
70 {
71 - get => (string)this.Fields[(int)WixRegistrySearchTupleFields.Value];
72 - set => this.Set((int)WixRegistrySearchTupleFields.Value, value);
71 + get => (string)this.Fields[(int)WixRegistrySearchSymbolFields.Value];
72 + set => this.Set((int)WixRegistrySearchSymbolFields.Value, value);
73 }
74
75 public WixRegistrySearchAttributes Attributes
76 {
77 - get => (WixRegistrySearchAttributes)this.Fields[(int)WixRegistrySearchTupleFields.Attributes].AsNumber();
78 - set => this.Set((int)WixRegistrySearchTupleFields.Attributes, (int)value);
77 + get => (WixRegistrySearchAttributes)this.Fields[(int)WixRegistrySearchSymbolFields.Attributes].AsNumber();
78 + set => this.Set((int)WixRegistrySearchSymbolFields.Attributes, (int)value);
79 }
80 }
81 }
src/WixToolset.Data/Tuples/WixRelatedBundleTuple.cs
+17 -17
@@ -2,24 +2,24 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixRelatedBundle = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixRelatedBundle,
9 + public static readonly IntermediateSymbolDefinition WixRelatedBundle = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixRelatedBundle,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixRelatedBundleTupleFields.BundleId), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixRelatedBundleTupleFields.Action), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixRelatedBundleSymbolFields.BundleId), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixRelatedBundleSymbolFields.Action), IntermediateFieldType.Number),
15 },
16 - typeof(WixRelatedBundleTuple));
16 + typeof(WixRelatedBundleSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum WixRelatedBundleTupleFields
22 + public enum WixRelatedBundleSymbolFields
23 {
24 BundleId,
25 Action,
@@ -33,28 +33,28 @@ namespace WixToolset.Data.Tuples
33 Patch
34 }
35
36 - public class WixRelatedBundleTuple : IntermediateTuple
36 + public class WixRelatedBundleSymbol : IntermediateSymbol
37 {
38 - public WixRelatedBundleTuple() : base(TupleDefinitions.WixRelatedBundle, null, null)
38 + public WixRelatedBundleSymbol() : base(SymbolDefinitions.WixRelatedBundle, null, null)
39 {
40 }
41
42 - public WixRelatedBundleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixRelatedBundle, sourceLineNumber, id)
42 + public WixRelatedBundleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixRelatedBundle, sourceLineNumber, id)
43 {
44 }
45
46 - public IntermediateField this[WixRelatedBundleTupleFields index] => this.Fields[(int)index];
46 + public IntermediateField this[WixRelatedBundleSymbolFields index] => this.Fields[(int)index];
47
48 public string BundleId
49 {
50 - get => (string)this.Fields[(int)WixRelatedBundleTupleFields.BundleId];
51 - set => this.Set((int)WixRelatedBundleTupleFields.BundleId, value);
50 + get => (string)this.Fields[(int)WixRelatedBundleSymbolFields.BundleId];
51 + set => this.Set((int)WixRelatedBundleSymbolFields.BundleId, value);
52 }
53
54 public RelatedBundleActionType Action
55 {
56 - get => (RelatedBundleActionType)this.Fields[(int)WixRelatedBundleTupleFields.Action].AsNumber();
57 - set => this.Set((int)WixRelatedBundleTupleFields.Action, (int)value);
56 + get => (RelatedBundleActionType)this.Fields[(int)WixRelatedBundleSymbolFields.Action].AsNumber();
57 + set => this.Set((int)WixRelatedBundleSymbolFields.Action, (int)value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixSearchRelation = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixSearchRelation,
9 + public static readonly IntermediateSymbolDefinition WixSearchRelation = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixSearchRelation,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.ParentSearchRef), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.Attributes), IntermediateFieldType.Number),
13 + new IntermediateFieldDefinition(nameof(WixSearchRelationSymbolFields.ParentSearchRef), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixSearchRelationSymbolFields.Attributes), IntermediateFieldType.Number),
15 },
16 - typeof(WixSearchRelationTuple));
16 + typeof(WixSearchRelationSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum WixSearchRelationTupleFields
22 + public enum WixSearchRelationSymbolFields
23 {
24 ParentSearchRef,
25 Attributes,
26 }
27
28 - public class WixSearchRelationTuple : IntermediateTuple
28 + public class WixSearchRelationSymbol : IntermediateSymbol
29 {
30 - public WixSearchRelationTuple() : base(TupleDefinitions.WixSearchRelation, null, null)
30 + public WixSearchRelationSymbol() : base(SymbolDefinitions.WixSearchRelation, null, null)
31 {
32 }
33
34 - public WixSearchRelationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSearchRelation, sourceLineNumber, id)
34 + public WixSearchRelationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixSearchRelation, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[WixSearchRelationTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[WixSearchRelationSymbolFields index] => this.Fields[(int)index];
39
40 public string ParentSearchRef
41 {
42 - get => (string)this.Fields[(int)WixSearchRelationTupleFields.ParentSearchRef];
43 - set => this.Set((int)WixSearchRelationTupleFields.ParentSearchRef, value);
42 + get => (string)this.Fields[(int)WixSearchRelationSymbolFields.ParentSearchRef];
43 + set => this.Set((int)WixSearchRelationSymbolFields.ParentSearchRef, value);
44 }
45
46 public int Attributes
47 {
48 - get => (int)this.Fields[(int)WixSearchRelationTupleFields.Attributes];
49 - set => this.Set((int)WixSearchRelationTupleFields.Attributes, value);
48 + get => (int)this.Fields[(int)WixSearchRelationSymbolFields.Attributes];
49 + set => this.Set((int)WixSearchRelationSymbolFields.Attributes, value);
50 }
51 }
52 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixSearchTuple.cs
+20 -20
@@ -2,59 +2,59 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixSearch = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixSearch,
9 + public static readonly IntermediateSymbolDefinition WixSearch = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixSearch,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixSearchTupleFields.Variable), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixSearchTupleFields.Condition), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixSearchTupleFields.BundleExtensionRef), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixSearchSymbolFields.Variable), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixSearchSymbolFields.Condition), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixSearchSymbolFields.BundleExtensionRef), IntermediateFieldType.String),
16 },
17 - typeof(WixSearchTuple));
17 + typeof(WixSearchSymbol));
18 }
19 }
20
21 -namespace WixToolset.Data.Tuples
21 +namespace WixToolset.Data.Symbols
22 {
23 - public enum WixSearchTupleFields
23 + public enum WixSearchSymbolFields
24 {
25 Variable,
26 Condition,
27 BundleExtensionRef,
28 }
29
30 - public class WixSearchTuple : IntermediateTuple
30 + public class WixSearchSymbol : IntermediateSymbol
31 {
32 - public WixSearchTuple() : base(TupleDefinitions.WixSearch, null, null)
32 + public WixSearchSymbol() : base(SymbolDefinitions.WixSearch, null, null)
33 {
34 }
35
36 - public WixSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSearch, sourceLineNumber, id)
36 + public WixSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixSearch, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[WixSearchTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[WixSearchSymbolFields index] => this.Fields[(int)index];
41
42 public string Variable
43 {
44 - get => (string)this.Fields[(int)WixSearchTupleFields.Variable];
45 - set => this.Set((int)WixSearchTupleFields.Variable, value);
44 + get => (string)this.Fields[(int)WixSearchSymbolFields.Variable];
45 + set => this.Set((int)WixSearchSymbolFields.Variable, value);
46 }
47
48 public string Condition
49 {
50 - get => (string)this.Fields[(int)WixSearchTupleFields.Condition];
51 - set => this.Set((int)WixSearchTupleFields.Condition, value);
50 + get => (string)this.Fields[(int)WixSearchSymbolFields.Condition];
51 + set => this.Set((int)WixSearchSymbolFields.Condition, value);
52 }
53
54 public string BundleExtensionRef
55 {
56 - get => (string)this.Fields[(int)WixSearchTupleFields.BundleExtensionRef];
57 - set => this.Set((int)WixSearchTupleFields.BundleExtensionRef, value);
56 + get => (string)this.Fields[(int)WixSearchSymbolFields.BundleExtensionRef];
57 + set => this.Set((int)WixSearchSymbolFields.BundleExtensionRef, value);
58 }
59 }
60 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixSetVariableTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixSetVariable = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixSetVariable,
9 + public static readonly IntermediateSymbolDefinition WixSetVariable = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixSetVariable,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixSetVariableTupleFields.Value), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixSetVariableTupleFields.Type), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixSetVariableSymbolFields.Value), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixSetVariableSymbolFields.Type), IntermediateFieldType.String),
15 },
16 - typeof(WixSetVariableTuple));
16 + typeof(WixSetVariableSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum WixSetVariableTupleFields
22 + public enum WixSetVariableSymbolFields
23 {
24 Value,
25 Type,
26 }
27
28 - public class WixSetVariableTuple : IntermediateTuple
28 + public class WixSetVariableSymbol : IntermediateSymbol
29 {
30 - public WixSetVariableTuple() : base(TupleDefinitions.WixSetVariable, null, null)
30 + public WixSetVariableSymbol() : base(SymbolDefinitions.WixSetVariable, null, null)
31 {
32 }
33
34 - public WixSetVariableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSetVariable, sourceLineNumber, id)
34 + public WixSetVariableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixSetVariable, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[WixSetVariableTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[WixSetVariableSymbolFields index] => this.Fields[(int)index];
39
40 public string Value
41 {
42 - get => (string)this.Fields[(int)WixSetVariableTupleFields.Value];
43 - set => this.Set((int)WixSetVariableTupleFields.Value, value);
42 + get => (string)this.Fields[(int)WixSetVariableSymbolFields.Value];
43 + set => this.Set((int)WixSetVariableSymbolFields.Value, value);
44 }
45
46 public string Type
47 {
48 - get => (string)this.Fields[(int)WixSetVariableTupleFields.Type];
49 - set => this.Set((int)WixSetVariableTupleFields.Type, value);
48 + get => (string)this.Fields[(int)WixSetVariableSymbolFields.Type];
49 + set => this.Set((int)WixSetVariableSymbolFields.Type, value);
50 }
51 }
52 }
src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs
+17 -17
@@ -2,55 +2,55 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixSimpleReference = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixSimpleReference,
9 + public static readonly IntermediateSymbolDefinition WixSimpleReference = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixSimpleReference,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixSimpleReferenceTupleFields.Table), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixSimpleReferenceTupleFields.PrimaryKeys), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixSimpleReferenceSymbolFields.Table), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixSimpleReferenceSymbolFields.PrimaryKeys), IntermediateFieldType.String),
15 },
16 - typeof(WixSimpleReferenceTuple));
16 + typeof(WixSimpleReferenceSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 using System;
23 using System.Diagnostics;
24
25 - public enum WixSimpleReferenceTupleFields
25 + public enum WixSimpleReferenceSymbolFields
26 {
27 Table,
28 PrimaryKeys,
29 }
30
31 [DebuggerDisplay("{SymbolicName}")]
32 - public class WixSimpleReferenceTuple : IntermediateTuple
32 + public class WixSimpleReferenceSymbol : IntermediateSymbol
33 {
34 - public WixSimpleReferenceTuple() : base(TupleDefinitions.WixSimpleReference, null, null)
34 + public WixSimpleReferenceSymbol() : base(SymbolDefinitions.WixSimpleReference, null, null)
35 {
36 }
37
38 - public WixSimpleReferenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSimpleReference, sourceLineNumber, id)
38 + public WixSimpleReferenceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixSimpleReference, sourceLineNumber, id)
39 {
40 }
41
42 - public IntermediateField this[WixSimpleReferenceTupleFields index] => this.Fields[(int)index];
42 + public IntermediateField this[WixSimpleReferenceSymbolFields index] => this.Fields[(int)index];
43
44 public string Table
45 {
46 - get => (string)this.Fields[(int)WixSimpleReferenceTupleFields.Table];
47 - set => this.Set((int)WixSimpleReferenceTupleFields.Table, value);
46 + get => (string)this.Fields[(int)WixSimpleReferenceSymbolFields.Table];
47 + set => this.Set((int)WixSimpleReferenceSymbolFields.Table, value);
48 }
49
50 public string PrimaryKeys
51 {
52 - get => (string)this.Fields[(int)WixSimpleReferenceTupleFields.PrimaryKeys];
53 - set => this.Set((int)WixSimpleReferenceTupleFields.PrimaryKeys, value);
52 + get => (string)this.Fields[(int)WixSimpleReferenceSymbolFields.PrimaryKeys];
53 + set => this.Set((int)WixSimpleReferenceSymbolFields.PrimaryKeys, value);
54 }
55
56 /// <summary>
src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs
+17 -17
@@ -2,53 +2,53 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixSuppressAction = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixSuppressAction,
9 + public static readonly IntermediateSymbolDefinition WixSuppressAction = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixSuppressAction,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixSuppressActionTupleFields.SequenceTable), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixSuppressActionTupleFields.Action), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixSuppressActionSymbolFields.SequenceTable), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixSuppressActionSymbolFields.Action), IntermediateFieldType.String),
15 },
16 - typeof(WixSuppressActionTuple));
16 + typeof(WixSuppressActionSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 using System;
23
24 - public enum WixSuppressActionTupleFields
24 + public enum WixSuppressActionSymbolFields
25 {
26 SequenceTable,
27 Action,
28 }
29
30 - public class WixSuppressActionTuple : IntermediateTuple
30 + public class WixSuppressActionSymbol : IntermediateSymbol
31 {
32 - public WixSuppressActionTuple() : base(TupleDefinitions.WixSuppressAction, null, null)
32 + public WixSuppressActionSymbol() : base(SymbolDefinitions.WixSuppressAction, null, null)
33 {
34 }
35
36 - public WixSuppressActionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSuppressAction, sourceLineNumber, id)
36 + public WixSuppressActionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixSuppressAction, sourceLineNumber, id)
37 {
38 }
39
40 - public IntermediateField this[WixSuppressActionTupleFields index] => this.Fields[(int)index];
40 + public IntermediateField this[WixSuppressActionSymbolFields index] => this.Fields[(int)index];
41
42 public SequenceTable SequenceTable
43 {
44 - get => (SequenceTable)Enum.Parse(typeof(SequenceTable), (string)this.Fields[(int)WixSuppressActionTupleFields.SequenceTable]);
45 - set => this.Set((int)WixSuppressActionTupleFields.SequenceTable, value.ToString());
44 + get => (SequenceTable)Enum.Parse(typeof(SequenceTable), (string)this.Fields[(int)WixSuppressActionSymbolFields.SequenceTable]);
45 + set => this.Set((int)WixSuppressActionSymbolFields.SequenceTable, value.ToString());
46 }
47
48 public string Action
49 {
50 - get => (string)this.Fields[(int)WixSuppressActionTupleFields.Action];
51 - set => this.Set((int)WixSuppressActionTupleFields.Action, value);
50 + get => (string)this.Fields[(int)WixSuppressActionSymbolFields.Action];
51 + set => this.Set((int)WixSuppressActionSymbolFields.Action, value);
52 }
53 }
54 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixSuppressModularizationTuple.cs
+11 -11
@@ -2,35 +2,35 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixSuppressModularization = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixSuppressModularization,
9 + public static readonly IntermediateSymbolDefinition WixSuppressModularization = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixSuppressModularization,
11 new IntermediateFieldDefinition[]
12 {
13 },
14 - typeof(WixSuppressModularizationTuple));
14 + typeof(WixSuppressModularizationSymbol));
15 }
16 }
17
18 -namespace WixToolset.Data.Tuples
18 +namespace WixToolset.Data.Symbols
19 {
20 - public enum WixSuppressModularizationTupleFields
20 + public enum WixSuppressModularizationSymbolFields
21 {
22 }
23
24 - public class WixSuppressModularizationTuple : IntermediateTuple
24 + public class WixSuppressModularizationSymbol : IntermediateSymbol
25 {
26 - public WixSuppressModularizationTuple() : base(TupleDefinitions.WixSuppressModularization, null, null)
26 + public WixSuppressModularizationSymbol() : base(SymbolDefinitions.WixSuppressModularization, null, null)
27 {
28 }
29
30 - public WixSuppressModularizationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSuppressModularization, sourceLineNumber, id)
30 + public WixSuppressModularizationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixSuppressModularization, sourceLineNumber, id)
31 {
32 }
33
34 - public IntermediateField this[WixSuppressModularizationTupleFields index] => this.Fields[(int)index];
34 + public IntermediateField this[WixSuppressModularizationSymbolFields index] => this.Fields[(int)index];
35 }
36 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixUITuple.cs
+11 -11
@@ -2,35 +2,35 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixUI = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixUI,
9 + public static readonly IntermediateSymbolDefinition WixUI = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixUI,
11 new IntermediateFieldDefinition[]
12 {
13 },
14 - typeof(WixUITuple));
14 + typeof(WixUISymbol));
15 }
16 }
17
18 -namespace WixToolset.Data.Tuples
18 +namespace WixToolset.Data.Symbols
19 {
20 - public enum WixUITupleFields
20 + public enum WixUISymbolFields
21 {
22 }
23
24 - public class WixUITuple : IntermediateTuple
24 + public class WixUISymbol : IntermediateSymbol
25 {
26 - public WixUITuple() : base(TupleDefinitions.WixUI, null, null)
26 + public WixUISymbol() : base(SymbolDefinitions.WixUI, null, null)
27 {
28 }
29
30 - public WixUITuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixUI, sourceLineNumber, id)
30 + public WixUISymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixUI, sourceLineNumber, id)
31 {
32 }
33
34 - public IntermediateField this[WixUITupleFields index] => this.Fields[(int)index];
34 + public IntermediateField this[WixUISymbolFields index] => this.Fields[(int)index];
35 }
36 }
src/WixToolset.Data/Tuples/WixUpdateRegistrationTuple.cs
+26 -26
@@ -2,27 +2,27 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixUpdateRegistration = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixUpdateRegistration,
9 + public static readonly IntermediateSymbolDefinition WixUpdateRegistration = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixUpdateRegistration,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixUpdateRegistrationTupleFields.Manufacturer), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixUpdateRegistrationTupleFields.Department), IntermediateFieldType.String),
15 - new IntermediateFieldDefinition(nameof(WixUpdateRegistrationTupleFields.ProductFamily), IntermediateFieldType.String),
16 - new IntermediateFieldDefinition(nameof(WixUpdateRegistrationTupleFields.Name), IntermediateFieldType.String),
17 - new IntermediateFieldDefinition(nameof(WixUpdateRegistrationTupleFields.Classification), IntermediateFieldType.String),
13 + new IntermediateFieldDefinition(nameof(WixUpdateRegistrationSymbolFields.Manufacturer), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixUpdateRegistrationSymbolFields.Department), IntermediateFieldType.String),
15 + new IntermediateFieldDefinition(nameof(WixUpdateRegistrationSymbolFields.ProductFamily), IntermediateFieldType.String),
16 + new IntermediateFieldDefinition(nameof(WixUpdateRegistrationSymbolFields.Name), IntermediateFieldType.String),
17 + new IntermediateFieldDefinition(nameof(WixUpdateRegistrationSymbolFields.Classification), IntermediateFieldType.String),
18 },
19 - typeof(WixUpdateRegistrationTuple));
19 + typeof(WixUpdateRegistrationSymbol));
20 }
21 }
22
23 -namespace WixToolset.Data.Tuples
23 +namespace WixToolset.Data.Symbols
24 {
25 - public enum WixUpdateRegistrationTupleFields
25 + public enum WixUpdateRegistrationSymbolFields
26 {
27 Manufacturer,
28 Department,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
31 Classification,
32 }
33
34 - public class WixUpdateRegistrationTuple : IntermediateTuple
34 + public class WixUpdateRegistrationSymbol : IntermediateSymbol
35 {
36 - public WixUpdateRegistrationTuple() : base(TupleDefinitions.WixUpdateRegistration, null, null)
36 + public WixUpdateRegistrationSymbol() : base(SymbolDefinitions.WixUpdateRegistration, null, null)
37 {
38 }
39
40 - public WixUpdateRegistrationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixUpdateRegistration, sourceLineNumber, id)
40 + public WixUpdateRegistrationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixUpdateRegistration, sourceLineNumber, id)
41 {
42 }
43
44 - public IntermediateField this[WixUpdateRegistrationTupleFields index] => this.Fields[(int)index];
44 + public IntermediateField this[WixUpdateRegistrationSymbolFields index] => this.Fields[(int)index];
45
46 public string Manufacturer
47 {
48 - get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Manufacturer];
49 - set => this.Set((int)WixUpdateRegistrationTupleFields.Manufacturer, value);
48 + get => (string)this.Fields[(int)WixUpdateRegistrationSymbolFields.Manufacturer];
49 + set => this.Set((int)WixUpdateRegistrationSymbolFields.Manufacturer, value);
50 }
51
52 public string Department
53 {
54 - get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Department];
55 - set => this.Set((int)WixUpdateRegistrationTupleFields.Department, value);
54 + get => (string)this.Fields[(int)WixUpdateRegistrationSymbolFields.Department];
55 + set => this.Set((int)WixUpdateRegistrationSymbolFields.Department, value);
56 }
57
58 public string ProductFamily
59 {
60 - get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.ProductFamily];
61 - set => this.Set((int)WixUpdateRegistrationTupleFields.ProductFamily, value);
60 + get => (string)this.Fields[(int)WixUpdateRegistrationSymbolFields.ProductFamily];
61 + set => this.Set((int)WixUpdateRegistrationSymbolFields.ProductFamily, value);
62 }
63
64 public string Name
65 {
66 - get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Name];
67 - set => this.Set((int)WixUpdateRegistrationTupleFields.Name, value);
66 + get => (string)this.Fields[(int)WixUpdateRegistrationSymbolFields.Name];
67 + set => this.Set((int)WixUpdateRegistrationSymbolFields.Name, value);
68 }
69
70 public string Classification
71 {
72 - get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Classification];
73 - set => this.Set((int)WixUpdateRegistrationTupleFields.Classification, value);
72 + get => (string)this.Fields[(int)WixUpdateRegistrationSymbolFields.Classification];
73 + set => this.Set((int)WixUpdateRegistrationSymbolFields.Classification, value);
74 }
75 }
76 }
\ No newline at end of file
src/WixToolset.Data/Tuples/WixVariableTuple.cs
+17 -17
@@ -2,51 +2,51 @@
2
3 namespace WixToolset.Data
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 - public static partial class TupleDefinitions
7 + public static partial class SymbolDefinitions
8 {
9 - public static readonly IntermediateTupleDefinition WixVariable = new IntermediateTupleDefinition(
10 - TupleDefinitionType.WixVariable,
9 + public static readonly IntermediateSymbolDefinition WixVariable = new IntermediateSymbolDefinition(
10 + SymbolDefinitionType.WixVariable,
11 new[]
12 {
13 - new IntermediateFieldDefinition(nameof(WixVariableTupleFields.Value), IntermediateFieldType.String),
14 - new IntermediateFieldDefinition(nameof(WixVariableTupleFields.Overridable), IntermediateFieldType.Bool),
13 + new IntermediateFieldDefinition(nameof(WixVariableSymbolFields.Value), IntermediateFieldType.String),
14 + new IntermediateFieldDefinition(nameof(WixVariableSymbolFields.Overridable), IntermediateFieldType.Bool),
15 },
16 - typeof(WixVariableTuple));
16 + typeof(WixVariableSymbol));
17 }
18 }
19
20 -namespace WixToolset.Data.Tuples
20 +namespace WixToolset.Data.Symbols
21 {
22 - public enum WixVariableTupleFields
22 + public enum WixVariableSymbolFields
23 {
24 Value,
25 Overridable,
26 }
27
28 - public class WixVariableTuple : IntermediateTuple
28 + public class WixVariableSymbol : IntermediateSymbol
29 {
30 - public WixVariableTuple() : base(TupleDefinitions.WixVariable, null, null)
30 + public WixVariableSymbol() : base(SymbolDefinitions.WixVariable, null, null)
31 {
32 }
33
34 - public WixVariableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixVariable, sourceLineNumber, id)
34 + public WixVariableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixVariable, sourceLineNumber, id)
35 {
36 }
37
38 - public IntermediateField this[WixVariableTupleFields index] => this.Fields[(int)index];
38 + public IntermediateField this[WixVariableSymbolFields index] => this.Fields[(int)index];
39
40 public string Value
41 {
42 - get => (string)this.Fields[(int)WixVariableTupleFields.Value];
43 - set => this.Set((int)WixVariableTupleFields.Value, value);
42 + get => (string)this.Fields[(int)WixVariableSymbolFields.Value];
43 + set => this.Set((int)WixVariableSymbolFields.Value, value);
44 }
45
46 public bool Overridable
47 {
48 - get => (bool)this.Fields[(int)WixVariableTupleFields.Overridable];
49 - set => this.Set((int)WixVariableTupleFields.Overridable, value);
48 + get => (bool)this.Fields[(int)WixVariableSymbolFields.Overridable];
49 + set => this.Set((int)WixVariableSymbolFields.Overridable, value);
50 }
51 }
52 }
src/WixToolset.Data/WarningMessages.cs
+4 -4
@@ -567,10 +567,10 @@ namespace WixToolset.Data
567 return Message(sourceLineNumbers, Ids.TooManyProgIds, "Class '{0}' tried to use ProgId '{1}' which has already been associated with class '{2}'. This information will be left out of the decompiled output.", clsId, progId, otherClsId);
568 }
569
570 - public static Message TupleNotTranslatedToOutput(IntermediateTuple tuple)
570 + public static Message SymbolNotTranslatedToOutput(IntermediateSymbol symbol)
571 {
572 - var tupleString = $"TupleName: '{tuple.Definition.Name}', Id: '{tuple.Id?.Id}'";
573 - return Message(tuple.SourceLineNumbers, Ids.TupleNotTranslatedToOutput, "The binder doesn't know how to place the following tuple into the output: {0}", tupleString);
572 + var symbolString = $"SymbolName: '{symbol.Definition.Name}', Id: '{symbol.Id?.Id}'";
573 + return Message(symbol.SourceLineNumbers, Ids.SymbolNotTranslatedToOutput, "The binder doesn't know how to place the following symbol into the output: {0}", symbolString);
574 }
575
576 public static Message UnableToFindFileFromCabOrImage(SourceLineNumber sourceLineNumbers, string existingFileSpec, string srcFileSpec)
@@ -779,7 +779,7 @@ namespace WixToolset.Data
779 BackslashTerminateInlineDirectorySyntax = 1147,
780 VersionTruncated = 1148,
781 ServiceConfigFamilyNotSupported = 1149,
782 - TupleNotTranslatedToOutput = 1150,
782 + SymbolNotTranslatedToOutput = 1150,
783 }
784 }
785 }
src/WixToolset.Data/WindowsInstaller/SequenceTableExtensions.cs
+1 -1
@@ -2,7 +2,7 @@
2
3 namespace WixToolset.Data.WindowsInstaller
4 {
5 - using WixToolset.Data.Tuples;
5 + using WixToolset.Data.Symbols;
6
7 /// <summary>
8 /// Enhancements to the SequenceTable enum.
src/WixToolset.Data/WindowsInstaller/TableDefinition.cs
+15 -15
@@ -22,15 +22,15 @@ namespace WixToolset.Data.WindowsInstaller
22 /// Creates a table definition.
23 /// </summary>
24 /// <param name="name">Name of table to create.</param>
25 - /// <param name="tupleDefinition">Optional tuple definition for this table.</param>
25 + /// <param name="symbolDefinition">Optional symbol definition for this table.</param>
26 /// <param name="columns">Column definitions for the table.</param>
27 /// <param name="unreal">Flag if table is unreal.</param>
28 - /// <param name="tupleIdIsPrimaryKey">Whether the primary key is the id of the tuple definition associated with this table.</param>
29 - public TableDefinition(string name, IntermediateTupleDefinition tupleDefinition, IEnumerable<ColumnDefinition> columns, bool unreal = false, bool tupleIdIsPrimaryKey = false, Type strongRowType = null)
28 + /// <param name="symbolIdIsPrimaryKey">Whether the primary key is the id of the symbol definition associated with this table.</param>
29 + public TableDefinition(string name, IntermediateSymbolDefinition symbolDefinition, IEnumerable<ColumnDefinition> columns, bool unreal = false, bool symbolIdIsPrimaryKey = false, Type strongRowType = null)
30 {
31 this.Name = name;
32 - this.TupleDefinition = tupleDefinition;
33 - this.TupleIdIsPrimaryKey = tupleIdIsPrimaryKey;
32 + this.SymbolDefinition = symbolDefinition;
33 + this.SymbolIdIsPrimaryKey = symbolIdIsPrimaryKey;
34 this.Unreal = unreal;
35 this.Columns = columns?.ToArray();
36 this.StrongRowType = strongRowType ?? typeof(Row);
@@ -51,10 +51,10 @@ namespace WixToolset.Data.WindowsInstaller
51 public string Name { get; }
52
53 /// <summary>
54 - /// Gets the tuple definition associated with this table.
54 + /// Gets the symbol definition associated with this table.
55 /// </summary>
56 - /// <value>The tuple definition.</value>
57 - public IntermediateTupleDefinition TupleDefinition { get; }
56 + /// <value>The symbol definition.</value>
57 + public IntermediateSymbolDefinition SymbolDefinition { get; }
58
59 /// <summary>
60 /// Gets if the table is unreal.
@@ -69,10 +69,10 @@ namespace WixToolset.Data.WindowsInstaller
69 public ColumnDefinition[] Columns { get; }
70
71 /// <summary>
72 - /// Gets if the primary key is the id of the tuple definition associated with this table.
72 + /// Gets if the primary key is the id of the symbol definition associated with this table.
73 /// </summary>
74 /// <value>Flag if table is unreal.</value>
75 - public bool TupleIdIsPrimaryKey { get; }
75 + public bool SymbolIdIsPrimaryKey { get; }
76
77 private Type StrongRowType { get; }
78
@@ -162,9 +162,9 @@ namespace WixToolset.Data.WindowsInstaller
162 {
163 var empty = reader.IsEmptyElement;
164 string name = null;
165 - IntermediateTupleDefinition tupleDefinition = null;
165 + IntermediateSymbolDefinition symbolDefinition = null;
166 var unreal = false;
167 - var tupleIdIsPrimaryKey = false;
167 + var symbolIdIsPrimaryKey = false;
168 Type strongRowType = null;
169
170 while (reader.MoveToNextAttribute())
@@ -187,8 +187,8 @@ namespace WixToolset.Data.WindowsInstaller
187
188 if (tableDefinitions.TryGet(name, out var tableDefinition))
189 {
190 - tupleDefinition = tableDefinition.TupleDefinition;
191 - tupleIdIsPrimaryKey = tableDefinition.TupleIdIsPrimaryKey;
190 + symbolDefinition = tableDefinition.SymbolDefinition;
191 + symbolIdIsPrimaryKey = tableDefinition.SymbolIdIsPrimaryKey;
192 strongRowType = tableDefinition.StrongRowType;
193 }
194
@@ -237,7 +237,7 @@ namespace WixToolset.Data.WindowsInstaller
237 }
238 }
239
240 - return new TableDefinition(name, tupleDefinition, columns.ToArray(), unreal, tupleIdIsPrimaryKey, strongRowType);
240 + return new TableDefinition(name, symbolDefinition, columns.ToArray(), unreal, symbolIdIsPrimaryKey, strongRowType);
241 }
242
243 /// <summary>
src/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs
+116 -116
@@ -5,11 +5,11 @@ namespace WixToolset.Data.WindowsInstaller
5 using System;
6 using System.Collections.Generic;
7 using System.Linq;
8 - using WixToolset.Data.Tuples;
8 + using WixToolset.Data.Symbols;
9
10 public static class WindowsInstallerStandard
11 {
12 - private static readonly Dictionary<string, WixActionTuple> standardActionsById;
12 + private static readonly Dictionary<string, WixActionSymbol> standardActionsById;
13 private static readonly HashSet<string> standardActionNames;
14
15 private static readonly HashSet<string> standardDirectories = new HashSet<string>
@@ -45,8 +45,8 @@ namespace WixToolset.Data.WindowsInstaller
45 };
46
47 /// <summary>
48 - /// References:
49 - /// Title: Property Reference [Windows Installer]:
48 + /// References:
49 + /// Title: Property Reference [Windows Installer]:
50 /// URL: http://msdn.microsoft.com/library/en-us/msi/setup/property_reference.asp
51 /// </summary>
52 private static readonly HashSet<string> standardProperties = new HashSet<string>
@@ -243,156 +243,156 @@ namespace WixToolset.Data.WindowsInstaller
243 {
244 var standardActions = new[]
245 {
246 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/InstallInitialize")) { Action="InstallInitialize", Sequence=1500, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
247 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/InstallInitialize")) { Action="InstallInitialize", Sequence=1500, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
248 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallInitialize")) { Action="InstallInitialize", Sequence=1500, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
246 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/InstallInitialize")) { Action="InstallInitialize", Sequence=1500, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
247 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/InstallInitialize")) { Action="InstallInitialize", Sequence=1500, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
248 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallInitialize")) { Action="InstallInitialize", Sequence=1500, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
249
250 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallExecute")) { Action="InstallExecute", Sequence=6500, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="NOT Installed" },
250 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallExecute")) { Action="InstallExecute", Sequence=6500, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="NOT Installed" },
251
252 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallExecuteAgain")) { Action="InstallExecuteAgain", Sequence=6550, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="NOT Installed" },
252 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallExecuteAgain")) { Action="InstallExecuteAgain", Sequence=6550, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="NOT Installed" },
253
254 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/InstallFinalize")) { Action="InstallFinalize", Sequence=6600, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
255 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/InstallFinalize")) { Action="InstallFinalize", Sequence=6600, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
256 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallFinalize")) { Action="InstallFinalize", Sequence=6600, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
254 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/InstallFinalize")) { Action="InstallFinalize", Sequence=6600, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
255 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/InstallFinalize")) { Action="InstallFinalize", Sequence=6600, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
256 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallFinalize")) { Action="InstallFinalize", Sequence=6600, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
257
258 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/InstallFiles")) { Action="InstallFiles", Sequence=4000, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
259 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallFiles")) { Action="InstallFiles", Sequence=4000, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
258 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/InstallFiles")) { Action="InstallFiles", Sequence=4000, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
259 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallFiles")) { Action="InstallFiles", Sequence=4000, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
260
261 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/InstallAdminPackage")) { Action="InstallAdminPackage", Sequence=3900, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
261 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/InstallAdminPackage")) { Action="InstallAdminPackage", Sequence=3900, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
262
263 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/FileCost")) { Action="FileCost", Sequence=900, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
264 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdminUISequence/FileCost")) { Action="FileCost", Sequence=900, SequenceTable=SequenceTable.AdminUISequence, Overridable = true },
265 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/FileCost")) { Action="FileCost", Sequence=900, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
266 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallUISequence/FileCost")) { Action="FileCost", Sequence=900, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
263 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/FileCost")) { Action="FileCost", Sequence=900, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
264 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdminUISequence/FileCost")) { Action="FileCost", Sequence=900, SequenceTable=SequenceTable.AdminUISequence, Overridable = true },
265 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/FileCost")) { Action="FileCost", Sequence=900, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
266 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallUISequence/FileCost")) { Action="FileCost", Sequence=900, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
267
268 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/CostInitialize")) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
269 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdminUISequence/CostInitialize")) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.AdminUISequence, Overridable = true },
270 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/CostInitialize")) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
271 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/CostInitialize")) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
272 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallUISequence/CostInitialize")) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
268 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/CostInitialize")) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
269 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdminUISequence/CostInitialize")) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.AdminUISequence, Overridable = true },
270 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/CostInitialize")) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
271 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/CostInitialize")) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
272 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallUISequence/CostInitialize")) { Action="CostInitialize", Sequence=800, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
273
274 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/CostFinalize")) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
275 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdminUISequence/CostFinalize")) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.AdminUISequence, Overridable = true },
276 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/CostFinalize")) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
277 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/CostFinalize")) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
278 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallUISequence/CostFinalize")) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
274 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/CostFinalize")) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
275 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdminUISequence/CostFinalize")) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.AdminUISequence, Overridable = true },
276 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/CostFinalize")) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
277 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/CostFinalize")) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
278 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallUISequence/CostFinalize")) { Action="CostFinalize", Sequence=1000, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
279
280 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/InstallValidate")) { Action="InstallValidate", Sequence=1400, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
281 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/InstallValidate")) { Action="InstallValidate", Sequence=1400, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
282 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallValidate")) { Action="InstallValidate", Sequence=1400, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
280 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/InstallValidate")) { Action="InstallValidate", Sequence=1400, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
281 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/InstallValidate")) { Action="InstallValidate", Sequence=1400, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
282 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallValidate")) { Action="InstallValidate", Sequence=1400, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
283
284 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdminUISequence/ExecuteAction")) { Action="ExecuteAction", Sequence=1300, SequenceTable=SequenceTable.AdminUISequence, Overridable = true },
285 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallUISequence/ExecuteAction")) { Action="ExecuteAction", Sequence=1300, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
284 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdminUISequence/ExecuteAction")) { Action="ExecuteAction", Sequence=1300, SequenceTable=SequenceTable.AdminUISequence, Overridable = true },
285 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallUISequence/ExecuteAction")) { Action="ExecuteAction", Sequence=1300, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
286
287 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/CreateShortcuts")) { Action="CreateShortcuts", Sequence=4500, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
288 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/CreateShortcuts")) { Action="CreateShortcuts", Sequence=4500, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
287 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/CreateShortcuts")) { Action="CreateShortcuts", Sequence=4500, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
288 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/CreateShortcuts")) { Action="CreateShortcuts", Sequence=4500, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
289
290 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/MsiPublishAssemblies")) { Action="MsiPublishAssemblies", Sequence=6250, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
291 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/MsiPublishAssemblies")) { Action="MsiPublishAssemblies", Sequence=6250, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
290 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/MsiPublishAssemblies")) { Action="MsiPublishAssemblies", Sequence=6250, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
291 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/MsiPublishAssemblies")) { Action="MsiPublishAssemblies", Sequence=6250, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
292
293 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/PublishComponents")) { Action="PublishComponents", Sequence=6200, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
294 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/PublishComponents")) { Action="PublishComponents", Sequence=6200, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
293 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/PublishComponents")) { Action="PublishComponents", Sequence=6200, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
294 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/PublishComponents")) { Action="PublishComponents", Sequence=6200, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
295
296 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/PublishFeatures")) { Action="PublishFeatures", Sequence=6300, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
297 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/PublishFeatures")) { Action="PublishFeatures", Sequence=6300, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
296 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/PublishFeatures")) { Action="PublishFeatures", Sequence=6300, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
297 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/PublishFeatures")) { Action="PublishFeatures", Sequence=6300, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
298
299 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/PublishProduct")) { Action="PublishProduct", Sequence=6400, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
300 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/PublishProduct")) { Action="PublishProduct", Sequence=6400, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
299 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/PublishProduct")) { Action="PublishProduct", Sequence=6400, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
300 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/PublishProduct")) { Action="PublishProduct", Sequence=6400, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
301
302 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/RegisterClassInfo")) { Action="RegisterClassInfo", Sequence=4600, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
303 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterClassInfo")) { Action="RegisterClassInfo", Sequence=4600, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
302 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/RegisterClassInfo")) { Action="RegisterClassInfo", Sequence=4600, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
303 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterClassInfo")) { Action="RegisterClassInfo", Sequence=4600, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
304
305 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/RegisterExtensionInfo")) { Action="RegisterExtensionInfo", Sequence=4700, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
306 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterExtensionInfo")) { Action="RegisterExtensionInfo", Sequence=4700, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
305 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/RegisterExtensionInfo")) { Action="RegisterExtensionInfo", Sequence=4700, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
306 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterExtensionInfo")) { Action="RegisterExtensionInfo", Sequence=4700, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
307
308 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/RegisterMIMEInfo")) { Action="RegisterMIMEInfo", Sequence=4900, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
309 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterMIMEInfo")) { Action="RegisterMIMEInfo", Sequence=4900, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
308 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/RegisterMIMEInfo")) { Action="RegisterMIMEInfo", Sequence=4900, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
309 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterMIMEInfo")) { Action="RegisterMIMEInfo", Sequence=4900, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
310
311 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/RegisterProgIdInfo")) { Action="RegisterProgIdInfo", Sequence=4800, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
312 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterProgIdInfo")) { Action="RegisterProgIdInfo", Sequence=4800, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
311 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdvertiseExecuteSequence/RegisterProgIdInfo")) { Action="RegisterProgIdInfo", Sequence=4800, SequenceTable=SequenceTable.AdvertiseExecuteSequence, Overridable = true },
312 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterProgIdInfo")) { Action="RegisterProgIdInfo", Sequence=4800, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
313
314 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/AllocateRegistrySpace")) { Action="AllocateRegistrySpace", Sequence=1550, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
314 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/AllocateRegistrySpace")) { Action="AllocateRegistrySpace", Sequence=1550, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
315
316 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallUISequence/AppSearch")) { Action="AppSearch", Sequence=50, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
317 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/AppSearch")) { Action="AppSearch", Sequence=50, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
316 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallUISequence/AppSearch")) { Action="AppSearch", Sequence=50, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
317 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/AppSearch")) { Action="AppSearch", Sequence=50, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
318
319 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/BindImage")) { Action="BindImage", Sequence=4300, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
320 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/CreateFolders")) { Action="CreateFolders", Sequence=3700, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
321 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/DuplicateFiles")) { Action="DuplicateFiles", Sequence=4210, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
319 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/BindImage")) { Action="BindImage", Sequence=4300, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
320 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/CreateFolders")) { Action="CreateFolders", Sequence=3700, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
321 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/DuplicateFiles")) { Action="DuplicateFiles", Sequence=4210, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
322
323 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallUISequence/FindRelatedProducts")) { Action="FindRelatedProducts", Sequence=25, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
324 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/FindRelatedProducts")) { Action="FindRelatedProducts", Sequence=25, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
323 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallUISequence/FindRelatedProducts")) { Action="FindRelatedProducts", Sequence=25, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
324 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/FindRelatedProducts")) { Action="FindRelatedProducts", Sequence=25, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
325
326 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallODBC")) { Action="InstallODBC", Sequence=5400, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
326 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallODBC")) { Action="InstallODBC", Sequence=5400, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
327
328 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallServices")) { Action="InstallServices", Sequence=5800, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="VersionNT" },
329 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/MsiConfigureServices")) { Action="MsiConfigureServices", Sequence=5850, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="VersionNT>=600" },
328 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/InstallServices")) { Action="InstallServices", Sequence=5800, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="VersionNT" },
329 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/MsiConfigureServices")) { Action="MsiConfigureServices", Sequence=5850, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="VersionNT>=600" },
330
331 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallUISequence/IsolateComponents")) { Action="IsolateComponents", Sequence=950, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
332 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/IsolateComponents")) { Action="IsolateComponents", Sequence=950, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
331 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallUISequence/IsolateComponents")) { Action="IsolateComponents", Sequence=950, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
332 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/IsolateComponents")) { Action="IsolateComponents", Sequence=950, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
333
334 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdminUISequence/LaunchConditions")) { Action="LaunchConditions", Sequence=100, SequenceTable=SequenceTable.AdminUISequence, Overridable = true },
335 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/LaunchConditions")) { Action="LaunchConditions", Sequence=100, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
336 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallUISequence/LaunchConditions")) { Action="LaunchConditions", Sequence=100, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
337 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/LaunchConditions")) { Action="LaunchConditions", Sequence=100, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
334 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdminUISequence/LaunchConditions")) { Action="LaunchConditions", Sequence=100, SequenceTable=SequenceTable.AdminUISequence, Overridable = true },
335 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/LaunchConditions")) { Action="LaunchConditions", Sequence=100, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
336 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallUISequence/LaunchConditions")) { Action="LaunchConditions", Sequence=100, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
337 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/LaunchConditions")) { Action="LaunchConditions", Sequence=100, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
338
339 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallUISequence/MigrateFeatureStates")) { Action="MigrateFeatureStates", Sequence=1200, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
340 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/MigrateFeatureStates")) { Action="MigrateFeatureStates", Sequence=1200, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
339 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallUISequence/MigrateFeatureStates")) { Action="MigrateFeatureStates", Sequence=1200, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
340 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/MigrateFeatureStates")) { Action="MigrateFeatureStates", Sequence=1200, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
341
342 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/MoveFiles")) { Action="MoveFiles", Sequence=3800, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
342 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/MoveFiles")) { Action="MoveFiles", Sequence=3800, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
343
344 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/PatchFiles")) { Action="PatchFiles", Sequence=4090, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
345 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/PatchFiles")) { Action="PatchFiles", Sequence=4090, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
344 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "AdminExecuteSequence/PatchFiles")) { Action="PatchFiles", Sequence=4090, SequenceTable=SequenceTable.AdminExecuteSequence, Overridable = true },
345 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/PatchFiles")) { Action="PatchFiles", Sequence=4090, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
346
347 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/ProcessComponents")) { Action="ProcessComponents", Sequence=1600, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
347 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/ProcessComponents")) { Action="ProcessComponents", Sequence=1600, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
348
349 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterComPlus")) { Action="RegisterComPlus", Sequence=5700, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
350 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterFonts")) { Action="RegisterFonts", Sequence=5300, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
351 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterProduct")) { Action="RegisterProduct", Sequence=6100, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
352 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterTypeLibraries")) { Action="RegisterTypeLibraries", Sequence=5500, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
353 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterUser")) { Action="RegisterUser", Sequence=6000, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
349 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterComPlus")) { Action="RegisterComPlus", Sequence=5700, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
350 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterFonts")) { Action="RegisterFonts", Sequence=5300, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
351 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterProduct")) { Action="RegisterProduct", Sequence=6100, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
352 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterTypeLibraries")) { Action="RegisterTypeLibraries", Sequence=5500, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
353 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RegisterUser")) { Action="RegisterUser", Sequence=6000, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
354
355 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveDuplicateFiles")) { Action="RemoveDuplicateFiles", Sequence=3400, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
356 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveEnvironmentStrings")) { Action="RemoveEnvironmentStrings", Sequence=3300, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
357 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveFiles")) { Action="RemoveFiles", Sequence=3500, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
358 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveFolders")) { Action="RemoveFolders", Sequence=3600, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
359 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveIniValues")) { Action="RemoveIniValues", Sequence=3100, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
360 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveODBC")) { Action="RemoveODBC", Sequence=2400, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
361 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveRegistryValues")) { Action="RemoveRegistryValues", Sequence=2600, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
362 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveShortcuts")) { Action="RemoveShortcuts", Sequence=3200, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
355 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveDuplicateFiles")) { Action="RemoveDuplicateFiles", Sequence=3400, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
356 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveEnvironmentStrings")) { Action="RemoveEnvironmentStrings", Sequence=3300, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
357 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveFiles")) { Action="RemoveFiles", Sequence=3500, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
358 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveFolders")) { Action="RemoveFolders", Sequence=3600, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
359 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveIniValues")) { Action="RemoveIniValues", Sequence=3100, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
360 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveODBC")) { Action="RemoveODBC", Sequence=2400, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
361 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveRegistryValues")) { Action="RemoveRegistryValues", Sequence=2600, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
362 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RemoveShortcuts")) { Action="RemoveShortcuts", Sequence=3200, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
363
364 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/SelfRegModules")) { Action="SelfRegModules", Sequence=5600, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
365 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/SelfUnregModules")) { Action="SelfUnregModules", Sequence=2200, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
366 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/SetODBCFolders")) { Action="SetODBCFolders", Sequence=1100, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
364 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/SelfRegModules")) { Action="SelfRegModules", Sequence=5600, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
365 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/SelfUnregModules")) { Action="SelfUnregModules", Sequence=2200, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
366 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/SetODBCFolders")) { Action="SetODBCFolders", Sequence=1100, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
367
368 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/CCPSearch")) { Action="CCPSearch", Sequence=500, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="NOT Installed" },
369 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallUISequence/CCPSearch")) { Action="CCPSearch", Sequence=500, SequenceTable=SequenceTable.InstallUISequence, Overridable = true, Condition="NOT Installed" },
368 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/CCPSearch")) { Action="CCPSearch", Sequence=500, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="NOT Installed" },
369 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallUISequence/CCPSearch")) { Action="CCPSearch", Sequence=500, SequenceTable=SequenceTable.InstallUISequence, Overridable = true, Condition="NOT Installed" },
370
371 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/DeleteServices")) { Action="DeleteServices", Sequence=2000, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="VersionNT" },
371 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/DeleteServices")) { Action="DeleteServices", Sequence=2000, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="VersionNT" },
372
373 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RMCCPSearch")) { Action="RMCCPSearch", Sequence=600, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="NOT Installed" },
374 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallUISequence/RMCCPSearch")) { Action="RMCCPSearch", Sequence=600, SequenceTable=SequenceTable.InstallUISequence, Overridable = true, Condition="NOT Installed" },
373 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/RMCCPSearch")) { Action="RMCCPSearch", Sequence=600, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="NOT Installed" },
374 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallUISequence/RMCCPSearch")) { Action="RMCCPSearch", Sequence=600, SequenceTable=SequenceTable.InstallUISequence, Overridable = true, Condition="NOT Installed" },
375
376 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/StartServices")) { Action="StartServices", Sequence=5900, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="VersionNT" },
377 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/StopServices")) { Action="StopServices", Sequence=1900, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="VersionNT" },
376 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/StartServices")) { Action="StartServices", Sequence=5900, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="VersionNT" },
377 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/StopServices")) { Action="StopServices", Sequence=1900, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true, Condition="VersionNT" },
378
379 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/MsiUnpublishAssemblies")) { Action="MsiUnpublishAssemblies", Sequence=1750, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
380 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnpublishComponents")) { Action="UnpublishComponents", Sequence=1700, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
381 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnpublishFeatures")) { Action="UnpublishFeatures", Sequence=1800, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
382 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnregisterClassInfo")) { Action="UnregisterClassInfo", Sequence=2700, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
383 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnregisterComPlus")) { Action="UnregisterComPlus", Sequence=2100, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
384 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnregisterExtensionInfo")) { Action="UnregisterExtensionInfo", Sequence=2800, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
385 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnregisterFonts")) { Action="UnregisterFonts", Sequence=2500, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
386 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnregisterMIMEInfo")) { Action="UnregisterMIMEInfo", Sequence=3000, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
387 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnregisterProgIdInfo")) { Action="UnregisterProgIdInfo", Sequence=2900, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
388 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnregisterTypeLibraries")) { Action="UnregisterTypeLibraries", Sequence=2300, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
379 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/MsiUnpublishAssemblies")) { Action="MsiUnpublishAssemblies", Sequence=1750, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
380 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnpublishComponents")) { Action="UnpublishComponents", Sequence=1700, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
381 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnpublishFeatures")) { Action="UnpublishFeatures", Sequence=1800, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
382 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnregisterClassInfo")) { Action="UnregisterClassInfo", Sequence=2700, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
383 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnregisterComPlus")) { Action="UnregisterComPlus", Sequence=2100, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
384 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnregisterExtensionInfo")) { Action="UnregisterExtensionInfo", Sequence=2800, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
385 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnregisterFonts")) { Action="UnregisterFonts", Sequence=2500, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
386 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnregisterMIMEInfo")) { Action="UnregisterMIMEInfo", Sequence=3000, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
387 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnregisterProgIdInfo")) { Action="UnregisterProgIdInfo", Sequence=2900, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
388 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/UnregisterTypeLibraries")) { Action="UnregisterTypeLibraries", Sequence=2300, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
389
390 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallUISequence/ValidateProductID")) { Action="ValidateProductID", Sequence=700, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
391 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/ValidateProductID")) { Action="ValidateProductID", Sequence=700, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
390 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallUISequence/ValidateProductID")) { Action="ValidateProductID", Sequence=700, SequenceTable=SequenceTable.InstallUISequence, Overridable = true },
391 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/ValidateProductID")) { Action="ValidateProductID", Sequence=700, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
392
393 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/WriteEnvironmentStrings")) { Action="WriteEnvironmentStrings", Sequence=5200, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
394 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/WriteIniValues")) { Action="WriteIniValues", Sequence=5100, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
395 - new WixActionTuple(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/WriteRegistryValues")) { Action="WriteRegistryValues", Sequence=5000, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
393 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/WriteEnvironmentStrings")) { Action="WriteEnvironmentStrings", Sequence=5200, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
394 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/WriteIniValues")) { Action="WriteIniValues", Sequence=5100, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
395 + new WixActionSymbol(null, new Identifier(AccessModifier.Public, "InstallExecuteSequence/WriteRegistryValues")) { Action="WriteRegistryValues", Sequence=5000, SequenceTable=SequenceTable.InstallExecuteSequence, Overridable = true },
396 };
397
398 standardActionNames = new HashSet<string>(standardActions.Select(a => a.Action));
@@ -409,7 +409,7 @@ namespace WixToolset.Data.WindowsInstaller
409 /// <summary>
410 /// Standard actions.
411 /// </summary>
412 - public static IEnumerable<WixActionTuple> StandardActions() => standardActionsById.Values;
412 + public static IEnumerable<WixActionSymbol> StandardActions() => standardActionsById.Values;
413
414 /// <summary>
415 /// Find out if a directory is a standard directory.
@@ -428,11 +428,11 @@ namespace WixToolset.Data.WindowsInstaller
428 /// <summary>
429 /// Try to get standard action by id.
430 /// </summary>
431 - public static bool TryGetStandardAction(string id, out WixActionTuple standardAction) => standardActionsById.TryGetValue(id, out standardAction);
431 + public static bool TryGetStandardAction(string id, out WixActionSymbol standardAction) => standardActionsById.TryGetValue(id, out standardAction);
432
433 /// <summary>
434 /// Try to get standard action by sequence and action name.
435 /// </summary>
436 - public static bool TryGetStandardAction(string sequenceName, string actioname, out WixActionTuple standardAction) => standardActionsById.TryGetValue(String.Concat(sequenceName, "/", actioname), out standardAction);
436 + public static bool TryGetStandardAction(string sequenceName, string actioname, out WixActionSymbol standardAction) => standardActionsById.TryGetValue(String.Concat(sequenceName, "/", actioname), out standardAction);
437 }
438 }
src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs
+229 -229
@@ -8,14 +8,14 @@ namespace WixToolset.Data.WindowsInstaller
8 {
9 public static readonly TableDefinition ActionText = new TableDefinition(
10 "ActionText",
11 - TupleDefinitions.ActionText,
11 + SymbolDefinitions.ActionText,
12 new[]
13 {
14 new ColumnDefinition("Action", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of action to be described.", modularizeType: ColumnModularizeType.Column),
15 new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Localized description displayed in progress dialog and log when action is executing."),
16 new ColumnDefinition("Template", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Template, description: "Optional localized format template used to format action data records for display during action execution.", modularizeType: ColumnModularizeType.Property),
17 },
18 - tupleIdIsPrimaryKey: false
18 + symbolIdIsPrimaryKey: false
19 );
20
21 public static readonly TableDefinition AdminExecuteSequence = new TableDefinition(
@@ -27,19 +27,19 @@ namespace WixToolset.Data.WindowsInstaller
27 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.", forceLocalizable: true),
28 new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -4, maxValue: 32767, description: "Number that determines the sort order in which the actions are to be executed. Leave blank to suppress action."),
29 },
30 - tupleIdIsPrimaryKey: true
30 + symbolIdIsPrimaryKey: true
31 );
32
33 public static readonly TableDefinition Condition = new TableDefinition(
34 "Condition",
35 - TupleDefinitions.Condition,
35 + SymbolDefinitions.Condition,
36 new[]
37 {
38 new ColumnDefinition("Feature_", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Feature", keyColumn: 1, description: "Reference to a Feature entry in Feature table."),
39 new ColumnDefinition("Level", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "New selection Level to set in Feature table if Condition evaluates to TRUE."),
40 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Expression evaluated to determine if Level in the Feature table is to change.", forceLocalizable: true),
41 },
42 - tupleIdIsPrimaryKey: false
42 + symbolIdIsPrimaryKey: false
43 );
44
45 public static readonly TableDefinition AdminUISequence = new TableDefinition(
@@ -51,7 +51,7 @@ namespace WixToolset.Data.WindowsInstaller
51 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.", forceLocalizable: true),
52 new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -4, maxValue: 32767, description: "Number that determines the sort order in which the actions are to be executed. Leave blank to suppress action."),
53 },
54 - tupleIdIsPrimaryKey: true
54 + symbolIdIsPrimaryKey: true
55 );
56
57 public static readonly TableDefinition AdvtExecuteSequence = new TableDefinition(
@@ -63,7 +63,7 @@ namespace WixToolset.Data.WindowsInstaller
63 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.", forceLocalizable: true),
64 new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -4, maxValue: 32767, description: "Number that determines the sort order in which the actions are to be executed. Leave blank to suppress action."),
65 },
66 - tupleIdIsPrimaryKey: true
66 + symbolIdIsPrimaryKey: true
67 );
68
69 public static readonly TableDefinition AdvtUISequence = new TableDefinition(
@@ -75,12 +75,12 @@ namespace WixToolset.Data.WindowsInstaller
75 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.", forceLocalizable: true),
76 new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -4, maxValue: 32767, description: "Number that determines the sort order in which the actions are to be executed. Leave blank to suppress action."),
77 },
78 - tupleIdIsPrimaryKey: true
78 + symbolIdIsPrimaryKey: true
79 );
80
81 public static readonly TableDefinition AppId = new TableDefinition(
82 "AppId",
83 - TupleDefinitions.AppId,
83 + SymbolDefinitions.AppId,
84 new[]
85 {
86 new ColumnDefinition("AppId", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Guid),
@@ -91,35 +91,35 @@ namespace WixToolset.Data.WindowsInstaller
91 new ColumnDefinition("ActivateAtStorage", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1),
92 new ColumnDefinition("RunAsInteractiveUser", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1),
93 },
94 - tupleIdIsPrimaryKey: false
94 + symbolIdIsPrimaryKey: false
95 );
96
97 public static readonly TableDefinition AppSearch = new TableDefinition(
98 "AppSearch",
99 - TupleDefinitions.AppSearch,
99 + SymbolDefinitions.AppSearch,
100 new[]
101 {
102 new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The property associated with a Signature", modularizeType: ColumnModularizeType.Column),
103 new ColumnDefinition("Signature_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Signature;RegLocator;IniLocator;DrLocator;CompLocator", keyColumn: 1, description: "The Signature_ represents a unique file signature and is also the foreign key in the Signature, RegLocator, IniLocator, CompLocator and the DrLocator tables.", modularizeType: ColumnModularizeType.Column),
104 },
105 - tupleIdIsPrimaryKey: false
105 + symbolIdIsPrimaryKey: false
106 );
107
108 public static readonly TableDefinition Property = new TableDefinition(
109 "Property",
110 - TupleDefinitions.Property,
110 + SymbolDefinitions.Property,
111 new[]
112 {
113 new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of property, uppercase if settable by launcher or loader.", modularizeType: ColumnModularizeType.Column),
114 new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "String value for property. Never null or empty."),
115 },
116 strongRowType: typeof(PropertyRow),
117 - tupleIdIsPrimaryKey: true
117 + symbolIdIsPrimaryKey: true
118 );
119
120 public static readonly TableDefinition BBControl = new TableDefinition(
121 "BBControl",
122 - TupleDefinitions.BBControl,
122 + SymbolDefinitions.BBControl,
123 new[]
124 {
125 new ColumnDefinition("Billboard_", ColumnType.String, 50, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Billboard", keyColumn: 1, description: "External key to the Billboard table, name of the billboard.", modularizeType: ColumnModularizeType.Column),
@@ -133,12 +133,12 @@ namespace WixToolset.Data.WindowsInstaller
133 new ColumnDefinition("Text", ColumnType.Localized, 50, primaryKey: false, nullable: true, ColumnCategory.Text, description: "A string used to set the initial text contained within a control (if appropriate)."),
134 },
135 strongRowType: typeof(BBControlRow),
136 - tupleIdIsPrimaryKey: false
136 + symbolIdIsPrimaryKey: false
137 );
138
139 public static readonly TableDefinition Billboard = new TableDefinition(
140 "Billboard",
141 - TupleDefinitions.Billboard,
141 + SymbolDefinitions.Billboard,
142 new[]
143 {
144 new ColumnDefinition("Billboard", ColumnType.String, 50, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of the billboard.", modularizeType: ColumnModularizeType.Column),
@@ -146,12 +146,12 @@ namespace WixToolset.Data.WindowsInstaller
146 new ColumnDefinition("Action", ColumnType.String, 50, primaryKey: false, nullable: true, ColumnCategory.Identifier, description: "The name of an action. The billboard is displayed during the progress messages received from this action."),
147 new ColumnDefinition("Ordering", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "A positive integer. If there is more than one billboard corresponding to an action they will be shown in the order defined by this column."),
148 },
149 - tupleIdIsPrimaryKey: true
149 + symbolIdIsPrimaryKey: true
150 );
151
152 public static readonly TableDefinition Feature = new TableDefinition(
153 "Feature",
154 - TupleDefinitions.Feature,
154 + SymbolDefinitions.Feature,
155 new[]
156 {
157 new ColumnDefinition("Feature", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key used to identify a particular feature record."),
@@ -163,18 +163,18 @@ namespace WixToolset.Data.WindowsInstaller
163 new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.UpperCase, keyTable: "Directory", keyColumn: 1, description: "The name of the Directory that can be configured by the UI. A non-null value will enable the browse button.", modularizeType: ColumnModularizeType.Column),
164 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, possibilities: "0;1;2;4;5;6;8;9;10;16;17;18;20;21;22;24;25;26;32;33;34;36;37;38;48;49;50;52;53;54", description: "Feature attributes"),
165 },
166 - tupleIdIsPrimaryKey: true
166 + symbolIdIsPrimaryKey: true
167 );
168
169 public static readonly TableDefinition Binary = new TableDefinition(
170 "Binary",
171 - TupleDefinitions.Binary,
171 + SymbolDefinitions.Binary,
172 new[]
173 {
174 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Unique key identifying the binary data.", modularizeType: ColumnModularizeType.Column),
175 new ColumnDefinition("Data", ColumnType.Object, 0, primaryKey: false, nullable: false, ColumnCategory.Binary, description: "The unformatted binary data."),
176 },
177 - tupleIdIsPrimaryKey: true
177 + symbolIdIsPrimaryKey: true
178 );
179
180 public static readonly TableDefinition BindImage = new TableDefinition(
@@ -185,12 +185,12 @@ namespace WixToolset.Data.WindowsInstaller
185 new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "The index into the File table. This must be an executable file.", modularizeType: ColumnModularizeType.Column),
186 new ColumnDefinition("Path", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Paths, description: "A list of ; delimited paths that represent the paths to be searched for the import DLLS. The list is usually a list of properties each enclosed within square brackets [] .", modularizeType: ColumnModularizeType.Property),
187 },
188 - tupleIdIsPrimaryKey: false
188 + symbolIdIsPrimaryKey: false
189 );
190
191 public static readonly TableDefinition File = new TableDefinition(
192 "File",
193 - TupleDefinitions.File,
193 + SymbolDefinitions.File,
194 new[]
195 {
196 new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token, must match identifier in cabinet. For uncompressed files, this field is ignored.", modularizeType: ColumnModularizeType.Column),
@@ -205,33 +205,33 @@ namespace WixToolset.Data.WindowsInstaller
205 new ColumnDefinition("Source", ColumnType.Object, 0, primaryKey: false, nullable: false, ColumnCategory.Binary, description: "Path to source of file.", unreal: true),
206 },
207 strongRowType: typeof(FileRow),
208 - tupleIdIsPrimaryKey: true
208 + symbolIdIsPrimaryKey: true
209 );
210
211 public static readonly TableDefinition CCPSearch = new TableDefinition(
212 "CCPSearch",
213 - TupleDefinitions.CCPSearch,
213 + SymbolDefinitions.CCPSearch,
214 new[]
215 {
216 new ColumnDefinition("Signature_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Signature;RegLocator;IniLocator;DrLocator;CompLocator", keyColumn: 1, description: "The Signature_ represents a unique file signature and is also the foreign key in the Signature, RegLocator, IniLocator, CompLocator and the DrLocator tables."),
217 },
218 - tupleIdIsPrimaryKey: true
218 + symbolIdIsPrimaryKey: true
219 );
220
221 public static readonly TableDefinition CheckBox = new TableDefinition(
222 "CheckBox",
223 - TupleDefinitions.CheckBox,
223 + SymbolDefinitions.CheckBox,
224 new[]
225 {
226 new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A named property to be tied to the item.", modularizeType: ColumnModularizeType.Column),
227 new ColumnDefinition("Value", ColumnType.String, 64, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The value string associated with the item.", modularizeType: ColumnModularizeType.Property),
228 },
229 - tupleIdIsPrimaryKey: false
229 + symbolIdIsPrimaryKey: false
230 );
231
232 public static readonly TableDefinition Class = new TableDefinition(
233 "Class",
234 - TupleDefinitions.Class,
234 + SymbolDefinitions.Class,
235 new[]
236 {
237 new ColumnDefinition("CLSID", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Guid, description: "The CLSID of an OLE factory."),
@@ -248,12 +248,12 @@ namespace WixToolset.Data.WindowsInstaller
248 new ColumnDefinition("Feature_", ColumnType.String, 38, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Feature", keyColumn: 1, description: "Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational."),
249 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, maxValue: 32767, description: "Class registration attributes."),
250 },
251 - tupleIdIsPrimaryKey: false
251 + symbolIdIsPrimaryKey: false
252 );
253
254 public static readonly TableDefinition Component = new TableDefinition(
255 "Component",
256 - TupleDefinitions.Component,
256 + SymbolDefinitions.Component,
257 new[]
258 {
259 new ColumnDefinition("Component", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key used to identify a particular component record.", modularizeType: ColumnModularizeType.Column),
@@ -264,23 +264,23 @@ namespace WixToolset.Data.WindowsInstaller
264 new ColumnDefinition("KeyPath", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File;Registry;ODBCDataSource", keyColumn: 1, description: "Either the primary key into the File table, Registry table, or ODBCDataSource table. This extract path is stored when the component is installed, and is used to detect the presence of the component and to return the path to it.", modularizeType: ColumnModularizeType.Column),
265 },
266 strongRowType: typeof(ComponentRow),
267 - tupleIdIsPrimaryKey: true
267 + symbolIdIsPrimaryKey: true
268 );
269
270 public static readonly TableDefinition Icon = new TableDefinition(
271 "Icon",
272 - TupleDefinitions.Icon,
272 + SymbolDefinitions.Icon,
273 new[]
274 {
275 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key. Name of the icon file.", modularizeType: ColumnModularizeType.Icon),
276 new ColumnDefinition("Data", ColumnType.Object, 0, primaryKey: false, nullable: false, ColumnCategory.Binary, description: "Binary stream. The binary icon data in PE (.DLL or .EXE) or icon (.ICO) format."),
277 },
278 - tupleIdIsPrimaryKey: true
278 + symbolIdIsPrimaryKey: true
279 );
280
281 public static readonly TableDefinition ProgId = new TableDefinition(
282 "ProgId",
283 - TupleDefinitions.ProgId,
283 + SymbolDefinitions.ProgId,
284 new[]
285 {
286 new ColumnDefinition("ProgId", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, description: "The Program Identifier. Primary key."),
@@ -290,12 +290,12 @@ namespace WixToolset.Data.WindowsInstaller
290 new ColumnDefinition("Icon_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Icon", keyColumn: 1, description: "Optional foreign key into the Icon Table, specifying the icon file associated with this ProgId. Will be written under the DefaultIcon key.", modularizeType: ColumnModularizeType.Icon),
291 new ColumnDefinition("IconIndex", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -32767, maxValue: 32767, description: "Optional icon index."),
292 },
293 - tupleIdIsPrimaryKey: false
293 + symbolIdIsPrimaryKey: false
294 );
295
296 public static readonly TableDefinition ComboBox = new TableDefinition(
297 "ComboBox",
298 - TupleDefinitions.ComboBox,
298 + SymbolDefinitions.ComboBox,
299 new[]
300 {
301 new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A named property to be tied to this item. All the items tied to the same property become part of the same combobox.", modularizeType: ColumnModularizeType.Column),
@@ -303,47 +303,47 @@ namespace WixToolset.Data.WindowsInstaller
303 new ColumnDefinition("Value", ColumnType.String, 64, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The value string associated with this item. Selecting the line will set the associated property to this value.", modularizeType: ColumnModularizeType.Property, forceLocalizable: true),
304 new ColumnDefinition("Text", ColumnType.Localized, 64, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.", modularizeType: ColumnModularizeType.Property),
305 },
306 - tupleIdIsPrimaryKey: false
306 + symbolIdIsPrimaryKey: false
307 );
308
309 public static readonly TableDefinition CompLocator = new TableDefinition(
310 "CompLocator",
311 - TupleDefinitions.CompLocator,
311 + SymbolDefinitions.CompLocator,
312 new[]
313 {
314 new ColumnDefinition("Signature_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.", modularizeType: ColumnModularizeType.Column),
315 new ColumnDefinition("ComponentId", ColumnType.String, 38, primaryKey: false, nullable: false, ColumnCategory.Guid, description: "A string GUID unique to this component, version, and language."),
316 new ColumnDefinition("Type", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "A boolean value that determines if the registry value is a filename or a directory location."),
317 },
318 - tupleIdIsPrimaryKey: false
318 + symbolIdIsPrimaryKey: false
319 );
320
321 public static readonly TableDefinition Complus = new TableDefinition(
322 "Complus",
323 - TupleDefinitions.Complus,
323 + SymbolDefinitions.Complus,
324 new[]
325 {
326 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key referencing Component that controls the ComPlus component.", modularizeType: ColumnModularizeType.Column),
327 new ColumnDefinition("ExpType", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "ComPlus component attributes."),
328 },
329 - tupleIdIsPrimaryKey: false
329 + symbolIdIsPrimaryKey: false
330 );
331
332 public static readonly TableDefinition Directory = new TableDefinition(
333 "Directory",
334 - TupleDefinitions.Directory,
334 + SymbolDefinitions.Directory,
335 new[]
336 {
337 new ColumnDefinition("Directory", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Unique identifier for directory entry, primary key. If a property by this name is defined, it contains the full path to the directory.", modularizeType: ColumnModularizeType.Column),
338 new ColumnDefinition("Directory_Parent", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Reference to the entry in this table specifying the default parent directory. A record parented to itself or with a Null parent represents a root of the install tree.", modularizeType: ColumnModularizeType.Column),
339 new ColumnDefinition("DefaultDir", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.DefaultDir, description: "The default sub-path under parent's path."),
340 },
341 - tupleIdIsPrimaryKey: true
341 + symbolIdIsPrimaryKey: true
342 );
343
344 public static readonly TableDefinition Control = new TableDefinition(
345 "Control",
346 - TupleDefinitions.Control,
346 + SymbolDefinitions.Control,
347 new[]
348 {
349 new ColumnDefinition("Dialog_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Dialog", keyColumn: 1, description: "External key to the Dialog table, name of the dialog.", modularizeType: ColumnModularizeType.Column),
@@ -360,12 +360,12 @@ namespace WixToolset.Data.WindowsInstaller
360 new ColumnDefinition("Help", ColumnType.Localized, 50, primaryKey: false, nullable: true, ColumnCategory.Text, description: "The help strings used with the button. The text is optional. "),
361 },
362 strongRowType: typeof(ControlRow),
363 - tupleIdIsPrimaryKey: false
363 + symbolIdIsPrimaryKey: false
364 );
365
366 public static readonly TableDefinition Dialog = new TableDefinition(
367 "Dialog",
368 - TupleDefinitions.Dialog,
368 + SymbolDefinitions.Dialog,
369 new[]
370 {
371 new ColumnDefinition("Dialog", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of the dialog.", modularizeType: ColumnModularizeType.Column),
@@ -379,12 +379,12 @@ namespace WixToolset.Data.WindowsInstaller
379 new ColumnDefinition("Control_Default", ColumnType.String, 50, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Control", keyColumn: 2, description: "Defines the default control. Hitting return is equivalent to pushing this button."),
380 new ColumnDefinition("Control_Cancel", ColumnType.String, 50, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Control", keyColumn: 2, description: "Defines the cancel control. Hitting escape or clicking on the close icon on the dialog is equivalent to pushing this button."),
381 },
382 - tupleIdIsPrimaryKey: true
382 + symbolIdIsPrimaryKey: true
383 );
384
385 public static readonly TableDefinition ControlCondition = new TableDefinition(
386 "ControlCondition",
387 - TupleDefinitions.ControlCondition,
387 + SymbolDefinitions.ControlCondition,
388 new[]
389 {
390 new ColumnDefinition("Dialog_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Dialog", keyColumn: 1, description: "A foreign key to the Dialog table, name of the dialog.", modularizeType: ColumnModularizeType.Column),
@@ -392,12 +392,12 @@ namespace WixToolset.Data.WindowsInstaller
392 new ColumnDefinition("Action", ColumnType.String, 50, primaryKey: true, nullable: false, ColumnCategory.Unknown, possibilities: "Default;Disable;Enable;Hide;Show", description: "The desired action to be taken on the specified control."),
393 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Condition, description: "A standard conditional statement that specifies under which conditions the action should be triggered.", modularizeType: ColumnModularizeType.Condition, forceLocalizable: true),
394 },
395 - tupleIdIsPrimaryKey: false
395 + symbolIdIsPrimaryKey: false
396 );
397
398 public static readonly TableDefinition ControlEvent = new TableDefinition(
399 "ControlEvent",
400 - TupleDefinitions.ControlEvent,
400 + SymbolDefinitions.ControlEvent,
401 new[]
402 {
403 new ColumnDefinition("Dialog_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Dialog", keyColumn: 1, description: "A foreign key to the Dialog table, name of the dialog.", modularizeType: ColumnModularizeType.Column),
@@ -407,23 +407,23 @@ namespace WixToolset.Data.WindowsInstaller
407 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: true, nullable: true, ColumnCategory.Condition, description: "A standard conditional statement that specifies under which conditions an event should be triggered.", modularizeType: ColumnModularizeType.Condition, forceLocalizable: true),
408 new ColumnDefinition("Ordering", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "An integer used to order several events tied to the same control. Can be left blank."),
409 },
410 - tupleIdIsPrimaryKey: false
410 + symbolIdIsPrimaryKey: false
411 );
412
413 public static readonly TableDefinition CreateFolder = new TableDefinition(
414 "CreateFolder",
415 - TupleDefinitions.CreateFolder,
415 + SymbolDefinitions.CreateFolder,
416 new[]
417 {
418 new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Primary key, could be foreign key into the Directory table.", modularizeType: ColumnModularizeType.Column),
419 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table.", modularizeType: ColumnModularizeType.Column),
420 },
421 - tupleIdIsPrimaryKey: false
421 + symbolIdIsPrimaryKey: false
422 );
423
424 public static readonly TableDefinition CustomAction = new TableDefinition(
425 "CustomAction",
426 - TupleDefinitions.CustomAction,
426 + SymbolDefinitions.CustomAction,
427 new[]
428 {
429 new ColumnDefinition("Action", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, name of action, normally appears in sequence table unless private use.", modularizeType: ColumnModularizeType.Column),
@@ -432,12 +432,12 @@ namespace WixToolset.Data.WindowsInstaller
432 new ColumnDefinition("Target", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Excecution parameter, depends on the type of custom action", modularizeType: ColumnModularizeType.Property, forceLocalizable: true),
433 new ColumnDefinition("ExtendedType", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A numeric custom action type that extends code type or option flags of the Type column."),
434 },
435 - tupleIdIsPrimaryKey: true
435 + symbolIdIsPrimaryKey: true
436 );
437
438 public static readonly TableDefinition DrLocator = new TableDefinition(
439 "DrLocator",
440 - TupleDefinitions.DrLocator,
440 + SymbolDefinitions.DrLocator,
441 new[]
442 {
443 new ColumnDefinition("Signature_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The Signature_ represents a unique file signature and is also the foreign key in the Signature table.", modularizeType: ColumnModularizeType.Column),
@@ -445,12 +445,12 @@ namespace WixToolset.Data.WindowsInstaller
445 new ColumnDefinition("Path", ColumnType.String, 255, primaryKey: true, nullable: true, ColumnCategory.AnyPath, description: "The path on the user system. This is a either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.", modularizeType: ColumnModularizeType.Property),
446 new ColumnDefinition("Depth", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "The depth below the path to which the Signature_ is recursively searched. If absent, the depth is assumed to be 0."),
447 },
448 - tupleIdIsPrimaryKey: false
448 + symbolIdIsPrimaryKey: false
449 );
450
451 public static readonly TableDefinition DuplicateFile = new TableDefinition(
452 "DuplicateFile",
453 - TupleDefinitions.DuplicateFile,
453 + SymbolDefinitions.DuplicateFile,
454 new[]
455 {
456 new ColumnDefinition("FileKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key used to identify a particular file entry", modularizeType: ColumnModularizeType.Column),
@@ -459,12 +459,12 @@ namespace WixToolset.Data.WindowsInstaller
459 new ColumnDefinition("DestName", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Filename, description: "Filename to be given to the duplicate file."),
460 new ColumnDefinition("DestFolder", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, description: "Name of a property whose value is assumed to resolve to the full pathname to a destination folder.", modularizeType: ColumnModularizeType.Column),
461 },
462 - tupleIdIsPrimaryKey: true
462 + symbolIdIsPrimaryKey: true
463 );
464
465 public static readonly TableDefinition Environment = new TableDefinition(
466 "Environment",
467 - TupleDefinitions.Environment,
467 + SymbolDefinitions.Environment,
468 new[]
469 {
470 new ColumnDefinition("Environment", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Unique identifier for the environmental variable setting", modularizeType: ColumnModularizeType.Column),
@@ -472,23 +472,23 @@ namespace WixToolset.Data.WindowsInstaller
472 new ColumnDefinition("Value", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The value to set in the environmental settings.", modularizeType: ColumnModularizeType.Property),
473 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the environmental value.", modularizeType: ColumnModularizeType.Column),
474 },
475 - tupleIdIsPrimaryKey: true
475 + symbolIdIsPrimaryKey: true
476 );
477
478 public static readonly TableDefinition Error = new TableDefinition(
479 "Error",
480 - TupleDefinitions.Error,
480 + SymbolDefinitions.Error,
481 new[]
482 {
483 new ColumnDefinition("Error", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "Integer error number, obtained from header file IError(...) macros."),
484 new ColumnDefinition("Message", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Template, description: "Error formatting template, obtained from user ed. or localizers.", modularizeType: ColumnModularizeType.Property, useCData: true),
485 },
486 - tupleIdIsPrimaryKey: true
486 + symbolIdIsPrimaryKey: true
487 );
488
489 public static readonly TableDefinition EventMapping = new TableDefinition(
490 "EventMapping",
491 - TupleDefinitions.EventMapping,
491 + SymbolDefinitions.EventMapping,
492 new[]
493 {
494 new ColumnDefinition("Dialog_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Dialog", keyColumn: 1, description: "A foreign key to the Dialog table, name of the Dialog.", modularizeType: ColumnModularizeType.Column),
@@ -496,12 +496,12 @@ namespace WixToolset.Data.WindowsInstaller
496 new ColumnDefinition("Event", ColumnType.String, 50, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "An identifier that specifies the type of the event that the control subscribes to."),
497 new ColumnDefinition("Attribute", ColumnType.String, 50, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "The name of the control attribute, that is set when this event is received."),
498 },
499 - tupleIdIsPrimaryKey: false
499 + symbolIdIsPrimaryKey: false
500 );
501
502 public static readonly TableDefinition Extension = new TableDefinition(
503 "Extension",
504 - TupleDefinitions.Extension,
504 + SymbolDefinitions.Extension,
505 new[]
506 {
507 new ColumnDefinition("Extension", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, description: "The extension associated with the table row."),
@@ -510,53 +510,53 @@ namespace WixToolset.Data.WindowsInstaller
510 new ColumnDefinition("MIME_", ColumnType.String, 64, primaryKey: false, nullable: true, ColumnCategory.Text, keyTable: "MIME", keyColumn: 1, description: "Optional Context identifier, typically \"type/format\" associated with the extension"),
511 new ColumnDefinition("Feature_", ColumnType.String, 38, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Feature", keyColumn: 1, description: "Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational."),
512 },
513 - tupleIdIsPrimaryKey: false
513 + symbolIdIsPrimaryKey: false
514 );
515
516 public static readonly TableDefinition MIME = new TableDefinition(
517 "MIME",
518 - TupleDefinitions.MIME,
518 + SymbolDefinitions.MIME,
519 new[]
520 {
521 new ColumnDefinition("ContentType", ColumnType.String, 64, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Primary key. Context identifier, typically \"type/format\"."),
522 new ColumnDefinition("Extension_", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Text, keyTable: "Extension", keyColumn: 1, description: "Optional associated extension (without dot)"),
523 new ColumnDefinition("CLSID", ColumnType.String, 38, primaryKey: false, nullable: true, ColumnCategory.Guid, description: "Optional associated CLSID."),
524 },
525 - tupleIdIsPrimaryKey: false
525 + symbolIdIsPrimaryKey: false
526 );
527
528 public static readonly TableDefinition FeatureComponents = new TableDefinition(
529 "FeatureComponents",
530 - TupleDefinitions.FeatureComponents,
530 + SymbolDefinitions.FeatureComponents,
531 new[]
532 {
533 new ColumnDefinition("Feature_", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Feature", keyColumn: 1, description: "Foreign key into Feature table."),
534 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into Component table.", modularizeType: ColumnModularizeType.Column),
535 },
536 - tupleIdIsPrimaryKey: false
536 + symbolIdIsPrimaryKey: false
537 );
538
539 public static readonly TableDefinition FileSFPCatalog = new TableDefinition(
540 "FileSFPCatalog",
541 - TupleDefinitions.FileSFPCatalog,
541 + SymbolDefinitions.FileSFPCatalog,
542 new[]
543 {
544 new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "File associated with the catalog", modularizeType: ColumnModularizeType.Column),
545 new ColumnDefinition("SFPCatalog_", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Filename, keyTable: "SFPCatalog", keyColumn: 1, description: "Catalog associated with the file"),
546 },
547 - tupleIdIsPrimaryKey: false
547 + symbolIdIsPrimaryKey: false
548 );
549
550 public static readonly TableDefinition SFPCatalog = new TableDefinition(
551 "SFPCatalog",
552 - TupleDefinitions.SFPCatalog,
552 + SymbolDefinitions.SFPCatalog,
553 new[]
554 {
555 new ColumnDefinition("SFPCatalog", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Filename, description: "File name for the catalog."),
556 new ColumnDefinition("Catalog", ColumnType.Object, 0, primaryKey: false, nullable: false, ColumnCategory.Binary, description: "SFP Catalog"),
557 new ColumnDefinition("Dependency", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Parent catalog - only used by SFP", modularizeType: ColumnModularizeType.Property),
558 },
559 - tupleIdIsPrimaryKey: false
559 + symbolIdIsPrimaryKey: false
560 );
561
562 public static readonly TableDefinition Font = new TableDefinition(
@@ -567,12 +567,12 @@ namespace WixToolset.Data.WindowsInstaller
567 new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Primary key, foreign key into File table referencing font file.", modularizeType: ColumnModularizeType.Column),
568 new ColumnDefinition("FontTitle", ColumnType.String, 128, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Font name."),
569 },
570 - tupleIdIsPrimaryKey: false
570 + symbolIdIsPrimaryKey: false
571 );
572
573 public static readonly TableDefinition IniFile = new TableDefinition(
574 "IniFile",
575 - TupleDefinitions.IniFile,
575 + SymbolDefinitions.IniFile,
576 new[]
577 {
578 new ColumnDefinition("IniFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -584,12 +584,12 @@ namespace WixToolset.Data.WindowsInstaller
584 new ColumnDefinition("Action", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, possibilities: "0;1;3", description: "The type of modification to be made, one of iifEnum"),
585 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .INI value.", modularizeType: ColumnModularizeType.Column),
586 },
587 - tupleIdIsPrimaryKey: true
587 + symbolIdIsPrimaryKey: true
588 );
589
590 public static readonly TableDefinition IniLocator = new TableDefinition(
591 "IniLocator",
592 - TupleDefinitions.IniLocator,
592 + SymbolDefinitions.IniLocator,
593 new[]
594 {
595 new ColumnDefinition("Signature_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.", modularizeType: ColumnModularizeType.Column),
@@ -599,7 +599,7 @@ namespace WixToolset.Data.WindowsInstaller
599 new ColumnDefinition("Field", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "The field in the .INI line. If Field is null or 0 the entire line is read."),
600 new ColumnDefinition("Type", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2, description: "An integer value that determines if the .INI value read is a filename or a directory location or to be used as is w/o interpretation."),
601 },
602 - tupleIdIsPrimaryKey: false
602 + symbolIdIsPrimaryKey: false
603 );
604
605 public static readonly TableDefinition InstallExecuteSequence = new TableDefinition(
@@ -611,7 +611,7 @@ namespace WixToolset.Data.WindowsInstaller
611 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.", forceLocalizable: true),
612 new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -4, maxValue: 32767, description: "Number that determines the sort order in which the actions are to be executed. Leave blank to suppress action."),
613 },
614 - tupleIdIsPrimaryKey: true
614 + symbolIdIsPrimaryKey: true
615 );
616
617 public static readonly TableDefinition InstallUISequence = new TableDefinition(
@@ -623,34 +623,34 @@ namespace WixToolset.Data.WindowsInstaller
623 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, description: "Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.", forceLocalizable: true),
624 new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -4, maxValue: 32767, description: "Number that determines the sort order in which the actions are to be executed. Leave blank to suppress action."),
625 },
626 - tupleIdIsPrimaryKey: true
626 + symbolIdIsPrimaryKey: true
627 );
628
629 public static readonly TableDefinition IsolatedComponent = new TableDefinition(
630 "IsolatedComponent",
631 - TupleDefinitions.IsolatedComponent,
631 + SymbolDefinitions.IsolatedComponent,
632 new[]
633 {
634 new ColumnDefinition("Component_Shared", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Key to Component table item to be isolated", modularizeType: ColumnModularizeType.Column),
635 new ColumnDefinition("Component_Application", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Key to Component table item for application", modularizeType: ColumnModularizeType.Column),
636 },
637 - tupleIdIsPrimaryKey: false
637 + symbolIdIsPrimaryKey: false
638 );
639
640 public static readonly TableDefinition LaunchCondition = new TableDefinition(
641 "LaunchCondition",
642 - TupleDefinitions.LaunchCondition,
642 + SymbolDefinitions.LaunchCondition,
643 new[]
644 {
645 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Condition, description: "Expression which must evaluate to TRUE in order for install to commence.", forceLocalizable: true),
646 new ColumnDefinition("Description", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Localizable text to display when condition fails and install must abort."),
647 },
648 - tupleIdIsPrimaryKey: false
648 + symbolIdIsPrimaryKey: false
649 );
650
651 public static readonly TableDefinition ListBox = new TableDefinition(
652 "ListBox",
653 - TupleDefinitions.ListBox,
653 + SymbolDefinitions.ListBox,
654 new[]
655 {
656 new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A named property to be tied to this item. All the items tied to the same property become part of the same listbox.", modularizeType: ColumnModularizeType.Column),
@@ -658,12 +658,12 @@ namespace WixToolset.Data.WindowsInstaller
658 new ColumnDefinition("Value", ColumnType.String, 64, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The value string associated with this item. Selecting the line will set the associated property to this value.", modularizeType: ColumnModularizeType.Property),
659 new ColumnDefinition("Text", ColumnType.Localized, 64, primaryKey: false, nullable: true, ColumnCategory.Text, description: "The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value."),
660 },
661 - tupleIdIsPrimaryKey: false
661 + symbolIdIsPrimaryKey: false
662 );
663
664 public static readonly TableDefinition ListView = new TableDefinition(
665 "ListView",
666 - TupleDefinitions.ListView,
666 + SymbolDefinitions.ListView,
667 new[]
668 {
669 new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A named property to be tied to this item. All the items tied to the same property become part of the same listview.", modularizeType: ColumnModularizeType.Column),
@@ -672,12 +672,12 @@ namespace WixToolset.Data.WindowsInstaller
672 new ColumnDefinition("Text", ColumnType.Localized, 64, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.", modularizeType: ColumnModularizeType.Property),
673 new ColumnDefinition("Binary_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Binary", keyColumn: 1, description: "The name of the icon to be displayed with the icon. The binary information is looked up from the Binary Table.", modularizeType: ColumnModularizeType.Column),
674 },
675 - tupleIdIsPrimaryKey: false
675 + symbolIdIsPrimaryKey: false
676 );
677
678 public static readonly TableDefinition LockPermissions = new TableDefinition(
679 "LockPermissions",
680 - TupleDefinitions.LockPermissions,
680 + SymbolDefinitions.LockPermissions,
681 new[]
682 {
683 new ColumnDefinition("LockObject", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Foreign key into Registry or File table", modularizeType: ColumnModularizeType.Column),
@@ -686,12 +686,12 @@ namespace WixToolset.Data.WindowsInstaller
686 new ColumnDefinition("User", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "User for permissions to be set. (usually a property)", modularizeType: ColumnModularizeType.Property),
687 new ColumnDefinition("Permission", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -2147483647, maxValue: 2147483647, description: "Permission Access mask. Full Control = 268435456 (GENERIC_ALL = 0x10000000)"),
688 },
689 - tupleIdIsPrimaryKey: false
689 + symbolIdIsPrimaryKey: false
690 );
691
692 public static readonly TableDefinition MsiLockPermissionsEx = new TableDefinition(
693 "MsiLockPermissionsEx",
694 - TupleDefinitions.MsiLockPermissionsEx,
694 + SymbolDefinitions.MsiLockPermissionsEx,
695 new[]
696 {
697 new ColumnDefinition("MsiLockPermissionsEx", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -700,12 +700,12 @@ namespace WixToolset.Data.WindowsInstaller
700 new ColumnDefinition("SDDLText", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.FormattedSDDLText, description: "String to indicate permissions to be applied to the LockObject", modularizeType: ColumnModularizeType.Property),
701 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Expression which must evaluate to TRUE in order for this set of permissions to be applied", modularizeType: ColumnModularizeType.Property),
702 },
703 - tupleIdIsPrimaryKey: true
703 + symbolIdIsPrimaryKey: true
704 );
705
706 public static readonly TableDefinition Media = new TableDefinition(
707 "Media",
708 - TupleDefinitions.Media,
708 + SymbolDefinitions.Media,
709 new[]
710 {
711 new ColumnDefinition("DiskId", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 32767, description: "Primary key, integer to determine sort order for table."),
@@ -716,12 +716,12 @@ namespace WixToolset.Data.WindowsInstaller
716 new ColumnDefinition("Source", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Property, description: "The property defining the location of the cabinet file."),
717 },
718 strongRowType: typeof(MediaRow),
719 - tupleIdIsPrimaryKey: false
719 + symbolIdIsPrimaryKey: false
720 );
721
722 public static readonly TableDefinition MoveFile = new TableDefinition(
723 "MoveFile",
724 - TupleDefinitions.MoveFile,
724 + SymbolDefinitions.MoveFile,
725 new[]
726 {
727 new ColumnDefinition("FileKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key that uniquely identifies a particular MoveFile record", modularizeType: ColumnModularizeType.Column),
@@ -732,12 +732,12 @@ namespace WixToolset.Data.WindowsInstaller
732 new ColumnDefinition("DestFolder", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of a property whose value is assumed to resolve to the full path to the destination directory", modularizeType: ColumnModularizeType.Column),
733 new ColumnDefinition("Options", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Integer value specifying the MoveFile operating mode, one of imfoEnum"),
734 },
735 - tupleIdIsPrimaryKey: true
735 + symbolIdIsPrimaryKey: true
736 );
737
738 public static readonly TableDefinition MsiAssembly = new TableDefinition(
739 "MsiAssembly",
740 - TupleDefinitions.Assembly,
740 + SymbolDefinitions.Assembly,
741 new[]
742 {
743 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into Component table.", modularizeType: ColumnModularizeType.Column),
@@ -746,35 +746,35 @@ namespace WixToolset.Data.WindowsInstaller
746 new ColumnDefinition("File_Application", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Foreign key into File table, denoting the application context for private assemblies. Null for global assemblies.", modularizeType: ColumnModularizeType.Column),
747 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Assembly attributes"),
748 },
749 - tupleIdIsPrimaryKey: false
749 + symbolIdIsPrimaryKey: false
750 );
751
752 public static readonly TableDefinition MsiAssemblyName = new TableDefinition(
753 "MsiAssemblyName",
754 - TupleDefinitions.MsiAssemblyName,
754 + SymbolDefinitions.MsiAssemblyName,
755 new[]
756 {
757 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into Component table.", modularizeType: ColumnModularizeType.Column),
758 new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, description: "The name part of the name-value pairs for the assembly name."),
759 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Text, description: "The value part of the name-value pairs for the assembly name."),
760 },
761 - tupleIdIsPrimaryKey: false
761 + symbolIdIsPrimaryKey: false
762 );
763
764 public static readonly TableDefinition MsiDigitalCertificate = new TableDefinition(
765 "MsiDigitalCertificate",
766 - TupleDefinitions.MsiDigitalCertificate,
766 + SymbolDefinitions.MsiDigitalCertificate,
767 new[]
768 {
769 new ColumnDefinition("DigitalCertificate", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A unique identifier for the row"),
770 new ColumnDefinition("CertData", ColumnType.Object, 0, primaryKey: false, nullable: false, ColumnCategory.Binary, description: "A certificate context blob for a signer certificate"),
771 },
772 - tupleIdIsPrimaryKey: true
772 + symbolIdIsPrimaryKey: true
773 );
774
775 public static readonly TableDefinition MsiDigitalSignature = new TableDefinition(
776 "MsiDigitalSignature",
777 - TupleDefinitions.MsiDigitalSignature,
777 + SymbolDefinitions.MsiDigitalSignature,
778 new[]
779 {
780 new ColumnDefinition("Table", ColumnType.String, 32, primaryKey: true, nullable: false, ColumnCategory.Unknown, possibilities: "Media", description: "Reference to another table name (only Media table is supported)"),
@@ -782,12 +782,12 @@ namespace WixToolset.Data.WindowsInstaller
782 new ColumnDefinition("DigitalCertificate_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "MsiDigitalCertificate", keyColumn: 1, description: "Foreign key to MsiDigitalCertificate table identifying the signer certificate"),
783 new ColumnDefinition("Hash", ColumnType.Object, 0, primaryKey: false, nullable: true, ColumnCategory.Binary, description: "The encoded hash blob from the digital signature"),
784 },
785 - tupleIdIsPrimaryKey: false
785 + symbolIdIsPrimaryKey: false
786 );
787
788 public static readonly TableDefinition MsiEmbeddedChainer = new TableDefinition(
789 "MsiEmbeddedChainer",
790 - TupleDefinitions.MsiEmbeddedChainer,
790 + SymbolDefinitions.MsiEmbeddedChainer,
791 new[]
792 {
793 new ColumnDefinition("MsiEmbeddedChainer", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The primary key for the table.", modularizeType: ColumnModularizeType.Column),
@@ -796,12 +796,12 @@ namespace WixToolset.Data.WindowsInstaller
796 new ColumnDefinition("Source", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.CustomSource, description: "The location of the executable file for the user-defined function.", modularizeType: ColumnModularizeType.Column),
797 new ColumnDefinition("Type", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, possibilities: "2;18;50", description: "The functions listed in the MsiEmbeddedChainer table are described using the following custom action numeric types."),
798 },
799 - tupleIdIsPrimaryKey: true
799 + symbolIdIsPrimaryKey: true
800 );
801
802 public static readonly TableDefinition MsiEmbeddedUI = new TableDefinition(
803 "MsiEmbeddedUI",
804 - TupleDefinitions.MsiEmbeddedUI,
804 + SymbolDefinitions.MsiEmbeddedUI,
805 new[]
806 {
807 new ColumnDefinition("MsiEmbeddedUI", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The primary key for the table.", modularizeType: ColumnModularizeType.Column),
@@ -810,12 +810,12 @@ namespace WixToolset.Data.WindowsInstaller
810 new ColumnDefinition("MessageFilter", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies the types of messages that are sent to the user interface DLL."),
811 new ColumnDefinition("Data", ColumnType.Object, 0, primaryKey: false, nullable: false, ColumnCategory.Binary, description: "This column contains binary information."),
812 },
813 - tupleIdIsPrimaryKey: true
813 + symbolIdIsPrimaryKey: true
814 );
815
816 public static readonly TableDefinition MsiFileHash = new TableDefinition(
817 "MsiFileHash",
818 - TupleDefinitions.MsiFileHash,
818 + SymbolDefinitions.MsiFileHash,
819 new[]
820 {
821 new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Primary key, foreign key into File table referencing file with this hash", modularizeType: ColumnModularizeType.Column),
@@ -825,92 +825,92 @@ namespace WixToolset.Data.WindowsInstaller
825 new ColumnDefinition("HashPart3", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Size of file in bytes (long integer)."),
826 new ColumnDefinition("HashPart4", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Size of file in bytes (long integer)."),
827 },
828 - tupleIdIsPrimaryKey: true
828 + symbolIdIsPrimaryKey: true
829 );
830
831 public static readonly TableDefinition MsiPackageCertificate = new TableDefinition(
832 "MsiPackageCertificate",
833 - TupleDefinitions.MsiPackageCertificate,
833 + SymbolDefinitions.MsiPackageCertificate,
834 new[]
835 {
836 new ColumnDefinition("PackageCertificate", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key. A unique identifier for the row."),
837 new ColumnDefinition("DigitalCertificate_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "MsiDigitalCertificate", keyColumn: 1, description: "Foreign key to MsiDigitalCertificate table identifying the signer certificate."),
838 },
839 - tupleIdIsPrimaryKey: false
839 + symbolIdIsPrimaryKey: false
840 );
841
842 public static readonly TableDefinition MsiPatchCertificate = new TableDefinition(
843 "MsiPatchCertificate",
844 - TupleDefinitions.MsiPatchCertificate,
844 + SymbolDefinitions.MsiPatchCertificate,
845 new[]
846 {
847 new ColumnDefinition("PatchCertificate", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key. A unique identifier for the row."),
848 new ColumnDefinition("DigitalCertificate_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "MsiDigitalCertificate", keyColumn: 1, description: "Foreign key to MsiDigitalCertificate table identifying the signer certificate."),
849 },
850 - tupleIdIsPrimaryKey: false
850 + symbolIdIsPrimaryKey: false
851 );
852
853 public static readonly TableDefinition MsiPatchHeaders = new TableDefinition(
854 "MsiPatchHeaders",
855 - TupleDefinitions.MsiPatchHeaders,
855 + SymbolDefinitions.MsiPatchHeaders,
856 new[]
857 {
858 new ColumnDefinition("StreamRef", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key. A unique identifier for the row."),
859 new ColumnDefinition("Header", ColumnType.Object, 0, primaryKey: false, nullable: false, ColumnCategory.Binary, description: "Binary stream. The patch header, used for patch validation."),
860 },
861 - tupleIdIsPrimaryKey: false
861 + symbolIdIsPrimaryKey: false
862 );
863
864 public static readonly TableDefinition PatchMetadata = new TableDefinition(
865 "PatchMetadata",
866 - TupleDefinitions.PatchMetadata,
866 + SymbolDefinitions.PatchMetadata,
867 new[]
868 {
869 new ColumnDefinition("Company", ColumnType.String, 72, primaryKey: true, nullable: true, ColumnCategory.Identifier, description: "Primary key. The name of the company."),
870 new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key. The name of the property."),
871 new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Non-null, non-empty value of the metadata property."),
872 },
873 - tupleIdIsPrimaryKey: false
873 + symbolIdIsPrimaryKey: false
874 );
875
876 public static readonly TableDefinition MsiPatchMetadata = new TableDefinition(
877 "MsiPatchMetadata",
878 - TupleDefinitions.MsiPatchMetadata,
878 + SymbolDefinitions.MsiPatchMetadata,
879 new[]
880 {
881 new ColumnDefinition("Company", ColumnType.String, 72, primaryKey: true, nullable: true, ColumnCategory.Unknown),
882 new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Unknown),
883 new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Unknown),
884 },
885 - tupleIdIsPrimaryKey: false
885 + symbolIdIsPrimaryKey: false
886 );
887
888 public static readonly TableDefinition MsiPatchOldAssemblyFile = new TableDefinition(
889 "MsiPatchOldAssemblyFile",
890 - TupleDefinitions.MsiPatchOldAssemblyFile,
890 + SymbolDefinitions.MsiPatchOldAssemblyFile,
891 new[]
892 {
893 new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Foreign key into File table. Patch-only table.", modularizeType: ColumnModularizeType.Column),
894 new ColumnDefinition("Assembly_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "MsiPatchOldAssemblyName", keyColumn: 1, description: "Foreign key into MsiPatchOldAssemblyName table.", modularizeType: ColumnModularizeType.Column),
895 },
896 - tupleIdIsPrimaryKey: false
896 + symbolIdIsPrimaryKey: false
897 );
898
899 public static readonly TableDefinition MsiPatchOldAssemblyName = new TableDefinition(
900 "MsiPatchOldAssemblyName",
901 - TupleDefinitions.MsiPatchOldAssemblyName,
901 + SymbolDefinitions.MsiPatchOldAssemblyName,
902 new[]
903 {
904 new ColumnDefinition("Assembly", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A unique identifier for the row.", modularizeType: ColumnModularizeType.Column),
905 new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, description: "The name part of the name-value pairs for the assembly name. This represents the old name for the assembly."),
906 new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Text, description: "The value part of the name-value pairs for the assembly name. This represents the old name for the assembly."),
907 },
908 - tupleIdIsPrimaryKey: false
908 + symbolIdIsPrimaryKey: false
909 );
910
911 public static readonly TableDefinition PatchSequence = new TableDefinition(
912 "PatchSequence",
913 - TupleDefinitions.PatchSequence,
913 + SymbolDefinitions.PatchSequence,
914 new[]
915 {
916 new ColumnDefinition("PatchFamily", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key. The name of the family for the patch."),
@@ -918,12 +918,12 @@ namespace WixToolset.Data.WindowsInstaller
918 new ColumnDefinition("Sequence", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Sequence information in version (x.x.x.x) format."),
919 new ColumnDefinition("Supersede", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Indicates that this patch supersedes earlier patches."),
920 },
921 - tupleIdIsPrimaryKey: false
921 + symbolIdIsPrimaryKey: false
922 );
923
924 public static readonly TableDefinition MsiPatchSequence = new TableDefinition(
925 "MsiPatchSequence",
926 - TupleDefinitions.MsiPatchSequence,
926 + SymbolDefinitions.MsiPatchSequence,
927 new[]
928 {
929 new ColumnDefinition("PatchFamily", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Unknown),
@@ -931,24 +931,24 @@ namespace WixToolset.Data.WindowsInstaller
931 new ColumnDefinition("Sequence", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Unknown),
932 new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown),
933 },
934 - tupleIdIsPrimaryKey: false
934 + symbolIdIsPrimaryKey: false
935 );
936
937 public static readonly TableDefinition ODBCAttribute = new TableDefinition(
938 "ODBCAttribute",
939 - TupleDefinitions.ODBCAttribute,
939 + SymbolDefinitions.ODBCAttribute,
940 new[]
941 {
942 new ColumnDefinition("Driver_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ODBCDriver", keyColumn: 1, description: "Reference to ODBC driver in ODBCDriver table", modularizeType: ColumnModularizeType.Column),
943 new ColumnDefinition("Attribute", ColumnType.String, 40, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Name of ODBC driver attribute"),
944 new ColumnDefinition("Value", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Value for ODBC driver attribute"),
945 },
946 - tupleIdIsPrimaryKey: false
946 + symbolIdIsPrimaryKey: false
947 );
948
949 public static readonly TableDefinition ODBCDriver = new TableDefinition(
950 "ODBCDriver",
951 - TupleDefinitions.ODBCDriver,
951 + SymbolDefinitions.ODBCDriver,
952 new[]
953 {
954 new ColumnDefinition("Driver", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized.internal token for driver", modularizeType: ColumnModularizeType.Column),
@@ -957,12 +957,12 @@ namespace WixToolset.Data.WindowsInstaller
957 new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Reference to key driver file", modularizeType: ColumnModularizeType.Column),
958 new ColumnDefinition("File_Setup", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Optional reference to key driver setup DLL", modularizeType: ColumnModularizeType.Column),
959 },
960 - tupleIdIsPrimaryKey: true
960 + symbolIdIsPrimaryKey: true
961 );
962
963 public static readonly TableDefinition ODBCDataSource = new TableDefinition(
964 "ODBCDataSource",
965 - TupleDefinitions.ODBCDataSource,
965 + SymbolDefinitions.ODBCDataSource,
966 new[]
967 {
968 new ColumnDefinition("DataSource", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized.internal token for data source", modularizeType: ColumnModularizeType.Column),
@@ -971,24 +971,24 @@ namespace WixToolset.Data.WindowsInstaller
971 new ColumnDefinition("DriverDescription", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Reference to driver description, may be existing driver"),
972 new ColumnDefinition("Registration", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Registration option: 0=machine, 1=user, others t.b.d."),
973 },
974 - tupleIdIsPrimaryKey: true
974 + symbolIdIsPrimaryKey: true
975 );
976
977 public static readonly TableDefinition ODBCSourceAttribute = new TableDefinition(
978 "ODBCSourceAttribute",
979 - TupleDefinitions.ODBCSourceAttribute,
979 + SymbolDefinitions.ODBCSourceAttribute,
980 new[]
981 {
982 new ColumnDefinition("DataSource_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ODBCDataSource", keyColumn: 1, description: "Reference to ODBC data source in ODBCDataSource table", modularizeType: ColumnModularizeType.Column),
983 new ColumnDefinition("Attribute", ColumnType.String, 32, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Name of ODBC data source attribute"),
984 new ColumnDefinition("Value", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Value for ODBC data source attribute"),
985 },
986 - tupleIdIsPrimaryKey: false
986 + symbolIdIsPrimaryKey: false
987 );
988
989 public static readonly TableDefinition ODBCTranslator = new TableDefinition(
990 "ODBCTranslator",
991 - TupleDefinitions.ODBCTranslator,
991 + SymbolDefinitions.ODBCTranslator,
992 new[]
993 {
994 new ColumnDefinition("Translator", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized.internal token for translator", modularizeType: ColumnModularizeType.Column),
@@ -997,12 +997,12 @@ namespace WixToolset.Data.WindowsInstaller
997 new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Reference to key translator file", modularizeType: ColumnModularizeType.Column),
998 new ColumnDefinition("File_Setup", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Optional reference to key translator setup DLL", modularizeType: ColumnModularizeType.Column),
999 },
1000 - tupleIdIsPrimaryKey: true
1000 + symbolIdIsPrimaryKey: true
1001 );
1002
1003 public static readonly TableDefinition Patch = new TableDefinition(
1004 "Patch",
1005 - TupleDefinitions.Patch,
1005 + SymbolDefinitions.Patch,
1006 new[]
1007 {
1008 new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token, foreign key to File table, must match identifier in cabinet.", modularizeType: ColumnModularizeType.Column),
@@ -1012,23 +1012,23 @@ namespace WixToolset.Data.WindowsInstaller
1012 new ColumnDefinition("Header", ColumnType.Object, 0, primaryKey: false, nullable: true, ColumnCategory.Binary, description: "Binary stream. The patch header, used for patch validation."),
1013 new ColumnDefinition("StreamRef_", ColumnType.String, 38, primaryKey: false, nullable: true, ColumnCategory.Identifier, description: "Identifier. Foreign key to the StreamRef column of the MsiPatchHeaders table."),
1014 },
1015 - tupleIdIsPrimaryKey: false
1015 + symbolIdIsPrimaryKey: false
1016 );
1017
1018 public static readonly TableDefinition PatchPackage = new TableDefinition(
1019 "PatchPackage",
1020 - TupleDefinitions.PatchPackage,
1020 + SymbolDefinitions.PatchPackage,
1021 new[]
1022 {
1023 new ColumnDefinition("PatchId", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Guid, description: "A unique string GUID representing this patch."),
1024 new ColumnDefinition("Media_", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "Foreign key to DiskId column of Media table. Indicates the disk containing the patch package."),
1025 },
1026 - tupleIdIsPrimaryKey: false
1026 + symbolIdIsPrimaryKey: false
1027 );
1028
1029 public static readonly TableDefinition PublishComponent = new TableDefinition(
1030 "PublishComponent",
1031 - TupleDefinitions.PublishComponent,
1031 + SymbolDefinitions.PublishComponent,
1032 new[]
1033 {
1034 new ColumnDefinition("ComponentId", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Guid, description: "A string GUID that represents the component id that will be requested by the alien product."),
@@ -1037,12 +1037,12 @@ namespace WixToolset.Data.WindowsInstaller
1037 new ColumnDefinition("AppData", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "This is localisable Application specific data that can be associated with a Qualified Component."),
1038 new ColumnDefinition("Feature_", ColumnType.String, 38, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Feature", keyColumn: 1, description: "Foreign key into the Feature table."),
1039 },
1040 - tupleIdIsPrimaryKey: false
1040 + symbolIdIsPrimaryKey: false
1041 );
1042
1043 public static readonly TableDefinition RadioButton = new TableDefinition(
1044 "RadioButton",
1045 - TupleDefinitions.RadioButton,
1045 + SymbolDefinitions.RadioButton,
1046 new[]
1047 {
1048 new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A named property to be tied to this radio button. All the buttons tied to the same property become part of the same group.", modularizeType: ColumnModularizeType.Column),
@@ -1055,12 +1055,12 @@ namespace WixToolset.Data.WindowsInstaller
1055 new ColumnDefinition("Text", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "The visible title to be assigned to the radio button."),
1056 new ColumnDefinition("Help", ColumnType.Localized, 50, primaryKey: false, nullable: true, ColumnCategory.Text, description: "The help strings used with the button. The text is optional."),
1057 },
1058 - tupleIdIsPrimaryKey: false
1058 + symbolIdIsPrimaryKey: false
1059 );
1060
1061 public static readonly TableDefinition Registry = new TableDefinition(
1062 "Registry",
1063 - TupleDefinitions.Registry,
1063 + SymbolDefinitions.Registry,
1064 new[]
1065 {
1066 new ColumnDefinition("Registry", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -1070,12 +1070,12 @@ namespace WixToolset.Data.WindowsInstaller
1070 new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The registry value.", modularizeType: ColumnModularizeType.Property),
1071 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the registry value.", modularizeType: ColumnModularizeType.Column),
1072 },
1073 - tupleIdIsPrimaryKey: true
1073 + symbolIdIsPrimaryKey: true
1074 );
1075
1076 public static readonly TableDefinition RegLocator = new TableDefinition(
1077 "RegLocator",
1078 - TupleDefinitions.RegLocator,
1078 + SymbolDefinitions.RegLocator,
1079 new[]
1080 {
1081 new ColumnDefinition("Signature_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table. If the type is 0, the registry values refers a directory, and _Signature is not a foreign key.", modularizeType: ColumnModularizeType.Column),
@@ -1084,12 +1084,12 @@ namespace WixToolset.Data.WindowsInstaller
1084 new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The registry value name.", modularizeType: ColumnModularizeType.Property, forceLocalizable: true),
1085 new ColumnDefinition("Type", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 18, description: "An integer value that determines if the registry value is a filename or a directory location or to be used as is w/o interpretation."),
1086 },
1087 - tupleIdIsPrimaryKey: true
1087 + symbolIdIsPrimaryKey: true
1088 );
1089
1090 public static readonly TableDefinition RemoveFile = new TableDefinition(
1091 "RemoveFile",
1092 - TupleDefinitions.RemoveFile,
1092 + SymbolDefinitions.RemoveFile,
1093 new[]
1094 {
1095 new ColumnDefinition("FileKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key used to identify a particular file entry", modularizeType: ColumnModularizeType.Column),
@@ -1098,7 +1098,7 @@ namespace WixToolset.Data.WindowsInstaller
1098 new ColumnDefinition("DirProperty", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of a property whose value is assumed to resolve to the full pathname to the folder of the file to be removed.", modularizeType: ColumnModularizeType.Column),
1099 new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, possibilities: "1;2;3", description: "Installation option, one of iimEnum."),
1100 },
1101 - tupleIdIsPrimaryKey: true
1101 + symbolIdIsPrimaryKey: true
1102 );
1103
1104 public static readonly TableDefinition RemoveIniFile = new TableDefinition(
@@ -1115,12 +1115,12 @@ namespace WixToolset.Data.WindowsInstaller
1115 new ColumnDefinition("Action", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, possibilities: "2;4", description: "The type of modification to be made, one of iifEnum."),
1116 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the deletion of the .INI value.", modularizeType: ColumnModularizeType.Column),
1117 },
1118 - tupleIdIsPrimaryKey: true
1118 + symbolIdIsPrimaryKey: true
1119 );
1120
1121 public static readonly TableDefinition RemoveRegistry = new TableDefinition(
1122 "RemoveRegistry",
1123 - TupleDefinitions.RemoveRegistry,
1123 + SymbolDefinitions.RemoveRegistry,
1124 new[]
1125 {
1126 new ColumnDefinition("RemoveRegistry", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -1129,12 +1129,12 @@ namespace WixToolset.Data.WindowsInstaller
1129 new ColumnDefinition("Name", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The registry value name.", modularizeType: ColumnModularizeType.Property),
1130 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the deletion of the registry value.", modularizeType: ColumnModularizeType.Column),
1131 },
1132 - tupleIdIsPrimaryKey: true
1132 + symbolIdIsPrimaryKey: true
1133 );
1134
1135 public static readonly TableDefinition ReserveCost = new TableDefinition(
1136 "ReserveCost",
1137 - TupleDefinitions.ReserveCost,
1137 + SymbolDefinitions.ReserveCost,
1138 new[]
1139 {
1140 new ColumnDefinition("ReserveKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key that uniquely identifies a particular ReserveCost record", modularizeType: ColumnModularizeType.Column),
@@ -1143,7 +1143,7 @@ namespace WixToolset.Data.WindowsInstaller
1143 new ColumnDefinition("ReserveLocal", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "Disk space to reserve if linked component is installed locally."),
1144 new ColumnDefinition("ReserveSource", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "Disk space to reserve if linked component is installed to run from the source location."),
1145 },
1146 - tupleIdIsPrimaryKey: true
1146 + symbolIdIsPrimaryKey: true
1147 );
1148
1149 public static readonly TableDefinition SelfReg = new TableDefinition(
@@ -1154,12 +1154,12 @@ namespace WixToolset.Data.WindowsInstaller
1154 new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Foreign key into the File table denoting the module that needs to be registered.", modularizeType: ColumnModularizeType.Column),
1155 new ColumnDefinition("Cost", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "The cost of registering the module."),
1156 },
1157 - tupleIdIsPrimaryKey: false
1157 + symbolIdIsPrimaryKey: false
1158 );
1159
1160 public static readonly TableDefinition ServiceControl = new TableDefinition(
1161 "ServiceControl",
1162 - TupleDefinitions.ServiceControl,
1162 + SymbolDefinitions.ServiceControl,
1163 new[]
1164 {
1165 new ColumnDefinition("ServiceControl", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -1169,12 +1169,12 @@ namespace WixToolset.Data.WindowsInstaller
1169 new ColumnDefinition("Wait", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Boolean for whether to wait for the service to fully start"),
1170 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Required foreign key into the Component Table that controls the startup of the service", modularizeType: ColumnModularizeType.Column),
1171 },
1172 - tupleIdIsPrimaryKey: true
1172 + symbolIdIsPrimaryKey: true
1173 );
1174
1175 public static readonly TableDefinition ServiceInstall = new TableDefinition(
1176 "ServiceInstall",
1177 - TupleDefinitions.ServiceInstall,
1177 + SymbolDefinitions.ServiceInstall,
1178 new[]
1179 {
1180 new ColumnDefinition("ServiceInstall", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -1191,12 +1191,12 @@ namespace WixToolset.Data.WindowsInstaller
1191 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Required foreign key into the Component Table that controls the startup of the service", modularizeType: ColumnModularizeType.Column),
1192 new ColumnDefinition("Description", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Description of service.", modularizeType: ColumnModularizeType.Property),
1193 },
1194 - tupleIdIsPrimaryKey: true
1194 + symbolIdIsPrimaryKey: true
1195 );
1196
1197 public static readonly TableDefinition MsiServiceConfig = new TableDefinition(
1198 "MsiServiceConfig",
1199 - TupleDefinitions.MsiServiceConfig,
1199 + SymbolDefinitions.MsiServiceConfig,
1200 new[]
1201 {
1202 new ColumnDefinition("MsiServiceConfig", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -1206,12 +1206,12 @@ namespace WixToolset.Data.WindowsInstaller
1206 new ColumnDefinition("Argument", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Argument(s) for service configuration. Value depends on the content of the ConfigType field"),
1207 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Required foreign key into the Component Table that controls the configuration of the service", modularizeType: ColumnModularizeType.Column),
1208 },
1209 - tupleIdIsPrimaryKey: true
1209 + symbolIdIsPrimaryKey: true
1210 );
1211
1212 public static readonly TableDefinition MsiServiceConfigFailureActions = new TableDefinition(
1213 "MsiServiceConfigFailureActions",
1214 - TupleDefinitions.MsiServiceConfigFailureActions,
1214 + SymbolDefinitions.MsiServiceConfigFailureActions,
1215 new[]
1216 {
1217 new ColumnDefinition("MsiServiceConfigFailureActions", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -1224,12 +1224,12 @@ namespace WixToolset.Data.WindowsInstaller
1224 new ColumnDefinition("DelayActions", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "A list of delays (time in milli-seconds), separated by [~] delmiters, to wait before taking the corresponding Action. Terminate with [~][~]"),
1225 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Required foreign key into the Component Table that controls the configuration of failure actions for the service", modularizeType: ColumnModularizeType.Column),
1226 },
1227 - tupleIdIsPrimaryKey: true
1227 + symbolIdIsPrimaryKey: true
1228 );
1229
1230 public static readonly TableDefinition Shortcut = new TableDefinition(
1231 "Shortcut",
1232 - TupleDefinitions.Shortcut,
1232 + SymbolDefinitions.Shortcut,
1233 new[]
1234 {
1235 new ColumnDefinition("Shortcut", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -1249,12 +1249,12 @@ namespace WixToolset.Data.WindowsInstaller
1249 new ColumnDefinition("DescriptionResourceDLL", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The Formatted string providing the full path to the language neutral file containing the MUI Manifest.", modularizeType: ColumnModularizeType.Property),
1250 new ColumnDefinition("DescriptionResourceId", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 32767, description: "The description name index for the shortcut. This must be a non-negative number."),
1251 },
1252 - tupleIdIsPrimaryKey: true
1252 + symbolIdIsPrimaryKey: true
1253 );
1254
1255 public static readonly TableDefinition MsiShortcutProperty = new TableDefinition(
1256 "MsiShortcutProperty",
1257 - TupleDefinitions.MsiShortcutProperty,
1257 + SymbolDefinitions.MsiShortcutProperty,
1258 new[]
1259 {
1260 new ColumnDefinition("MsiShortcutProperty", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -1262,12 +1262,12 @@ namespace WixToolset.Data.WindowsInstaller
1262 new ColumnDefinition("PropertyKey", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Canonical string representation of the Property Key being set", modularizeType: ColumnModularizeType.Property),
1263 new ColumnDefinition("PropVariantValue", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "String representation of the value in the property", modularizeType: ColumnModularizeType.Property),
1264 },
1265 - tupleIdIsPrimaryKey: true
1265 + symbolIdIsPrimaryKey: true
1266 );
1267
1268 public static readonly TableDefinition Signature = new TableDefinition(
1269 "Signature",
1270 - TupleDefinitions.Signature,
1270 + SymbolDefinitions.Signature,
1271 new[]
1272 {
1273 new ColumnDefinition("Signature", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The table key. The Signature represents a unique file signature.", modularizeType: ColumnModularizeType.Column),
@@ -1280,12 +1280,12 @@ namespace WixToolset.Data.WindowsInstaller
1280 new ColumnDefinition("MaxDate", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "The maximum creation date of the file."),
1281 new ColumnDefinition("Languages", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Language, description: "The languages supported by the file."),
1282 },
1283 - tupleIdIsPrimaryKey: true
1283 + symbolIdIsPrimaryKey: true
1284 );
1285
1286 public static readonly TableDefinition TextStyle = new TableDefinition(
1287 "TextStyle",
1288 - TupleDefinitions.TextStyle,
1288 + SymbolDefinitions.TextStyle,
1289 new[]
1290 {
1291 new ColumnDefinition("TextStyle", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Name of the style. The primary key of this table. This name is embedded in the texts to indicate a style change."),
@@ -1294,12 +1294,12 @@ namespace WixToolset.Data.WindowsInstaller
1294 new ColumnDefinition("Color", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 16777215, description: "A long integer indicating the color of the string in the RGB format (Red, Green, Blue each 0-255, RGB = R + 256*G + 256^2*B)."),
1295 new ColumnDefinition("StyleBits", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 15, description: "A combination of style bits."),
1296 },
1297 - tupleIdIsPrimaryKey: true
1297 + symbolIdIsPrimaryKey: true
1298 );
1299
1300 public static readonly TableDefinition TypeLib = new TableDefinition(
1301 "TypeLib",
1302 - TupleDefinitions.TypeLib,
1302 + SymbolDefinitions.TypeLib,
1303 new[]
1304 {
1305 new ColumnDefinition("LibID", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Guid, description: "The GUID that represents the library."),
@@ -1311,23 +1311,23 @@ namespace WixToolset.Data.WindowsInstaller
1311 new ColumnDefinition("Feature_", ColumnType.String, 38, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Feature", keyColumn: 1, description: "Required foreign key into the Feature Table, specifying the feature to validate or install in order for the type library to be operational."),
1312 new ColumnDefinition("Cost", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "The cost associated with the registration of the typelib. This column is currently optional."),
1313 },
1314 - tupleIdIsPrimaryKey: false
1314 + symbolIdIsPrimaryKey: false
1315 );
1316
1317 public static readonly TableDefinition UIText = new TableDefinition(
1318 "UIText",
1319 - TupleDefinitions.UIText,
1319 + SymbolDefinitions.UIText,
1320 new[]
1321 {
1322 new ColumnDefinition("Key", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "A unique key that identifies the particular string."),
1323 new ColumnDefinition("Text", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "The localized version of the string."),
1324 },
1325 - tupleIdIsPrimaryKey: true
1325 + symbolIdIsPrimaryKey: true
1326 );
1327
1328 public static readonly TableDefinition Upgrade = new TableDefinition(
1329 "Upgrade",
1330 - TupleDefinitions.Upgrade,
1330 + SymbolDefinitions.Upgrade,
1331 new[]
1332 {
1333 new ColumnDefinition("UpgradeCode", ColumnType.String, 38, primaryKey: true, nullable: false, ColumnCategory.Guid, description: "The UpgradeCode GUID belonging to the products in this set."),
@@ -1339,12 +1339,12 @@ namespace WixToolset.Data.WindowsInstaller
1339 new ColumnDefinition("ActionProperty", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.UpperCase, description: "The property to set when a product in this set is found."),
1340 },
1341 strongRowType: typeof(UpgradeRow),
1342 - tupleIdIsPrimaryKey: false
1342 + symbolIdIsPrimaryKey: false
1343 );
1344
1345 public static readonly TableDefinition Verb = new TableDefinition(
1346 "Verb",
1347 - TupleDefinitions.Verb,
1347 + SymbolDefinitions.Verb,
1348 new[]
1349 {
1350 new ColumnDefinition("Extension_", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "Extension", keyColumn: 1, description: "The extension associated with the table row."),
@@ -1353,7 +1353,7 @@ namespace WixToolset.Data.WindowsInstaller
1353 new ColumnDefinition("Command", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "The command text.", modularizeType: ColumnModularizeType.Property),
1354 new ColumnDefinition("Argument", ColumnType.Localized, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Optional value for the command arguments.", modularizeType: ColumnModularizeType.Property),
1355 },
1356 - tupleIdIsPrimaryKey: false
1356 + symbolIdIsPrimaryKey: false
1357 );
1358
1359 public static readonly TableDefinition ModuleAdminExecuteSequence = new TableDefinition(
@@ -1367,7 +1367,7 @@ namespace WixToolset.Data.WindowsInstaller
1367 new ColumnDefinition("After", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Before (0) or After (1)"),
1368 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, modularizeType: ColumnModularizeType.Condition, forceLocalizable: true),
1369 },
1370 - tupleIdIsPrimaryKey: true
1370 + symbolIdIsPrimaryKey: true
1371 );
1372
1373 public static readonly TableDefinition ModuleAdminUISequence = new TableDefinition(
@@ -1381,7 +1381,7 @@ namespace WixToolset.Data.WindowsInstaller
1381 new ColumnDefinition("After", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Before (0) or After (1)"),
1382 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, modularizeType: ColumnModularizeType.Condition, forceLocalizable: true),
1383 },
1384 - tupleIdIsPrimaryKey: true
1384 + symbolIdIsPrimaryKey: true
1385 );
1386
1387 public static readonly TableDefinition ModuleAdvtExecuteSequence = new TableDefinition(
@@ -1395,7 +1395,7 @@ namespace WixToolset.Data.WindowsInstaller
1395 new ColumnDefinition("After", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Before (0) or After (1)"),
1396 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, modularizeType: ColumnModularizeType.Condition, forceLocalizable: true),
1397 },
1398 - tupleIdIsPrimaryKey: true
1398 + symbolIdIsPrimaryKey: true
1399 );
1400
1401 public static readonly TableDefinition ModuleAdvtUISequence = new TableDefinition(
@@ -1409,36 +1409,36 @@ namespace WixToolset.Data.WindowsInstaller
1409 new ColumnDefinition("After", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Before (0) or After (1)"),
1410 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, modularizeType: ColumnModularizeType.Condition, forceLocalizable: true),
1411 },
1412 - tupleIdIsPrimaryKey: true
1412 + symbolIdIsPrimaryKey: true
1413 );
1414
1415 public static readonly TableDefinition ModuleComponents = new TableDefinition(
1416 "ModuleComponents",
1417 - TupleDefinitions.ModuleComponents,
1417 + SymbolDefinitions.ModuleComponents,
1418 new[]
1419 {
1420 new ColumnDefinition("Component", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component contained in the module.", modularizeType: ColumnModularizeType.Column),
1421 new ColumnDefinition("ModuleID", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ModuleSignature", keyColumn: 1, description: "Module containing the component.", modularizeType: ColumnModularizeType.Column),
1422 new ColumnDefinition("Language", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, keyTable: "ModuleSignature", keyColumn: 2, description: "Default language ID for module (may be changed by transform).", forceLocalizable: true),
1423 },
1424 - tupleIdIsPrimaryKey: false
1424 + symbolIdIsPrimaryKey: false
1425 );
1426
1427 public static readonly TableDefinition ModuleSignature = new TableDefinition(
1428 "ModuleSignature",
1429 - TupleDefinitions.ModuleSignature,
1429 + SymbolDefinitions.ModuleSignature,
1430 new[]
1431 {
1432 new ColumnDefinition("ModuleID", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Module identifier (String.GUID).", modularizeType: ColumnModularizeType.Column),
1433 new ColumnDefinition("Language", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, description: "Default decimal language of module.", forceLocalizable: true),
1434 new ColumnDefinition("Version", ColumnType.String, 32, primaryKey: false, nullable: false, ColumnCategory.Version, description: "Version of the module."),
1435 },
1436 - tupleIdIsPrimaryKey: false
1436 + symbolIdIsPrimaryKey: false
1437 );
1438
1439 public static readonly TableDefinition ModuleConfiguration = new TableDefinition(
1440 "ModuleConfiguration",
1441 - TupleDefinitions.ModuleConfiguration,
1441 + SymbolDefinitions.ModuleConfiguration,
1442 new[]
1443 {
1444 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Unique identifier for this row."),
@@ -1452,12 +1452,12 @@ namespace WixToolset.Data.WindowsInstaller
1452 new ColumnDefinition("HelpLocation", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Filename or namespace of the context-sensitive help for this item."),
1453 new ColumnDefinition("HelpKeyword", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Keyword index into the HelpLocation for this item."),
1454 },
1455 - tupleIdIsPrimaryKey: true
1455 + symbolIdIsPrimaryKey: true
1456 );
1457
1458 public static readonly TableDefinition ModuleDependency = new TableDefinition(
1459 "ModuleDependency",
1460 - TupleDefinitions.ModuleDependency,
1460 + SymbolDefinitions.ModuleDependency,
1461 new[]
1462 {
1463 new ColumnDefinition("ModuleID", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ModuleSignature", keyColumn: 1, description: "Module requiring the dependency.", modularizeType: ColumnModularizeType.Column),
@@ -1466,12 +1466,12 @@ namespace WixToolset.Data.WindowsInstaller
1466 new ColumnDefinition("RequiredLanguage", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, description: "LanguageID of the required module.", forceLocalizable: true),
1467 new ColumnDefinition("RequiredVersion", ColumnType.String, 32, primaryKey: false, nullable: true, ColumnCategory.Version, description: "Version of the required version."),
1468 },
1469 - tupleIdIsPrimaryKey: false
1469 + symbolIdIsPrimaryKey: false
1470 );
1471
1472 public static readonly TableDefinition ModuleExclusion = new TableDefinition(
1473 "ModuleExclusion",
1474 - TupleDefinitions.ModuleExclusion,
1474 + SymbolDefinitions.ModuleExclusion,
1475 new[]
1476 {
1477 new ColumnDefinition("ModuleID", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ModuleSignature", keyColumn: 1, description: "String.GUID of module with exclusion requirement.", modularizeType: ColumnModularizeType.Column),
@@ -1481,17 +1481,17 @@ namespace WixToolset.Data.WindowsInstaller
1481 new ColumnDefinition("ExcludedMinVersion", ColumnType.String, 32, primaryKey: false, nullable: true, ColumnCategory.Version, description: "Minimum version of excluded module."),
1482 new ColumnDefinition("ExcludedMaxVersion", ColumnType.String, 32, primaryKey: false, nullable: true, ColumnCategory.Version, description: "Maximum version of excluded module."),
1483 },
1484 - tupleIdIsPrimaryKey: false
1484 + symbolIdIsPrimaryKey: false
1485 );
1486
1487 public static readonly TableDefinition ModuleIgnoreTable = new TableDefinition(
1488 "ModuleIgnoreTable",
1489 - TupleDefinitions.ModuleIgnoreTable,
1489 + SymbolDefinitions.ModuleIgnoreTable,
1490 new[]
1491 {
1492 new ColumnDefinition("Table", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Table name to ignore during merge operation."),
1493 },
1494 - tupleIdIsPrimaryKey: true
1494 + symbolIdIsPrimaryKey: true
1495 );
1496
1497 public static readonly TableDefinition ModuleInstallExecuteSequence = new TableDefinition(
@@ -1505,7 +1505,7 @@ namespace WixToolset.Data.WindowsInstaller
1505 new ColumnDefinition("After", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Before (0) or After (1)"),
1506 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, modularizeType: ColumnModularizeType.Condition, forceLocalizable: true),
1507 },
1508 - tupleIdIsPrimaryKey: true
1508 + symbolIdIsPrimaryKey: true
1509 );
1510
1511 public static readonly TableDefinition ModuleInstallUISequence = new TableDefinition(
@@ -1519,12 +1519,12 @@ namespace WixToolset.Data.WindowsInstaller
1519 new ColumnDefinition("After", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 1, description: "Before (0) or After (1)"),
1520 new ColumnDefinition("Condition", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Condition, modularizeType: ColumnModularizeType.Condition, forceLocalizable: true),
1521 },
1522 - tupleIdIsPrimaryKey: true
1522 + symbolIdIsPrimaryKey: true
1523 );
1524
1525 public static readonly TableDefinition ModuleSubstitution = new TableDefinition(
1526 "ModuleSubstitution",
1527 - TupleDefinitions.ModuleSubstitution,
1527 + SymbolDefinitions.ModuleSubstitution,
1528 new[]
1529 {
1530 new ColumnDefinition("Table", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Table containing the data to be modified."),
@@ -1532,23 +1532,23 @@ namespace WixToolset.Data.WindowsInstaller
1532 new ColumnDefinition("Column", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Column containing the data to be modified."),
1533 new ColumnDefinition("Value", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Template for modification data."),
1534 },
1535 - tupleIdIsPrimaryKey: false
1535 + symbolIdIsPrimaryKey: false
1536 );
1537
1538 public static readonly TableDefinition Properties = new TableDefinition(
1539 "Properties",
1540 - TupleDefinitions.Properties,
1540 + SymbolDefinitions.Properties,
1541 new[]
1542 {
1543 new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Primary key, non-localized token"),
1544 new ColumnDefinition("Value", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Value of the property"),
1545 },
1546 - tupleIdIsPrimaryKey: false
1546 + symbolIdIsPrimaryKey: false
1547 );
1548
1549 public static readonly TableDefinition ImageFamilies = new TableDefinition(
1550 "ImageFamilies",
1551 - TupleDefinitions.ImageFamilies,
1551 + SymbolDefinitions.ImageFamilies,
1552 new[]
1553 {
1554 new ColumnDefinition("Family", ColumnType.String, 8, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Primary key"),
@@ -1558,12 +1558,12 @@ namespace WixToolset.Data.WindowsInstaller
1558 new ColumnDefinition("DiskPrompt", ColumnType.String, 128, primaryKey: false, nullable: true, ColumnCategory.Text, forceLocalizable: true),
1559 new ColumnDefinition("VolumeLabel", ColumnType.String, 32, primaryKey: false, nullable: true, ColumnCategory.Text),
1560 },
1561 - tupleIdIsPrimaryKey: false
1561 + symbolIdIsPrimaryKey: false
1562 );
1563
1564 public static readonly TableDefinition UpgradedImages = new TableDefinition(
1565 "UpgradedImages",
1566 - TupleDefinitions.UpgradedImages,
1566 + SymbolDefinitions.UpgradedImages,
1567 new[]
1568 {
1569 new ColumnDefinition("Upgraded", ColumnType.String, 13, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Primary key"),
@@ -1572,23 +1572,23 @@ namespace WixToolset.Data.WindowsInstaller
1572 new ColumnDefinition("SymbolPaths", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text),
1573 new ColumnDefinition("Family", ColumnType.String, 8, primaryKey: false, nullable: false, ColumnCategory.Text, keyTable: "ImageFamilies", keyColumn: 1, description: "Foreign key, Family to which this image belongs"),
1574 },
1575 - tupleIdIsPrimaryKey: false
1575 + symbolIdIsPrimaryKey: false
1576 );
1577
1578 public static readonly TableDefinition UpgradedFilesToIgnore = new TableDefinition(
1579 "UpgradedFilesToIgnore",
1580 - TupleDefinitions.UpgradedFilesToIgnore,
1580 + SymbolDefinitions.UpgradedFilesToIgnore,
1581 new[]
1582 {
1583 new ColumnDefinition("Upgraded", ColumnType.String, 13, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "UpgradedImages", keyColumn: 1, description: "Foreign key, Upgraded image"),
1584 new ColumnDefinition("FTK", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "File", keyColumn: 1, description: "Foreign key, File to ignore", modularizeType: ColumnModularizeType.Column),
1585 },
1586 - tupleIdIsPrimaryKey: false
1586 + symbolIdIsPrimaryKey: false
1587 );
1588
1589 public static readonly TableDefinition UpgradedFilesOptionalData = new TableDefinition(
1590 "UpgradedFiles_OptionalData",
1591 - TupleDefinitions.UpgradedFilesOptionalData,
1591 + SymbolDefinitions.UpgradedFilesOptionalData,
1592 new[]
1593 {
1594 new ColumnDefinition("Upgraded", ColumnType.String, 13, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "UpgradedImages", keyColumn: 1, description: "Foreign key, Upgraded image"),
@@ -1597,12 +1597,12 @@ namespace WixToolset.Data.WindowsInstaller
1597 new ColumnDefinition("AllowIgnoreOnPatchError", ColumnType.Number, 0, primaryKey: false, nullable: true, ColumnCategory.Integer),
1598 new ColumnDefinition("IncludeWholeFile", ColumnType.Number, 0, primaryKey: false, nullable: true, ColumnCategory.Integer),
1599 },
1600 - tupleIdIsPrimaryKey: false
1600 + symbolIdIsPrimaryKey: false
1601 );
1602
1603 public static readonly TableDefinition TargetImages = new TableDefinition(
1604 "TargetImages",
1605 - TupleDefinitions.TargetImages,
1605 + SymbolDefinitions.TargetImages,
1606 new[]
1607 {
1608 new ColumnDefinition("Target", ColumnType.String, 13, primaryKey: true, nullable: false, ColumnCategory.Text),
@@ -1613,12 +1613,12 @@ namespace WixToolset.Data.WindowsInstaller
1613 new ColumnDefinition("ProductValidateFlags", ColumnType.String, 16, primaryKey: false, nullable: true, ColumnCategory.Text),
1614 new ColumnDefinition("IgnoreMissingSrcFiles", ColumnType.Number, 0, primaryKey: false, nullable: false, ColumnCategory.Integer),
1615 },
1616 - tupleIdIsPrimaryKey: false
1616 + symbolIdIsPrimaryKey: false
1617 );
1618
1619 public static readonly TableDefinition TargetFilesOptionalData = new TableDefinition(
1620 "TargetFiles_OptionalData",
1621 - TupleDefinitions.TargetFilesOptionalData,
1621 + SymbolDefinitions.TargetFilesOptionalData,
1622 new[]
1623 {
1624 new ColumnDefinition("Target", ColumnType.String, 13, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "TargetImages", keyColumn: 1, description: "Foreign key, Target image"),
@@ -1628,12 +1628,12 @@ namespace WixToolset.Data.WindowsInstaller
1628 new ColumnDefinition("IgnoreLengths", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text),
1629 new ColumnDefinition("RetainOffsets", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text),
1630 },
1631 - tupleIdIsPrimaryKey: false
1631 + symbolIdIsPrimaryKey: false
1632 );
1633
1634 public static readonly TableDefinition FamilyFileRanges = new TableDefinition(
1635 "FamilyFileRanges",
1636 - TupleDefinitions.FamilyFileRanges,
1636 + SymbolDefinitions.FamilyFileRanges,
1637 new[]
1638 {
1639 new ColumnDefinition("Family", ColumnType.String, 8, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "ImageFamilies", keyColumn: 1, description: "Foreign key, Family"),
@@ -1641,12 +1641,12 @@ namespace WixToolset.Data.WindowsInstaller
1641 new ColumnDefinition("RetainOffsets", ColumnType.String, 128, primaryKey: false, nullable: false, ColumnCategory.Text),
1642 new ColumnDefinition("RetainLengths", ColumnType.String, 128, primaryKey: false, nullable: false, ColumnCategory.Text),
1643 },
1644 - tupleIdIsPrimaryKey: false
1644 + symbolIdIsPrimaryKey: false
1645 );
1646
1647 public static readonly TableDefinition ExternalFiles = new TableDefinition(
1648 "ExternalFiles",
1649 - TupleDefinitions.ExternalFiles,
1649 + SymbolDefinitions.ExternalFiles,
1650 new[]
1651 {
1652 new ColumnDefinition("Family", ColumnType.String, 8, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "ImageFamilies", keyColumn: 1, description: "Foreign key, Family"),
@@ -1658,7 +1658,7 @@ namespace WixToolset.Data.WindowsInstaller
1658 new ColumnDefinition("RetainOffsets", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text),
1659 new ColumnDefinition("Order", ColumnType.Number, 0, primaryKey: false, nullable: false, ColumnCategory.Integer),
1660 },
1661 - tupleIdIsPrimaryKey: false
1661 + symbolIdIsPrimaryKey: false
1662 );
1663
1664 public static readonly TableDefinition Streams = new TableDefinition(
@@ -1670,18 +1670,18 @@ namespace WixToolset.Data.WindowsInstaller
1670 new ColumnDefinition("Data", ColumnType.Object, 0, primaryKey: false, nullable: true, ColumnCategory.Unknown),
1671 },
1672 unreal: true,
1673 - tupleIdIsPrimaryKey: false
1673 + symbolIdIsPrimaryKey: false
1674 );
1675
1676 public static readonly TableDefinition SummaryInformation = new TableDefinition(
1677 "_SummaryInformation",
1678 - TupleDefinitions.SummaryInformation,
1678 + SymbolDefinitions.SummaryInformation,
1679 new[]
1680 {
1681 new ColumnDefinition("PropertyId", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown),
1682 new ColumnDefinition("Value", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.Unknown),
1683 },
1684 - tupleIdIsPrimaryKey: false
1684 + symbolIdIsPrimaryKey: false
1685 );
1686
1687 public static readonly TableDefinition TransformView = new TableDefinition(
@@ -1696,7 +1696,7 @@ namespace WixToolset.Data.WindowsInstaller
1696 new ColumnDefinition("Current", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Unknown),
1697 },
1698 unreal: true,
1699 - tupleIdIsPrimaryKey: false
1699 + symbolIdIsPrimaryKey: false
1700 );
1701
1702 public static readonly TableDefinition Validation = new TableDefinition(
@@ -1715,7 +1715,7 @@ namespace WixToolset.Data.WindowsInstaller
1715 new ColumnDefinition("Set", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Set of values that are permitted"),
1716 new ColumnDefinition("Description", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Description of column"),
1717 },
1718 - tupleIdIsPrimaryKey: false
1718 + symbolIdIsPrimaryKey: false
1719 );
1720
1721 public static readonly TableDefinition[] All = new[]
src/test/WixToolsetTest.Data/SerializeFixture.cs
+85 -85
@@ -7,7 +7,7 @@ namespace WixToolsetTest.Data
7 using System.Linq;
8 using WixToolset.Data;
9 using WixToolset.Data.Bind;
10 - using WixToolset.Data.Tuples;
10 + using WixToolset.Data.Symbols;
11 using WixToolset.Data.WindowsInstaller.Rows;
12 using Xunit;
13
@@ -22,7 +22,7 @@ namespace WixToolsetTest.Data
22
23 var section = new IntermediateSection("test", SectionType.Product, 65001);
24
25 - section.Tuples.Add(new ComponentTuple(sln, new Identifier(AccessModifier.Public, "TestComponent"))
25 + section.Symbols.Add(new ComponentSymbol(sln, new Identifier(AccessModifier.Public, "TestComponent"))
26 {
27 ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"),
28 DirectoryRef = "TestFolder",
@@ -45,12 +45,12 @@ namespace WixToolsetTest.Data
45 Assert.True(loaded.HasLevel(IntermediateLevels.Linked));
46 Assert.True(loaded.HasLevel(IntermediateLevels.Resolved));
47
48 - var tuple = (ComponentTuple)loaded.Sections.Single().Tuples.Single();
48 + var symbol = (ComponentSymbol)loaded.Sections.Single().Symbols.Single();
49
50 - Assert.Equal("TestComponent", tuple.Id.Id);
51 - Assert.Equal(AccessModifier.Public, tuple.Id.Access);
52 - Assert.Equal("TestFolder", tuple.DirectoryRef);
53 - Assert.Equal(ComponentLocation.Either, tuple.Location);
50 + Assert.Equal("TestComponent", symbol.Id.Id);
51 + Assert.Equal(AccessModifier.Public, symbol.Id.Access);
52 + Assert.Equal("TestFolder", symbol.DirectoryRef);
53 + Assert.Equal(ComponentLocation.Either, symbol.Location);
54 }
55 finally
56 {
@@ -64,7 +64,7 @@ namespace WixToolsetTest.Data
64 var sln = new SourceLineNumber("test.wxs", 1);
65 var section = new IntermediateSection("test", SectionType.Product, 65001);
66
67 - section.Tuples.Add(new ComponentTuple(sln, new Identifier(AccessModifier.Public, "TestComponent"))
67 + section.Symbols.Add(new ComponentSymbol(sln, new Identifier(AccessModifier.Public, "TestComponent"))
68 {
69 ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"),
70 DirectoryRef = "TestFolder",
@@ -84,14 +84,14 @@ namespace WixToolsetTest.Data
84 using (var wixout = WixOutput.Read(uri, stream))
85 {
86 var loaded = Intermediate.Load(wixout);
87 - var tuple = (ComponentTuple)loaded.Sections.Single().Tuples.Single();
87 + var symbol = (ComponentSymbol)loaded.Sections.Single().Symbols.Single();
88
89 - Assert.Equal("TestComponent", tuple.Id.Id);
90 - Assert.Equal(AccessModifier.Public, tuple.Id.Access);
89 + Assert.Equal("TestComponent", symbol.Id.Id);
90 + Assert.Equal(AccessModifier.Public, symbol.Id.Access);
91
92 wixout.Reopen(writable: true);
93
94 - section.Tuples.Add(new ComponentTuple(sln, new Identifier(AccessModifier.Public, "NewComponent"))
94 + section.Symbols.Add(new ComponentSymbol(sln, new Identifier(AccessModifier.Public, "NewComponent"))
95 {
96 ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"),
97 });
@@ -99,13 +99,13 @@ namespace WixToolsetTest.Data
99 intermediate.Save(wixout);
100 loaded = Intermediate.Load(wixout);
101
102 - var newTuple = loaded.Sections.Single().Tuples.Where(t => t.Id.Id == "NewComponent");
103 - Assert.Single(newTuple);
102 + var newSymbol = loaded.Sections.Single().Symbols.Where(t => t.Id.Id == "NewComponent");
103 + Assert.Single(newSymbol);
104 }
105
106 var loadedAfterDispose = Intermediate.Load(path);
107 - var newTupleStillThere = loadedAfterDispose.Sections.Single().Tuples.Where(t => t.Id.Id == "NewComponent");
108 - Assert.Single(newTupleStillThere);
107 + var newSymbolStillThere = loadedAfterDispose.Sections.Single().Symbols.Where(t => t.Id.Id == "NewComponent");
108 + Assert.Single(newSymbolStillThere);
109
110 }
111 finally
@@ -128,14 +128,14 @@ namespace WixToolsetTest.Data
128 new IntermediateFieldDefinition("C", IntermediateFieldType.Bool),
129 };
130
131 - var tupleDef = new IntermediateTupleDefinition("CustomDef2", fieldDefs, null);
131 + var symbolDef = new IntermediateSymbolDefinition("CustomDef2", fieldDefs, null);
132
133 - var tuple = tupleDef.CreateTuple(sln, new Identifier(AccessModifier.Public, "customT"));
134 - tuple.Set(0, "foo");
135 - tuple.Set(1, 2);
136 - tuple.Set(2, true);
133 + var symbol = symbolDef.CreateSymbol(sln, new Identifier(AccessModifier.Public, "customT"));
134 + symbol.Set(0, "foo");
135 + symbol.Set(1, 2);
136 + symbol.Set(2, true);
137
138 - section.Tuples.Add(tuple);
138 + section.Symbols.Add(symbol);
139
140 var intermediate = new Intermediate("TestIntermediate", new[] { section }, null);
141
@@ -146,11 +146,11 @@ namespace WixToolsetTest.Data
146
147 var loaded = Intermediate.Load(path);
148 var loadedSection = loaded.Sections.Single();
149 - var loadedTuple = loadedSection.Tuples.Single();
149 + var loadedSymbol = loadedSection.Symbols.Single();
150
151 - Assert.Equal("foo", loadedTuple.AsString(0));
152 - Assert.Equal(2, loadedTuple[1].AsNumber());
153 - Assert.True(loadedTuple[2].AsBool());
151 + Assert.Equal("foo", loadedSymbol.AsString(0));
152 + Assert.Equal(2, loadedSymbol[1].AsNumber());
153 + Assert.True(loadedSymbol[2].AsBool());
154 }
155 finally
156 {
@@ -171,15 +171,15 @@ namespace WixToolsetTest.Data
171 new IntermediateFieldDefinition("C", IntermediateFieldType.Bool),
172 };
173
174 - var tupleDef = new IntermediateTupleDefinition("CustomDef", fieldDefs, null);
174 + var symbolDef = new IntermediateSymbolDefinition("CustomDef", fieldDefs, null);
175
176 - var tuple = tupleDef.CreateTuple(sln, new Identifier(AccessModifier.Public, "customT"));
177 - tuple.Set(0, "foo");
178 - tuple.Set(1, 2);
179 - tuple.Set(2, true);
176 + var symbol = symbolDef.CreateSymbol(sln, new Identifier(AccessModifier.Public, "customT"));
177 + symbol.Set(0, "foo");
178 + symbol.Set(1, 2);
179 + symbol.Set(2, true);
180
181 var section = new IntermediateSection("test", SectionType.Product, 65001);
182 - section.Tuples.Add(tuple);
182 + section.Symbols.Add(symbol);
183
184 var intermediate1 = new Intermediate("TestIntermediate", new[] { section }, null);
185
@@ -192,16 +192,16 @@ namespace WixToolsetTest.Data
192 new IntermediateFieldDefinition("D", IntermediateFieldType.String),
193 };
194
195 - var tupleDef2 = new IntermediateTupleDefinition("CustomDef2", 1, fieldDefs2, null);
195 + var symbolDef2 = new IntermediateSymbolDefinition("CustomDef2", 1, fieldDefs2, null);
196
197 - var tuple2 = tupleDef2.CreateTuple(sln, new Identifier(AccessModifier.Public, "customT2"));
198 - tuple2.Set(0, "bar");
199 - tuple2.Set(1, 3);
200 - tuple2.Set(2, false);
201 - tuple2.Set(3, "baz");
197 + var symbol2 = symbolDef2.CreateSymbol(sln, new Identifier(AccessModifier.Public, "customT2"));
198 + symbol2.Set(0, "bar");
199 + symbol2.Set(1, 3);
200 + symbol2.Set(2, false);
201 + symbol2.Set(3, "baz");
202
203 var section2 = new IntermediateSection("test2", SectionType.Fragment, 65001);
204 - section2.Tuples.Add(tuple2);
204 + section2.Symbols.Add(symbol2);
205
206 var intermediate2 = new Intermediate("TestIntermediate2", new[] { section2 }, null);
207
@@ -218,17 +218,17 @@ namespace WixToolsetTest.Data
218 var loaded1 = loaded.First();
219 var loaded2 = loaded.Skip(1).Single();
220
221 - var loadedTuple1 = loaded1.Sections.Single().Tuples.Single();
222 - var loadedTuple2 = loaded2.Sections.Single().Tuples.Single();
221 + var loadedSymbol1 = loaded1.Sections.Single().Symbols.Single();
222 + var loadedSymbol2 = loaded2.Sections.Single().Symbols.Single();
223
224 - Assert.Equal("foo", loadedTuple1.AsString(0));
225 - Assert.Equal(2, loadedTuple1[1].AsNumber());
226 - Assert.True(loadedTuple1[2].AsBool());
224 + Assert.Equal("foo", loadedSymbol1.AsString(0));
225 + Assert.Equal(2, loadedSymbol1[1].AsNumber());
226 + Assert.True(loadedSymbol1[2].AsBool());
227
228 - Assert.Equal("bar", loadedTuple2.AsString(0));
229 - Assert.Equal(3, loadedTuple2[1].AsNumber());
230 - Assert.False(loadedTuple2[2].AsBool());
231 - Assert.Equal("baz", loadedTuple2.AsString(3));
228 + Assert.Equal("bar", loadedSymbol2.AsString(0));
229 + Assert.Equal(3, loadedSymbol2[1].AsNumber());
230 + Assert.False(loadedSymbol2[2].AsBool());
231 + Assert.Equal("baz", loadedSymbol2.AsString(3));
232 }
233 finally
234 {
@@ -250,19 +250,19 @@ namespace WixToolsetTest.Data
250 new IntermediateFieldDefinition("C", IntermediateFieldType.Bool),
251 };
252
253 - var tupleDef = new IntermediateTupleDefinition("CustomDef", fieldDefs, null);
253 + var symbolDef = new IntermediateSymbolDefinition("CustomDef", fieldDefs, null);
254
255 - tupleDef.AddTag("customDef");
255 + symbolDef.AddTag("customDef");
256
257 - var tuple = tupleDef.CreateTuple(sln, new Identifier(AccessModifier.Public, "customT"));
258 - tuple.Set(0, "foo");
259 - tuple.Set(1, 2);
260 - tuple.Set(2, true);
257 + var symbol = symbolDef.CreateSymbol(sln, new Identifier(AccessModifier.Public, "customT"));
258 + symbol.Set(0, "foo");
259 + symbol.Set(1, 2);
260 + symbol.Set(2, true);
261
262 - tuple.AddTag("tuple1tag");
262 + symbol.AddTag("symbol1tag");
263
264 var section = new IntermediateSection("test", SectionType.Product, 65001);
265 - section.Tuples.Add(tuple);
265 + section.Symbols.Add(symbol);
266
267 var intermediate1 = new Intermediate("TestIntermediate", new[] { section }, null);
268
@@ -275,22 +275,22 @@ namespace WixToolsetTest.Data
275 new IntermediateFieldDefinition("D", IntermediateFieldType.String),
276 };
277
278 - var tupleDef2 = new IntermediateTupleDefinition("CustomDef2", 1, fieldDefs2, null);
278 + var symbolDef2 = new IntermediateSymbolDefinition("CustomDef2", 1, fieldDefs2, null);
279
280 - tupleDef2.AddTag("customDef2");
281 - tupleDef2.AddTag("customDef2 tag2");
280 + symbolDef2.AddTag("customDef2");
281 + symbolDef2.AddTag("customDef2 tag2");
282
283 - var tuple2 = tupleDef2.CreateTuple(sln, new Identifier(AccessModifier.Public, "customT2"));
284 - tuple2.Set(0, "bar");
285 - tuple2.Set(1, 3);
286 - tuple2.Set(2, false);
287 - tuple2.Set(3, "baz");
283 + var symbol2 = symbolDef2.CreateSymbol(sln, new Identifier(AccessModifier.Public, "customT2"));
284 + symbol2.Set(0, "bar");
285 + symbol2.Set(1, 3);
286 + symbol2.Set(2, false);
287 + symbol2.Set(3, "baz");
288
289 - tuple2.AddTag("tuple2tag1");
290 - tuple2.AddTag("tuple2tag2");
289 + symbol2.AddTag("symbol2tag1");
290 + symbol2.AddTag("symbol2tag2");
291
292 var section2 = new IntermediateSection("test2", SectionType.Fragment, 65001);
293 - section2.Tuples.Add(tuple2);
293 + section2.Symbols.Add(symbol2);
294
295 var intermediate2 = new Intermediate("TestIntermediate2", new[] { section2 }, null);
296
@@ -307,23 +307,23 @@ namespace WixToolsetTest.Data
307 var loaded1 = loaded.First();
308 var loaded2 = loaded.Skip(1).Single();
309
310 - var loadedTuple1 = loaded1.Sections.Single().Tuples.Single();
311 - var loadedTuple2 = loaded2.Sections.Single().Tuples.Single();
312 -
313 - Assert.True(loadedTuple1.Definition.HasTag("customDef"));
314 - Assert.Equal("foo", loadedTuple1.AsString(0));
315 - Assert.Equal(2, loadedTuple1[1].AsNumber());
316 - Assert.True(loadedTuple1[2].AsBool());
317 - Assert.True(loadedTuple1.HasTag("tuple1tag"));
318 -
319 - Assert.True(loadedTuple2.Definition.HasTag("customDef2"));
320 - Assert.True(loadedTuple2.Definition.HasTag("customDef2 tag2"));
321 - Assert.Equal("bar", loadedTuple2.AsString(0));
322 - Assert.Equal(3, loadedTuple2[1].AsNumber());
323 - Assert.False(loadedTuple2[2].AsBool());
324 - Assert.Equal("baz", loadedTuple2.AsString(3));
325 - Assert.True(loadedTuple2.HasTag("tuple2tag1"));
326 - Assert.True(loadedTuple2.HasTag("tuple2tag2"));
310 + var loadedSymbol1 = loaded1.Sections.Single().Symbols.Single();
311 + var loadedSymbol2 = loaded2.Sections.Single().Symbols.Single();
312 +
313 + Assert.True(loadedSymbol1.Definition.HasTag("customDef"));
314 + Assert.Equal("foo", loadedSymbol1.AsString(0));
315 + Assert.Equal(2, loadedSymbol1[1].AsNumber());
316 + Assert.True(loadedSymbol1[2].AsBool());
317 + Assert.True(loadedSymbol1.HasTag("symbol1tag"));
318 +
319 + Assert.True(loadedSymbol2.Definition.HasTag("customDef2"));
320 + Assert.True(loadedSymbol2.Definition.HasTag("customDef2 tag2"));
321 + Assert.Equal("bar", loadedSymbol2.AsString(0));
322 + Assert.Equal(3, loadedSymbol2[1].AsNumber());
323 + Assert.False(loadedSymbol2[2].AsBool());
324 + Assert.Equal("baz", loadedSymbol2.AsString(3));
325 + Assert.True(loadedSymbol2.HasTag("symbol2tag1"));
326 + Assert.True(loadedSymbol2.HasTag("symbol2tag2"));
327 }
328 finally
329 {
@@ -356,7 +356,7 @@ namespace WixToolsetTest.Data
356
357 var section = new IntermediateSection("test", SectionType.Product, 65001);
358
359 - section.Tuples.Add(new ComponentTuple(sln, new Identifier(AccessModifier.Public, "TestComponent"))
359 + section.Symbols.Add(new ComponentSymbol(sln, new Identifier(AccessModifier.Public, "TestComponent"))
360 {
361 ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"),
362 DirectoryRef = "TestFolder",
src/test/WixToolsetTest.Data/TagFixture.cs
+46 -46
@@ -10,92 +10,92 @@ namespace WixToolsetTest.Data
10 [Fact]
11 public void CanAddSingleTag()
12 {
13 - var tuple = TupleDefinitions.File.CreateTuple();
14 - Assert.True(tuple.AddTag("test"));
15 - Assert.True(tuple.HasTag("test"));
13 + var symbol = SymbolDefinitions.File.CreateSymbol();
14 + Assert.True(symbol.AddTag("test"));
15 + Assert.True(symbol.HasTag("test"));
16 }
17
18 [Fact]
19 public void CanAddDuplicateTag()
20 {
21 - var tuple = TupleDefinitions.File.CreateTuple();
22 - Assert.True(tuple.AddTag("test"));
23 - Assert.False(tuple.AddTag("test"));
21 + var symbol = SymbolDefinitions.File.CreateSymbol();
22 + Assert.True(symbol.AddTag("test"));
23 + Assert.False(symbol.AddTag("test"));
24 }
25
26 [Fact]
27 public void CanAddRemoveSingleTag()
28 {
29 - var tuple = TupleDefinitions.File.CreateTuple();
30 - Assert.True(tuple.AddTag("test"));
31 - Assert.True(tuple.RemoveTag("test"));
32 - Assert.False(tuple.HasTag("test"));
29 + var symbol = SymbolDefinitions.File.CreateSymbol();
30 + Assert.True(symbol.AddTag("test"));
31 + Assert.True(symbol.RemoveTag("test"));
32 + Assert.False(symbol.HasTag("test"));
33 }
34
35 [Fact]
36 public void CanAddMultipleTags()
37 {
38 - var tuple = TupleDefinitions.File.CreateTuple();
39 - Assert.True(tuple.AddTag("test1"));
40 - Assert.True(tuple.AddTag("test2"));
41 - Assert.True(tuple.HasTag("test1"));
42 - Assert.True(tuple.HasTag("test2"));
38 + var symbol = SymbolDefinitions.File.CreateSymbol();
39 + Assert.True(symbol.AddTag("test1"));
40 + Assert.True(symbol.AddTag("test2"));
41 + Assert.True(symbol.HasTag("test1"));
42 + Assert.True(symbol.HasTag("test2"));
43 }
44
45 [Fact]
46 public void CanAddRemoveMultipleTags()
47 {
48 - var tuple = TupleDefinitions.File.CreateTuple();
49 - Assert.True(tuple.AddTag("test1"));
50 - Assert.True(tuple.AddTag("test2"));
51 - Assert.True(tuple.RemoveTag("test2"));
52 - Assert.False(tuple.HasTag("test2"));
53 - Assert.True(tuple.RemoveTag("test1"));
54 - Assert.False(tuple.HasTag("test1"));
48 + var symbol = SymbolDefinitions.File.CreateSymbol();
49 + Assert.True(symbol.AddTag("test1"));
50 + Assert.True(symbol.AddTag("test2"));
51 + Assert.True(symbol.RemoveTag("test2"));
52 + Assert.False(symbol.HasTag("test2"));
53 + Assert.True(symbol.RemoveTag("test1"));
54 + Assert.False(symbol.HasTag("test1"));
55 }
56
57 [Fact]
58 public void CanAddRemoveMissingTags()
59 {
60 - var tuple = TupleDefinitions.File.CreateTuple();
61 - Assert.True(tuple.AddTag("test1"));
62 - Assert.True(tuple.AddTag("test2"));
63 - Assert.False(tuple.RemoveTag("test3"));
60 + var symbol = SymbolDefinitions.File.CreateSymbol();
61 + Assert.True(symbol.AddTag("test1"));
62 + Assert.True(symbol.AddTag("test2"));
63 + Assert.False(symbol.RemoveTag("test3"));
64 }
65
66 [Fact]
67 public void CanAdd2AndRemoveAllTags()
68 {
69 - var tuple = TupleDefinitions.File.CreateTuple();
70 - Assert.True(tuple.AddTag("test1"));
71 - Assert.True(tuple.AddTag("test2"));
72 - Assert.True(tuple.RemoveTag("test1"));
73 - Assert.True(tuple.RemoveTag("test2"));
69 + var symbol = SymbolDefinitions.File.CreateSymbol();
70 + Assert.True(symbol.AddTag("test1"));
71 + Assert.True(symbol.AddTag("test2"));
72 + Assert.True(symbol.RemoveTag("test1"));
73 + Assert.True(symbol.RemoveTag("test2"));
74 }
75
76 [Fact]
77 public void CanAdd3AndRemoveAllTags()
78 {
79 - var tuple = TupleDefinitions.File.CreateTuple();
80 - Assert.True(tuple.AddTag("test1"));
81 - Assert.True(tuple.AddTag("test2"));
82 - Assert.True(tuple.AddTag("test3"));
83 - Assert.True(tuple.RemoveTag("test1"));
84 - Assert.True(tuple.RemoveTag("test3"));
85 - Assert.True(tuple.RemoveTag("test2"));
79 + var symbol = SymbolDefinitions.File.CreateSymbol();
80 + Assert.True(symbol.AddTag("test1"));
81 + Assert.True(symbol.AddTag("test2"));
82 + Assert.True(symbol.AddTag("test3"));
83 + Assert.True(symbol.RemoveTag("test1"));
84 + Assert.True(symbol.RemoveTag("test3"));
85 + Assert.True(symbol.RemoveTag("test2"));
86 }
87
88 [Fact]
89 public void CanAdd3AndRemoveMissingTags()
90 {
91 - var tuple = TupleDefinitions.File.CreateTuple();
92 - Assert.True(tuple.AddTag("test1"));
93 - Assert.True(tuple.AddTag("test2"));
94 - Assert.True(tuple.AddTag("test3"));
95 - Assert.False(tuple.RemoveTag("test4"));
96 - Assert.True(tuple.RemoveTag("test1"));
97 - Assert.True(tuple.RemoveTag("test3"));
98 - Assert.True(tuple.RemoveTag("test2"));
91 + var symbol = SymbolDefinitions.File.CreateSymbol();
92 + Assert.True(symbol.AddTag("test1"));
93 + Assert.True(symbol.AddTag("test2"));
94 + Assert.True(symbol.AddTag("test3"));
95 + Assert.False(symbol.RemoveTag("test4"));
96 + Assert.True(symbol.RemoveTag("test1"));
97 + Assert.True(symbol.RemoveTag("test3"));
98 + Assert.True(symbol.RemoveTag("test2"));
99 }
100 }
101 }
src/test/WixToolsetTest.Data/TupleDefinitionFixture.cs
+46 -46
@@ -3,59 +3,59 @@
3 namespace WixToolsetTest.Data
4 {
5 using WixToolset.Data;
6 - using WixToolset.Data.Tuples;
6 + using WixToolset.Data.Symbols;
7 using Xunit;
8
9 - public class TupleDefinitionFixture
9 + public class SymbolDefinitionFixture
10 {
11 [Fact]
12 - public void CanCreateFileTuple()
12 + public void CanCreateFileSymbol()
13 {
14 - var tuple = TupleDefinitions.File.CreateTuple();
15 - Assert.IsType<FileTuple>(tuple);
16 - Assert.Same(TupleDefinitions.File, tuple.Definition);
14 + var symbol = SymbolDefinitions.File.CreateSymbol();
15 + Assert.IsType<FileSymbol>(symbol);
16 + Assert.Same(SymbolDefinitions.File, symbol.Definition);
17 }
18
19 [Fact]
20 - public void CanCreateFileTupleByName()
20 + public void CanCreateFileSymbolByName()
21 {
22 - var tuple = TupleDefinitions.ByName("File").CreateTuple();
23 - Assert.IsType<FileTuple>(tuple);
24 - Assert.Same(TupleDefinitions.File, tuple.Definition);
22 + var symbol = SymbolDefinitions.ByName("File").CreateSymbol();
23 + Assert.IsType<FileSymbol>(symbol);
24 + Assert.Same(SymbolDefinitions.File, symbol.Definition);
25 }
26
27 //[Fact]
28 - //public void CanCreateFileTupleByType()
28 + //public void CanCreateFileSymbolByType()
29 //{
30 - // var tuple = TupleDefinitions.CreateTuple<FileTuple>();
31 - // Assert.Same(TupleDefinitions.File, tuple.Definition);
30 + // var symbol = SymbolDefinitions.CreateSymbol<FileSymbol>();
31 + // Assert.Same(SymbolDefinitions.File, symbol.Definition);
32 //}
33
34 [Fact]
35 - public void CanSetComponentFieldInFileTupleByCasting()
35 + public void CanSetComponentFieldInFileSymbolByCasting()
36 {
37 - var fileTuple = (FileTuple)TupleDefinitions.File.CreateTuple();
38 - fileTuple.ComponentRef = "Foo";
39 - Assert.Equal("Foo", fileTuple.ComponentRef);
37 + var fileSymbol = (FileSymbol)SymbolDefinitions.File.CreateSymbol();
38 + fileSymbol.ComponentRef = "Foo";
39 + Assert.Equal("Foo", fileSymbol.ComponentRef);
40 }
41
42 [Fact]
43 public void CanCheckNameofField()
44 {
45 - var fileTuple = new FileTuple();
46 - Assert.Equal("ComponentRef", fileTuple.Definition.FieldDefinitions[0].Name);
47 - Assert.Null(fileTuple.Fields[0]);
48 - fileTuple.ComponentRef = "Foo";
49 - Assert.Equal("ComponentRef", fileTuple.Fields[0].Name);
50 - Assert.Same(fileTuple.Definition.FieldDefinitions[0].Name, fileTuple.Fields[0].Name);
45 + var fileSymbol = new FileSymbol();
46 + Assert.Equal("ComponentRef", fileSymbol.Definition.FieldDefinitions[0].Name);
47 + Assert.Null(fileSymbol.Fields[0]);
48 + fileSymbol.ComponentRef = "Foo";
49 + Assert.Equal("ComponentRef", fileSymbol.Fields[0].Name);
50 + Assert.Same(fileSymbol.Definition.FieldDefinitions[0].Name, fileSymbol.Fields[0].Name);
51 }
52
53 [Fact]
54 - public void CanSetComponentFieldInFileTupleByNew()
54 + public void CanSetComponentFieldInFileSymbolByNew()
55 {
56 - var fileTuple = new FileTuple();
57 - fileTuple.ComponentRef = "Foo";
58 - Assert.Equal("Foo", fileTuple.ComponentRef);
56 + var fileSymbol = new FileSymbol();
57 + fileSymbol.ComponentRef = "Foo";
58 + Assert.Equal("Foo", fileSymbol.ComponentRef);
59 }
60
61 [Fact]
@@ -63,10 +63,10 @@ namespace WixToolsetTest.Data
63 {
64 using (new IntermediateFieldContext("bar"))
65 {
66 - var fileTuple = new FileTuple();
67 - fileTuple.ComponentRef = "Foo";
66 + var fileSymbol = new FileSymbol();
67 + fileSymbol.ComponentRef = "Foo";
68
69 - var field = fileTuple[FileTupleFields.ComponentRef];
69 + var field = fileSymbol[FileSymbolFields.ComponentRef];
70 Assert.Equal("Foo", field.AsString());
71 Assert.Equal("bar", field.Context);
72 }
@@ -75,21 +75,21 @@ namespace WixToolsetTest.Data
75 [Fact]
76 public void CanSetInNestedContext()
77 {
78 - var fileTuple = new FileTuple();
78 + var fileSymbol = new FileSymbol();
79
80 using (new IntermediateFieldContext("bar"))
81 {
82 - fileTuple.ComponentRef = "Foo";
82 + fileSymbol.ComponentRef = "Foo";
83
84 - var field = fileTuple[FileTupleFields.ComponentRef];
84 + var field = fileSymbol[FileSymbolFields.ComponentRef];
85 Assert.Equal("Foo", field.AsString());
86 Assert.Equal("bar", field.Context);
87
88 using (new IntermediateFieldContext("baz"))
89 {
90 - fileTuple.ComponentRef = "Foo2";
90 + fileSymbol.ComponentRef = "Foo2";
91
92 - field = fileTuple[FileTupleFields.ComponentRef];
92 + field = fileSymbol[FileSymbolFields.ComponentRef];
93 Assert.Equal("Foo2", field.AsString());
94 Assert.Equal("baz", field.Context);
95
@@ -97,9 +97,9 @@ namespace WixToolsetTest.Data
97 Assert.Equal("bar", field.PreviousValue.Context);
98 }
99
100 - fileTuple.ComponentRef = "Foo3";
100 + fileSymbol.ComponentRef = "Foo3";
101
102 - field = fileTuple[FileTupleFields.ComponentRef];
102 + field = fileSymbol[FileSymbolFields.ComponentRef];
103 Assert.Equal("Foo3", field.AsString());
104 Assert.Equal("bar", field.Context);
105
@@ -110,26 +110,26 @@ namespace WixToolsetTest.Data
110 Assert.Equal("bar", field.PreviousValue.PreviousValue.Context);
111 }
112
113 - fileTuple.ComponentRef = "Foo4";
113 + fileSymbol.ComponentRef = "Foo4";
114
115 - var fieldOutside = fileTuple[FileTupleFields.ComponentRef];
115 + var fieldOutside = fileSymbol[FileSymbolFields.ComponentRef];
116 Assert.Equal("Foo4", fieldOutside.AsString());
117 Assert.Null(fieldOutside.Context);
118 }
119
120 //[Fact]
121 - //public void CanSetComponentFieldInFileTuple()
121 + //public void CanSetComponentFieldInFileSymbol()
122 //{
123 - // var fileTuple = TupleDefinitions.File.CreateTuple<FileTuple>();
124 - // fileTuple.Component_ = "Foo";
125 - // Assert.Equal("Foo", fileTuple.Component_);
123 + // var fileSymbol = SymbolDefinitions.File.CreateSymbol<FileSymbol>();
124 + // fileSymbol.Component_ = "Foo";
125 + // Assert.Equal("Foo", fileSymbol.Component_);
126 //}
127
128 //[Fact]
129 - //public void CanThrowOnMismatchTupleType()
129 + //public void CanThrowOnMismatchSymbolType()
130 //{
131 - // var e = Assert.Throws<InvalidCastException>(() => TupleDefinitions.File.CreateTuple<ComponentTuple>());
132 - // Assert.Equal("Requested wrong type WixToolset.Data.Tuples.ComponentTuple, actual type WixToolset.Data.Tuples.FileTuple", e.Message);
131 + // var e = Assert.Throws<InvalidCastException>(() => SymbolDefinitions.File.CreateSymbol<ComponentSymbol>());
132 + // Assert.Equal("Requested wrong type WixToolset.Data.Symbols.ComponentSymbol, actual type WixToolset.Data.Symbols.FileSymbol", e.Message);
133 //}
134 }
135 }