diff options
Diffstat (limited to 'src/WixToolset.Core/Compiler_Patch.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler_Patch.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/WixToolset.Core/Compiler_Patch.cs b/src/WixToolset.Core/Compiler_Patch.cs index f7481143..73e7f521 100644 --- a/src/WixToolset.Core/Compiler_Patch.cs +++ b/src/WixToolset.Core/Compiler_Patch.cs | |||
| @@ -8,7 +8,7 @@ namespace WixToolset.Core | |||
| 8 | using System.Globalization; | 8 | using System.Globalization; |
| 9 | using System.Xml.Linq; | 9 | using System.Xml.Linq; |
| 10 | using WixToolset.Data; | 10 | using WixToolset.Data; |
| 11 | using WixToolset.Data.Tuples; | 11 | using WixToolset.Data.Symbols; |
| 12 | using WixToolset.Extensibility; | 12 | using WixToolset.Extensibility; |
| 13 | 13 | ||
| 14 | /// <summary> | 14 | /// <summary> |
| @@ -197,7 +197,7 @@ namespace WixToolset.Core | |||
| 197 | 197 | ||
| 198 | if (!this.Core.EncounteredError) | 198 | if (!this.Core.EncounteredError) |
| 199 | { | 199 | { |
| 200 | this.Core.AddTuple(new WixPatchIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, patchId)) | 200 | this.Core.AddSymbol(new WixPatchIdSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, patchId)) |
| 201 | { | 201 | { |
| 202 | ClientPatchId = clientPatchId, | 202 | ClientPatchId = clientPatchId, |
| 203 | OptimizePatchSizeForLargeFiles = optimizePatchSizeForLargeFiles, | 203 | OptimizePatchSizeForLargeFiles = optimizePatchSizeForLargeFiles, |
| @@ -425,7 +425,7 @@ namespace WixToolset.Core | |||
| 425 | 425 | ||
| 426 | if (!this.Core.EncounteredError) | 426 | if (!this.Core.EncounteredError) |
| 427 | { | 427 | { |
| 428 | this.Core.AddTuple(new MsiPatchSequenceTuple(sourceLineNumbers) | 428 | this.Core.AddSymbol(new MsiPatchSequenceSymbol(sourceLineNumbers) |
| 429 | { | 429 | { |
| 430 | PatchFamily = id.Id, | 430 | PatchFamily = id.Id, |
| 431 | ProductCode = productCode, | 431 | ProductCode = productCode, |
| @@ -504,7 +504,7 @@ namespace WixToolset.Core | |||
| 504 | 504 | ||
| 505 | if (!this.Core.EncounteredError) | 505 | if (!this.Core.EncounteredError) |
| 506 | { | 506 | { |
| 507 | this.Core.AddTuple(new WixPatchFamilyGroupTuple(sourceLineNumbers, id)); | 507 | this.Core.AddSymbol(new WixPatchFamilyGroupSymbol(sourceLineNumbers, id)); |
| 508 | 508 | ||
| 509 | //Add this PatchFamilyGroup and its parent in WixGroup. | 509 | //Add this PatchFamilyGroup and its parent in WixGroup. |
| 510 | this.Core.CreateWixGroupRow(sourceLineNumbers, parentType, parentId, ComplexReferenceChildType.PatchFamilyGroup, id.Id); | 510 | this.Core.CreateWixGroupRow(sourceLineNumbers, parentType, parentId, ComplexReferenceChildType.PatchFamilyGroup, id.Id); |
| @@ -532,7 +532,7 @@ namespace WixToolset.Core | |||
| 532 | { | 532 | { |
| 533 | case "Id": | 533 | case "Id": |
| 534 | id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); | 534 | id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); |
| 535 | this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixPatchFamilyGroup, id); | 535 | this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixPatchFamilyGroup, id); |
| 536 | break; | 536 | break; |
| 537 | default: | 537 | default: |
| 538 | this.Core.UnexpectedAttribute(node, attrib); | 538 | this.Core.UnexpectedAttribute(node, attrib); |
| @@ -621,7 +621,7 @@ namespace WixToolset.Core | |||
| 621 | // By default, target ProductCodes should be added. | 621 | // By default, target ProductCodes should be added. |
| 622 | if (!replace) | 622 | if (!replace) |
| 623 | { | 623 | { |
| 624 | this.Core.AddTuple(new WixPatchTargetTuple(sourceLineNumbers) | 624 | this.Core.AddSymbol(new WixPatchTargetSymbol(sourceLineNumbers) |
| 625 | { | 625 | { |
| 626 | ProductCode = "*" | 626 | ProductCode = "*" |
| 627 | }); | 627 | }); |
| @@ -629,7 +629,7 @@ namespace WixToolset.Core | |||
| 629 | 629 | ||
| 630 | foreach (var targetProductCode in targetProductCodes) | 630 | foreach (var targetProductCode in targetProductCodes) |
| 631 | { | 631 | { |
| 632 | this.Core.AddTuple(new WixPatchTargetTuple(sourceLineNumbers) | 632 | this.Core.AddSymbol(new WixPatchTargetSymbol(sourceLineNumbers) |
| 633 | { | 633 | { |
| 634 | ProductCode = targetProductCode | 634 | ProductCode = targetProductCode |
| 635 | }); | 635 | }); |
| @@ -639,7 +639,7 @@ namespace WixToolset.Core | |||
| 639 | 639 | ||
| 640 | private void AddMsiPatchMetadata(SourceLineNumber sourceLineNumbers, string company, string property, string value) | 640 | private void AddMsiPatchMetadata(SourceLineNumber sourceLineNumbers, string company, string property, string value) |
| 641 | { | 641 | { |
| 642 | this.Core.AddTuple(new MsiPatchMetadataTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, company, property)) | 642 | this.Core.AddSymbol(new MsiPatchMetadataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, company, property)) |
| 643 | { | 643 | { |
| 644 | Company = company, | 644 | Company = company, |
| 645 | Property = property, | 645 | Property = property, |
