aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/Compiler_2.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core/Compiler_2.cs')
-rw-r--r--src/WixToolset.Core/Compiler_2.cs206
1 files changed, 103 insertions, 103 deletions
diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs
index 18a0366e..72550ed9 100644
--- a/src/WixToolset.Core/Compiler_2.cs
+++ b/src/WixToolset.Core/Compiler_2.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Core
10 using System.IO; 10 using System.IO;
11 using System.Xml.Linq; 11 using System.Xml.Linq;
12 using WixToolset.Data; 12 using WixToolset.Data;
13 using WixToolset.Data.Tuples; 13 using WixToolset.Data.Symbols;
14 using WixToolset.Data.WindowsInstaller; 14 using WixToolset.Data.WindowsInstaller;
15 using WixToolset.Extensibility; 15 using WixToolset.Extensibility;
16 16
@@ -190,7 +190,7 @@ namespace WixToolset.Core
190 this.ParseCustomActionElement(child); 190 this.ParseCustomActionElement(child);
191 break; 191 break;
192 case "CustomActionRef": 192 case "CustomActionRef":
193 this.ParseSimpleRefElement(child, TupleDefinitions.CustomAction); 193 this.ParseSimpleRefElement(child, SymbolDefinitions.CustomAction);
194 break; 194 break;
195 case "CustomTable": 195 case "CustomTable":
196 this.ParseCustomTableElement(child); 196 this.ParseCustomTableElement(child);
@@ -205,7 +205,7 @@ namespace WixToolset.Core
205 this.ParseEmbeddedChainerElement(child); 205 this.ParseEmbeddedChainerElement(child);
206 break; 206 break;
207 case "EmbeddedChainerRef": 207 case "EmbeddedChainerRef":
208 this.ParseSimpleRefElement(child, TupleDefinitions.MsiEmbeddedChainer); 208 this.ParseSimpleRefElement(child, SymbolDefinitions.MsiEmbeddedChainer);
209 break; 209 break;
210 case "EnsureTable": 210 case "EnsureTable":
211 this.ParseEnsureTableElement(child); 211 this.ParseEnsureTableElement(child);
@@ -248,7 +248,7 @@ namespace WixToolset.Core
248 this.ParsePropertyElement(child); 248 this.ParsePropertyElement(child);
249 break; 249 break;
250 case "PropertyRef": 250 case "PropertyRef":
251 this.ParseSimpleRefElement(child, TupleDefinitions.Property); 251 this.ParseSimpleRefElement(child, SymbolDefinitions.Property);
252 break; 252 break;
253 case "SetDirectory": 253 case "SetDirectory":
254 this.ParseSetDirectoryElement(child); 254 this.ParseSetDirectoryElement(child);
@@ -274,7 +274,7 @@ namespace WixToolset.Core
274 this.ParseUIElement(child); 274 this.ParseUIElement(child);
275 break; 275 break;
276 case "UIRef": 276 case "UIRef":
277 this.ParseSimpleRefElement(child, TupleDefinitions.WixUI); 277 this.ParseSimpleRefElement(child, SymbolDefinitions.WixUI);
278 break; 278 break;
279 case "Upgrade": 279 case "Upgrade":
280 this.ParseUpgradeElement(child); 280 this.ParseUpgradeElement(child);
@@ -297,7 +297,7 @@ namespace WixToolset.Core
297 { 297 {
298 if (null != symbols) 298 if (null != symbols)
299 { 299 {
300 this.Core.AddTuple(new WixDeltaPatchSymbolPathsTuple(sourceLineNumbers) 300 this.Core.AddSymbol(new WixDeltaPatchSymbolPathsSymbol(sourceLineNumbers)
301 { 301 {
302 SymbolId = productCode, 302 SymbolId = productCode,
303 SymbolType = SymbolPathType.Product, 303 SymbolType = SymbolPathType.Product,
@@ -318,8 +318,8 @@ namespace WixToolset.Core
318 /// <param name="node">Element to parse.</param> 318 /// <param name="node">Element to parse.</param>
319 /// <param name="componentId">Identifier of parent component.</param> 319 /// <param name="componentId">Identifier of parent component.</param>
320 /// <param name="fileId">Default identifer for driver/translator file.</param> 320 /// <param name="fileId">Default identifer for driver/translator file.</param>
321 /// <param name="tupleDefinitionType">Tuple type we're processing for.</param> 321 /// <param name="symbolDefinitionType">Symbol type we're processing for.</param>
322 private void ParseODBCDriverOrTranslator(XElement node, string componentId, string fileId, TupleDefinitionType tupleDefinitionType) 322 private void ParseODBCDriverOrTranslator(XElement node, string componentId, string fileId, SymbolDefinitionType symbolDefinitionType)
323 { 323 {
324 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); 324 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
325 Identifier id = null; 325 Identifier id = null;
@@ -338,14 +338,14 @@ namespace WixToolset.Core
338 break; 338 break;
339 case "File": 339 case "File":
340 driver = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 340 driver = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
341 this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, driver); 341 this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, driver);
342 break; 342 break;
343 case "Name": 343 case "Name":
344 name = this.Core.GetAttributeValue(sourceLineNumbers, attrib); 344 name = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
345 break; 345 break;
346 case "SetupFile": 346 case "SetupFile":
347 setup = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 347 setup = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
348 this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, setup); 348 this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, setup);
349 break; 349 break;
350 default: 350 default:
351 this.Core.UnexpectedAttribute(node, attrib); 351 this.Core.UnexpectedAttribute(node, attrib);
@@ -369,7 +369,7 @@ namespace WixToolset.Core
369 } 369 }
370 370
371 // drivers have a few possible children 371 // drivers have a few possible children
372 if (TupleDefinitionType.ODBCDriver == tupleDefinitionType) 372 if (SymbolDefinitionType.ODBCDriver == symbolDefinitionType)
373 { 373 {
374 // process any data sources for the driver 374 // process any data sources for the driver
375 foreach (var child in node.Elements()) 375 foreach (var child in node.Elements())
@@ -383,7 +383,7 @@ namespace WixToolset.Core
383 this.ParseODBCDataSource(child, componentId, name, out ignoredKeyPath); 383 this.ParseODBCDataSource(child, componentId, name, out ignoredKeyPath);
384 break; 384 break;
385 case "Property": 385 case "Property":
386 this.ParseODBCProperty(child, id.Id, TupleDefinitionType.ODBCAttribute); 386 this.ParseODBCProperty(child, id.Id, SymbolDefinitionType.ODBCAttribute);
387 break; 387 break;
388 default: 388 default:
389 this.Core.UnexpectedElement(node, child); 389 this.Core.UnexpectedElement(node, child);
@@ -403,10 +403,10 @@ namespace WixToolset.Core
403 403
404 if (!this.Core.EncounteredError) 404 if (!this.Core.EncounteredError)
405 { 405 {
406 switch (tupleDefinitionType) 406 switch (symbolDefinitionType)
407 { 407 {
408 case TupleDefinitionType.ODBCDriver: 408 case SymbolDefinitionType.ODBCDriver:
409 this.Core.AddTuple(new ODBCDriverTuple(sourceLineNumbers, id) 409 this.Core.AddSymbol(new ODBCDriverSymbol(sourceLineNumbers, id)
410 { 410 {
411 ComponentRef = componentId, 411 ComponentRef = componentId,
412 Description = name, 412 Description = name,
@@ -414,8 +414,8 @@ namespace WixToolset.Core
414 SetupFileRef = setup, 414 SetupFileRef = setup,
415 }); 415 });
416 break; 416 break;
417 case TupleDefinitionType.ODBCTranslator: 417 case SymbolDefinitionType.ODBCTranslator:
418 this.Core.AddTuple(new ODBCTranslatorTuple(sourceLineNumbers, id) 418 this.Core.AddSymbol(new ODBCTranslatorSymbol(sourceLineNumbers, id)
419 { 419 {
420 ComponentRef = componentId, 420 ComponentRef = componentId,
421 Description = name, 421 Description = name,
@@ -424,7 +424,7 @@ namespace WixToolset.Core
424 }); 424 });
425 break; 425 break;
426 default: 426 default:
427 throw new ArgumentOutOfRangeException(nameof(tupleDefinitionType)); 427 throw new ArgumentOutOfRangeException(nameof(symbolDefinitionType));
428 } 428 }
429 } 429 }
430 } 430 }
@@ -434,8 +434,8 @@ namespace WixToolset.Core
434 /// </summary> 434 /// </summary>
435 /// <param name="node">Element to parse.</param> 435 /// <param name="node">Element to parse.</param>
436 /// <param name="parentId">Identifier of parent driver or translator.</param> 436 /// <param name="parentId">Identifier of parent driver or translator.</param>
437 /// <param name="tupleDefinitionType">Name of the table to create property in.</param> 437 /// <param name="symbolDefinitionType">Name of the table to create property in.</param>
438 private void ParseODBCProperty(XElement node, string parentId, TupleDefinitionType tupleDefinitionType) 438 private void ParseODBCProperty(XElement node, string parentId, SymbolDefinitionType symbolDefinitionType)
439 { 439 {
440 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); 440 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
441 string id = null; 441 string id = null;
@@ -474,18 +474,18 @@ namespace WixToolset.Core
474 if (!this.Core.EncounteredError) 474 if (!this.Core.EncounteredError)
475 { 475 {
476 var identifier = new Identifier(AccessModifier.Private, parentId, id); 476 var identifier = new Identifier(AccessModifier.Private, parentId, id);
477 switch (tupleDefinitionType) 477 switch (symbolDefinitionType)
478 { 478 {
479 case TupleDefinitionType.ODBCAttribute: 479 case SymbolDefinitionType.ODBCAttribute:
480 this.Core.AddTuple(new ODBCAttributeTuple(sourceLineNumbers, identifier) 480 this.Core.AddSymbol(new ODBCAttributeSymbol(sourceLineNumbers, identifier)
481 { 481 {
482 DriverRef = parentId, 482 DriverRef = parentId,
483 Attribute = id, 483 Attribute = id,
484 Value = propertyValue, 484 Value = propertyValue,
485 }); 485 });
486 break; 486 break;
487 case TupleDefinitionType.ODBCSourceAttribute: 487 case SymbolDefinitionType.ODBCSourceAttribute:
488 this.Core.AddTuple(new ODBCSourceAttributeTuple(sourceLineNumbers, identifier) 488 this.Core.AddSymbol(new ODBCSourceAttributeSymbol(sourceLineNumbers, identifier)
489 { 489 {
490 DataSourceRef = parentId, 490 DataSourceRef = parentId,
491 Attribute = id, 491 Attribute = id,
@@ -493,7 +493,7 @@ namespace WixToolset.Core
493 }); 493 });
494 break; 494 break;
495 default: 495 default:
496 throw new ArgumentOutOfRangeException(nameof(tupleDefinitionType)); 496 throw new ArgumentOutOfRangeException(nameof(symbolDefinitionType));
497 } 497 }
498 } 498 }
499 } 499 }
@@ -578,7 +578,7 @@ namespace WixToolset.Core
578 switch (child.Name.LocalName) 578 switch (child.Name.LocalName)
579 { 579 {
580 case "Property": 580 case "Property":
581 this.ParseODBCProperty(child, id.Id, TupleDefinitionType.ODBCSourceAttribute); 581 this.ParseODBCProperty(child, id.Id, SymbolDefinitionType.ODBCSourceAttribute);
582 break; 582 break;
583 default: 583 default:
584 this.Core.UnexpectedElement(node, child); 584 this.Core.UnexpectedElement(node, child);
@@ -593,7 +593,7 @@ namespace WixToolset.Core
593 593
594 if (!this.Core.EncounteredError) 594 if (!this.Core.EncounteredError)
595 { 595 {
596 this.Core.AddTuple(new ODBCDataSourceTuple(sourceLineNumbers, id) 596 this.Core.AddSymbol(new ODBCDataSourceSymbol(sourceLineNumbers, id)
597 { 597 {
598 ComponentRef = componentId, 598 ComponentRef = componentId,
599 Description = name, 599 Description = name,
@@ -712,7 +712,7 @@ namespace WixToolset.Core
712 switch (installScope) 712 switch (installScope)
713 { 713 {
714 case "perMachine": 714 case "perMachine":
715 this.Core.AddTuple(new PropertyTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "ALLUSERS")) 715 this.Core.AddSymbol(new PropertySymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "ALLUSERS"))
716 { 716 {
717 Value = "1" 717 Value = "1"
718 }); 718 });
@@ -870,67 +870,67 @@ namespace WixToolset.Core
870 870
871 if (!this.Core.EncounteredError) 871 if (!this.Core.EncounteredError)
872 { 872 {
873 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 873 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
874 { 874 {
875 PropertyId = SummaryInformationType.Codepage, 875 PropertyId = SummaryInformationType.Codepage,
876 Value = codepage 876 Value = codepage
877 }); 877 });
878 878
879 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 879 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
880 { 880 {
881 PropertyId = SummaryInformationType.Title, 881 PropertyId = SummaryInformationType.Title,
882 Value = "Installation Database" 882 Value = "Installation Database"
883 }); 883 });
884 884
885 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 885 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
886 { 886 {
887 PropertyId = SummaryInformationType.Subject, 887 PropertyId = SummaryInformationType.Subject,
888 Value = packageName 888 Value = packageName
889 }); 889 });
890 890
891 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 891 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
892 { 892 {
893 PropertyId = SummaryInformationType.Author, 893 PropertyId = SummaryInformationType.Author,
894 Value = packageAuthor 894 Value = packageAuthor
895 }); 895 });
896 896
897 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 897 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
898 { 898 {
899 PropertyId = SummaryInformationType.Keywords, 899 PropertyId = SummaryInformationType.Keywords,
900 Value = keywords 900 Value = keywords
901 }); 901 });
902 902
903 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 903 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
904 { 904 {
905 PropertyId = SummaryInformationType.Comments, 905 PropertyId = SummaryInformationType.Comments,
906 Value = comments 906 Value = comments
907 }); 907 });
908 908
909 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 909 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
910 { 910 {
911 PropertyId = SummaryInformationType.PlatformAndLanguage, 911 PropertyId = SummaryInformationType.PlatformAndLanguage,
912 Value = String.Format(CultureInfo.InvariantCulture, "{0};{1}", platform, packageLanguages) 912 Value = String.Format(CultureInfo.InvariantCulture, "{0};{1}", platform, packageLanguages)
913 }); 913 });
914 914
915 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 915 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
916 { 916 {
917 PropertyId = SummaryInformationType.PackageCode, 917 PropertyId = SummaryInformationType.PackageCode,
918 Value = packageCode 918 Value = packageCode
919 }); 919 });
920 920
921 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 921 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
922 { 922 {
923 PropertyId = SummaryInformationType.WindowsInstallerVersion, 923 PropertyId = SummaryInformationType.WindowsInstallerVersion,
924 Value = msiVersion.ToString(CultureInfo.InvariantCulture) 924 Value = msiVersion.ToString(CultureInfo.InvariantCulture)
925 }); 925 });
926 926
927 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 927 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
928 { 928 {
929 PropertyId = SummaryInformationType.WordCount, 929 PropertyId = SummaryInformationType.WordCount,
930 Value = sourceBits.ToString(CultureInfo.InvariantCulture) 930 Value = sourceBits.ToString(CultureInfo.InvariantCulture)
931 }); 931 });
932 932
933 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 933 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
934 { 934 {
935 PropertyId = SummaryInformationType.Security, 935 PropertyId = SummaryInformationType.Security,
936 Value = YesNoDefaultType.No == security ? "0" : YesNoDefaultType.Yes == security ? "4" : "2" 936 Value = YesNoDefaultType.No == security ? "0" : YesNoDefaultType.Yes == security ? "4" : "2"
@@ -1007,13 +1007,13 @@ namespace WixToolset.Core
1007 1007
1008 if (!this.Core.EncounteredError) 1008 if (!this.Core.EncounteredError)
1009 { 1009 {
1010 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 1010 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
1011 { 1011 {
1012 PropertyId = SummaryInformationType.Codepage, 1012 PropertyId = SummaryInformationType.Codepage,
1013 Value = codepage 1013 Value = codepage
1014 }); 1014 });
1015 1015
1016 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 1016 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
1017 { 1017 {
1018 PropertyId = SummaryInformationType.Title, 1018 PropertyId = SummaryInformationType.Title,
1019 Value = "Patch" 1019 Value = "Patch"
@@ -1021,7 +1021,7 @@ namespace WixToolset.Core
1021 1021
1022 if (null != packageName) 1022 if (null != packageName)
1023 { 1023 {
1024 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 1024 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
1025 { 1025 {
1026 PropertyId = SummaryInformationType.Subject, 1026 PropertyId = SummaryInformationType.Subject,
1027 Value = packageName 1027 Value = packageName
@@ -1030,7 +1030,7 @@ namespace WixToolset.Core
1030 1030
1031 if (null != packageAuthor) 1031 if (null != packageAuthor)
1032 { 1032 {
1033 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 1033 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
1034 { 1034 {
1035 PropertyId = SummaryInformationType.Author, 1035 PropertyId = SummaryInformationType.Author,
1036 Value = packageAuthor 1036 Value = packageAuthor
@@ -1039,7 +1039,7 @@ namespace WixToolset.Core
1039 1039
1040 if (null != keywords) 1040 if (null != keywords)
1041 { 1041 {
1042 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 1042 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
1043 { 1043 {
1044 PropertyId = SummaryInformationType.Keywords, 1044 PropertyId = SummaryInformationType.Keywords,
1045 Value = keywords 1045 Value = keywords
@@ -1048,26 +1048,26 @@ namespace WixToolset.Core
1048 1048
1049 if (null != comments) 1049 if (null != comments)
1050 { 1050 {
1051 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 1051 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
1052 { 1052 {
1053 PropertyId = SummaryInformationType.Comments, 1053 PropertyId = SummaryInformationType.Comments,
1054 Value = comments 1054 Value = comments
1055 }); 1055 });
1056 } 1056 }
1057 1057
1058 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 1058 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
1059 { 1059 {
1060 PropertyId = SummaryInformationType.WindowsInstallerVersion, 1060 PropertyId = SummaryInformationType.WindowsInstallerVersion,
1061 Value = msiVersion.ToString(CultureInfo.InvariantCulture) 1061 Value = msiVersion.ToString(CultureInfo.InvariantCulture)
1062 }); 1062 });
1063 1063
1064 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 1064 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
1065 { 1065 {
1066 PropertyId = SummaryInformationType.WordCount, 1066 PropertyId = SummaryInformationType.WordCount,
1067 Value = "0" 1067 Value = "0"
1068 }); 1068 });
1069 1069
1070 this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) 1070 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
1071 { 1071 {
1072 PropertyId = SummaryInformationType.Security, 1072 PropertyId = SummaryInformationType.Security,
1073 Value = YesNoDefaultType.No == security ? "0" : YesNoDefaultType.Yes == security ? "4" : "2" 1073 Value = YesNoDefaultType.No == security ? "0" : YesNoDefaultType.Yes == security ? "4" : "2"
@@ -1163,7 +1163,7 @@ namespace WixToolset.Core
1163 1163
1164 if (!this.Core.EncounteredError) 1164 if (!this.Core.EncounteredError)
1165 { 1165 {
1166 this.Core.AddTuple(new LockPermissionsTuple(sourceLineNumbers) 1166 this.Core.AddSymbol(new LockPermissionsSymbol(sourceLineNumbers)
1167 { 1167 {
1168 LockObject = objectId, 1168 LockObject = objectId,
1169 Table = tableName, 1169 Table = tableName,
@@ -1239,7 +1239,7 @@ namespace WixToolset.Core
1239 1239
1240 if (!this.Core.EncounteredError) 1240 if (!this.Core.EncounteredError)
1241 { 1241 {
1242 this.Core.AddTuple(new MsiLockPermissionsExTuple(sourceLineNumbers, id) 1242 this.Core.AddSymbol(new MsiLockPermissionsExSymbol(sourceLineNumbers, id)
1243 { 1243 {
1244 LockObject = objectId, 1244 LockObject = objectId,
1245 Table = tableName, 1245 Table = tableName,
@@ -1371,7 +1371,7 @@ namespace WixToolset.Core
1371 { 1371 {
1372 if (!this.Core.EncounteredError) 1372 if (!this.Core.EncounteredError)
1373 { 1373 {
1374 var tuple = this.Core.AddTuple(new ProgIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, progId)) 1374 var symbol = this.Core.AddSymbol(new ProgIdSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, progId))
1375 { 1375 {
1376 ProgId = progId, 1376 ProgId = progId,
1377 ParentProgIdRef = parent, 1377 ParentProgIdRef = parent,
@@ -1381,13 +1381,13 @@ namespace WixToolset.Core
1381 1381
1382 if (null != icon) 1382 if (null != icon)
1383 { 1383 {
1384 tuple.IconRef = icon; 1384 symbol.IconRef = icon;
1385 this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Icon, icon); 1385 this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Icon, icon);
1386 } 1386 }
1387 1387
1388 if (CompilerConstants.IntegerNotSet != iconIndex) 1388 if (CompilerConstants.IntegerNotSet != iconIndex)
1389 { 1389 {
1390 tuple.IconIndex = iconIndex; 1390 symbol.IconIndex = iconIndex;
1391 } 1391 }
1392 1392
1393 this.Core.EnsureTable(sourceLineNumbers, WindowsInstallerTableDefinitions.Class); 1393 this.Core.EnsureTable(sourceLineNumbers, WindowsInstallerTableDefinitions.Class);
@@ -1419,7 +1419,7 @@ namespace WixToolset.Core
1419 1419
1420 if (null != icon) // ProgId's Default Icon 1420 if (null != icon) // ProgId's Default Icon
1421 { 1421 {
1422 this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, icon); 1422 this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, icon);
1423 1423
1424 icon = String.Format(CultureInfo.InvariantCulture, "\"[#{0}]\"", icon); 1424 icon = String.Format(CultureInfo.InvariantCulture, "\"[#{0}]\"", icon);
1425 1425
@@ -1515,7 +1515,7 @@ namespace WixToolset.Core
1515 1515
1516 if ("ErrorDialog" == id.Id) 1516 if ("ErrorDialog" == id.Id)
1517 { 1517 {
1518 this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Dialog, value); 1518 this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Dialog, value);
1519 } 1519 }
1520 1520
1521 foreach (var child in node.Elements()) 1521 foreach (var child in node.Elements())
@@ -1550,7 +1550,7 @@ namespace WixToolset.Core
1550 { 1550 {
1551 if (complianceCheck && !this.Core.EncounteredError) 1551 if (complianceCheck && !this.Core.EncounteredError)
1552 { 1552 {
1553 this.Core.AddTuple(new CCPSearchTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, sig))); 1553 this.Core.AddSymbol(new CCPSearchSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, sig)));
1554 } 1554 }
1555 1555
1556 this.AddAppSearch(sourceLineNumbers, id, sig); 1556 this.AddAppSearch(sourceLineNumbers, id, sig);
@@ -1579,7 +1579,7 @@ namespace WixToolset.Core
1579 { 1579 {
1580 this.Core.Write(WarningMessages.PropertyModularizationSuppressed(sourceLineNumbers)); 1580 this.Core.Write(WarningMessages.PropertyModularizationSuppressed(sourceLineNumbers));
1581 1581
1582 this.Core.AddTuple(new WixSuppressModularizationTuple(sourceLineNumbers, id)); 1582 this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers, id));
1583 } 1583 }
1584 } 1584 }
1585 1585
@@ -1766,7 +1766,7 @@ namespace WixToolset.Core
1766 1766
1767 if (!this.Core.EncounteredError && null != name) 1767 if (!this.Core.EncounteredError && null != name)
1768 { 1768 {
1769 this.Core.AddTuple(new RegistryTuple(sourceLineNumbers, id) 1769 this.Core.AddSymbol(new RegistrySymbol(sourceLineNumbers, id)
1770 { 1770 {
1771 Root = root.Value, 1771 Root = root.Value,
1772 Key = key, 1772 Key = key,
@@ -2008,7 +2008,7 @@ namespace WixToolset.Core
2008 2008
2009 if (!this.Core.EncounteredError) 2009 if (!this.Core.EncounteredError)
2010 { 2010 {
2011 this.Core.AddTuple(new RegistryTuple(sourceLineNumbers, id) 2011 this.Core.AddSymbol(new RegistrySymbol(sourceLineNumbers, id)
2012 { 2012 {
2013 Root = root.Value, 2013 Root = root.Value,
2014 Key = key, 2014 Key = key,
@@ -2154,7 +2154,7 @@ namespace WixToolset.Core
2154 2154
2155 if (!this.Core.EncounteredError) 2155 if (!this.Core.EncounteredError)
2156 { 2156 {
2157 this.Core.AddTuple(new RemoveRegistryTuple(sourceLineNumbers, id) 2157 this.Core.AddSymbol(new RemoveRegistrySymbol(sourceLineNumbers, id)
2158 { 2158 {
2159 Root = root.Value, 2159 Root = root.Value,
2160 Key = key, 2160 Key = key,
@@ -2230,7 +2230,7 @@ namespace WixToolset.Core
2230 2230
2231 if (!this.Core.EncounteredError) 2231 if (!this.Core.EncounteredError)
2232 { 2232 {
2233 this.Core.AddTuple(new RemoveRegistryTuple(sourceLineNumbers, id) 2233 this.Core.AddSymbol(new RemoveRegistrySymbol(sourceLineNumbers, id)
2234 { 2234 {
2235 Root = root.Value, 2235 Root = root.Value,
2236 Key = key, 2236 Key = key,
@@ -2349,7 +2349,7 @@ namespace WixToolset.Core
2349 2349
2350 if (!this.Core.EncounteredError) 2350 if (!this.Core.EncounteredError)
2351 { 2351 {
2352 this.Core.AddTuple(new RemoveFileTuple(sourceLineNumbers, id) 2352 this.Core.AddSymbol(new RemoveFileSymbol(sourceLineNumbers, id)
2353 { 2353 {
2354 ComponentRef = componentId, 2354 ComponentRef = componentId,
2355 FileName = this.GetMsiFilenameValue(shortName, name), 2355 FileName = this.GetMsiFilenameValue(shortName, name),
@@ -2437,7 +2437,7 @@ namespace WixToolset.Core
2437 2437
2438 if (!this.Core.EncounteredError) 2438 if (!this.Core.EncounteredError)
2439 { 2439 {
2440 this.Core.AddTuple(new RemoveFileTuple(sourceLineNumbers, id) 2440 this.Core.AddSymbol(new RemoveFileSymbol(sourceLineNumbers, id)
2441 { 2441 {
2442 ComponentRef = componentId, 2442 ComponentRef = componentId,
2443 DirProperty = directory ?? property ?? parentDirectory, 2443 DirProperty = directory ?? property ?? parentDirectory,
@@ -2508,7 +2508,7 @@ namespace WixToolset.Core
2508 2508
2509 if (!this.Core.EncounteredError) 2509 if (!this.Core.EncounteredError)
2510 { 2510 {
2511 this.Core.AddTuple(new ReserveCostTuple(sourceLineNumbers, id) 2511 this.Core.AddSymbol(new ReserveCostSymbol(sourceLineNumbers, id)
2512 { 2512 {
2513 ComponentRef = componentId, 2513 ComponentRef = componentId,
2514 ReserveFolder = directoryId, 2514 ReserveFolder = directoryId,
@@ -2552,7 +2552,7 @@ namespace WixToolset.Core
2552 if (customAction) 2552 if (customAction)
2553 { 2553 {
2554 actionName = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib); 2554 actionName = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib);
2555 this.Core.CreateSimpleReference(childSourceLineNumbers, TupleDefinitions.CustomAction, actionName); 2555 this.Core.CreateSimpleReference(childSourceLineNumbers, SymbolDefinitions.CustomAction, actionName);
2556 } 2556 }
2557 else 2557 else
2558 { 2558 {
@@ -2563,7 +2563,7 @@ namespace WixToolset.Core
2563 if (customAction || showDialog || specialAction || specialStandardAction) 2563 if (customAction || showDialog || specialAction || specialStandardAction)
2564 { 2564 {
2565 afterAction = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib); 2565 afterAction = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib);
2566 this.Core.CreateSimpleReference(childSourceLineNumbers, TupleDefinitions.WixAction, sequenceTable.ToString(), afterAction); 2566 this.Core.CreateSimpleReference(childSourceLineNumbers, SymbolDefinitions.WixAction, sequenceTable.ToString(), afterAction);
2567 } 2567 }
2568 else 2568 else
2569 { 2569 {
@@ -2574,7 +2574,7 @@ namespace WixToolset.Core
2574 if (customAction || showDialog || specialAction || specialStandardAction) 2574 if (customAction || showDialog || specialAction || specialStandardAction)
2575 { 2575 {
2576 beforeAction = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib); 2576 beforeAction = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib);
2577 this.Core.CreateSimpleReference(childSourceLineNumbers, TupleDefinitions.WixAction, sequenceTable.ToString(), beforeAction); 2577 this.Core.CreateSimpleReference(childSourceLineNumbers, SymbolDefinitions.WixAction, sequenceTable.ToString(), beforeAction);
2578 } 2578 }
2579 else 2579 else
2580 { 2580 {
@@ -2588,7 +2588,7 @@ namespace WixToolset.Core
2588 if (showDialog) 2588 if (showDialog)
2589 { 2589 {
2590 actionName = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib); 2590 actionName = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib);
2591 this.Core.CreateSimpleReference(childSourceLineNumbers, TupleDefinitions.Dialog, actionName); 2591 this.Core.CreateSimpleReference(childSourceLineNumbers, SymbolDefinitions.Dialog, actionName);
2592 } 2592 }
2593 else 2593 else
2594 { 2594 {
@@ -2703,7 +2703,7 @@ namespace WixToolset.Core
2703 { 2703 {
2704 if (suppress) 2704 if (suppress)
2705 { 2705 {
2706 this.Core.AddTuple(new WixSuppressActionTuple(childSourceLineNumbers, new Identifier(AccessModifier.Public, sequenceTable, actionName)) 2706 this.Core.AddSymbol(new WixSuppressActionSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Public, sequenceTable, actionName))
2707 { 2707 {
2708 SequenceTable = sequenceTable, 2708 SequenceTable = sequenceTable,
2709 Action = actionName 2709 Action = actionName
@@ -2711,7 +2711,7 @@ namespace WixToolset.Core
2711 } 2711 }
2712 else 2712 else
2713 { 2713 {
2714 var tuple = this.Core.AddTuple(new WixActionTuple(childSourceLineNumbers, new Identifier(AccessModifier.Public, sequenceTable, actionName)) 2714 var symbol = this.Core.AddSymbol(new WixActionSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Public, sequenceTable, actionName))
2715 { 2715 {
2716 SequenceTable = sequenceTable, 2716 SequenceTable = sequenceTable,
2717 Action = actionName, 2717 Action = actionName,
@@ -2723,7 +2723,7 @@ namespace WixToolset.Core
2723 2723
2724 if (CompilerConstants.IntegerNotSet != sequence) 2724 if (CompilerConstants.IntegerNotSet != sequence)
2725 { 2725 {
2726 tuple.Sequence = sequence; 2726 symbol.Sequence = sequence;
2727 } 2727 }
2728 } 2728 }
2729 } 2729 }
@@ -2897,7 +2897,7 @@ namespace WixToolset.Core
2897 { 2897 {
2898 if (!String.IsNullOrEmpty(delayedAutoStart)) 2898 if (!String.IsNullOrEmpty(delayedAutoStart))
2899 { 2899 {
2900 this.Core.AddTuple(new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".DS"))) 2900 this.Core.AddSymbol(new MsiServiceConfigSymbol(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".DS")))
2901 { 2901 {
2902 Name = name, 2902 Name = name,
2903 OnInstall = install, 2903 OnInstall = install,
@@ -2911,7 +2911,7 @@ namespace WixToolset.Core
2911 2911
2912 if (!String.IsNullOrEmpty(failureActionsWhen)) 2912 if (!String.IsNullOrEmpty(failureActionsWhen))
2913 { 2913 {
2914 this.Core.AddTuple(new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".FA"))) 2914 this.Core.AddSymbol(new MsiServiceConfigSymbol(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".FA")))
2915 { 2915 {
2916 Name = name, 2916 Name = name,
2917 OnInstall = install, 2917 OnInstall = install,
@@ -2925,7 +2925,7 @@ namespace WixToolset.Core
2925 2925
2926 if (!String.IsNullOrEmpty(sid)) 2926 if (!String.IsNullOrEmpty(sid))
2927 { 2927 {
2928 this.Core.AddTuple(new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".SS"))) 2928 this.Core.AddSymbol(new MsiServiceConfigSymbol(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".SS")))
2929 { 2929 {
2930 Name = name, 2930 Name = name,
2931 OnInstall = install, 2931 OnInstall = install,
@@ -2939,7 +2939,7 @@ namespace WixToolset.Core
2939 2939
2940 if (!String.IsNullOrEmpty(requiredPrivileges)) 2940 if (!String.IsNullOrEmpty(requiredPrivileges))
2941 { 2941 {
2942 this.Core.AddTuple(new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".RP"))) 2942 this.Core.AddSymbol(new MsiServiceConfigSymbol(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".RP")))
2943 { 2943 {
2944 Name = name, 2944 Name = name,
2945 OnInstall = install, 2945 OnInstall = install,
@@ -2953,7 +2953,7 @@ namespace WixToolset.Core
2953 2953
2954 if (!String.IsNullOrEmpty(preShutdownDelay)) 2954 if (!String.IsNullOrEmpty(preShutdownDelay))
2955 { 2955 {
2956 this.Core.AddTuple(new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".PD"))) 2956 this.Core.AddSymbol(new MsiServiceConfigSymbol(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".PD")))
2957 { 2957 {
2958 Name = name, 2958 Name = name,
2959 OnInstall = install, 2959 OnInstall = install,
@@ -3279,12 +3279,12 @@ namespace WixToolset.Core
3279 3279
3280 if (!this.Core.EncounteredError) 3280 if (!this.Core.EncounteredError)
3281 { 3281 {
3282 this.Core.AddTuple(new MsiServiceConfigFailureActionsTuple(sourceLineNumbers, id) 3282 this.Core.AddSymbol(new MsiServiceConfigFailureActionsSymbol(sourceLineNumbers, id)
3283 { 3283 {
3284 Name = name, 3284 Name = name,
3285 OnInstall = install, 3285 OnInstall = install,
3286 OnReinstall = reinstall, 3286 OnReinstall = reinstall,
3287 OnUninstall = uninstall, 3287 OnUninstall = uninstall,
3288 ResetPeriod = resetPeriod, 3288 ResetPeriod = resetPeriod,
3289 RebootMessage = rebootMessage, 3289 RebootMessage = rebootMessage,
3290 Command = command, 3290 Command = command,
@@ -3427,7 +3427,7 @@ namespace WixToolset.Core
3427 3427
3428 if (!this.Core.EncounteredError) 3428 if (!this.Core.EncounteredError)
3429 { 3429 {
3430 this.Core.AddTuple(new ServiceControlTuple(sourceLineNumbers, id) 3430 this.Core.AddSymbol(new ServiceControlSymbol(sourceLineNumbers, id)
3431 { 3431 {
3432 Name = name, 3432 Name = name,
3433 InstallRemove = installRemove, 3433 InstallRemove = installRemove,
@@ -3715,7 +3715,7 @@ namespace WixToolset.Core
3715 3715
3716 if (!this.Core.EncounteredError) 3716 if (!this.Core.EncounteredError)
3717 { 3717 {
3718 this.Core.AddTuple(new ServiceInstallTuple(sourceLineNumbers, id) 3718 this.Core.AddSymbol(new ServiceInstallSymbol(sourceLineNumbers, id)
3719 { 3719 {
3720 Name = name, 3720 Name = name,
3721 DisplayName = displayName, 3721 DisplayName = displayName,
@@ -3763,7 +3763,7 @@ namespace WixToolset.Core
3763 break; 3763 break;
3764 case "Id": 3764 case "Id":
3765 id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 3765 id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
3766 this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Directory, id); 3766 this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Directory, id);
3767 break; 3767 break;
3768 case "Sequence": 3768 case "Sequence":
3769 var sequenceValue = this.Core.GetAttributeValue(sourceLineNumbers, attrib); 3769 var sequenceValue = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
@@ -3819,7 +3819,7 @@ namespace WixToolset.Core
3819 3819
3820 if (!this.Core.EncounteredError) 3820 if (!this.Core.EncounteredError)
3821 { 3821 {
3822 this.Core.AddTuple(new CustomActionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName)) 3822 this.Core.AddSymbol(new CustomActionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName))
3823 { 3823 {
3824 ExecutionType = executionType, 3824 ExecutionType = executionType,
3825 SourceType = CustomActionSourceType.Directory, 3825 SourceType = CustomActionSourceType.Directory,
@@ -3830,7 +3830,7 @@ namespace WixToolset.Core
3830 3830
3831 foreach (var sequence in sequences) 3831 foreach (var sequence in sequences)
3832 { 3832 {
3833 this.Core.ScheduleActionTuple(sourceLineNumbers, AccessModifier.Public, sequence, actionName, condition, afterAction: "CostInitialize"); 3833 this.Core.ScheduleActionSymbol(sourceLineNumbers, AccessModifier.Public, sequence, actionName, condition, afterAction: "CostInitialize");
3834 } 3834 }
3835 } 3835 }
3836 } 3836 }
@@ -3946,7 +3946,7 @@ namespace WixToolset.Core
3946 this.Core.Write(ErrorMessages.ActionScheduledRelativeToItself(sourceLineNumbers, node.Name.LocalName, "After", afterAction)); 3946 this.Core.Write(ErrorMessages.ActionScheduledRelativeToItself(sourceLineNumbers, node.Name.LocalName, "After", afterAction));
3947 } 3947 }
3948 3948
3949 this.Core.AddTuple(new CustomActionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName)) 3949 this.Core.AddSymbol(new CustomActionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName))
3950 { 3950 {
3951 ExecutionType = executionType, 3951 ExecutionType = executionType,
3952 SourceType = CustomActionSourceType.Property, 3952 SourceType = CustomActionSourceType.Property,
@@ -3957,7 +3957,7 @@ namespace WixToolset.Core
3957 3957
3958 foreach (var sequence in sequences) 3958 foreach (var sequence in sequences)
3959 { 3959 {
3960 this.Core.ScheduleActionTuple(sourceLineNumbers, AccessModifier.Public, sequence, actionName, condition, beforeAction, afterAction); 3960 this.Core.ScheduleActionSymbol(sourceLineNumbers, AccessModifier.Public, sequence, actionName, condition, beforeAction, afterAction);
3961 } 3961 }
3962 } 3962 }
3963 } 3963 }
@@ -4001,7 +4001,7 @@ namespace WixToolset.Core
4001 4001
4002 if (!this.Core.EncounteredError) 4002 if (!this.Core.EncounteredError)
4003 { 4003 {
4004 this.Core.AddTuple(new FileSFPCatalogTuple(sourceLineNumbers) 4004 this.Core.AddSymbol(new FileSFPCatalogSymbol(sourceLineNumbers)
4005 { 4005 {
4006 FileRef = id, 4006 FileRef = id,
4007 SFPCatalogRef = parentSFPCatalog 4007 SFPCatalogRef = parentSFPCatalog
@@ -4094,7 +4094,7 @@ namespace WixToolset.Core
4094 4094
4095 if (!this.Core.EncounteredError) 4095 if (!this.Core.EncounteredError)
4096 { 4096 {
4097 this.Core.AddTuple(new SFPCatalogTuple(sourceLineNumbers) 4097 this.Core.AddSymbol(new SFPCatalogSymbol(sourceLineNumbers)
4098 { 4098 {
4099 SFPCatalog = name, 4099 SFPCatalog = name,
4100 Catalog = sourceFile, 4100 Catalog = sourceFile,
@@ -4170,7 +4170,7 @@ namespace WixToolset.Core
4170 break; 4170 break;
4171 case "Icon": 4171 case "Icon":
4172 icon = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 4172 icon = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
4173 this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Icon, icon); 4173 this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Icon, icon);
4174 break; 4174 break;
4175 case "IconIndex": 4175 case "IconIndex":
4176 iconIndex = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, Int16.MinValue + 1, Int16.MaxValue); 4176 iconIndex = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, Int16.MinValue + 1, Int16.MaxValue);
@@ -4368,7 +4368,7 @@ namespace WixToolset.Core
4368 target = String.Format(CultureInfo.InvariantCulture, "[#{0}]", defaultTarget); 4368 target = String.Format(CultureInfo.InvariantCulture, "[#{0}]", defaultTarget);
4369 } 4369 }
4370 4370
4371 this.Core.AddTuple(new ShortcutTuple(sourceLineNumbers, id) 4371 this.Core.AddSymbol(new ShortcutSymbol(sourceLineNumbers, id)
4372 { 4372 {
4373 DirectoryRef = directory, 4373 DirectoryRef = directory,
4374 Name = name, 4374 Name = name,
@@ -4445,7 +4445,7 @@ namespace WixToolset.Core
4445 4445
4446 if (!this.Core.EncounteredError) 4446 if (!this.Core.EncounteredError)
4447 { 4447 {
4448 this.Core.AddTuple(new MsiShortcutPropertyTuple(sourceLineNumbers, id) 4448 this.Core.AddSymbol(new MsiShortcutPropertySymbol(sourceLineNumbers, id)
4449 { 4449 {
4450 ShortcutRef = shortcutId, 4450 ShortcutRef = shortcutId,
4451 PropertyKey = key, 4451 PropertyKey = key,
@@ -4642,7 +4642,7 @@ namespace WixToolset.Core
4642 4642
4643 if (!this.Core.EncounteredError) 4643 if (!this.Core.EncounteredError)
4644 { 4644 {
4645 var tuple = this.Core.AddTuple(new TypeLibTuple(sourceLineNumbers) 4645 var symbol = this.Core.AddSymbol(new TypeLibSymbol(sourceLineNumbers)
4646 { 4646 {
4647 LibId = id, 4647 LibId = id,
4648 Language = language, 4648 Language = language,
@@ -4654,12 +4654,12 @@ namespace WixToolset.Core
4654 4654
4655 if (CompilerConstants.IntegerNotSet != majorVersion || CompilerConstants.IntegerNotSet != minorVersion) 4655 if (CompilerConstants.IntegerNotSet != majorVersion || CompilerConstants.IntegerNotSet != minorVersion)
4656 { 4656 {
4657 tuple.Version = (CompilerConstants.IntegerNotSet != majorVersion ? majorVersion * 256 : 0) + (CompilerConstants.IntegerNotSet != minorVersion ? minorVersion : 0); 4657 symbol.Version = (CompilerConstants.IntegerNotSet != majorVersion ? majorVersion * 256 : 0) + (CompilerConstants.IntegerNotSet != minorVersion ? minorVersion : 0);
4658 } 4658 }
4659 4659
4660 if (CompilerConstants.IntegerNotSet != cost) 4660 if (CompilerConstants.IntegerNotSet != cost)
4661 { 4661 {
4662 tuple.Cost = cost; 4662 symbol.Cost = cost;
4663 } 4663 }
4664 } 4664 }
4665 } 4665 }
@@ -4855,7 +4855,7 @@ namespace WixToolset.Core
4855 4855
4856 if (!this.Core.EncounteredError) 4856 if (!this.Core.EncounteredError)
4857 { 4857 {
4858 this.Core.AddTuple(new UpgradeTuple(sourceLineNumbers) 4858 this.Core.AddSymbol(new UpgradeSymbol(sourceLineNumbers)
4859 { 4859 {
4860 UpgradeCode = upgradeId, 4860 UpgradeCode = upgradeId,
4861 VersionMin = minimum, 4861 VersionMin = minimum,
@@ -4875,7 +4875,7 @@ namespace WixToolset.Core
4875 // if at least one row in Upgrade table lacks the OnlyDetect attribute. 4875 // if at least one row in Upgrade table lacks the OnlyDetect attribute.
4876 if (!onlyDetect) 4876 if (!onlyDetect)
4877 { 4877 {
4878 this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixAction, "InstallExecuteSequence", "RemoveExistingProducts"); 4878 this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixAction, "InstallExecuteSequence", "RemoveExistingProducts");
4879 } 4879 }
4880 } 4880 }
4881 } 4881 }
@@ -4923,7 +4923,7 @@ namespace WixToolset.Core
4923 break; 4923 break;
4924 case "TargetFile": 4924 case "TargetFile":
4925 targetFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); 4925 targetFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
4926 this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, targetFile); 4926 this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, targetFile);
4927 break; 4927 break;
4928 case "TargetProperty": 4928 case "TargetProperty":
4929 targetProperty = this.Core.GetAttributeValue(sourceLineNumbers, attrib); 4929 targetProperty = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
@@ -4980,7 +4980,7 @@ namespace WixToolset.Core
4980 4980
4981 if (!this.Core.EncounteredError) 4981 if (!this.Core.EncounteredError)
4982 { 4982 {
4983 var tuple = this.Core.AddTuple(new VerbTuple(sourceLineNumbers) 4983 var symbol = this.Core.AddSymbol(new VerbSymbol(sourceLineNumbers)
4984 { 4984 {
4985 ExtensionRef = extension, 4985 ExtensionRef = extension,
4986 Verb = id, 4986 Verb = id,
@@ -4990,7 +4990,7 @@ namespace WixToolset.Core
4990 4990
4991 if (CompilerConstants.IntegerNotSet != sequence) 4991 if (CompilerConstants.IntegerNotSet != sequence)
4992 { 4992 {
4993 tuple.Sequence = sequence; 4993 symbol.Sequence = sequence;
4994 } 4994 }
4995 } 4995 }
4996 } 4996 }
@@ -5086,7 +5086,7 @@ namespace WixToolset.Core
5086 5086
5087 if (!this.Core.EncounteredError) 5087 if (!this.Core.EncounteredError)
5088 { 5088 {
5089 this.Core.AddTuple(new WixVariableTuple(sourceLineNumbers, id) 5089 this.Core.AddSymbol(new WixVariableSymbol(sourceLineNumbers, id)
5090 { 5090 {
5091 Value = value, 5091 Value = value,
5092 Overridable = overridable 5092 Overridable = overridable
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-14 13:51:38 +0000