From 3859a8cd7d6001f7b49c22065e33242ddb486fbb Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 22 May 2019 14:48:20 -0700 Subject: Adopt "Ref" as reference convention over "_" --- src/WixToolset.Core/Compiler.cs | 104 ++++++++++----------- src/WixToolset.Core/Compiler_2.cs | 58 ++++++------ src/WixToolset.Core/Compiler_Bundle.cs | 16 ++-- src/WixToolset.Core/Compiler_PatchCreation.cs | 4 +- src/WixToolset.Core/Compiler_UI.cs | 20 ++-- .../ExtensibilityServices/ParseHelper.cs | 4 +- src/WixToolset.Core/Link/WixGroupingOrdering.cs | 4 +- src/WixToolset.Core/Linker.cs | 8 +- src/WixToolset.Core/Resolver.cs | 2 +- 9 files changed, 110 insertions(+), 110 deletions(-) (limited to 'src/WixToolset.Core') 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 var tuple = new AppSearchTuple(sourceLineNumbers, propertyId) { - Signature_ = signature + SignatureRef = signature }; this.Core.AddTuple(tuple); @@ -412,7 +412,7 @@ namespace WixToolset.Core var tuple = new WixPropertyTuple(sourceLineNumbers) { - Property_ = property.Id, + PropertyRef = property.Id, Admin = admin, Hidden = hidden, Secure = secure @@ -651,7 +651,7 @@ namespace WixToolset.Core { var tuple = new MsiAssemblyNameTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, componentId, id)) { - Component_ = componentId, + ComponentRef = componentId, Name = id, Value = value }; @@ -1012,9 +1012,9 @@ namespace WixToolset.Core { ComponentId = id, Qualifier = qualifier, - Component_ = componentId, + ComponentRef = componentId, AppData = appData, - Feature_ = feature ?? Guid.Empty.ToString("B"), + FeatureRef = feature ?? Guid.Empty.ToString("B"), }; this.Core.AddTuple(tuple); @@ -1271,25 +1271,25 @@ namespace WixToolset.Core { CLSID = classId, Context = context, - Component_ = componentId, - ProgId_Default = defaultProgId, + ComponentRef = componentId, + DefaultProgIdRef = defaultProgId, Description = description, FileTypeMask = fileTypeMask, DefInprocHandler = defaultInprocHandler, Argument = argument, - Feature_ = Guid.Empty.ToString("B"), + FeatureRef = Guid.Empty.ToString("B"), RelativePath = YesNoType.Yes == relativePath, }; if (null != appId) { - tuple.AppId_ = appId; + tuple.AppIdRef = appId; this.Core.CreateSimpleReference(sourceLineNumbers, "AppId", appId); } if (null != icon) { - tuple.Icon_ = icon; + tuple.IconRef = icon; this.Core.CreateSimpleReference(sourceLineNumbers, "Icon", icon); } @@ -2484,8 +2484,8 @@ namespace WixToolset.Core { var tuple = new CreateFolderTuple(sourceLineNumbers) { - Directory_ = directoryId, - Component_ = id.Id + DirectoryRef = directoryId, + ComponentRef = id.Id }; this.Core.AddTuple(tuple); @@ -2543,7 +2543,7 @@ namespace WixToolset.Core var tuple = new ComponentTuple(sourceLineNumbers, id) { ComponentId = guid, - Directory_ = directoryId, + DirectoryRef = directoryId, Location = location, Condition = condition, KeyPath = keyPath, @@ -2564,7 +2564,7 @@ namespace WixToolset.Core { this.Core.AddTuple(new WixInstanceComponentTuple(sourceLineNumbers, id) { - Component_ = id.Id, + ComponentRef = id.Id, }); } @@ -2585,7 +2585,7 @@ namespace WixToolset.Core { var complusTuple = new ComplusTuple(sourceLineNumbers) { - Component_ = id.Id, + ComponentRef = id.Id, ExpType = comPlusBits, }; @@ -2982,8 +2982,8 @@ namespace WixToolset.Core { var tuple = new CreateFolderTuple(sourceLineNumbers) { - Directory_ = directoryId, - Component_ = componentId + DirectoryRef = directoryId, + ComponentRef = componentId }; this.Core.AddTuple(tuple); @@ -3109,7 +3109,7 @@ namespace WixToolset.Core { var tuple = new MoveFileTuple(sourceLineNumbers, id) { - Component_ = componentId, + ComponentRef = componentId, SourceName = sourceName, DestName= String.IsNullOrEmpty(destinationShortName) && String.IsNullOrEmpty(destinationName) ? null : this.GetMsiFilenameValue(destinationShortName, destinationName), SourceFolder = sourceDirectory ?? sourceProperty, @@ -3156,10 +3156,10 @@ namespace WixToolset.Core { var tuple = new DuplicateFileTuple(sourceLineNumbers, id) { - Component_ = componentId, - File_ = fileId, - DestName = String.IsNullOrEmpty(destinationShortName) && String.IsNullOrEmpty(destinationName) ? null : this.GetMsiFilenameValue(destinationShortName, destinationName), - DestFolder = destinationDirectory ?? destinationProperty + ComponentRef = componentId, + FileRef = fileId, + DestinationName = String.IsNullOrEmpty(destinationShortName) && String.IsNullOrEmpty(destinationName) ? null : this.GetMsiFilenameValue(destinationShortName, destinationName), + DestinationFolder = destinationDirectory ?? destinationProperty }; this.Core.AddTuple(tuple); @@ -4259,7 +4259,7 @@ namespace WixToolset.Core { var tuple = new DirectoryTuple(sourceLineNumbers, id) { - Directory_Parent = parentId, + ParentDirectoryRef = parentId, DefaultDir = defaultDir, ComponentGuidGenerationSeed = componentGuidGenerationSeed }; @@ -4492,7 +4492,7 @@ namespace WixToolset.Core var tuple = new DrLocatorTuple(sourceLineNumbers) { - Signature_ = rowId, + SignatureRef = rowId, Parent = parentSignature, Path = path, }; @@ -4865,7 +4865,7 @@ namespace WixToolset.Core Description = description, Display = display, Level = level, - Directory_ = configurableDirectory, + DirectoryRef = configurableDirectory, DisallowAbsent = disallowAbsent, DisallowAdvertise = disallowAdvertise, InstallDefault = installDefault, @@ -5300,7 +5300,7 @@ namespace WixToolset.Core Part = part, Permanent = permanent, System = system, - Component_ = componentId + ComponentRef = componentId }; this.Core.AddTuple(tuple); @@ -5446,10 +5446,10 @@ namespace WixToolset.Core var tuple = new ExtensionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, extension, componentId)) { Extension = extension, - Component_ = componentId, - ProgId_ = progId, - MIME_ = mime, - Feature_ = Guid.Empty.ToString("B") + ComponentRef = componentId, + ProgIdRef = progId, + MimeRef = mime, + FeatureRef = Guid.Empty.ToString("B") }; this.Core.AddTuple(tuple); @@ -5873,9 +5873,9 @@ namespace WixToolset.Core var tuple = new FileTuple(sourceLineNumbers, id) { - Component_ = componentId, - ShortFileName = shortName, - LongFileName = name, + ComponentRef = componentId, + ShortName = shortName, + Name = name, FileSize = defaultSize, Version = companionFile ?? defaultVersion, Language = defaultLanguage, @@ -5895,9 +5895,9 @@ namespace WixToolset.Core // TODO: Remove all this. var wixFileRow = (WixFileTuple)this.Core.CreateTuple(sourceLineNumbers, TupleDefinitionType.WixFile, id); wixFileRow.AssemblyType = assemblyType; - wixFileRow.File_AssemblyManifest = assemblyManifest; - wixFileRow.File_AssemblyApplication = assemblyApplication; - wixFileRow.Directory_ = directoryId; + wixFileRow.AssemblyManifestFileRef = assemblyManifest; + wixFileRow.AssemblyApplicationFileRef = assemblyApplication; + wixFileRow.DirectoryRef = directoryId; wixFileRow.DiskId = (CompilerConstants.IntegerNotSet == diskId) ? 0 : diskId; wixFileRow.Source = new IntermediateFieldPathValue { Path = source }; wixFileRow.ProcessorArchitecture = procArch; @@ -5929,10 +5929,10 @@ namespace WixToolset.Core { this.Core.AddTuple(new MsiAssemblyTuple(sourceLineNumbers) { - Component_ = componentId, - Feature_ = Guid.Empty.ToString("B"), - File_Manifest = assemblyManifest, - File_Application = assemblyApplication, + ComponentRef = componentId, + FeatureRef = Guid.Empty.ToString("B"), + ManifestFileRef = assemblyManifest, + ApplicationFileRef = assemblyApplication, Type = assemblyType }); } @@ -6118,7 +6118,7 @@ namespace WixToolset.Core // the parent DirectorySearch creates the file locator row. this.Core.AddTuple(new DrLocatorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, parentSignature, id.Id, String.Empty)) { - Signature_ = parentSignature, + SignatureRef = parentSignature, Parent = id.Id }); } @@ -6126,7 +6126,7 @@ namespace WixToolset.Core { this.Core.AddTuple(new DrLocatorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, id.Id, parentSignature, String.Empty)) { - Signature_ = id.Id, + SignatureRef = id.Id, Parent = parentSignature }); } @@ -6450,8 +6450,8 @@ namespace WixToolset.Core { this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers) { - Dialog_ = dialog, - Control_ = id, + DialogRef = dialog, + ControlRef = id, Action = action, Condition = condition, }); @@ -6468,7 +6468,7 @@ namespace WixToolset.Core { this.Core.AddTuple(new ConditionTuple(sourceLineNumbers) { - Feature_ = id, + FeatureRef = id, Level = level, Condition = condition }); @@ -6639,7 +6639,7 @@ namespace WixToolset.Core Key = key, Value = value, Action = action.Value, - Component_ = componentId + ComponentRef = componentId }; this.Core.AddTuple(tuple); @@ -6878,8 +6878,8 @@ namespace WixToolset.Core { this.Core.AddTuple(new IsolatedComponentTuple(sourceLineNumbers) { - Component_Shared = shared, - Component_Application = componentId + SharedComponentRef = shared, + ApplicationComponentRef = componentId }); } } @@ -7066,7 +7066,7 @@ namespace WixToolset.Core { Table = "Media", SignObject = diskId, - DigitalCertificate_ = certificateId, + DigitalCertificateRef = certificateId, Hash = sourceFile }); } @@ -7686,12 +7686,12 @@ namespace WixToolset.Core { var tuple = new WixMergeTuple(sourceLineNumbers, id) { - Directory_ = directoryId, + DirectoryRef = directoryId, SourceFile = sourceFile, DiskId = diskId, ConfigurationData = configData, FileCompression = fileCompression, - Feature_ = Guid.Empty.ToString("B") + FeatureRef = Guid.Empty.ToString("B") }; tuple.Set((int)WixMergeTupleFields.Language, language); @@ -7877,7 +7877,7 @@ namespace WixToolset.Core var tuple = new MIMETuple(sourceLineNumbers, new Identifier(AccessModifier.Private, contentType)) { ContentType = contentType, - Extension_ = extension, + ExtensionRef = extension, CLSID = classId }; 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 { this.Core.AddTuple(new ODBCDataSourceTuple(sourceLineNumbers, id) { - Component_ = componentId, + ComponentRef = componentId, Description = name, DriverDescription = driverName, Registration = registration @@ -1364,14 +1364,14 @@ namespace WixToolset.Core var tuple = new ProgIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, progId)) { ProgId = progId, - ProgId_Parent = parent, - Class_ = classId, + ParentProgIdRef = parent, + ClassRef = classId, Description = description, }; if (null != icon) { - tuple.Icon_ = icon; + tuple.IconRef = icon; this.Core.CreateSimpleReference(sourceLineNumbers, "Icon", icon); } @@ -1777,7 +1777,7 @@ namespace WixToolset.Core Root = root.Value, Key = key, Name = name, - Component_ = componentId, + ComponentRef = componentId, }; this.Core.AddTuple(tuple); @@ -2026,7 +2026,7 @@ namespace WixToolset.Core Value = value, ValueType = valueType, ValueAction = actionType, - Component_ = componentId, + ComponentRef = componentId, }; this.Core.AddTuple(tuple); @@ -2147,7 +2147,7 @@ namespace WixToolset.Core Key = key, Name = name, Action = actionType.Value, - Component_ = componentId + ComponentRef = componentId }; this.Core.AddTuple(tuple); @@ -2224,7 +2224,7 @@ namespace WixToolset.Core Root = root.Value, Key = key, Name = name, - Component_ = componentId + ComponentRef = componentId }; this.Core.AddTuple(tuple); @@ -2342,7 +2342,7 @@ namespace WixToolset.Core { var tuple = new RemoveFileTuple(sourceLineNumbers, id) { - Component_ = componentId, + ComponentRef = componentId, FileName = this.GetMsiFilenameValue(shortName, name), DirProperty = directory ?? property ?? parentDirectory, OnInstall = onInstall, @@ -2432,7 +2432,7 @@ namespace WixToolset.Core { var tuple = new RemoveFileTuple(sourceLineNumbers, id) { - Component_ = componentId, + ComponentRef = componentId, DirProperty = directory ?? property ?? parentDirectory, OnInstall = onInstall, OnUninstall = onUninstall @@ -2505,7 +2505,7 @@ namespace WixToolset.Core { this.Core.AddTuple(new ReserveCostTuple(sourceLineNumbers, id) { - Component_ = componentId, + ComponentRef = componentId, ReserveFolder = directoryId, ReserveLocal = runLocal, ReserveSource = runFromSource @@ -3023,7 +3023,7 @@ namespace WixToolset.Core OnUninstall = uninstall, ConfigType = MsiServiceConfigType.DelayedAutoStart, Argument = delayedAutoStart, - Component_ = componentId, + ComponentRef = componentId, }; this.Core.AddTuple(tuple); @@ -3045,7 +3045,7 @@ namespace WixToolset.Core OnUninstall = uninstall, ConfigType = MsiServiceConfigType.FailureActionsFlag, Argument = failureActionsWhen, - Component_ = componentId, + ComponentRef = componentId, }; this.Core.AddTuple(tuple); @@ -3067,7 +3067,7 @@ namespace WixToolset.Core OnUninstall = uninstall, ConfigType = MsiServiceConfigType.ServiceSidInfo, Argument = sid, - Component_ = componentId, + ComponentRef = componentId, }; this.Core.AddTuple(tuple); @@ -3089,7 +3089,7 @@ namespace WixToolset.Core OnUninstall = uninstall, ConfigType = MsiServiceConfigType.RequiredPrivilegesInfo, Argument = requiredPrivileges, - Component_ = componentId, + ComponentRef = componentId, }; this.Core.AddTuple(tuple); @@ -3111,7 +3111,7 @@ namespace WixToolset.Core OnUninstall = uninstall, ConfigType = MsiServiceConfigType.PreshutdownInfo, Argument = preShutdownDelay, - Component_ = componentId, + ComponentRef = componentId, }; this.Core.AddTuple(tuple); @@ -3302,7 +3302,7 @@ namespace WixToolset.Core Command = command, Actions = actions, DelayActions = actionsDelays, - Component_ = componentId, + ComponentRef = componentId, }; this.Core.AddTuple(tuple); @@ -3456,7 +3456,7 @@ namespace WixToolset.Core UninstallStop = uninstallStop, Arguments = arguments, Wait = wait, - Component_ = componentId + ComponentRef = componentId }; this.Core.AddTuple(tuple); @@ -3716,7 +3716,7 @@ namespace WixToolset.Core StartName = account, Password = password, Arguments = arguments, - Component_ = componentId, + ComponentRef = componentId, Description = description, Interactive = interactive, Vital = vital @@ -4032,8 +4032,8 @@ namespace WixToolset.Core { this.Core.AddTuple(new FileSFPCatalogTuple(sourceLineNumbers) { - File_ = id, - SFPCatalog_ = parentSFPCatalog + FileRef = id, + SFPCatalogRef = parentSFPCatalog }); } } @@ -4400,14 +4400,14 @@ namespace WixToolset.Core var tuple = new ShortcutTuple(sourceLineNumbers, id) { - Directory_ = directory, + DirectoryRef = directory, Name = this.GetMsiFilenameValue(shortName, name), - Component_ = componentId, + ComponentRef = componentId, Target = target, Arguments = arguments, Description = description, Hotkey = hotkey, - Icon_ = icon, + IconRef = icon, IconIndex = iconIndex, Show = show, WorkingDirectory = workingDirectory, @@ -4543,7 +4543,7 @@ namespace WixToolset.Core { this.Core.AddTuple(new MsiShortcutPropertyTuple(sourceLineNumbers, id) { - Shortcut_ = shortcutId, + ShortcutRef = shortcutId, PropertyKey = key, PropVariantValue = value }); @@ -4742,10 +4742,10 @@ namespace WixToolset.Core { LibId = id, Language = language, - Component_ = componentId, + ComponentRef = componentId, Description = description, - Directory_ = helpDirectory, - Feature_ = Guid.Empty.ToString("B") + DirectoryRef = helpDirectory, + FeatureRef = Guid.Empty.ToString("B") }; if (CompilerConstants.IntegerNotSet != majorVersion || CompilerConstants.IntegerNotSet != minorVersion) @@ -5085,7 +5085,7 @@ namespace WixToolset.Core { var tuple = new VerbTuple(sourceLineNumbers) { - Extension_ = extension, + ExtensionRef = extension, Verb = id, Command = command, 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 this.Core.AddTuple(new WixBundleCatalogTuple(sourceLineNumbers, id) { - Payload_ = id.Id, + PayloadRef = id.Id, }); } } @@ -1309,9 +1309,9 @@ namespace WixToolset.Core var tuple = new WixOrderingTuple(sourceLineNumbers) { ItemType = type, - ItemId_ = id, + ItemIdRef = id, DependsOnType = previousType, - DependsOnId_ = previousId + DependsOnIdRef = previousId }; this.Core.AddTuple(tuple); @@ -2041,7 +2041,7 @@ namespace WixToolset.Core var chainPackageTuple = new WixBundlePackageTuple(sourceLineNumbers, id) { Type = packageType, - Payload_ = id.Id, + PayloadRef = id.Id, Attributes = attributes, InstallCondition = installCondition, CacheId = cacheId, @@ -2176,7 +2176,7 @@ namespace WixToolset.Core { this.Core.AddTuple(new WixBundlePackageCommandLineTuple(sourceLineNumbers) { - WixBundlePackage_ = packageId, + WixBundlePackageRef = packageId, InstallArgument = installArgument, UninstallArgument = uninstallArgument, RepairArgument = repairArgument, @@ -2460,7 +2460,7 @@ namespace WixToolset.Core { var tuple = new WixBundleMsiPropertyTuple(sourceLineNumbers) { - WixBundlePackage_ = packageId, + WixBundlePackageRef = packageId, Name = name, Value = value }; @@ -2516,8 +2516,8 @@ namespace WixToolset.Core { this.Core.AddTuple(new WixBundleSlipstreamMspTuple(sourceLineNumbers) { - WixBundlePackage_ = packageId, - WixBundlePackage_Msp = id + WixBundlePackageRef = packageId, + MspWixBundlePackageRef = id }); } } 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 } else { - this.Core.AddTuple(new UpgradedFiles_OptionalDataTuple(sourceLineNumbers) + this.Core.AddTuple(new UpgradedFilesOptionalDataTuple(sourceLineNumbers) { Upgraded = upgrade, FTK = file, @@ -675,7 +675,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = new TargetFiles_OptionalDataTuple(sourceLineNumbers) + var tuple = new TargetFilesOptionalDataTuple(sourceLineNumbers) { Target = target, 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 { var tuple = new BillboardTuple(sourceLineNumbers, id) { - Feature_ = feature, + FeatureRef = feature, Action = action, Ordering = order }; @@ -1029,9 +1029,9 @@ namespace WixToolset.Core SystemModal = systemModal, TrackDiskSpace = trackDiskSpace, Title = title, - Control_First = firstControl, - Control_Default = defaultControl, - Control_Cancel = cancelControl, + FirstControlRef = firstControl, + DefaultControlRef = defaultControl, + CancelControlRef = cancelControl, }; this.Core.AddTuple(tuple); @@ -1486,7 +1486,7 @@ namespace WixToolset.Core { var bbTuple = new BBControlTuple(sourceLineNumbers, id) { - Billboard_ = dialog, + BillboardRef = dialog, BBControl = controlId.Id, Type = controlType, Attributes = attributes, @@ -1515,7 +1515,7 @@ namespace WixToolset.Core { var controlTuple = new ControlTuple(sourceLineNumbers, id) { - Dialog_ = dialog, + DialogRef = dialog, Control = controlId.Id, Type = controlType, Attributes = attributes, @@ -1673,8 +1673,8 @@ namespace WixToolset.Core { var tuple = new ControlEventTuple(sourceLineNumbers) { - Dialog_ = dialog, - Control_ = control, + DialogRef = dialog, + ControlRef = control, Event = controlEvent ?? property, Argument = argument, Condition = condition, @@ -1742,8 +1742,8 @@ namespace WixToolset.Core { var tuple = new EventMappingTuple(sourceLineNumbers) { - Dialog_ = dialog, - Control_ = control, + DialogRef = dialog, + ControlRef = control, Event = eventMapping, Attribute = controlAttribute }; ; 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 var tuple = new DirectoryTuple(sourceLineNumbers, id) { - Directory_Parent = parentId, + ParentDirectoryRef = parentId, DefaultDir = defaultDir, }; @@ -232,7 +232,7 @@ namespace WixToolset.Core.ExtensibilityServices Key = key, Name = name, Value = value, - Component_ = componentId, + ComponentRef = componentId, }; 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 foreach (var row in this.EntrySection.Tuples.OfType()) { var rowItemType = row.ItemType.ToString(); - var rowItemName = row.ItemId_; + var rowItemName = row.ItemIdRef; var rowDependsOnType = row.DependsOnType.ToString(); - var rowDependsOnName = row.DependsOnId_; + var rowDependsOnName = row.DependsOnIdRef; // If this row specifies some other (unknown) type in either // 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 foreach (var feature in connectToFeature.ConnectFeatures) { var row = new WixFeatureModulesTuple(); - row.Feature_ = feature; - row.WixMerge_ = connectToFeature.ChildId; + row.FeatureRef = feature; + row.WixMergeRef = connectToFeature.ChildId; resolvedSection.Tuples.Add(row); } @@ -1182,8 +1182,8 @@ namespace WixToolset.Core // add a row to the FeatureComponents table var featureComponent = new FeatureComponentsTuple(); - featureComponent.Feature_ = wixComplexReferenceRow.Parent; - featureComponent.Component_ = wixComplexReferenceRow.Child; + featureComponent.FeatureRef = wixComplexReferenceRow.Parent; + featureComponent.ComponentRef = wixComplexReferenceRow.Child; featureComponents.Add(featureComponent); 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 foreach (var tuple in section.Tuples.OfType()) { - if (context.VariableResolver.TryGetLocalizedControl(tuple.Dialog_, tuple.Control, out var localizedControl)) + if (context.VariableResolver.TryGetLocalizedControl(tuple.DialogRef, tuple.Control, out var localizedControl)) { if (CompilerConstants.IntegerNotSet != localizedControl.X) { -- cgit v1.2.3-55-g6feb