aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core')
-rw-r--r--src/WixToolset.Core/Compiler.cs104
-rw-r--r--src/WixToolset.Core/Compiler_2.cs58
-rw-r--r--src/WixToolset.Core/Compiler_Bundle.cs16
-rw-r--r--src/WixToolset.Core/Compiler_PatchCreation.cs4
-rw-r--r--src/WixToolset.Core/Compiler_UI.cs20
-rw-r--r--src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs4
-rw-r--r--src/WixToolset.Core/Link/WixGroupingOrdering.cs4
-rw-r--r--src/WixToolset.Core/Linker.cs8
-rw-r--r--src/WixToolset.Core/Resolver.cs2
9 files changed, 110 insertions, 110 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index 6be4c9ba..ea018d54 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -325,7 +325,7 @@ namespace WixToolset.Core
325 325
326 var tuple = new AppSearchTuple(sourceLineNumbers, propertyId) 326 var tuple = new AppSearchTuple(sourceLineNumbers, propertyId)
327 { 327 {
328 Signature_ = signature 328 SignatureRef = signature
329 }; 329 };
330 330
331 this.Core.AddTuple(tuple); 331 this.Core.AddTuple(tuple);
@@ -412,7 +412,7 @@ namespace WixToolset.Core
412 412
413 var tuple = new WixPropertyTuple(sourceLineNumbers) 413 var tuple = new WixPropertyTuple(sourceLineNumbers)
414 { 414 {
415 Property_ = property.Id, 415 PropertyRef = property.Id,
416 Admin = admin, 416 Admin = admin,
417 Hidden = hidden, 417 Hidden = hidden,
418 Secure = secure 418 Secure = secure
@@ -651,7 +651,7 @@ namespace WixToolset.Core
651 { 651 {
652 var tuple = new MsiAssemblyNameTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, componentId, id)) 652 var tuple = new MsiAssemblyNameTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, componentId, id))
653 { 653 {
654 Component_ = componentId, 654 ComponentRef = componentId,
655 Name = id, 655 Name = id,
656 Value = value 656 Value = value
657 }; 657 };
@@ -1012,9 +1012,9 @@ namespace WixToolset.Core
1012 { 1012 {
1013 ComponentId = id, 1013 ComponentId = id,
1014 Qualifier = qualifier, 1014 Qualifier = qualifier,
1015 Component_ = componentId, 1015 ComponentRef = componentId,
1016 AppData = appData, 1016 AppData = appData,
1017 Feature_ = feature ?? Guid.Empty.ToString("B"), 1017 FeatureRef = feature ?? Guid.Empty.ToString("B"),
1018 }; 1018 };
1019 1019
1020 this.Core.AddTuple(tuple); 1020 this.Core.AddTuple(tuple);
@@ -1271,25 +1271,25 @@ namespace WixToolset.Core
1271 { 1271 {
1272 CLSID = classId, 1272 CLSID = classId,
1273 Context = context, 1273 Context = context,
1274 Component_ = componentId, 1274 ComponentRef = componentId,
1275 ProgId_Default = defaultProgId, 1275 DefaultProgIdRef = defaultProgId,
1276 Description = description, 1276 Description = description,
1277 FileTypeMask = fileTypeMask, 1277 FileTypeMask = fileTypeMask,
1278 DefInprocHandler = defaultInprocHandler, 1278 DefInprocHandler = defaultInprocHandler,
1279 Argument = argument, 1279 Argument = argument,
1280 Feature_ = Guid.Empty.ToString("B"), 1280 FeatureRef = Guid.Empty.ToString("B"),
1281 RelativePath = YesNoType.Yes == relativePath, 1281 RelativePath = YesNoType.Yes == relativePath,
1282 }; 1282 };
1283 1283
1284 if (null != appId) 1284 if (null != appId)
1285 { 1285 {
1286 tuple.AppId_ = appId; 1286 tuple.AppIdRef = appId;
1287 this.Core.CreateSimpleReference(sourceLineNumbers, "AppId", appId); 1287 this.Core.CreateSimpleReference(sourceLineNumbers, "AppId", appId);
1288 } 1288 }
1289 1289
1290 if (null != icon) 1290 if (null != icon)
1291 { 1291 {
1292 tuple.Icon_ = icon; 1292 tuple.IconRef = icon;
1293 this.Core.CreateSimpleReference(sourceLineNumbers, "Icon", icon); 1293 this.Core.CreateSimpleReference(sourceLineNumbers, "Icon", icon);
1294 } 1294 }
1295 1295
@@ -2484,8 +2484,8 @@ namespace WixToolset.Core
2484 { 2484 {
2485 var tuple = new CreateFolderTuple(sourceLineNumbers) 2485 var tuple = new CreateFolderTuple(sourceLineNumbers)
2486 { 2486 {
2487 Directory_ = directoryId, 2487 DirectoryRef = directoryId,
2488 Component_ = id.Id 2488 ComponentRef = id.Id
2489 }; 2489 };
2490 2490
2491 this.Core.AddTuple(tuple); 2491 this.Core.AddTuple(tuple);
@@ -2543,7 +2543,7 @@ namespace WixToolset.Core
2543 var tuple = new ComponentTuple(sourceLineNumbers, id) 2543 var tuple = new ComponentTuple(sourceLineNumbers, id)
2544 { 2544 {
2545 ComponentId = guid, 2545 ComponentId = guid,
2546 Directory_ = directoryId, 2546 DirectoryRef = directoryId,
2547 Location = location, 2547 Location = location,
2548 Condition = condition, 2548 Condition = condition,
2549 KeyPath = keyPath, 2549 KeyPath = keyPath,
@@ -2564,7 +2564,7 @@ namespace WixToolset.Core
2564 { 2564 {
2565 this.Core.AddTuple(new WixInstanceComponentTuple(sourceLineNumbers, id) 2565 this.Core.AddTuple(new WixInstanceComponentTuple(sourceLineNumbers, id)
2566 { 2566 {
2567 Component_ = id.Id, 2567 ComponentRef = id.Id,
2568 }); 2568 });
2569 } 2569 }
2570 2570
@@ -2585,7 +2585,7 @@ namespace WixToolset.Core
2585 { 2585 {
2586 var complusTuple = new ComplusTuple(sourceLineNumbers) 2586 var complusTuple = new ComplusTuple(sourceLineNumbers)
2587 { 2587 {
2588 Component_ = id.Id, 2588 ComponentRef = id.Id,
2589 ExpType = comPlusBits, 2589 ExpType = comPlusBits,
2590 }; 2590 };
2591 2591
@@ -2982,8 +2982,8 @@ namespace WixToolset.Core
2982 { 2982 {
2983 var tuple = new CreateFolderTuple(sourceLineNumbers) 2983 var tuple = new CreateFolderTuple(sourceLineNumbers)
2984 { 2984 {
2985 Directory_ = directoryId, 2985 DirectoryRef = directoryId,
2986 Component_ = componentId 2986 ComponentRef = componentId
2987 }; 2987 };
2988 2988
2989 this.Core.AddTuple(tuple); 2989 this.Core.AddTuple(tuple);
@@ -3109,7 +3109,7 @@ namespace WixToolset.Core
3109 { 3109 {
3110 var tuple = new MoveFileTuple(sourceLineNumbers, id) 3110 var tuple = new MoveFileTuple(sourceLineNumbers, id)
3111 { 3111 {
3112 Component_ = componentId, 3112 ComponentRef = componentId,
3113 SourceName = sourceName, 3113 SourceName = sourceName,
3114 DestName= String.IsNullOrEmpty(destinationShortName) && String.IsNullOrEmpty(destinationName) ? null : this.GetMsiFilenameValue(destinationShortName, destinationName), 3114 DestName= String.IsNullOrEmpty(destinationShortName) && String.IsNullOrEmpty(destinationName) ? null : this.GetMsiFilenameValue(destinationShortName, destinationName),
3115 SourceFolder = sourceDirectory ?? sourceProperty, 3115 SourceFolder = sourceDirectory ?? sourceProperty,
@@ -3156,10 +3156,10 @@ namespace WixToolset.Core
3156 { 3156 {
3157 var tuple = new DuplicateFileTuple(sourceLineNumbers, id) 3157 var tuple = new DuplicateFileTuple(sourceLineNumbers, id)
3158 { 3158 {
3159 Component_ = componentId, 3159 ComponentRef = componentId,
3160 File_ = fileId, 3160 FileRef = fileId,
3161 DestName = String.IsNullOrEmpty(destinationShortName) && String.IsNullOrEmpty(destinationName) ? null : this.GetMsiFilenameValue(destinationShortName, destinationName), 3161 DestinationName = String.IsNullOrEmpty(destinationShortName) && String.IsNullOrEmpty(destinationName) ? null : this.GetMsiFilenameValue(destinationShortName, destinationName),
3162 DestFolder = destinationDirectory ?? destinationProperty 3162 DestinationFolder = destinationDirectory ?? destinationProperty
3163 }; 3163 };
3164 3164
3165 this.Core.AddTuple(tuple); 3165 this.Core.AddTuple(tuple);
@@ -4259,7 +4259,7 @@ namespace WixToolset.Core
4259 { 4259 {
4260 var tuple = new DirectoryTuple(sourceLineNumbers, id) 4260 var tuple = new DirectoryTuple(sourceLineNumbers, id)
4261 { 4261 {
4262 Directory_Parent = parentId, 4262 ParentDirectoryRef = parentId,
4263 DefaultDir = defaultDir, 4263 DefaultDir = defaultDir,
4264 ComponentGuidGenerationSeed = componentGuidGenerationSeed 4264 ComponentGuidGenerationSeed = componentGuidGenerationSeed
4265 }; 4265 };
@@ -4492,7 +4492,7 @@ namespace WixToolset.Core
4492 4492
4493 var tuple = new DrLocatorTuple(sourceLineNumbers) 4493 var tuple = new DrLocatorTuple(sourceLineNumbers)
4494 { 4494 {
4495 Signature_ = rowId, 4495 SignatureRef = rowId,
4496 Parent = parentSignature, 4496 Parent = parentSignature,
4497 Path = path, 4497 Path = path,
4498 }; 4498 };
@@ -4865,7 +4865,7 @@ namespace WixToolset.Core
4865 Description = description, 4865 Description = description,
4866 Display = display, 4866 Display = display,
4867 Level = level, 4867 Level = level,
4868 Directory_ = configurableDirectory, 4868 DirectoryRef = configurableDirectory,
4869 DisallowAbsent = disallowAbsent, 4869 DisallowAbsent = disallowAbsent,
4870 DisallowAdvertise = disallowAdvertise, 4870 DisallowAdvertise = disallowAdvertise,
4871 InstallDefault = installDefault, 4871 InstallDefault = installDefault,
@@ -5300,7 +5300,7 @@ namespace WixToolset.Core
5300 Part = part, 5300 Part = part,
5301 Permanent = permanent, 5301 Permanent = permanent,
5302 System = system, 5302 System = system,
5303 Component_ = componentId 5303 ComponentRef = componentId
5304 }; 5304 };
5305 5305
5306 this.Core.AddTuple(tuple); 5306 this.Core.AddTuple(tuple);
@@ -5446,10 +5446,10 @@ namespace WixToolset.Core
5446 var tuple = new ExtensionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, extension, componentId)) 5446 var tuple = new ExtensionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, extension, componentId))
5447 { 5447 {
5448 Extension = extension, 5448 Extension = extension,
5449 Component_ = componentId, 5449 ComponentRef = componentId,
5450 ProgId_ = progId, 5450 ProgIdRef = progId,
5451 MIME_ = mime, 5451 MimeRef = mime,
5452 Feature_ = Guid.Empty.ToString("B") 5452 FeatureRef = Guid.Empty.ToString("B")
5453 }; 5453 };
5454 5454
5455 this.Core.AddTuple(tuple); 5455 this.Core.AddTuple(tuple);
@@ -5873,9 +5873,9 @@ namespace WixToolset.Core
5873 5873
5874 var tuple = new FileTuple(sourceLineNumbers, id) 5874 var tuple = new FileTuple(sourceLineNumbers, id)
5875 { 5875 {
5876 Component_ = componentId, 5876 ComponentRef = componentId,
5877 ShortFileName = shortName, 5877 ShortName = shortName,
5878 LongFileName = name, 5878 Name = name,
5879 FileSize = defaultSize, 5879 FileSize = defaultSize,
5880 Version = companionFile ?? defaultVersion, 5880 Version = companionFile ?? defaultVersion,
5881 Language = defaultLanguage, 5881 Language = defaultLanguage,
@@ -5895,9 +5895,9 @@ namespace WixToolset.Core
5895 // TODO: Remove all this. 5895 // TODO: Remove all this.
5896 var wixFileRow = (WixFileTuple)this.Core.CreateTuple(sourceLineNumbers, TupleDefinitionType.WixFile, id); 5896 var wixFileRow = (WixFileTuple)this.Core.CreateTuple(sourceLineNumbers, TupleDefinitionType.WixFile, id);
5897 wixFileRow.AssemblyType = assemblyType; 5897 wixFileRow.AssemblyType = assemblyType;
5898 wixFileRow.File_AssemblyManifest = assemblyManifest; 5898 wixFileRow.AssemblyManifestFileRef = assemblyManifest;
5899 wixFileRow.File_AssemblyApplication = assemblyApplication; 5899 wixFileRow.AssemblyApplicationFileRef = assemblyApplication;
5900 wixFileRow.Directory_ = directoryId; 5900 wixFileRow.DirectoryRef = directoryId;
5901 wixFileRow.DiskId = (CompilerConstants.IntegerNotSet == diskId) ? 0 : diskId; 5901 wixFileRow.DiskId = (CompilerConstants.IntegerNotSet == diskId) ? 0 : diskId;
5902 wixFileRow.Source = new IntermediateFieldPathValue { Path = source }; 5902 wixFileRow.Source = new IntermediateFieldPathValue { Path = source };
5903 wixFileRow.ProcessorArchitecture = procArch; 5903 wixFileRow.ProcessorArchitecture = procArch;
@@ -5929,10 +5929,10 @@ namespace WixToolset.Core
5929 { 5929 {
5930 this.Core.AddTuple(new MsiAssemblyTuple(sourceLineNumbers) 5930 this.Core.AddTuple(new MsiAssemblyTuple(sourceLineNumbers)
5931 { 5931 {
5932 Component_ = componentId, 5932 ComponentRef = componentId,
5933 Feature_ = Guid.Empty.ToString("B"), 5933 FeatureRef = Guid.Empty.ToString("B"),
5934 File_Manifest = assemblyManifest, 5934 ManifestFileRef = assemblyManifest,
5935 File_Application = assemblyApplication, 5935 ApplicationFileRef = assemblyApplication,
5936 Type = assemblyType 5936 Type = assemblyType
5937 }); 5937 });
5938 } 5938 }
@@ -6118,7 +6118,7 @@ namespace WixToolset.Core
6118 // the parent DirectorySearch creates the file locator row. 6118 // the parent DirectorySearch creates the file locator row.
6119 this.Core.AddTuple(new DrLocatorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, parentSignature, id.Id, String.Empty)) 6119 this.Core.AddTuple(new DrLocatorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, parentSignature, id.Id, String.Empty))
6120 { 6120 {
6121 Signature_ = parentSignature, 6121 SignatureRef = parentSignature,
6122 Parent = id.Id 6122 Parent = id.Id
6123 }); 6123 });
6124 } 6124 }
@@ -6126,7 +6126,7 @@ namespace WixToolset.Core
6126 { 6126 {
6127 this.Core.AddTuple(new DrLocatorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, id.Id, parentSignature, String.Empty)) 6127 this.Core.AddTuple(new DrLocatorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, id.Id, parentSignature, String.Empty))
6128 { 6128 {
6129 Signature_ = id.Id, 6129 SignatureRef = id.Id,
6130 Parent = parentSignature 6130 Parent = parentSignature
6131 }); 6131 });
6132 } 6132 }
@@ -6450,8 +6450,8 @@ namespace WixToolset.Core
6450 { 6450 {
6451 this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers) 6451 this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers)
6452 { 6452 {
6453 Dialog_ = dialog, 6453 DialogRef = dialog,
6454 Control_ = id, 6454 ControlRef = id,
6455 Action = action, 6455 Action = action,
6456 Condition = condition, 6456 Condition = condition,
6457 }); 6457 });
@@ -6468,7 +6468,7 @@ namespace WixToolset.Core
6468 { 6468 {
6469 this.Core.AddTuple(new ConditionTuple(sourceLineNumbers) 6469 this.Core.AddTuple(new ConditionTuple(sourceLineNumbers)
6470 { 6470 {
6471 Feature_ = id, 6471 FeatureRef = id,
6472 Level = level, 6472 Level = level,
6473 Condition = condition 6473 Condition = condition
6474 }); 6474 });
@@ -6639,7 +6639,7 @@ namespace WixToolset.Core
6639 Key = key, 6639 Key = key,
6640 Value = value, 6640 Value = value,
6641 Action = action.Value, 6641 Action = action.Value,
6642 Component_ = componentId 6642 ComponentRef = componentId
6643 }; 6643 };
6644 6644
6645 this.Core.AddTuple(tuple); 6645 this.Core.AddTuple(tuple);
@@ -6878,8 +6878,8 @@ namespace WixToolset.Core
6878 { 6878 {
6879 this.Core.AddTuple(new IsolatedComponentTuple(sourceLineNumbers) 6879 this.Core.AddTuple(new IsolatedComponentTuple(sourceLineNumbers)
6880 { 6880 {
6881 Component_Shared = shared, 6881 SharedComponentRef = shared,
6882 Component_Application = componentId 6882 ApplicationComponentRef = componentId
6883 }); 6883 });
6884 } 6884 }
6885 } 6885 }
@@ -7066,7 +7066,7 @@ namespace WixToolset.Core
7066 { 7066 {
7067 Table = "Media", 7067 Table = "Media",
7068 SignObject = diskId, 7068 SignObject = diskId,
7069 DigitalCertificate_ = certificateId, 7069 DigitalCertificateRef = certificateId,
7070 Hash = sourceFile 7070 Hash = sourceFile
7071 }); 7071 });
7072 } 7072 }
@@ -7686,12 +7686,12 @@ namespace WixToolset.Core
7686 { 7686 {
7687 var tuple = new WixMergeTuple(sourceLineNumbers, id) 7687 var tuple = new WixMergeTuple(sourceLineNumbers, id)
7688 { 7688 {
7689 Directory_ = directoryId, 7689 DirectoryRef = directoryId,
7690 SourceFile = sourceFile, 7690 SourceFile = sourceFile,
7691 DiskId = diskId, 7691 DiskId = diskId,
7692 ConfigurationData = configData, 7692 ConfigurationData = configData,
7693 FileCompression = fileCompression, 7693 FileCompression = fileCompression,
7694 Feature_ = Guid.Empty.ToString("B") 7694 FeatureRef = Guid.Empty.ToString("B")
7695 }; 7695 };
7696 7696
7697 tuple.Set((int)WixMergeTupleFields.Language, language); 7697 tuple.Set((int)WixMergeTupleFields.Language, language);
@@ -7877,7 +7877,7 @@ namespace WixToolset.Core
7877 var tuple = new MIMETuple(sourceLineNumbers, new Identifier(AccessModifier.Private, contentType)) 7877 var tuple = new MIMETuple(sourceLineNumbers, new Identifier(AccessModifier.Private, contentType))
7878 { 7878 {
7879 ContentType = contentType, 7879 ContentType = contentType,
7880 Extension_ = extension, 7880 ExtensionRef = extension,
7881 CLSID = classId 7881 CLSID = classId
7882 }; 7882 };
7883 7883
diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs
index c1c189ca..beebd4f8 100644
--- a/src/WixToolset.Core/Compiler_2.cs
+++ b/src/WixToolset.Core/Compiler_2.cs
@@ -561,7 +561,7 @@ namespace WixToolset.Core
561 { 561 {
562 this.Core.AddTuple(new ODBCDataSourceTuple(sourceLineNumbers, id) 562 this.Core.AddTuple(new ODBCDataSourceTuple(sourceLineNumbers, id)
563 { 563 {
564 Component_ = componentId, 564 ComponentRef = componentId,
565 Description = name, 565 Description = name,
566 DriverDescription = driverName, 566 DriverDescription = driverName,
567 Registration = registration 567 Registration = registration
@@ -1364,14 +1364,14 @@ namespace WixToolset.Core
1364 var tuple = new ProgIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, progId)) 1364 var tuple = new ProgIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, progId))
1365 { 1365 {
1366 ProgId = progId, 1366 ProgId = progId,
1367 ProgId_Parent = parent, 1367 ParentProgIdRef = parent,
1368 Class_ = classId, 1368 ClassRef = classId,
1369 Description = description, 1369 Description = description,
1370 }; 1370 };
1371 1371
1372 if (null != icon) 1372 if (null != icon)
1373 { 1373 {
1374 tuple.Icon_ = icon; 1374 tuple.IconRef = icon;
1375 this.Core.CreateSimpleReference(sourceLineNumbers, "Icon", icon); 1375 this.Core.CreateSimpleReference(sourceLineNumbers, "Icon", icon);
1376 } 1376 }
1377 1377
@@ -1777,7 +1777,7 @@ namespace WixToolset.Core
1777 Root = root.Value, 1777 Root = root.Value,
1778 Key = key, 1778 Key = key,
1779 Name = name, 1779 Name = name,
1780 Component_ = componentId, 1780 ComponentRef = componentId,
1781 }; 1781 };
1782 1782
1783 this.Core.AddTuple(tuple); 1783 this.Core.AddTuple(tuple);
@@ -2026,7 +2026,7 @@ namespace WixToolset.Core
2026 Value = value, 2026 Value = value,
2027 ValueType = valueType, 2027 ValueType = valueType,
2028 ValueAction = actionType, 2028 ValueAction = actionType,
2029 Component_ = componentId, 2029 ComponentRef = componentId,
2030 }; 2030 };
2031 2031
2032 this.Core.AddTuple(tuple); 2032 this.Core.AddTuple(tuple);
@@ -2147,7 +2147,7 @@ namespace WixToolset.Core
2147 Key = key, 2147 Key = key,
2148 Name = name, 2148 Name = name,
2149 Action = actionType.Value, 2149 Action = actionType.Value,
2150 Component_ = componentId 2150 ComponentRef = componentId
2151 }; 2151 };
2152 2152
2153 this.Core.AddTuple(tuple); 2153 this.Core.AddTuple(tuple);
@@ -2224,7 +2224,7 @@ namespace WixToolset.Core
2224 Root = root.Value, 2224 Root = root.Value,
2225 Key = key, 2225 Key = key,
2226 Name = name, 2226 Name = name,
2227 Component_ = componentId 2227 ComponentRef = componentId
2228 }; 2228 };
2229 2229
2230 this.Core.AddTuple(tuple); 2230 this.Core.AddTuple(tuple);
@@ -2342,7 +2342,7 @@ namespace WixToolset.Core
2342 { 2342 {
2343 var tuple = new RemoveFileTuple(sourceLineNumbers, id) 2343 var tuple = new RemoveFileTuple(sourceLineNumbers, id)
2344 { 2344 {
2345 Component_ = componentId, 2345 ComponentRef = componentId,
2346 FileName = this.GetMsiFilenameValue(shortName, name), 2346 FileName = this.GetMsiFilenameValue(shortName, name),
2347 DirProperty = directory ?? property ?? parentDirectory, 2347 DirProperty = directory ?? property ?? parentDirectory,
2348 OnInstall = onInstall, 2348 OnInstall = onInstall,
@@ -2432,7 +2432,7 @@ namespace WixToolset.Core
2432 { 2432 {
2433 var tuple = new RemoveFileTuple(sourceLineNumbers, id) 2433 var tuple = new RemoveFileTuple(sourceLineNumbers, id)
2434 { 2434 {
2435 Component_ = componentId, 2435 ComponentRef = componentId,
2436 DirProperty = directory ?? property ?? parentDirectory, 2436 DirProperty = directory ?? property ?? parentDirectory,
2437 OnInstall = onInstall, 2437 OnInstall = onInstall,
2438 OnUninstall = onUninstall 2438 OnUninstall = onUninstall
@@ -2505,7 +2505,7 @@ namespace WixToolset.Core
2505 { 2505 {
2506 this.Core.AddTuple(new ReserveCostTuple(sourceLineNumbers, id) 2506 this.Core.AddTuple(new ReserveCostTuple(sourceLineNumbers, id)
2507 { 2507 {
2508 Component_ = componentId, 2508 ComponentRef = componentId,
2509 ReserveFolder = directoryId, 2509 ReserveFolder = directoryId,
2510 ReserveLocal = runLocal, 2510 ReserveLocal = runLocal,
2511 ReserveSource = runFromSource 2511 ReserveSource = runFromSource
@@ -3023,7 +3023,7 @@ namespace WixToolset.Core
3023 OnUninstall = uninstall, 3023 OnUninstall = uninstall,
3024 ConfigType = MsiServiceConfigType.DelayedAutoStart, 3024 ConfigType = MsiServiceConfigType.DelayedAutoStart,
3025 Argument = delayedAutoStart, 3025 Argument = delayedAutoStart,
3026 Component_ = componentId, 3026 ComponentRef = componentId,
3027 }; 3027 };
3028 3028
3029 this.Core.AddTuple(tuple); 3029 this.Core.AddTuple(tuple);
@@ -3045,7 +3045,7 @@ namespace WixToolset.Core
3045 OnUninstall = uninstall, 3045 OnUninstall = uninstall,
3046 ConfigType = MsiServiceConfigType.FailureActionsFlag, 3046 ConfigType = MsiServiceConfigType.FailureActionsFlag,
3047 Argument = failureActionsWhen, 3047 Argument = failureActionsWhen,
3048 Component_ = componentId, 3048 ComponentRef = componentId,
3049 }; 3049 };
3050 3050
3051 this.Core.AddTuple(tuple); 3051 this.Core.AddTuple(tuple);
@@ -3067,7 +3067,7 @@ namespace WixToolset.Core
3067 OnUninstall = uninstall, 3067 OnUninstall = uninstall,
3068 ConfigType = MsiServiceConfigType.ServiceSidInfo, 3068 ConfigType = MsiServiceConfigType.ServiceSidInfo,
3069 Argument = sid, 3069 Argument = sid,
3070 Component_ = componentId, 3070 ComponentRef = componentId,
3071 }; 3071 };
3072 3072
3073 this.Core.AddTuple(tuple); 3073 this.Core.AddTuple(tuple);
@@ -3089,7 +3089,7 @@ namespace WixToolset.Core
3089 OnUninstall = uninstall, 3089 OnUninstall = uninstall,
3090 ConfigType = MsiServiceConfigType.RequiredPrivilegesInfo, 3090 ConfigType = MsiServiceConfigType.RequiredPrivilegesInfo,
3091 Argument = requiredPrivileges, 3091 Argument = requiredPrivileges,
3092 Component_ = componentId, 3092 ComponentRef = componentId,
3093 }; 3093 };
3094 3094
3095 this.Core.AddTuple(tuple); 3095 this.Core.AddTuple(tuple);
@@ -3111,7 +3111,7 @@ namespace WixToolset.Core
3111 OnUninstall = uninstall, 3111 OnUninstall = uninstall,
3112 ConfigType = MsiServiceConfigType.PreshutdownInfo, 3112 ConfigType = MsiServiceConfigType.PreshutdownInfo,
3113 Argument = preShutdownDelay, 3113 Argument = preShutdownDelay,
3114 Component_ = componentId, 3114 ComponentRef = componentId,
3115 }; 3115 };
3116 3116
3117 this.Core.AddTuple(tuple); 3117 this.Core.AddTuple(tuple);
@@ -3302,7 +3302,7 @@ namespace WixToolset.Core
3302 Command = command, 3302 Command = command,
3303 Actions = actions, 3303 Actions = actions,
3304 DelayActions = actionsDelays, 3304 DelayActions = actionsDelays,
3305 Component_ = componentId, 3305 ComponentRef = componentId,
3306 }; 3306 };
3307 3307
3308 this.Core.AddTuple(tuple); 3308 this.Core.AddTuple(tuple);
@@ -3456,7 +3456,7 @@ namespace WixToolset.Core
3456 UninstallStop = uninstallStop, 3456 UninstallStop = uninstallStop,
3457 Arguments = arguments, 3457 Arguments = arguments,
3458 Wait = wait, 3458 Wait = wait,
3459 Component_ = componentId 3459 ComponentRef = componentId
3460 }; 3460 };
3461 3461
3462 this.Core.AddTuple(tuple); 3462 this.Core.AddTuple(tuple);
@@ -3716,7 +3716,7 @@ namespace WixToolset.Core
3716 StartName = account, 3716 StartName = account,
3717 Password = password, 3717 Password = password,
3718 Arguments = arguments, 3718 Arguments = arguments,
3719 Component_ = componentId, 3719 ComponentRef = componentId,
3720 Description = description, 3720 Description = description,
3721 Interactive = interactive, 3721 Interactive = interactive,
3722 Vital = vital 3722 Vital = vital
@@ -4032,8 +4032,8 @@ namespace WixToolset.Core
4032 { 4032 {
4033 this.Core.AddTuple(new FileSFPCatalogTuple(sourceLineNumbers) 4033 this.Core.AddTuple(new FileSFPCatalogTuple(sourceLineNumbers)
4034 { 4034 {
4035 File_ = id, 4035 FileRef = id,
4036 SFPCatalog_ = parentSFPCatalog 4036 SFPCatalogRef = parentSFPCatalog
4037 }); 4037 });
4038 } 4038 }
4039 } 4039 }
@@ -4400,14 +4400,14 @@ namespace WixToolset.Core
4400 4400
4401 var tuple = new ShortcutTuple(sourceLineNumbers, id) 4401 var tuple = new ShortcutTuple(sourceLineNumbers, id)
4402 { 4402 {
4403 Directory_ = directory, 4403 DirectoryRef = directory,
4404 Name = this.GetMsiFilenameValue(shortName, name), 4404 Name = this.GetMsiFilenameValue(shortName, name),
4405 Component_ = componentId, 4405 ComponentRef = componentId,
4406 Target = target, 4406 Target = target,
4407 Arguments = arguments, 4407 Arguments = arguments,
4408 Description = description, 4408 Description = description,
4409 Hotkey = hotkey, 4409 Hotkey = hotkey,
4410 Icon_ = icon, 4410 IconRef = icon,
4411 IconIndex = iconIndex, 4411 IconIndex = iconIndex,
4412 Show = show, 4412 Show = show,
4413 WorkingDirectory = workingDirectory, 4413 WorkingDirectory = workingDirectory,
@@ -4543,7 +4543,7 @@ namespace WixToolset.Core
4543 { 4543 {
4544 this.Core.AddTuple(new MsiShortcutPropertyTuple(sourceLineNumbers, id) 4544 this.Core.AddTuple(new MsiShortcutPropertyTuple(sourceLineNumbers, id)
4545 { 4545 {
4546 Shortcut_ = shortcutId, 4546 ShortcutRef = shortcutId,
4547 PropertyKey = key, 4547 PropertyKey = key,
4548 PropVariantValue = value 4548 PropVariantValue = value
4549 }); 4549 });
@@ -4742,10 +4742,10 @@ namespace WixToolset.Core
4742 { 4742 {
4743 LibId = id, 4743 LibId = id,
4744 Language = language, 4744 Language = language,
4745 Component_ = componentId, 4745 ComponentRef = componentId,
4746 Description = description, 4746 Description = description,
4747 Directory_ = helpDirectory, 4747 DirectoryRef = helpDirectory,
4748 Feature_ = Guid.Empty.ToString("B") 4748 FeatureRef = Guid.Empty.ToString("B")
4749 }; 4749 };
4750 4750
4751 if (CompilerConstants.IntegerNotSet != majorVersion || CompilerConstants.IntegerNotSet != minorVersion) 4751 if (CompilerConstants.IntegerNotSet != majorVersion || CompilerConstants.IntegerNotSet != minorVersion)
@@ -5085,7 +5085,7 @@ namespace WixToolset.Core
5085 { 5085 {
5086 var tuple = new VerbTuple(sourceLineNumbers) 5086 var tuple = new VerbTuple(sourceLineNumbers)
5087 { 5087 {
5088 Extension_ = extension, 5088 ExtensionRef = extension,
5089 Verb = id, 5089 Verb = id,
5090 Command = command, 5090 Command = command,
5091 Argument = argument, 5091 Argument = argument,
diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs
index 2ec66333..58a4ee64 100644
--- a/src/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/WixToolset.Core/Compiler_Bundle.cs
@@ -524,7 +524,7 @@ namespace WixToolset.Core
524 524
525 this.Core.AddTuple(new WixBundleCatalogTuple(sourceLineNumbers, id) 525 this.Core.AddTuple(new WixBundleCatalogTuple(sourceLineNumbers, id)
526 { 526 {
527 Payload_ = id.Id, 527 PayloadRef = id.Id,
528 }); 528 });
529 } 529 }
530 } 530 }
@@ -1309,9 +1309,9 @@ namespace WixToolset.Core
1309 var tuple = new WixOrderingTuple(sourceLineNumbers) 1309 var tuple = new WixOrderingTuple(sourceLineNumbers)
1310 { 1310 {
1311 ItemType = type, 1311 ItemType = type,
1312 ItemId_ = id, 1312 ItemIdRef = id,
1313 DependsOnType = previousType, 1313 DependsOnType = previousType,
1314 DependsOnId_ = previousId 1314 DependsOnIdRef = previousId
1315 }; 1315 };
1316 1316
1317 this.Core.AddTuple(tuple); 1317 this.Core.AddTuple(tuple);
@@ -2041,7 +2041,7 @@ namespace WixToolset.Core
2041 var chainPackageTuple = new WixBundlePackageTuple(sourceLineNumbers, id) 2041 var chainPackageTuple = new WixBundlePackageTuple(sourceLineNumbers, id)
2042 { 2042 {
2043 Type = packageType, 2043 Type = packageType,
2044 Payload_ = id.Id, 2044 PayloadRef = id.Id,
2045 Attributes = attributes, 2045 Attributes = attributes,
2046 InstallCondition = installCondition, 2046 InstallCondition = installCondition,
2047 CacheId = cacheId, 2047 CacheId = cacheId,
@@ -2176,7 +2176,7 @@ namespace WixToolset.Core
2176 { 2176 {
2177 this.Core.AddTuple(new WixBundlePackageCommandLineTuple(sourceLineNumbers) 2177 this.Core.AddTuple(new WixBundlePackageCommandLineTuple(sourceLineNumbers)
2178 { 2178 {
2179 WixBundlePackage_ = packageId, 2179 WixBundlePackageRef = packageId,
2180 InstallArgument = installArgument, 2180 InstallArgument = installArgument,
2181 UninstallArgument = uninstallArgument, 2181 UninstallArgument = uninstallArgument,
2182 RepairArgument = repairArgument, 2182 RepairArgument = repairArgument,
@@ -2460,7 +2460,7 @@ namespace WixToolset.Core
2460 { 2460 {
2461 var tuple = new WixBundleMsiPropertyTuple(sourceLineNumbers) 2461 var tuple = new WixBundleMsiPropertyTuple(sourceLineNumbers)
2462 { 2462 {
2463 WixBundlePackage_ = packageId, 2463 WixBundlePackageRef = packageId,
2464 Name = name, 2464 Name = name,
2465 Value = value 2465 Value = value
2466 }; 2466 };
@@ -2516,8 +2516,8 @@ namespace WixToolset.Core
2516 { 2516 {
2517 this.Core.AddTuple(new WixBundleSlipstreamMspTuple(sourceLineNumbers) 2517 this.Core.AddTuple(new WixBundleSlipstreamMspTuple(sourceLineNumbers)
2518 { 2518 {
2519 WixBundlePackage_ = packageId, 2519 WixBundlePackageRef = packageId,
2520 WixBundlePackage_Msp = id 2520 MspWixBundlePackageRef = id
2521 }); 2521 });
2522 } 2522 }
2523 } 2523 }
diff --git a/src/WixToolset.Core/Compiler_PatchCreation.cs b/src/WixToolset.Core/Compiler_PatchCreation.cs
index 42cdf374..5994795c 100644
--- a/src/WixToolset.Core/Compiler_PatchCreation.cs
+++ b/src/WixToolset.Core/Compiler_PatchCreation.cs
@@ -472,7 +472,7 @@ namespace WixToolset.Core
472 } 472 }
473 else 473 else
474 { 474 {
475 this.Core.AddTuple(new UpgradedFiles_OptionalDataTuple(sourceLineNumbers) 475 this.Core.AddTuple(new UpgradedFilesOptionalDataTuple(sourceLineNumbers)
476 { 476 {
477 Upgraded = upgrade, 477 Upgraded = upgrade,
478 FTK = file, 478 FTK = file,
@@ -675,7 +675,7 @@ namespace WixToolset.Core
675 675
676 if (!this.Core.EncounteredError) 676 if (!this.Core.EncounteredError)
677 { 677 {
678 var tuple = new TargetFiles_OptionalDataTuple(sourceLineNumbers) 678 var tuple = new TargetFilesOptionalDataTuple(sourceLineNumbers)
679 { 679 {
680 Target = target, 680 Target = target,
681 FTK = file, 681 FTK = file,
diff --git a/src/WixToolset.Core/Compiler_UI.cs b/src/WixToolset.Core/Compiler_UI.cs
index 24398895..6b933d09 100644
--- a/src/WixToolset.Core/Compiler_UI.cs
+++ b/src/WixToolset.Core/Compiler_UI.cs
@@ -488,7 +488,7 @@ namespace WixToolset.Core
488 { 488 {
489 var tuple = new BillboardTuple(sourceLineNumbers, id) 489 var tuple = new BillboardTuple(sourceLineNumbers, id)
490 { 490 {
491 Feature_ = feature, 491 FeatureRef = feature,
492 Action = action, 492 Action = action,
493 Ordering = order 493 Ordering = order
494 }; 494 };
@@ -1029,9 +1029,9 @@ namespace WixToolset.Core
1029 SystemModal = systemModal, 1029 SystemModal = systemModal,
1030 TrackDiskSpace = trackDiskSpace, 1030 TrackDiskSpace = trackDiskSpace,
1031 Title = title, 1031 Title = title,
1032 Control_First = firstControl, 1032 FirstControlRef = firstControl,
1033 Control_Default = defaultControl, 1033 DefaultControlRef = defaultControl,
1034 Control_Cancel = cancelControl, 1034 CancelControlRef = cancelControl,
1035 }; 1035 };
1036 1036
1037 this.Core.AddTuple(tuple); 1037 this.Core.AddTuple(tuple);
@@ -1486,7 +1486,7 @@ namespace WixToolset.Core
1486 { 1486 {
1487 var bbTuple = new BBControlTuple(sourceLineNumbers, id) 1487 var bbTuple = new BBControlTuple(sourceLineNumbers, id)
1488 { 1488 {
1489 Billboard_ = dialog, 1489 BillboardRef = dialog,
1490 BBControl = controlId.Id, 1490 BBControl = controlId.Id,
1491 Type = controlType, 1491 Type = controlType,
1492 Attributes = attributes, 1492 Attributes = attributes,
@@ -1515,7 +1515,7 @@ namespace WixToolset.Core
1515 { 1515 {
1516 var controlTuple = new ControlTuple(sourceLineNumbers, id) 1516 var controlTuple = new ControlTuple(sourceLineNumbers, id)
1517 { 1517 {
1518 Dialog_ = dialog, 1518 DialogRef = dialog,
1519 Control = controlId.Id, 1519 Control = controlId.Id,
1520 Type = controlType, 1520 Type = controlType,
1521 Attributes = attributes, 1521 Attributes = attributes,
@@ -1673,8 +1673,8 @@ namespace WixToolset.Core
1673 { 1673 {
1674 var tuple = new ControlEventTuple(sourceLineNumbers) 1674 var tuple = new ControlEventTuple(sourceLineNumbers)
1675 { 1675 {
1676 Dialog_ = dialog, 1676 DialogRef = dialog,
1677 Control_ = control, 1677 ControlRef = control,
1678 Event = controlEvent ?? property, 1678 Event = controlEvent ?? property,
1679 Argument = argument, 1679 Argument = argument,
1680 Condition = condition, 1680 Condition = condition,
@@ -1742,8 +1742,8 @@ namespace WixToolset.Core
1742 { 1742 {
1743 var tuple = new EventMappingTuple(sourceLineNumbers) 1743 var tuple = new EventMappingTuple(sourceLineNumbers)
1744 { 1744 {
1745 Dialog_ = dialog, 1745 DialogRef = dialog,
1746 Control_ = control, 1746 ControlRef = control,
1747 Event = eventMapping, 1747 Event = eventMapping,
1748 Attribute = controlAttribute 1748 Attribute = controlAttribute
1749 }; ; 1749 }; ;
diff --git a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
index 8220ec25..0e80100b 100644
--- a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
@@ -125,7 +125,7 @@ namespace WixToolset.Core.ExtensibilityServices
125 125
126 var tuple = new DirectoryTuple(sourceLineNumbers, id) 126 var tuple = new DirectoryTuple(sourceLineNumbers, id)
127 { 127 {
128 Directory_Parent = parentId, 128 ParentDirectoryRef = parentId,
129 DefaultDir = defaultDir, 129 DefaultDir = defaultDir,
130 }; 130 };
131 131
@@ -232,7 +232,7 @@ namespace WixToolset.Core.ExtensibilityServices
232 Key = key, 232 Key = key,
233 Name = name, 233 Name = name,
234 Value = value, 234 Value = value,
235 Component_ = componentId, 235 ComponentRef = componentId,
236 }; 236 };
237 237
238 section.Tuples.Add(tuple); 238 section.Tuples.Add(tuple);
diff --git a/src/WixToolset.Core/Link/WixGroupingOrdering.cs b/src/WixToolset.Core/Link/WixGroupingOrdering.cs
index c40af502..9080775e 100644
--- a/src/WixToolset.Core/Link/WixGroupingOrdering.cs
+++ b/src/WixToolset.Core/Link/WixGroupingOrdering.cs
@@ -361,9 +361,9 @@ namespace WixToolset.Core.Link
361 foreach (var row in this.EntrySection.Tuples.OfType<WixOrderingTuple>()) 361 foreach (var row in this.EntrySection.Tuples.OfType<WixOrderingTuple>())
362 { 362 {
363 var rowItemType = row.ItemType.ToString(); 363 var rowItemType = row.ItemType.ToString();
364 var rowItemName = row.ItemId_; 364 var rowItemName = row.ItemIdRef;
365 var rowDependsOnType = row.DependsOnType.ToString(); 365 var rowDependsOnType = row.DependsOnType.ToString();
366 var rowDependsOnName = row.DependsOnId_; 366 var rowDependsOnName = row.DependsOnIdRef;
367 367
368 // If this row specifies some other (unknown) type in either 368 // If this row specifies some other (unknown) type in either
369 // position, we assume it's not a row that we're concerned about. 369 // position, we assume it's not a row that we're concerned about.
diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs
index fa4c97b0..31b2ef8a 100644
--- a/src/WixToolset.Core/Linker.cs
+++ b/src/WixToolset.Core/Linker.cs
@@ -464,8 +464,8 @@ namespace WixToolset.Core
464 foreach (var feature in connectToFeature.ConnectFeatures) 464 foreach (var feature in connectToFeature.ConnectFeatures)
465 { 465 {
466 var row = new WixFeatureModulesTuple(); 466 var row = new WixFeatureModulesTuple();
467 row.Feature_ = feature; 467 row.FeatureRef = feature;
468 row.WixMerge_ = connectToFeature.ChildId; 468 row.WixMergeRef = connectToFeature.ChildId;
469 469
470 resolvedSection.Tuples.Add(row); 470 resolvedSection.Tuples.Add(row);
471 } 471 }
@@ -1182,8 +1182,8 @@ namespace WixToolset.Core
1182 1182
1183 // add a row to the FeatureComponents table 1183 // add a row to the FeatureComponents table
1184 var featureComponent = new FeatureComponentsTuple(); 1184 var featureComponent = new FeatureComponentsTuple();
1185 featureComponent.Feature_ = wixComplexReferenceRow.Parent; 1185 featureComponent.FeatureRef = wixComplexReferenceRow.Parent;
1186 featureComponent.Component_ = wixComplexReferenceRow.Child; 1186 featureComponent.ComponentRef = wixComplexReferenceRow.Child;
1187 1187
1188 featureComponents.Add(featureComponent); 1188 featureComponents.Add(featureComponent);
1189 1189
diff --git a/src/WixToolset.Core/Resolver.cs b/src/WixToolset.Core/Resolver.cs
index 42c7c9fb..d2a81477 100644
--- a/src/WixToolset.Core/Resolver.cs
+++ b/src/WixToolset.Core/Resolver.cs
@@ -163,7 +163,7 @@ namespace WixToolset.Core
163 163
164 foreach (var tuple in section.Tuples.OfType<ControlTuple>()) 164 foreach (var tuple in section.Tuples.OfType<ControlTuple>())
165 { 165 {
166 if (context.VariableResolver.TryGetLocalizedControl(tuple.Dialog_, tuple.Control, out var localizedControl)) 166 if (context.VariableResolver.TryGetLocalizedControl(tuple.DialogRef, tuple.Control, out var localizedControl))
167 { 167 {
168 if (CompilerConstants.IntegerNotSet != localizedControl.X) 168 if (CompilerConstants.IntegerNotSet != localizedControl.X)
169 { 169 {
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-07 22:08:56 +0000