@joebigelow / wix / commits / 3859a8cd

Adopt "Ref" as reference convention over "_"

Rob Mensching committed May 22, 2019 at 14:48 UTC 3859a8cd7d6001f7b49c22065e33242ddb486fbb

18 files changed +161 -163

src/WixToolset.Core.WindowsInstaller/Bind/CabinetBuilder.cs

-2

@@ -163,8 +163,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind

163

164 // create the cabinet file

165 var cabinetPath = Path.GetFullPath(cabinetWorkItem.CabinetFile);

166 - string cabinetFileName = Path.GetFileName(cabinetWorkItem.CabinetFile);

167 - string cabinetDirectory = Path.GetDirectoryName(cabinetWorkItem.CabinetFile);

166

167 var files = cabinetWorkItem.FileFacades

168 .Select(facade => facade.Hash == null ?

src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs

+6 -6

@@ -87,7 +87,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

87 }

89 var targetName = Common.GetName(row.DefaultDir, false, true);

90 - targetPathsByDirectoryId.Add(row.Id.Id, new ResolvedDirectory(row.Directory_Parent, targetName));

90 + targetPathsByDirectoryId.Add(row.Id.Id, new ResolvedDirectory(row.ParentDirectoryRef, targetName));

91 }

92 }

@@ -112,10 +112,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind

112

113 foreach (var file in files)

114 {

115 - if (!filesByComponentId.TryGetValue(file.Component_, out var componentFiles))

115 + if (!filesByComponentId.TryGetValue(file.ComponentRef, out var componentFiles))

116 {

117 componentFiles = new List<FileTuple>();

118 - filesByComponentId.Add(file.Component_, componentFiles);

118 + filesByComponentId.Add(file.ComponentRef, componentFiles);

119 }

120

121 componentFiles.Add(file);

@@ -132,8 +132,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind

132 if (fileRow.Id.Id == componentTuple.KeyPath)

133 {

134 // calculate the key file's canonical target path

135 - string directoryPath = PathResolver.GetDirectoryPath(targetPathsByDirectoryId, componentIdGenSeeds, componentTuple.Directory_, true);

136 - string fileName = Common.GetName(fileRow.LongFileName, false, true).ToLowerInvariant();

135 + string directoryPath = PathResolver.GetDirectoryPath(targetPathsByDirectoryId, componentIdGenSeeds, componentTuple.DirectoryRef, true);

136 + string fileName = Common.GetName(fileRow.Name, false, true).ToLowerInvariant();

137 path = Path.Combine(directoryPath, fileName);

138

139 // find paths that are not canonicalized

@@ -144,7 +144,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

144 path.StartsWith(@"StartMenuFolder\programs", StringComparison.Ordinal) ||

145 path.StartsWith(@"WindowsFolder\fonts", StringComparison.Ordinal))

146 {

147 - this.Messaging.Write(ErrorMessages.IllegalPathForGeneratedComponentGuid(componentTuple.SourceLineNumbers, fileRow.Component_, path));

147 + this.Messaging.Write(ErrorMessages.IllegalPathForGeneratedComponentGuid(componentTuple.SourceLineNumbers, fileRow.ComponentRef, path));

148 }

149

150 // if component has more than one file, the key path must be versioned

src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs

+23 -23

@@ -196,7 +196,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

196

197 var table = output.EnsureTable(this.TableDefinitions["BBControl"]);

198 var row = table.CreateRow(tuple.SourceLineNumbers);

199 - row[0] = tuple.Billboard_;

199 + row[0] = tuple.BillboardRef;

200 row[1] = tuple.BBControl;

201 row[2] = tuple.Type;

202 row[3] = tuple.X;

@@ -234,7 +234,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

234

235 var table = output.EnsureTable(this.TableDefinitions["Control"]);

236 var row = table.CreateRow(tuple.SourceLineNumbers);

237 - row[0] = tuple.Dialog_;

237 + row[0] = tuple.DialogRef;

238 row[1] = tuple.Control;

239 row[2] = tuple.Type;

240 row[3] = tuple.X;

@@ -243,7 +243,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

243 row[6] = tuple.Height;

244 row[7] = attributes;

245 row[8] = text;

246 - row[9] = tuple.Control_Next;

246 + row[9] = tuple.NextControlRef;

247 row[10] = tuple.Help;

248 }

249

@@ -266,7 +266,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

266 var row = table.CreateRow(tuple.SourceLineNumbers);

267 row[0] = tuple.Id.Id;

268 row[1] = tuple.ComponentId;

269 - row[2] = tuple.Directory_;

269 + row[2] = tuple.DirectoryRef;

270 row[3] = attributes;

271 row[4] = tuple.Condition;

272 row[5] = tuple.KeyPath;

@@ -331,9 +331,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind

331 row[4] = tuple.Height;

332 row[5] = attributes;

333 row[6] = tuple.Title;

334 - row[7] = tuple.Control_First;

335 - row[8] = tuple.Control_Default;

336 - row[9] = tuple.Control_Cancel;

334 + row[7] = tuple.FirstControlRef;

335 + row[8] = tuple.DefaultControlRef;

336 + row[9] = tuple.CancelControlRef;

337 }

338

339 private void AddDirectoryTuple(DirectoryTuple tuple, Output output)

@@ -341,7 +341,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

341 var table = output.EnsureTable(this.TableDefinitions["Directory"]);

342 var row = table.CreateRow(tuple.SourceLineNumbers);

343 row[0] = tuple.Id.Id;

344 - row[1] = tuple.Directory_Parent;

344 + row[1] = tuple.ParentDirectoryRef;

345 row[2] = tuple.DefaultDir;

346 }

347

@@ -380,7 +380,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

380 row[0] = tuple.Id.Id;

381 row[1] = String.Concat(action, uninstall, system, tuple.Name);

382 row[2] = value;

383 - row[3] = tuple.Component_;

383 + row[3] = tuple.ComponentRef;

384 }

385

386 private void AddFeatureTuple(FeatureTuple tuple, Output output)

@@ -394,12 +394,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind

394 var table = output.EnsureTable(this.TableDefinitions["Feature"]);

395 var row = table.CreateRow(tuple.SourceLineNumbers);

396 row[0] = tuple.Id.Id;

397 - row[1] = tuple.Feature_Parent;

397 + row[1] = tuple.ParentFeatureRef;

398 row[2] = tuple.Title;

399 row[3] = tuple.Description;

400 row[4] = tuple.Display;

401 row[5] = tuple.Level;

402 - row[6] = tuple.Directory_;

402 + row[6] = tuple.DirectoryRef;

403 row[7] = attributes;

404 }

405

@@ -408,8 +408,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind

408 var table = output.EnsureTable(this.TableDefinitions["File"]);

409 var row = (FileRow)table.CreateRow(tuple.SourceLineNumbers);

410 row.File = tuple.Id.Id;

411 - row.Component = tuple.Component_;

412 - row.FileName = GetMsiFilenameValue(tuple.ShortFileName, tuple.LongFileName);

411 + row.Component = tuple.ComponentRef;

412 + row.FileName = GetMsiFilenameValue(tuple.ShortName, tuple.Name);

413 row.FileSize = tuple.FileSize;

414 row.Version = tuple.Version;

415 row.Language = tuple.Language;

@@ -437,7 +437,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

437 row[4] = tuple.Key;

438 row[5] = tuple.Value;

439 row[6] = tuple.Action;

440 - row[7] = tuple.Component_;

440 + row[7] = tuple.ComponentRef;

441 }

442

443 private void AddMediaTuple(MediaTuple tuple, Output output)

@@ -499,7 +499,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

499 row[2] = events;

500 row[3] = tuple.ConfigType;

501 row[4] = tuple.Argument;

502 - row[5] = tuple.Component_;

502 + row[5] = tuple.ComponentRef;

503 }

504

505 private void AddMsiServiceConfigFailureActionsTuple(MsiServiceConfigFailureActionsTuple tuple, Output output)

@@ -518,7 +518,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

518 row[5] = tuple.Command ?? "[~]";

519 row[6] = tuple.Actions;

520 row[7] = tuple.DelayActions;

521 - row[8] = tuple.Component_;

521 + row[8] = tuple.ComponentRef;

522 }

523

524 private void AddMoveFileTuple(MoveFileTuple tuple, Output output)

@@ -526,7 +526,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

526 var table = output.EnsureTable(this.TableDefinitions["MoveFile"]);

527 var row = table.CreateRow(tuple.SourceLineNumbers);

528 row[0] = tuple.Id.Id;

529 - row[1] = tuple.Component_;

529 + row[1] = tuple.ComponentRef;

530 row[2] = tuple.SourceName;

531 row[3] = tuple.DestName;

532 row[4] = tuple.SourceFolder;

@@ -555,7 +555,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

555 var table = output.EnsureTable(this.TableDefinitions["RemoveFile"]);

556 var row = table.CreateRow(tuple.SourceLineNumbers);

557 row[0] = tuple.Id.Id;

558 - row[1] = tuple.Component_;

558 + row[1] = tuple.ComponentRef;

559 row[2] = tuple.FileName;

560 row[3] = tuple.DirProperty;

561 row[4] = installMode;

@@ -610,7 +610,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

610 row[2] = tuple.Key;

611 row[3] = tuple.Name;

612 row[4] = value;

613 - row[5] = tuple.Component_;

613 + row[5] = tuple.ComponentRef;

614 }

615

616 private void AddRegLocatorTuple(RegLocatorTuple tuple, Output output)

@@ -637,7 +637,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

637 row[1] = tuple.Root;

638 row[2] = tuple.Key;

639 row[3] = tuple.Name;

640 - row[4] = tuple.Component_;

640 + row[4] = tuple.ComponentRef;

641 }

642 else // Registry table is used to remove registry keys on uninstall.

643 {

@@ -647,7 +647,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

647 row[1] = tuple.Root;

648 row[2] = tuple.Key;

649 row[3] = tuple.Name;

650 - row[5] = tuple.Component_;

650 + row[5] = tuple.ComponentRef;

651 }

652 }

653

@@ -667,7 +667,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

667 row[2] = events;

668 row[3] = tuple.Arguments;

669 row[4] = tuple.Wait;

670 - row[5] = tuple.Component_;

670 + row[5] = tuple.ComponentRef;

671 }

672

673 private void AddServiceInstallTuple(ServiceInstallTuple tuple, Output output)

@@ -691,7 +691,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

691 row[8] = tuple.StartName;

692 row[9] = tuple.Password;

693 row[10] = tuple.Arguments;

694 - row[11] = tuple.Component_;

694 + row[11] = tuple.ComponentRef;

695 row[12] = tuple.Description;

696 }

697

src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs

+3 -3

@@ -28,17 +28,17 @@ namespace WixToolset.Core.WindowsInstaller.Bind

28 {

29 if (wixPropertyRow.Admin)

30 {

31 - adminProperties.Add(wixPropertyRow.Property_);

31 + adminProperties.Add(wixPropertyRow.PropertyRef);

32 }

34 if (wixPropertyRow.Hidden)

35 {

36 - hiddenProperties.Add(wixPropertyRow.Property_);

36 + hiddenProperties.Add(wixPropertyRow.PropertyRef);

37 }

39 if (wixPropertyRow.Secure)

40 {

41 - secureProperties.Add(wixPropertyRow.Property_);

41 + secureProperties.Add(wixPropertyRow.PropertyRef);

42 }

43 }

src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs

+1 -1

@@ -105,7 +105,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

105 fileRow.Compressed = wixMergeRow.FileCompression;

106

107 var wixFileRow = new WixFileTuple(wixMergeRow.SourceLineNumbers);

108 - wixFileRow.Directory_ = record[2];

108 + wixFileRow.DirectoryRef = record[2];

109 wixFileRow.DiskId = wixMergeRow.DiskId;

110 wixFileRow.PatchGroup = -1;

111 wixFileRow.Source = new IntermediateFieldPathValue { Path = Path.Combine(this.IntermediateFolder, wixMergeRow.Id.Id, record[1]) };

src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesCommand.cs

+2 -2

@@ -62,7 +62,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

62 case SymbolPathType.Component:

63 if (null == filesByComponent)

64 {

65 - filesByComponent = facades.ToLookup(f => f.File.Component_);

65 + filesByComponent = facades.ToLookup(f => f.File.ComponentRef);

66 }

68 foreach (var facade in filesByComponent[row.SymbolId])

@@ -74,7 +74,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

74 case SymbolPathType.Directory:

75 if (null == filesByDirectory)

76 {

77 - filesByDirectory = facades.ToLookup(f => f.WixFile.Directory_);

77 + filesByDirectory = facades.ToLookup(f => f.WixFile.DirectoryRef);

78 }

80 foreach (var facade in filesByDirectory[row.SymbolId])

src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs

+13 -13

@@ -53,7 +53,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

53 var assemblyNameTuples = new Dictionary<string, MsiAssemblyNameTuple>();

54 foreach (var assemblyTuple in this.Section.Tuples.OfType<MsiAssemblyNameTuple>())

55 {

56 - assemblyNameTuples.Add(assemblyTuple.Component_ + "/" + assemblyTuple.Name, assemblyTuple);

56 + assemblyNameTuples.Add(assemblyTuple.ComponentRef + "/" + assemblyTuple.Name, assemblyTuple);

57 }

59 FileInfo fileInfo = null;

@@ -79,7 +79,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

80 if (!fileInfo.Exists)

81 {

82 - this.Messaging.Write(ErrorMessages.CannotFindFile(file.File.SourceLineNumbers, file.File.Id.Id, file.File.LongFileName, file.WixFile.Source.Path));

82 + this.Messaging.Write(ErrorMessages.CannotFindFile(file.File.SourceLineNumbers, file.File.Id.Id, file.File.Name, file.WixFile.Source.Path));

83 return;

84 }

@@ -162,7 +162,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

162 this.Section.Tuples.Add(file.Hash);

163 }

164

165 - file.Hash.File_ = file.File.Id.Id;

165 + file.Hash.FileRef = file.File.Id.Id;

166 file.Hash.Options = 0;

167 file.Hash.HashPart1 = hash[0];

168 file.Hash.HashPart2 = hash[1];

@@ -243,9 +243,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind

243 {

244 this.SetMsiAssemblyName(assemblyNameTuples, file, "publicKeyToken", assemblyName.PublicKeyToken);

245 }

246 - else if (file.WixFile.File_AssemblyApplication == null)

246 + else if (file.WixFile.AssemblyApplicationFileRef == null)

247 {

248 - throw new WixException(ErrorMessages.GacAssemblyNoStrongName(file.File.SourceLineNumbers, fileInfo.FullName, file.File.Component_));

248 + throw new WixException(ErrorMessages.GacAssemblyNoStrongName(file.File.SourceLineNumbers, fileInfo.FullName, file.File.ComponentRef));

249 }

250

251 if (!String.IsNullOrEmpty(assemblyName.FileVersion))

@@ -269,10 +269,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind

269 // TODO: Consider passing in the this.FileFacades as an indexed collection instead of searching through

270 // all files like this. Even though this is a rare case it looks like we might be able to index the

271 // file earlier.

272 - var fileManifest = this.FileFacades.FirstOrDefault(r => r.File.Id.Id.Equals(file.WixFile.File_AssemblyManifest, StringComparison.Ordinal));

272 + var fileManifest = this.FileFacades.FirstOrDefault(r => r.File.Id.Id.Equals(file.WixFile.AssemblyManifestFileRef, StringComparison.Ordinal));

273 if (null == fileManifest)

274 {

275 - this.Messaging.Write(ErrorMessages.MissingManifestForWin32Assembly(file.File.SourceLineNumbers, file.File.Id.Id, file.WixFile.File_AssemblyManifest));

275 + this.Messaging.Write(ErrorMessages.MissingManifestForWin32Assembly(file.File.SourceLineNumbers, file.File.Id.Id, file.WixFile.AssemblyManifestFileRef));

276 }

277

278 try

@@ -324,24 +324,24 @@ namespace WixToolset.Core.WindowsInstaller.Bind

324 // check for null value (this can occur when grabbing the file version from an assembly without one)

325 if (String.IsNullOrEmpty(value))

326 {

327 - this.Messaging.Write(WarningMessages.NullMsiAssemblyNameValue(file.File.SourceLineNumbers, file.File.Component_, name));

327 + this.Messaging.Write(WarningMessages.NullMsiAssemblyNameValue(file.File.SourceLineNumbers, file.File.ComponentRef, name));

328 }

329 else

330 {

331 // if the assembly will be GAC'd and the name in the file table doesn't match the name in the MsiAssemblyName table, error because the install will fail.

332 if ("name" == name && FileAssemblyType.DotNetAssembly == file.WixFile.AssemblyType &&

333 - String.IsNullOrEmpty(file.WixFile.File_AssemblyApplication) &&

334 - !String.Equals(Path.GetFileNameWithoutExtension(file.File.LongFileName), value, StringComparison.OrdinalIgnoreCase))

333 + String.IsNullOrEmpty(file.WixFile.AssemblyApplicationFileRef) &&

334 + !String.Equals(Path.GetFileNameWithoutExtension(file.File.Name), value, StringComparison.OrdinalIgnoreCase))

335 {

336 - this.Messaging.Write(ErrorMessages.GACAssemblyIdentityWarning(file.File.SourceLineNumbers, Path.GetFileNameWithoutExtension(file.File.LongFileName), value));

336 + this.Messaging.Write(ErrorMessages.GACAssemblyIdentityWarning(file.File.SourceLineNumbers, Path.GetFileNameWithoutExtension(file.File.Name), value));

337 }

338

339 // override directly authored value

340 - var lookup = String.Concat(file.File.Component_, "/", name);

340 + var lookup = String.Concat(file.File.ComponentRef, "/", name);

341 if (!assemblyNameTuples.TryGetValue(lookup, out var assemblyNameRow))

342 {

343 assemblyNameRow = new MsiAssemblyNameTuple(file.File.SourceLineNumbers);

344 - assemblyNameRow.Component_ = file.File.Component_;

344 + assemblyNameRow.ComponentRef = file.File.ComponentRef;

345 assemblyNameRow.Name = name;

346 assemblyNameRow.Value = value;

347

src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs

+1 -1

@@ -119,7 +119,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

119 // TODO: Sort these facades even smarter by directory path and component id

120 // and maybe file size or file extension and other creative ideas to

121 // get optimal install speed out of MSI.

122 - return this.FileFacades.OrderBy(f => f.File.Component_);

122 + return this.FileFacades.OrderBy(f => f.File.ComponentRef);

123 }

124 }

125 }

src/WixToolset.Core/Compiler.cs

+52 -52

@@ -325,7 +325,7 @@ namespace WixToolset.Core

325

326 var tuple = new AppSearchTuple(sourceLineNumbers, propertyId)

327 {

328 - Signature_ = signature

328 + SignatureRef = signature

329 };

330

331 this.Core.AddTuple(tuple);

@@ -412,7 +412,7 @@ namespace WixToolset.Core

412

413 var tuple = new WixPropertyTuple(sourceLineNumbers)

414 {

415 - Property_ = property.Id,

415 + PropertyRef = property.Id,

416 Admin = admin,

417 Hidden = hidden,

418 Secure = secure

@@ -651,7 +651,7 @@ namespace WixToolset.Core

651 {

652 var tuple = new MsiAssemblyNameTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, componentId, id))

653 {

654 - Component_ = componentId,

654 + ComponentRef = componentId,

655 Name = id,

656 Value = value

657 };

@@ -1012,9 +1012,9 @@ namespace WixToolset.Core

1012 {

1013 ComponentId = id,

1014 Qualifier = qualifier,

1015 - Component_ = componentId,

1015 + ComponentRef = componentId,

1016 AppData = appData,

1017 - Feature_ = feature ?? Guid.Empty.ToString("B"),

1017 + FeatureRef = feature ?? Guid.Empty.ToString("B"),

1018 };

1019

1020 this.Core.AddTuple(tuple);

@@ -1271,25 +1271,25 @@ namespace WixToolset.Core

1271 {

1272 CLSID = classId,

1273 Context = context,

1274 - Component_ = componentId,

1275 - ProgId_Default = defaultProgId,

1274 + ComponentRef = componentId,

1275 + DefaultProgIdRef = defaultProgId,

1276 Description = description,

1277 FileTypeMask = fileTypeMask,

1278 DefInprocHandler = defaultInprocHandler,

1279 Argument = argument,

1280 - Feature_ = Guid.Empty.ToString("B"),

1280 + FeatureRef = Guid.Empty.ToString("B"),

1281 RelativePath = YesNoType.Yes == relativePath,

1282 };

1283

1284 if (null != appId)

1285 {

1286 - tuple.AppId_ = appId;

1286 + tuple.AppIdRef = appId;

1287 this.Core.CreateSimpleReference(sourceLineNumbers, "AppId", appId);

1288 }

1289

1290 if (null != icon)

1291 {

1292 - tuple.Icon_ = icon;

1292 + tuple.IconRef = icon;

1293 this.Core.CreateSimpleReference(sourceLineNumbers, "Icon", icon);

1294 }

1295

@@ -2484,8 +2484,8 @@ namespace WixToolset.Core

2484 {

2485 var tuple = new CreateFolderTuple(sourceLineNumbers)

2486 {

2487 - Directory_ = directoryId,

2488 - Component_ = id.Id

2487 + DirectoryRef = directoryId,

2488 + ComponentRef = id.Id

2489 };

2490

2491 this.Core.AddTuple(tuple);

@@ -2543,7 +2543,7 @@ namespace WixToolset.Core

2543 var tuple = new ComponentTuple(sourceLineNumbers, id)

2544 {

2545 ComponentId = guid,

2546 - Directory_ = directoryId,

2546 + DirectoryRef = directoryId,

2547 Location = location,

2548 Condition = condition,

2549 KeyPath = keyPath,

@@ -2564,7 +2564,7 @@ namespace WixToolset.Core

2564 {

2565 this.Core.AddTuple(new WixInstanceComponentTuple(sourceLineNumbers, id)

2566 {

2567 - Component_ = id.Id,

2567 + ComponentRef = id.Id,

2568 });

2569 }

2570

@@ -2585,7 +2585,7 @@ namespace WixToolset.Core

2585 {

2586 var complusTuple = new ComplusTuple(sourceLineNumbers)

2587 {

2588 - Component_ = id.Id,

2588 + ComponentRef = id.Id,

2589 ExpType = comPlusBits,

2590 };

2591

@@ -2982,8 +2982,8 @@ namespace WixToolset.Core

2982 {

2983 var tuple = new CreateFolderTuple(sourceLineNumbers)

2984 {

2985 - Directory_ = directoryId,

2986 - Component_ = componentId

2985 + DirectoryRef = directoryId,

2986 + ComponentRef = componentId

2987 };

2988

2989 this.Core.AddTuple(tuple);

@@ -3109,7 +3109,7 @@ namespace WixToolset.Core

3109 {

3110 var tuple = new MoveFileTuple(sourceLineNumbers, id)

3111 {

3112 - Component_ = componentId,

3112 + ComponentRef = componentId,

3113 SourceName = sourceName,

3114 DestName= String.IsNullOrEmpty(destinationShortName) && String.IsNullOrEmpty(destinationName) ? null : this.GetMsiFilenameValue(destinationShortName, destinationName),

3115 SourceFolder = sourceDirectory ?? sourceProperty,

@@ -3156,10 +3156,10 @@ namespace WixToolset.Core

3156 {

3157 var tuple = new DuplicateFileTuple(sourceLineNumbers, id)

3158 {

3159 - Component_ = componentId,

3160 - File_ = fileId,

3161 - DestName = String.IsNullOrEmpty(destinationShortName) && String.IsNullOrEmpty(destinationName) ? null : this.GetMsiFilenameValue(destinationShortName, destinationName),

3162 - DestFolder = destinationDirectory ?? destinationProperty

3159 + ComponentRef = componentId,

3160 + FileRef = fileId,

3161 + DestinationName = String.IsNullOrEmpty(destinationShortName) && String.IsNullOrEmpty(destinationName) ? null : this.GetMsiFilenameValue(destinationShortName, destinationName),

3162 + DestinationFolder = destinationDirectory ?? destinationProperty

3163 };

3164

3165 this.Core.AddTuple(tuple);

@@ -4259,7 +4259,7 @@ namespace WixToolset.Core

4259 {

4260 var tuple = new DirectoryTuple(sourceLineNumbers, id)

4261 {

4262 - Directory_Parent = parentId,

4262 + ParentDirectoryRef = parentId,

4263 DefaultDir = defaultDir,

4264 ComponentGuidGenerationSeed = componentGuidGenerationSeed

4265 };

@@ -4492,7 +4492,7 @@ namespace WixToolset.Core

4492

4493 var tuple = new DrLocatorTuple(sourceLineNumbers)

4494 {

4495 - Signature_ = rowId,

4495 + SignatureRef = rowId,

4496 Parent = parentSignature,

4497 Path = path,

4498 };

@@ -4865,7 +4865,7 @@ namespace WixToolset.Core

4865 Description = description,

4866 Display = display,

4867 Level = level,

4868 - Directory_ = configurableDirectory,

4868 + DirectoryRef = configurableDirectory,

4869 DisallowAbsent = disallowAbsent,

4870 DisallowAdvertise = disallowAdvertise,

4871 InstallDefault = installDefault,

@@ -5300,7 +5300,7 @@ namespace WixToolset.Core

5300 Part = part,

5301 Permanent = permanent,

5302 System = system,

5303 - Component_ = componentId

5303 + ComponentRef = componentId

5304 };

5305

5306 this.Core.AddTuple(tuple);

@@ -5446,10 +5446,10 @@ namespace WixToolset.Core

5446 var tuple = new ExtensionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, extension, componentId))

5447 {

5448 Extension = extension,

5449 - Component_ = componentId,

5450 - ProgId_ = progId,

5451 - MIME_ = mime,

5452 - Feature_ = Guid.Empty.ToString("B")

5449 + ComponentRef = componentId,

5450 + ProgIdRef = progId,

5451 + MimeRef = mime,

5452 + FeatureRef = Guid.Empty.ToString("B")

5453 };

5454

5455 this.Core.AddTuple(tuple);

@@ -5873,9 +5873,9 @@ namespace WixToolset.Core

5873

5874 var tuple = new FileTuple(sourceLineNumbers, id)

5875 {

5876 - Component_ = componentId,

5877 - ShortFileName = shortName,

5878 - LongFileName = name,

5876 + ComponentRef = componentId,

5877 + ShortName = shortName,

5878 + Name = name,

5879 FileSize = defaultSize,

5880 Version = companionFile ?? defaultVersion,

5881 Language = defaultLanguage,

@@ -5895,9 +5895,9 @@ namespace WixToolset.Core

5895 // TODO: Remove all this.

5896 var wixFileRow = (WixFileTuple)this.Core.CreateTuple(sourceLineNumbers, TupleDefinitionType.WixFile, id);

5897 wixFileRow.AssemblyType = assemblyType;

5898 - wixFileRow.File_AssemblyManifest = assemblyManifest;

5899 - wixFileRow.File_AssemblyApplication = assemblyApplication;

5900 - wixFileRow.Directory_ = directoryId;

5898 + wixFileRow.AssemblyManifestFileRef = assemblyManifest;

5899 + wixFileRow.AssemblyApplicationFileRef = assemblyApplication;

5900 + wixFileRow.DirectoryRef = directoryId;

5901 wixFileRow.DiskId = (CompilerConstants.IntegerNotSet == diskId) ? 0 : diskId;

5902 wixFileRow.Source = new IntermediateFieldPathValue { Path = source };

5903 wixFileRow.ProcessorArchitecture = procArch;

@@ -5929,10 +5929,10 @@ namespace WixToolset.Core

5929 {

5930 this.Core.AddTuple(new MsiAssemblyTuple(sourceLineNumbers)

5931 {

5932 - Component_ = componentId,

5933 - Feature_ = Guid.Empty.ToString("B"),

5934 - File_Manifest = assemblyManifest,

5935 - File_Application = assemblyApplication,

5932 + ComponentRef = componentId,

5933 + FeatureRef = Guid.Empty.ToString("B"),

5934 + ManifestFileRef = assemblyManifest,

5935 + ApplicationFileRef = assemblyApplication,

5936 Type = assemblyType

5937 });

5938 }

@@ -6118,7 +6118,7 @@ namespace WixToolset.Core

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))

6120 {

6121 - Signature_ = parentSignature,

6121 + SignatureRef = parentSignature,

6122 Parent = id.Id

6123 });

6124 }

@@ -6126,7 +6126,7 @@ namespace WixToolset.Core

6126 {

6127 this.Core.AddTuple(new DrLocatorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, id.Id, parentSignature, String.Empty))

6128 {

6129 - Signature_ = id.Id,

6129 + SignatureRef = id.Id,

6130 Parent = parentSignature

6131 });

6132 }

@@ -6450,8 +6450,8 @@ namespace WixToolset.Core

6450 {

6451 this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers)

6452 {

6453 - Dialog_ = dialog,

6454 - Control_ = id,

6453 + DialogRef = dialog,

6454 + ControlRef = id,

6455 Action = action,

6456 Condition = condition,

6457 });

@@ -6468,7 +6468,7 @@ namespace WixToolset.Core

6468 {

6469 this.Core.AddTuple(new ConditionTuple(sourceLineNumbers)

6470 {

6471 - Feature_ = id,

6471 + FeatureRef = id,

6472 Level = level,

6473 Condition = condition

6474 });

@@ -6639,7 +6639,7 @@ namespace WixToolset.Core

6639 Key = key,

6640 Value = value,

6641 Action = action.Value,

6642 - Component_ = componentId

6642 + ComponentRef = componentId

6643 };

6644

6645 this.Core.AddTuple(tuple);

@@ -6878,8 +6878,8 @@ namespace WixToolset.Core

6878 {

6879 this.Core.AddTuple(new IsolatedComponentTuple(sourceLineNumbers)

6880 {

6881 - Component_Shared = shared,

6882 - Component_Application = componentId

6881 + SharedComponentRef = shared,

6882 + ApplicationComponentRef = componentId

6883 });

6884 }

6885 }

@@ -7066,7 +7066,7 @@ namespace WixToolset.Core

7066 {

7067 Table = "Media",

7068 SignObject = diskId,

7069 - DigitalCertificate_ = certificateId,

7069 + DigitalCertificateRef = certificateId,

7070 Hash = sourceFile

7071 });

7072 }

@@ -7686,12 +7686,12 @@ namespace WixToolset.Core

7686 {

7687 var tuple = new WixMergeTuple(sourceLineNumbers, id)

7688 {

7689 - Directory_ = directoryId,

7689 + DirectoryRef = directoryId,

7690 SourceFile = sourceFile,

7691 DiskId = diskId,

7692 ConfigurationData = configData,

7693 FileCompression = fileCompression,

7694 - Feature_ = Guid.Empty.ToString("B")

7694 + FeatureRef = Guid.Empty.ToString("B")

7695 };

7696

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))

7878 {

7879 ContentType = contentType,

7880 - Extension_ = extension,

7880 + ExtensionRef = extension,

7881 CLSID = classId

7882 };

7883

src/WixToolset.Core/Compiler_2.cs

+29 -29

@@ -561,7 +561,7 @@ namespace WixToolset.Core

561 {

562 this.Core.AddTuple(new ODBCDataSourceTuple(sourceLineNumbers, id)

563 {

564 - Component_ = componentId,

564 + ComponentRef = componentId,

565 Description = name,

566 DriverDescription = driverName,

567 Registration = registration

@@ -1364,14 +1364,14 @@ namespace WixToolset.Core

1364 var tuple = new ProgIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, progId))

1365 {

1366 ProgId = progId,

1367 - ProgId_Parent = parent,

1368 - Class_ = classId,

1367 + ParentProgIdRef = parent,

1368 + ClassRef = classId,

1369 Description = description,

1370 };

1371

1372 if (null != icon)

1373 {

1374 - tuple.Icon_ = icon;

1374 + tuple.IconRef = icon;

1375 this.Core.CreateSimpleReference(sourceLineNumbers, "Icon", icon);

1376 }

1377

@@ -1777,7 +1777,7 @@ namespace WixToolset.Core

1777 Root = root.Value,

1778 Key = key,

1779 Name = name,

1780 - Component_ = componentId,

1780 + ComponentRef = componentId,

1781 };

1782

1783 this.Core.AddTuple(tuple);

@@ -2026,7 +2026,7 @@ namespace WixToolset.Core

2026 Value = value,

2027 ValueType = valueType,

2028 ValueAction = actionType,

2029 - Component_ = componentId,

2029 + ComponentRef = componentId,

2030 };

2031

2032 this.Core.AddTuple(tuple);

@@ -2147,7 +2147,7 @@ namespace WixToolset.Core

2147 Key = key,

2148 Name = name,

2149 Action = actionType.Value,

2150 - Component_ = componentId

2150 + ComponentRef = componentId

2151 };

2152

2153 this.Core.AddTuple(tuple);

@@ -2224,7 +2224,7 @@ namespace WixToolset.Core

2224 Root = root.Value,

2225 Key = key,

2226 Name = name,

2227 - Component_ = componentId

2227 + ComponentRef = componentId

2228 };

2229

2230 this.Core.AddTuple(tuple);

@@ -2342,7 +2342,7 @@ namespace WixToolset.Core

2342 {

2343 var tuple = new RemoveFileTuple(sourceLineNumbers, id)

2344 {

2345 - Component_ = componentId,

2345 + ComponentRef = componentId,

2346 FileName = this.GetMsiFilenameValue(shortName, name),

2347 DirProperty = directory ?? property ?? parentDirectory,

2348 OnInstall = onInstall,

@@ -2432,7 +2432,7 @@ namespace WixToolset.Core

2432 {

2433 var tuple = new RemoveFileTuple(sourceLineNumbers, id)

2434 {

2435 - Component_ = componentId,

2435 + ComponentRef = componentId,

2436 DirProperty = directory ?? property ?? parentDirectory,

2437 OnInstall = onInstall,

2438 OnUninstall = onUninstall

@@ -2505,7 +2505,7 @@ namespace WixToolset.Core

2505 {

2506 this.Core.AddTuple(new ReserveCostTuple(sourceLineNumbers, id)

2507 {

2508 - Component_ = componentId,

2508 + ComponentRef = componentId,

2509 ReserveFolder = directoryId,

2510 ReserveLocal = runLocal,

2511 ReserveSource = runFromSource

@@ -3023,7 +3023,7 @@ namespace WixToolset.Core

3023 OnUninstall = uninstall,

3024 ConfigType = MsiServiceConfigType.DelayedAutoStart,

3025 Argument = delayedAutoStart,

3026 - Component_ = componentId,

3026 + ComponentRef = componentId,

3027 };

3028

3029 this.Core.AddTuple(tuple);

@@ -3045,7 +3045,7 @@ namespace WixToolset.Core

3045 OnUninstall = uninstall,

3046 ConfigType = MsiServiceConfigType.FailureActionsFlag,

3047 Argument = failureActionsWhen,

3048 - Component_ = componentId,

3048 + ComponentRef = componentId,

3049 };

3050

3051 this.Core.AddTuple(tuple);

@@ -3067,7 +3067,7 @@ namespace WixToolset.Core

3067 OnUninstall = uninstall,

3068 ConfigType = MsiServiceConfigType.ServiceSidInfo,

3069 Argument = sid,

3070 - Component_ = componentId,

3070 + ComponentRef = componentId,

3071 };

3072

3073 this.Core.AddTuple(tuple);

@@ -3089,7 +3089,7 @@ namespace WixToolset.Core

3089 OnUninstall = uninstall,

3090 ConfigType = MsiServiceConfigType.RequiredPrivilegesInfo,

3091 Argument = requiredPrivileges,

3092 - Component_ = componentId,

3092 + ComponentRef = componentId,

3093 };

3094

3095 this.Core.AddTuple(tuple);

@@ -3111,7 +3111,7 @@ namespace WixToolset.Core

3111 OnUninstall = uninstall,

3112 ConfigType = MsiServiceConfigType.PreshutdownInfo,

3113 Argument = preShutdownDelay,

3114 - Component_ = componentId,

3114 + ComponentRef = componentId,

3115 };

3116

3117 this.Core.AddTuple(tuple);

@@ -3302,7 +3302,7 @@ namespace WixToolset.Core

3302 Command = command,

3303 Actions = actions,

3304 DelayActions = actionsDelays,

3305 - Component_ = componentId,

3305 + ComponentRef = componentId,

3306 };

3307

3308 this.Core.AddTuple(tuple);

@@ -3456,7 +3456,7 @@ namespace WixToolset.Core

3456 UninstallStop = uninstallStop,

3457 Arguments = arguments,

3458 Wait = wait,

3459 - Component_ = componentId

3459 + ComponentRef = componentId

3460 };

3461

3462 this.Core.AddTuple(tuple);

@@ -3716,7 +3716,7 @@ namespace WixToolset.Core

3716 StartName = account,

3717 Password = password,

3718 Arguments = arguments,

3719 - Component_ = componentId,

3719 + ComponentRef = componentId,

3720 Description = description,

3721 Interactive = interactive,

3722 Vital = vital

@@ -4032,8 +4032,8 @@ namespace WixToolset.Core

4032 {

4033 this.Core.AddTuple(new FileSFPCatalogTuple(sourceLineNumbers)

4034 {

4035 - File_ = id,

4036 - SFPCatalog_ = parentSFPCatalog

4035 + FileRef = id,

4036 + SFPCatalogRef = parentSFPCatalog

4037 });

4038 }

4039 }

@@ -4400,14 +4400,14 @@ namespace WixToolset.Core

4400

4401 var tuple = new ShortcutTuple(sourceLineNumbers, id)

4402 {

4403 - Directory_ = directory,

4403 + DirectoryRef = directory,

4404 Name = this.GetMsiFilenameValue(shortName, name),

4405 - Component_ = componentId,

4405 + ComponentRef = componentId,

4406 Target = target,

4407 Arguments = arguments,

4408 Description = description,

4409 Hotkey = hotkey,

4410 - Icon_ = icon,

4410 + IconRef = icon,

4411 IconIndex = iconIndex,

4412 Show = show,

4413 WorkingDirectory = workingDirectory,

@@ -4543,7 +4543,7 @@ namespace WixToolset.Core

4543 {

4544 this.Core.AddTuple(new MsiShortcutPropertyTuple(sourceLineNumbers, id)

4545 {

4546 - Shortcut_ = shortcutId,

4546 + ShortcutRef = shortcutId,

4547 PropertyKey = key,

4548 PropVariantValue = value

4549 });

@@ -4742,10 +4742,10 @@ namespace WixToolset.Core

4742 {

4743 LibId = id,

4744 Language = language,

4745 - Component_ = componentId,

4745 + ComponentRef = componentId,

4746 Description = description,

4747 - Directory_ = helpDirectory,

4748 - Feature_ = Guid.Empty.ToString("B")

4747 + DirectoryRef = helpDirectory,

4748 + FeatureRef = Guid.Empty.ToString("B")

4749 };

4750

4751 if (CompilerConstants.IntegerNotSet != majorVersion || CompilerConstants.IntegerNotSet != minorVersion)

@@ -5085,7 +5085,7 @@ namespace WixToolset.Core

5085 {

5086 var tuple = new VerbTuple(sourceLineNumbers)

5087 {

5088 - Extension_ = extension,

5088 + ExtensionRef = extension,

5089 Verb = id,

5090 Command = command,

5091 Argument = argument,

src/WixToolset.Core/Compiler_Bundle.cs

+8 -8

@@ -524,7 +524,7 @@ namespace WixToolset.Core

524

525 this.Core.AddTuple(new WixBundleCatalogTuple(sourceLineNumbers, id)

526 {

527 - Payload_ = id.Id,

527 + PayloadRef = id.Id,

528 });

529 }

530 }

@@ -1309,9 +1309,9 @@ namespace WixToolset.Core

1309 var tuple = new WixOrderingTuple(sourceLineNumbers)

1310 {

1311 ItemType = type,

1312 - ItemId_ = id,

1312 + ItemIdRef = id,

1313 DependsOnType = previousType,

1314 - DependsOnId_ = previousId

1314 + DependsOnIdRef = previousId

1315 };

1316

1317 this.Core.AddTuple(tuple);

@@ -2041,7 +2041,7 @@ namespace WixToolset.Core

2041 var chainPackageTuple = new WixBundlePackageTuple(sourceLineNumbers, id)

2042 {

2043 Type = packageType,

2044 - Payload_ = id.Id,

2044 + PayloadRef = id.Id,

2045 Attributes = attributes,

2046 InstallCondition = installCondition,

2047 CacheId = cacheId,

@@ -2176,7 +2176,7 @@ namespace WixToolset.Core

2176 {

2177 this.Core.AddTuple(new WixBundlePackageCommandLineTuple(sourceLineNumbers)

2178 {

2179 - WixBundlePackage_ = packageId,

2179 + WixBundlePackageRef = packageId,

2180 InstallArgument = installArgument,

2181 UninstallArgument = uninstallArgument,

2182 RepairArgument = repairArgument,

@@ -2460,7 +2460,7 @@ namespace WixToolset.Core

2460 {

2461 var tuple = new WixBundleMsiPropertyTuple(sourceLineNumbers)

2462 {

2463 - WixBundlePackage_ = packageId,

2463 + WixBundlePackageRef = packageId,

2464 Name = name,

2465 Value = value

2466 };

@@ -2516,8 +2516,8 @@ namespace WixToolset.Core

2516 {

2517 this.Core.AddTuple(new WixBundleSlipstreamMspTuple(sourceLineNumbers)

2518 {

2519 - WixBundlePackage_ = packageId,

2520 - WixBundlePackage_Msp = id

2519 + WixBundlePackageRef = packageId,

2520 + MspWixBundlePackageRef = id

2521 });

2522 }

2523 }

src/WixToolset.Core/Compiler_PatchCreation.cs

+2 -2

@@ -472,7 +472,7 @@ namespace WixToolset.Core

472 }

473 else

474 {

475 - this.Core.AddTuple(new UpgradedFiles_OptionalDataTuple(sourceLineNumbers)

475 + this.Core.AddTuple(new UpgradedFilesOptionalDataTuple(sourceLineNumbers)

476 {

477 Upgraded = upgrade,

478 FTK = file,

@@ -675,7 +675,7 @@ namespace WixToolset.Core

675

676 if (!this.Core.EncounteredError)

677 {

678 - var tuple = new TargetFiles_OptionalDataTuple(sourceLineNumbers)

678 + var tuple = new TargetFilesOptionalDataTuple(sourceLineNumbers)

679 {

680 Target = target,

681 FTK = file,

src/WixToolset.Core/Compiler_UI.cs

+10 -10

@@ -488,7 +488,7 @@ namespace WixToolset.Core

488 {

489 var tuple = new BillboardTuple(sourceLineNumbers, id)

490 {

491 - Feature_ = feature,

491 + FeatureRef = feature,

492 Action = action,

493 Ordering = order

494 };

@@ -1029,9 +1029,9 @@ namespace WixToolset.Core

1029 SystemModal = systemModal,

1030 TrackDiskSpace = trackDiskSpace,

1031 Title = title,

1032 - Control_First = firstControl,

1033 - Control_Default = defaultControl,

1034 - Control_Cancel = cancelControl,

1032 + FirstControlRef = firstControl,

1033 + DefaultControlRef = defaultControl,

1034 + CancelControlRef = cancelControl,

1035 };

1036

1037 this.Core.AddTuple(tuple);

@@ -1486,7 +1486,7 @@ namespace WixToolset.Core

1486 {

1487 var bbTuple = new BBControlTuple(sourceLineNumbers, id)

1488 {

1489 - Billboard_ = dialog,

1489 + BillboardRef = dialog,

1490 BBControl = controlId.Id,

1491 Type = controlType,

1492 Attributes = attributes,

@@ -1515,7 +1515,7 @@ namespace WixToolset.Core

1515 {

1516 var controlTuple = new ControlTuple(sourceLineNumbers, id)

1517 {

1518 - Dialog_ = dialog,

1518 + DialogRef = dialog,

1519 Control = controlId.Id,

1520 Type = controlType,

1521 Attributes = attributes,

@@ -1673,8 +1673,8 @@ namespace WixToolset.Core

1673 {

1674 var tuple = new ControlEventTuple(sourceLineNumbers)

1675 {

1676 - Dialog_ = dialog,

1677 - Control_ = control,

1676 + DialogRef = dialog,

1677 + ControlRef = control,

1678 Event = controlEvent ?? property,

1679 Argument = argument,

1680 Condition = condition,

@@ -1742,8 +1742,8 @@ namespace WixToolset.Core

1742 {

1743 var tuple = new EventMappingTuple(sourceLineNumbers)

1744 {

1745 - Dialog_ = dialog,

1746 - Control_ = control,

1745 + DialogRef = dialog,

1746 + ControlRef = control,

1747 Event = eventMapping,

1748 Attribute = controlAttribute

1749 }; ;

src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs

+2 -2

@@ -125,7 +125,7 @@ namespace WixToolset.Core.ExtensibilityServices

125

126 var tuple = new DirectoryTuple(sourceLineNumbers, id)

127 {

128 - Directory_Parent = parentId,

128 + ParentDirectoryRef = parentId,

129 DefaultDir = defaultDir,

130 };

131

@@ -232,7 +232,7 @@ namespace WixToolset.Core.ExtensibilityServices

232 Key = key,

233 Name = name,

234 Value = value,

235 - Component_ = componentId,

235 + ComponentRef = componentId,

236 };

237

238 section.Tuples.Add(tuple);

src/WixToolset.Core/Link/WixGroupingOrdering.cs

+2 -2

@@ -361,9 +361,9 @@ namespace WixToolset.Core.Link

361 foreach (var row in this.EntrySection.Tuples.OfType<WixOrderingTuple>())

362 {

363 var rowItemType = row.ItemType.ToString();

364 - var rowItemName = row.ItemId_;

364 + var rowItemName = row.ItemIdRef;

365 var rowDependsOnType = row.DependsOnType.ToString();

366 - var rowDependsOnName = row.DependsOnId_;

366 + var rowDependsOnName = row.DependsOnIdRef;

367

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.

src/WixToolset.Core/Linker.cs

+4 -4

@@ -464,8 +464,8 @@ namespace WixToolset.Core

464 foreach (var feature in connectToFeature.ConnectFeatures)

465 {

466 var row = new WixFeatureModulesTuple();

467 - row.Feature_ = feature;

468 - row.WixMerge_ = connectToFeature.ChildId;

467 + row.FeatureRef = feature;

468 + row.WixMergeRef = connectToFeature.ChildId;

469

470 resolvedSection.Tuples.Add(row);

471 }

@@ -1182,8 +1182,8 @@ namespace WixToolset.Core

1182

1183 // add a row to the FeatureComponents table

1184 var featureComponent = new FeatureComponentsTuple();

1185 - featureComponent.Feature_ = wixComplexReferenceRow.Parent;

1186 - featureComponent.Component_ = wixComplexReferenceRow.Child;

1185 + featureComponent.FeatureRef = wixComplexReferenceRow.Parent;

1186 + featureComponent.ComponentRef = wixComplexReferenceRow.Child;

1187

1188 featureComponents.Add(featureComponent);

1189

src/WixToolset.Core/Resolver.cs

+1 -1

@@ -163,7 +163,7 @@ namespace WixToolset.Core

163

164 foreach (var tuple in section.Tuples.OfType<ControlTuple>())

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 {

168 if (CompilerConstants.IntegerNotSet != localizedControl.X)

169 {

src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs

+2 -2

@@ -641,9 +641,9 @@ namespace WixToolsetTest.CoreIntegration

641 var progids = section.Tuples.OfType<ProgIdTuple>().OrderBy(tuple => tuple.ProgId).ToList();

642 Assert.Equal(2, progids.Count);

643 Assert.Equal("Foo.File.hol", progids[0].ProgId);

644 - Assert.Equal("Foo.File.hol.15", progids[0].ProgId_Parent);

644 + Assert.Equal("Foo.File.hol.15", progids[0].ParentProgIdRef);

645 Assert.Equal("Foo.File.hol.15", progids[1].ProgId);

646 - Assert.Null(progids[1].ProgId_Parent);

646 + Assert.Null(progids[1].ParentProgIdRef);

647 }

648 }

649