aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/Compiler_PatchCreation.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core/Compiler_PatchCreation.cs')
-rw-r--r--src/WixToolset.Core/Compiler_PatchCreation.cs38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/WixToolset.Core/Compiler_PatchCreation.cs b/src/WixToolset.Core/Compiler_PatchCreation.cs
index 3371d84e..ddd07654 100644
--- a/src/WixToolset.Core/Compiler_PatchCreation.cs
+++ b/src/WixToolset.Core/Compiler_PatchCreation.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Core
7 using System.Globalization; 7 using System.Globalization;
8 using System.Xml.Linq; 8 using System.Xml.Linq;
9 using WixToolset.Data; 9 using WixToolset.Data;
10 using WixToolset.Data.Tuples; 10 using WixToolset.Data.Symbols;
11 using WixToolset.Extensibility; 11 using WixToolset.Extensibility;
12 12
13 /// <summary> 13 /// <summary>
@@ -258,7 +258,7 @@ namespace WixToolset.Core
258 258
259 if (!this.Core.EncounteredError) 259 if (!this.Core.EncounteredError)
260 { 260 {
261 var tuple = this.Core.AddTuple(new ImageFamiliesTuple(sourceLineNumbers) 261 var symbol = this.Core.AddSymbol(new ImageFamiliesSymbol(sourceLineNumbers)
262 { 262 {
263 Family = name, 263 Family = name,
264 MediaSrcPropName = mediaSrcProp, 264 MediaSrcPropName = mediaSrcProp,
@@ -268,12 +268,12 @@ namespace WixToolset.Core
268 268
269 if (CompilerConstants.IntegerNotSet != diskId) 269 if (CompilerConstants.IntegerNotSet != diskId)
270 { 270 {
271 tuple.MediaDiskId = diskId; 271 symbol.MediaDiskId = diskId;
272 } 272 }
273 273
274 if (CompilerConstants.IntegerNotSet != sequenceStart) 274 if (CompilerConstants.IntegerNotSet != sequenceStart)
275 { 275 {
276 tuple.FileSequenceStart = sequenceStart; 276 symbol.FileSequenceStart = sequenceStart;
277 } 277 }
278 } 278 }
279 } 279 }
@@ -379,7 +379,7 @@ namespace WixToolset.Core
379 379
380 if (!this.Core.EncounteredError) 380 if (!this.Core.EncounteredError)
381 { 381 {
382 this.Core.AddTuple(new UpgradedImagesTuple(sourceLineNumbers) 382 this.Core.AddSymbol(new UpgradedImagesSymbol(sourceLineNumbers)
383 { 383 {
384 Upgraded = upgrade, 384 Upgraded = upgrade,
385 MsiPath = sourceFile, 385 MsiPath = sourceFile,
@@ -462,7 +462,7 @@ namespace WixToolset.Core
462 { 462 {
463 if (ignore) 463 if (ignore)
464 { 464 {
465 this.Core.AddTuple(new UpgradedFilesToIgnoreTuple(sourceLineNumbers) 465 this.Core.AddSymbol(new UpgradedFilesToIgnoreSymbol(sourceLineNumbers)
466 { 466 {
467 Upgraded = upgrade, 467 Upgraded = upgrade,
468 FTK = file 468 FTK = file
@@ -470,7 +470,7 @@ namespace WixToolset.Core
470 } 470 }
471 else 471 else
472 { 472 {
473 this.Core.AddTuple(new UpgradedFilesOptionalDataTuple(sourceLineNumbers) 473 this.Core.AddSymbol(new UpgradedFilesOptionalDataSymbol(sourceLineNumbers)
474 { 474 {
475 Upgraded = upgrade, 475 Upgraded = upgrade,
476 FTK = file, 476 FTK = file,
@@ -591,7 +591,7 @@ namespace WixToolset.Core
591 591
592 if (!this.Core.EncounteredError) 592 if (!this.Core.EncounteredError)
593 { 593 {
594 this.Core.AddTuple(new TargetImagesTuple(sourceLineNumbers) 594 this.Core.AddSymbol(new TargetImagesSymbol(sourceLineNumbers)
595 { 595 {
596 Target = target, 596 Target = target,
597 MsiPath = sourceFile, 597 MsiPath = sourceFile,
@@ -673,7 +673,7 @@ namespace WixToolset.Core
673 673
674 if (!this.Core.EncounteredError) 674 if (!this.Core.EncounteredError)
675 { 675 {
676 var tuple = this.Core.AddTuple(new TargetFilesOptionalDataTuple(sourceLineNumbers) 676 var symbol = this.Core.AddSymbol(new TargetFilesOptionalDataSymbol(sourceLineNumbers)
677 { 677 {
678 Target = target, 678 Target = target,
679 FTK = file, 679 FTK = file,
@@ -684,9 +684,9 @@ namespace WixToolset.Core
684 684
685 if (null != protectOffsets) 685 if (null != protectOffsets)
686 { 686 {
687 tuple.RetainOffsets = protectOffsets; 687 symbol.RetainOffsets = protectOffsets;
688 688
689 this.Core.AddTuple(new FamilyFileRangesTuple(sourceLineNumbers) 689 this.Core.AddSymbol(new FamilyFileRangesSymbol(sourceLineNumbers)
690 { 690 {
691 Family = family, 691 Family = family,
692 FTK = file, 692 FTK = file,
@@ -793,7 +793,7 @@ namespace WixToolset.Core
793 793
794 if (!this.Core.EncounteredError) 794 if (!this.Core.EncounteredError)
795 { 795 {
796 var tuple = this.Core.AddTuple(new ExternalFilesTuple(sourceLineNumbers) 796 var symbol = this.Core.AddSymbol(new ExternalFilesSymbol(sourceLineNumbers)
797 { 797 {
798 Family = family, 798 Family = family,
799 FTK = file, 799 FTK = file,
@@ -805,17 +805,17 @@ namespace WixToolset.Core
805 805
806 if (null != protectOffsets) 806 if (null != protectOffsets)
807 { 807 {
808 tuple.RetainOffsets = protectOffsets; 808 symbol.RetainOffsets = protectOffsets;
809 } 809 }
810 810
811 if (CompilerConstants.IntegerNotSet != order) 811 if (CompilerConstants.IntegerNotSet != order)
812 { 812 {
813 tuple.Order = order; 813 symbol.Order = order;
814 } 814 }
815 815
816 if (null != protectOffsets) 816 if (null != protectOffsets)
817 { 817 {
818 this.Core.AddTuple(new FamilyFileRangesTuple(sourceLineNumbers) 818 this.Core.AddSymbol(new FamilyFileRangesSymbol(sourceLineNumbers)
819 { 819 {
820 Family = family, 820 Family = family,
821 FTK = file, 821 FTK = file,
@@ -890,7 +890,7 @@ namespace WixToolset.Core
890 890
891 if (!this.Core.EncounteredError) 891 if (!this.Core.EncounteredError)
892 { 892 {
893 this.Core.AddTuple(new FamilyFileRangesTuple(sourceLineNumbers) 893 this.Core.AddSymbol(new FamilyFileRangesSymbol(sourceLineNumbers)
894 { 894 {
895 Family = family, 895 Family = family,
896 FTK = file, 896 FTK = file,
@@ -1251,7 +1251,7 @@ namespace WixToolset.Core
1251 this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttributes(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "Target", "ProductCode")); 1251 this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttributes(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "Target", "ProductCode"));
1252 } 1252 }
1253 target = this.Core.GetAttributeValue(sourceLineNumbers, attrib); 1253 target = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
1254 this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.TargetImages, target); 1254 this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.TargetImages, target);
1255 break; 1255 break;
1256 case "Sequence": 1256 case "Sequence":
1257 sequence = this.Core.GetAttributeVersionValue(sourceLineNumbers, attrib); 1257 sequence = this.Core.GetAttributeVersionValue(sourceLineNumbers, attrib);
@@ -1282,7 +1282,7 @@ namespace WixToolset.Core
1282 1282
1283 if (!this.Core.EncounteredError) 1283 if (!this.Core.EncounteredError)
1284 { 1284 {
1285 this.Core.AddTuple(new PatchSequenceTuple(sourceLineNumbers) 1285 this.Core.AddSymbol(new PatchSequenceSymbol(sourceLineNumbers)
1286 { 1286 {
1287 PatchFamily = family, 1287 PatchFamily = family,
1288 Target = target, 1288 Target = target,
@@ -1294,7 +1294,7 @@ namespace WixToolset.Core
1294 1294
1295 private void AddPatchMetadata(SourceLineNumber sourceLineNumbers, string company, string property, string value) 1295 private void AddPatchMetadata(SourceLineNumber sourceLineNumbers, string company, string property, string value)
1296 { 1296 {
1297 this.Core.AddTuple(new PatchMetadataTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, company, property)) 1297 this.Core.AddSymbol(new PatchMetadataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, company, property))
1298 { 1298 {
1299 Company = company, 1299 Company = company,
1300 Property = property, 1300 Property = property,