aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-27 15:08:14 -0700
committerRob Mensching <rob@firegiant.com>2020-06-27 15:14:32 -0700
commit28666e3beb1776324c6d3e719cb0c37d4f2fbeff (patch)
treed355877242e8941c5b7d9f8c11fb4892e8a9d211
parent0c348ca49e201b0d09dbda64b51cea82b48f45a5 (diff)
downloadwix-28666e3beb1776324c6d3e719cb0c37d4f2fbeff.tar.gz
wix-28666e3beb1776324c6d3e719cb0c37d4f2fbeff.tar.bz2
wix-28666e3beb1776324c6d3e719cb0c37d4f2fbeff.zip
The Great Tuple to Symbol Rename (tm)
Diffstat
-rw-r--r--src/wixext/IIsCompiler.cs134
-rw-r--r--src/wixext/IIsExtensionData.cs10
-rw-r--r--src/wixext/IisTableDefinitions.cs72
-rw-r--r--src/wixext/Tuples/CertificateHashTuple.cs34
-rw-r--r--src/wixext/Tuples/CertificateTuple.cs70
-rw-r--r--src/wixext/Tuples/IIsAppPoolTuple.cs112
-rw-r--r--src/wixext/Tuples/IIsFilterTuple.cs64
-rw-r--r--src/wixext/Tuples/IIsHttpHeaderTuple.cs64
-rw-r--r--src/wixext/Tuples/IIsMimeMapTuple.cs46
-rw-r--r--src/wixext/Tuples/IIsPropertyTuple.cs40
-rw-r--r--src/wixext/Tuples/IIsWebAddressTuple.cs52
-rw-r--r--src/wixext/Tuples/IIsWebApplicationExtensionTuple.cs52
-rw-r--r--src/wixext/Tuples/IIsWebApplicationTuple.cs88
-rw-r--r--src/wixext/Tuples/IIsWebDirPropertiesTuple.cs106
-rw-r--r--src/wixext/Tuples/IIsWebDirTuple.cs52
-rw-r--r--src/wixext/Tuples/IIsWebErrorTuple.cs58
-rw-r--r--src/wixext/Tuples/IIsWebLogTuple.cs28
-rw-r--r--src/wixext/Tuples/IIsWebServiceExtensionTuple.cs52
-rw-r--r--src/wixext/Tuples/IIsWebSiteCertificatesTuple.cs34
-rw-r--r--src/wixext/Tuples/IIsWebSiteTuple.cs94
-rw-r--r--src/wixext/Tuples/IIsWebVirtualDirTuple.cs58
-rw-r--r--src/wixext/Tuples/IisTupleDefinitions.cs82
22 files changed, 701 insertions, 701 deletions
diff --git a/src/wixext/IIsCompiler.cs b/src/wixext/IIsCompiler.cs
index f84f8f0a..6f0cdd5e 100644
--- a/src/wixext/IIsCompiler.cs
+++ b/src/wixext/IIsCompiler.cs
@@ -8,7 +8,7 @@ namespace WixToolset.Iis
8 using System.Xml.Linq; 8 using System.Xml.Linq;
9 using WixToolset.Data; 9 using WixToolset.Data;
10 using WixToolset.Extensibility; 10 using WixToolset.Extensibility;
11 using WixToolset.Iis.Tuples; 11 using WixToolset.Iis.Symbols;
12 12
13 /// <summary> 13 /// <summary>
14 /// The compiler for the WiX Toolset Internet Information Services Extension. 14 /// The compiler for the WiX Toolset Internet Information Services Extension.
@@ -159,7 +159,7 @@ namespace WixToolset.Iis
159 case "BinaryKey": 159 case "BinaryKey":
160 attributes |= 2; // SCA_CERT_ATTRIBUTE_BINARYDATA 160 attributes |= 2; // SCA_CERT_ATTRIBUTE_BINARYDATA
161 binaryKey = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 161 binaryKey = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
162 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Binary, binaryKey); 162 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, binaryKey);
163 break; 163 break;
164 case "CertificatePath": 164 case "CertificatePath":
165 certificatePath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); 165 certificatePath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -287,13 +287,13 @@ namespace WixToolset.Iis
287 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); 287 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
288 288
289 // Reference InstallCertificates and UninstallCertificates since nothing will happen without them 289 // Reference InstallCertificates and UninstallCertificates since nothing will happen without them
290 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "InstallCertificates"); 290 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "InstallCertificates");
291 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "UninstallCertificates"); 291 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "UninstallCertificates");
292 this.ParseHelper.EnsureTable(section, sourceLineNumbers, IisTableDefinitions.CertificateHash); // Certificate CustomActions require the CertificateHash table 292 this.ParseHelper.EnsureTable(section, sourceLineNumbers, IisTableDefinitions.CertificateHash); // Certificate CustomActions require the CertificateHash table
293 293
294 if (!this.Messaging.EncounteredError) 294 if (!this.Messaging.EncounteredError)
295 { 295 {
296 section.AddTuple(new CertificateTuple(sourceLineNumbers, id) 296 section.AddSymbol(new CertificateSymbol(sourceLineNumbers, id)
297 { 297 {
298 ComponentRef = componentId, 298 ComponentRef = componentId,
299 Name = name, 299 Name = name,
@@ -325,7 +325,7 @@ namespace WixToolset.Iis
325 { 325 {
326 case "Id": 326 case "Id":
327 id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); 327 id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
328 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.Certificate, id.Id); 328 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.Certificate, id.Id);
329 break; 329 break;
330 default: 330 default:
331 this.ParseHelper.UnexpectedAttribute(element, attrib); 331 this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -347,9 +347,9 @@ namespace WixToolset.Iis
347 347
348 if (!this.Messaging.EncounteredError) 348 if (!this.Messaging.EncounteredError)
349 { 349 {
350 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.Certificate, id.Id); 350 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.Certificate, id.Id);
351 351
352 section.AddTuple(new IIsWebSiteCertificatesTuple(sourceLineNumbers) 352 section.AddSymbol(new IIsWebSiteCertificatesSymbol(sourceLineNumbers)
353 { 353 {
354 WebRef = webId, 354 WebRef = webId,
355 CertificateRef = id.Id, 355 CertificateRef = id.Id,
@@ -422,7 +422,7 @@ namespace WixToolset.Iis
422 422
423 if (!this.Messaging.EncounteredError) 423 if (!this.Messaging.EncounteredError)
424 { 424 {
425 section.AddTuple(new IIsMimeMapTuple(sourceLineNumbers, id) 425 section.AddSymbol(new IIsMimeMapSymbol(sourceLineNumbers, id)
426 { 426 {
427 ParentType = (int)parentType, 427 ParentType = (int)parentType,
428 ParentValue = parentId, 428 ParentValue = parentId,
@@ -533,7 +533,7 @@ namespace WixToolset.Iis
533 533
534 if (!this.Messaging.EncounteredError) 534 if (!this.Messaging.EncounteredError)
535 { 535 {
536 section.AddTuple(new IIsWebAddressTuple(sourceLineNumbers, id) 536 section.AddSymbol(new IIsWebAddressSymbol(sourceLineNumbers, id)
537 { 537 {
538 WebRef = parentWeb, 538 WebRef = parentWeb,
539 IP = ip, 539 IP = ip,
@@ -639,7 +639,7 @@ namespace WixToolset.Iis
639 break; 639 break;
640 case "WebAppPool": 640 case "WebAppPool":
641 appPool = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 641 appPool = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
642 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsAppPool, appPool); 642 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsAppPool, appPool);
643 break; 643 break;
644 default: 644 default:
645 this.ParseHelper.UnexpectedAttribute(element, attrib); 645 this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -688,7 +688,7 @@ namespace WixToolset.Iis
688 688
689 if (!this.Messaging.EncounteredError) 689 if (!this.Messaging.EncounteredError)
690 { 690 {
691 var tuple = section.AddTuple(new IIsWebApplicationTuple(sourceLineNumbers, id) 691 var symbol = section.AddSymbol(new IIsWebApplicationSymbol(sourceLineNumbers, id)
692 { 692 {
693 Name = name, 693 Name = name,
694 Isolation = isolation, 694 Isolation = isolation,
@@ -698,37 +698,37 @@ namespace WixToolset.Iis
698 698
699 if (YesNoDefaultType.Default != allowSessions) 699 if (YesNoDefaultType.Default != allowSessions)
700 { 700 {
701 tuple.AllowSessions = YesNoDefaultType.Yes == allowSessions ? 1 : 0; 701 symbol.AllowSessions = YesNoDefaultType.Yes == allowSessions ? 1 : 0;
702 } 702 }
703 703
704 if (CompilerConstants.IntegerNotSet != sessionTimeout) 704 if (CompilerConstants.IntegerNotSet != sessionTimeout)
705 { 705 {
706 tuple.SessionTimeout = sessionTimeout; 706 symbol.SessionTimeout = sessionTimeout;
707 } 707 }
708 708
709 if (YesNoDefaultType.Default != buffer) 709 if (YesNoDefaultType.Default != buffer)
710 { 710 {
711 tuple.Buffer = YesNoDefaultType.Yes == buffer ? 1 : 0; 711 symbol.Buffer = YesNoDefaultType.Yes == buffer ? 1 : 0;
712 } 712 }
713 713
714 if (YesNoDefaultType.Default != parentPaths) 714 if (YesNoDefaultType.Default != parentPaths)
715 { 715 {
716 tuple.ParentPaths = YesNoDefaultType.Yes == parentPaths ? 1 : 0; 716 symbol.ParentPaths = YesNoDefaultType.Yes == parentPaths ? 1 : 0;
717 } 717 }
718 718
719 if (CompilerConstants.IntegerNotSet != scriptTimeout) 719 if (CompilerConstants.IntegerNotSet != scriptTimeout)
720 { 720 {
721 tuple.ScriptTimeout = scriptTimeout; 721 symbol.ScriptTimeout = scriptTimeout;
722 } 722 }
723 723
724 if (YesNoDefaultType.Default != serverDebugging) 724 if (YesNoDefaultType.Default != serverDebugging)
725 { 725 {
726 tuple.ServerDebugging = YesNoDefaultType.Yes == serverDebugging ? 1 : 0; 726 symbol.ServerDebugging = YesNoDefaultType.Yes == serverDebugging ? 1 : 0;
727 } 727 }
728 728
729 if (YesNoDefaultType.Default != clientDebugging) 729 if (YesNoDefaultType.Default != clientDebugging)
730 { 730 {
731 tuple.ClientDebugging = YesNoDefaultType.Yes == clientDebugging ? 1 : 0; 731 symbol.ClientDebugging = YesNoDefaultType.Yes == clientDebugging ? 1 : 0;
732 } 732 }
733 } 733 }
734 734
@@ -798,7 +798,7 @@ namespace WixToolset.Iis
798 798
799 if (!this.Messaging.EncounteredError) 799 if (!this.Messaging.EncounteredError)
800 { 800 {
801 var tuple = section.AddTuple(new IIsWebApplicationExtensionTuple(sourceLineNumbers) 801 var symbol = section.AddSymbol(new IIsWebApplicationExtensionSymbol(sourceLineNumbers)
802 { 802 {
803 ApplicationRef = application, 803 ApplicationRef = application,
804 Extension = extension, 804 Extension = extension,
@@ -808,7 +808,7 @@ namespace WixToolset.Iis
808 808
809 if (0 < attributes) 809 if (0 < attributes)
810 { 810 {
811 tuple.Attributes = attributes; 811 symbol.Attributes = attributes;
812 } 812 }
813 } 813 }
814 } 814 }
@@ -925,7 +925,7 @@ namespace WixToolset.Iis
925 { 925 {
926 switch (managedPipelineMode) 926 switch (managedPipelineMode)
927 { 927 {
928 // In 3.5 we allowed lower case values (per camel case enum style), we now use formatted fields, 928 // In 3.5 we allowed lower case values (per camel case enum style), we now use formatted fields,
929 // so the value needs to match exactly what we pass in to IIS which uses pascal case. 929 // so the value needs to match exactly what we pass in to IIS which uses pascal case.
930 case "classic": 930 case "classic":
931 managedPipelineMode = "Classic"; 931 managedPipelineMode = "Classic";
@@ -1113,7 +1113,7 @@ namespace WixToolset.Iis
1113 1113
1114 if (!this.Messaging.EncounteredError) 1114 if (!this.Messaging.EncounteredError)
1115 { 1115 {
1116 var tuple = section.AddTuple(new IIsAppPoolTuple(sourceLineNumbers, id) 1116 var symbol = section.AddSymbol(new IIsAppPoolSymbol(sourceLineNumbers, id)
1117 { 1117 {
1118 Name = name, 1118 Name = name,
1119 ComponentRef = componentId, 1119 ComponentRef = componentId,
@@ -1127,37 +1127,37 @@ namespace WixToolset.Iis
1127 1127
1128 if (CompilerConstants.IntegerNotSet != recycleMinutes) 1128 if (CompilerConstants.IntegerNotSet != recycleMinutes)
1129 { 1129 {
1130 tuple.RecycleMinutes = recycleMinutes; 1130 symbol.RecycleMinutes = recycleMinutes;
1131 } 1131 }
1132 1132
1133 if (CompilerConstants.IntegerNotSet != recycleRequests) 1133 if (CompilerConstants.IntegerNotSet != recycleRequests)
1134 { 1134 {
1135 tuple.RecycleRequests = recycleRequests; 1135 symbol.RecycleRequests = recycleRequests;
1136 } 1136 }
1137 1137
1138 if (CompilerConstants.IntegerNotSet != idleTimeout) 1138 if (CompilerConstants.IntegerNotSet != idleTimeout)
1139 { 1139 {
1140 tuple.IdleTimeout = idleTimeout; 1140 symbol.IdleTimeout = idleTimeout;
1141 } 1141 }
1142 1142
1143 if (CompilerConstants.IntegerNotSet != queueLimit) 1143 if (CompilerConstants.IntegerNotSet != queueLimit)
1144 { 1144 {
1145 tuple.QueueLimit = queueLimit; 1145 symbol.QueueLimit = queueLimit;
1146 } 1146 }
1147 1147
1148 if (CompilerConstants.IntegerNotSet != maxWorkerProcs) 1148 if (CompilerConstants.IntegerNotSet != maxWorkerProcs)
1149 { 1149 {
1150 tuple.MaxProc = maxWorkerProcs; 1150 symbol.MaxProc = maxWorkerProcs;
1151 } 1151 }
1152 1152
1153 if (CompilerConstants.IntegerNotSet != virtualMemory) 1153 if (CompilerConstants.IntegerNotSet != virtualMemory)
1154 { 1154 {
1155 tuple.VirtualMemory = virtualMemory; 1155 symbol.VirtualMemory = virtualMemory;
1156 } 1156 }
1157 1157
1158 if (CompilerConstants.IntegerNotSet != privateMemory) 1158 if (CompilerConstants.IntegerNotSet != privateMemory)
1159 { 1159 {
1160 tuple.PrivateMemory = privateMemory; 1160 symbol.PrivateMemory = privateMemory;
1161 } 1161 }
1162 } 1162 }
1163 } 1163 }
@@ -1201,7 +1201,7 @@ namespace WixToolset.Iis
1201 } 1201 }
1202 1202
1203 parentWeb = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 1203 parentWeb = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
1204 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebSite, parentWeb); 1204 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebSite, parentWeb);
1205 break; 1205 break;
1206 default: 1206 default:
1207 this.ParseHelper.UnexpectedAttribute(element, attrib); 1207 this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -1278,17 +1278,17 @@ namespace WixToolset.Iis
1278 1278
1279 if (null != application) 1279 if (null != application)
1280 { 1280 {
1281 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebApplication, application); 1281 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebApplication, application);
1282 } 1282 }
1283 1283
1284 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebDirProperties, dirProperties); 1284 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebDirProperties, dirProperties);
1285 1285
1286 // Reference ConfigureIIs since nothing will happen without it 1286 // Reference ConfigureIIs since nothing will happen without it
1287 this.AddReferenceToConfigureIIs(section, sourceLineNumbers); 1287 this.AddReferenceToConfigureIIs(section, sourceLineNumbers);
1288 1288
1289 if (!this.Messaging.EncounteredError) 1289 if (!this.Messaging.EncounteredError)
1290 { 1290 {
1291 section.AddTuple(new IIsWebDirTuple(sourceLineNumbers, id) 1291 section.AddSymbol(new IIsWebDirSymbol(sourceLineNumbers, id)
1292 { 1292 {
1293 ComponentRef = componentId, 1293 ComponentRef = componentId,
1294 WebRef = parentWeb, 1294 WebRef = parentWeb,
@@ -1557,7 +1557,7 @@ namespace WixToolset.Iis
1557 1557
1558 if (!this.Messaging.EncounteredError) 1558 if (!this.Messaging.EncounteredError)
1559 { 1559 {
1560 var tuple = section.AddTuple(new IIsWebDirPropertiesTuple(sourceLineNumbers, id) 1560 var symbol = section.AddSymbol(new IIsWebDirPropertiesSymbol(sourceLineNumbers, id)
1561 { 1561 {
1562 AnonymousUserRef = anonymousUser, 1562 AnonymousUserRef = anonymousUser,
1563 IIsControlledPassword = iisControlledPassword ? 1 : 0, 1563 IIsControlledPassword = iisControlledPassword ? 1 : 0,
@@ -1568,47 +1568,47 @@ namespace WixToolset.Iis
1568 1568
1569 if (accessSet) 1569 if (accessSet)
1570 { 1570 {
1571 tuple.Access = access; 1571 symbol.Access = access;
1572 } 1572 }
1573 1573
1574 if (authorizationSet) 1574 if (authorizationSet)
1575 { 1575 {
1576 tuple.Authorization = authorization; 1576 symbol.Authorization = authorization;
1577 } 1577 }
1578 1578
1579 if (YesNoType.NotSet != logVisits) 1579 if (YesNoType.NotSet != logVisits)
1580 { 1580 {
1581 tuple.LogVisits = YesNoType.Yes == logVisits ? 1 : 0; 1581 symbol.LogVisits = YesNoType.Yes == logVisits ? 1 : 0;
1582 } 1582 }
1583 1583
1584 if (YesNoType.NotSet != index) 1584 if (YesNoType.NotSet != index)
1585 { 1585 {
1586 tuple.Index = YesNoType.Yes == index ? 1 : 0; 1586 symbol.Index = YesNoType.Yes == index ? 1 : 0;
1587 } 1587 }
1588 1588
1589 if (YesNoType.NotSet != aspDetailedError) 1589 if (YesNoType.NotSet != aspDetailedError)
1590 { 1590 {
1591 tuple.AspDetailedError = YesNoType.Yes == aspDetailedError ? 1 : 0; 1591 symbol.AspDetailedError = YesNoType.Yes == aspDetailedError ? 1 : 0;
1592 } 1592 }
1593 1593
1594 if (CompilerConstants.LongNotSet != cacheControlMaxAge) 1594 if (CompilerConstants.LongNotSet != cacheControlMaxAge)
1595 { 1595 {
1596 tuple.CacheControlMaxAge = unchecked((int)cacheControlMaxAge); 1596 symbol.CacheControlMaxAge = unchecked((int)cacheControlMaxAge);
1597 } 1597 }
1598 1598
1599 if (YesNoType.NotSet != notCustomError) 1599 if (YesNoType.NotSet != notCustomError)
1600 { 1600 {
1601 tuple.NoCustomError = YesNoType.Yes == notCustomError ? 1 : 0; 1601 symbol.NoCustomError = YesNoType.Yes == notCustomError ? 1 : 0;
1602 } 1602 }
1603 1603
1604 if (accessSSLFlagsSet) 1604 if (accessSSLFlagsSet)
1605 { 1605 {
1606 tuple.AccessSSLFlags = accessSSLFlags; 1606 symbol.AccessSSLFlags = accessSSLFlags;
1607 } 1607 }
1608 1608
1609 if (null != authenticationProviders) 1609 if (null != authenticationProviders)
1610 { 1610 {
1611 tuple.AuthenticationProviders = authenticationProviders; 1611 symbol.AuthenticationProviders = authenticationProviders;
1612 } 1612 }
1613 } 1613 }
1614 1614
@@ -1682,7 +1682,7 @@ namespace WixToolset.Iis
1682 1682
1683 if (!this.Messaging.EncounteredError) 1683 if (!this.Messaging.EncounteredError)
1684 { 1684 {
1685 section.AddTuple(new IIsWebErrorTuple(sourceLineNumbers) 1685 section.AddSymbol(new IIsWebErrorSymbol(sourceLineNumbers)
1686 { 1686 {
1687 ErrorCode = errorCode, 1687 ErrorCode = errorCode,
1688 SubCode = subCode, 1688 SubCode = subCode,
@@ -1756,7 +1756,7 @@ namespace WixToolset.Iis
1756 } 1756 }
1757 1757
1758 parentWeb = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 1758 parentWeb = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
1759 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebSite, parentWeb); 1759 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebSite, parentWeb);
1760 break; 1760 break;
1761 default: 1761 default:
1762 this.ParseHelper.UnexpectedAttribute(element, attrib); 1762 this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -1791,7 +1791,7 @@ namespace WixToolset.Iis
1791 1791
1792 if (!this.Messaging.EncounteredError) 1792 if (!this.Messaging.EncounteredError)
1793 { 1793 {
1794 var tuple = section.AddTuple(new IIsFilterTuple(sourceLineNumbers, id) 1794 var symbol = section.AddSymbol(new IIsFilterSymbol(sourceLineNumbers, id)
1795 { 1795 {
1796 Name = name, 1796 Name = name,
1797 ComponentRef = componentId, 1797 ComponentRef = componentId,
@@ -1803,7 +1803,7 @@ namespace WixToolset.Iis
1803 1803
1804 if (CompilerConstants.IntegerNotSet != loadOrder) 1804 if (CompilerConstants.IntegerNotSet != loadOrder)
1805 { 1805 {
1806 tuple.LoadOrder = loadOrder; 1806 symbol.LoadOrder = loadOrder;
1807 } 1807 }
1808 } 1808 }
1809 } 1809 }
@@ -1879,7 +1879,7 @@ namespace WixToolset.Iis
1879 1879
1880 if (!this.Messaging.EncounteredError) 1880 if (!this.Messaging.EncounteredError)
1881 { 1881 {
1882 section.AddTuple(new IIsWebLogTuple(sourceLineNumbers, id) 1882 section.AddSymbol(new IIsWebLogSymbol(sourceLineNumbers, id)
1883 { 1883 {
1884 Format = type, 1884 Format = type,
1885 }); 1885 });
@@ -1950,7 +1950,7 @@ namespace WixToolset.Iis
1950 1950
1951 if (!this.Messaging.EncounteredError) 1951 if (!this.Messaging.EncounteredError)
1952 { 1952 {
1953 section.AddTuple(new IIsPropertyTuple(sourceLineNumbers, id) 1953 section.AddSymbol(new IIsPropertySymbol(sourceLineNumbers, id)
1954 { 1954 {
1955 ComponentRef = componentId, 1955 ComponentRef = componentId,
1956 Attributes = 0, 1956 Attributes = 0,
@@ -2039,7 +2039,7 @@ namespace WixToolset.Iis
2039 2039
2040 if (!this.Messaging.EncounteredError) 2040 if (!this.Messaging.EncounteredError)
2041 { 2041 {
2042 section.AddTuple(new IIsWebServiceExtensionTuple(sourceLineNumbers, id) 2042 section.AddSymbol(new IIsWebServiceExtensionSymbol(sourceLineNumbers, id)
2043 { 2043 {
2044 ComponentRef = componentId, 2044 ComponentRef = componentId,
2045 File = file, 2045 File = file,
@@ -2118,7 +2118,7 @@ namespace WixToolset.Iis
2118 break; 2118 break;
2119 case "Directory": 2119 case "Directory":
2120 directory = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 2120 directory = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
2121 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Directory, directory); 2121 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Directory, directory);
2122 break; 2122 break;
2123 case "DirProperties": 2123 case "DirProperties":
2124 if (null == componentId) 2124 if (null == componentId)
@@ -2169,7 +2169,7 @@ namespace WixToolset.Iis
2169 } 2169 }
2170 2170
2171 log = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 2171 log = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
2172 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebLog, log); 2172 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebLog, log);
2173 break; 2173 break;
2174 default: 2174 default:
2175 this.ParseHelper.UnexpectedAttribute(element, attrib); 2175 this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -2310,12 +2310,12 @@ namespace WixToolset.Iis
2310 2310
2311 if (null != application) 2311 if (null != application)
2312 { 2312 {
2313 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebApplication, application); 2313 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebApplication, application);
2314 } 2314 }
2315 2315
2316 if (null != dirProperties) 2316 if (null != dirProperties)
2317 { 2317 {
2318 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebDirProperties, dirProperties); 2318 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebDirProperties, dirProperties);
2319 } 2319 }
2320 2320
2321 if (null != componentId) 2321 if (null != componentId)
@@ -2326,7 +2326,7 @@ namespace WixToolset.Iis
2326 2326
2327 if (!this.Messaging.EncounteredError) 2327 if (!this.Messaging.EncounteredError)
2328 { 2328 {
2329 var tuple = section.AddTuple(new IIsWebSiteTuple(sourceLineNumbers, id) 2329 var symbol = section.AddSymbol(new IIsWebSiteSymbol(sourceLineNumbers, id)
2330 { 2330 {
2331 ComponentRef = componentId, 2331 ComponentRef = componentId,
2332 Description = description, 2332 Description = description,
@@ -2340,22 +2340,22 @@ namespace WixToolset.Iis
2340 2340
2341 if (CompilerConstants.IntegerNotSet != connectionTimeout) 2341 if (CompilerConstants.IntegerNotSet != connectionTimeout)
2342 { 2342 {
2343 tuple.ConnectionTimeout = connectionTimeout; 2343 symbol.ConnectionTimeout = connectionTimeout;
2344 } 2344 }
2345 2345
2346 if (CompilerConstants.IntegerNotSet != state) 2346 if (CompilerConstants.IntegerNotSet != state)
2347 { 2347 {
2348 tuple.State = state; 2348 symbol.State = state;
2349 } 2349 }
2350 2350
2351 if (0 != attributes) 2351 if (0 != attributes)
2352 { 2352 {
2353 tuple.Attributes = attributes; 2353 symbol.Attributes = attributes;
2354 } 2354 }
2355 2355
2356 if (CompilerConstants.IntegerNotSet != sequence) 2356 if (CompilerConstants.IntegerNotSet != sequence)
2357 { 2357 {
2358 tuple.Sequence = sequence; 2358 symbol.Sequence = sequence;
2359 } 2359 }
2360 } 2360 }
2361 } 2361 }
@@ -2415,7 +2415,7 @@ namespace WixToolset.Iis
2415 2415
2416 if (!this.Messaging.EncounteredError) 2416 if (!this.Messaging.EncounteredError)
2417 { 2417 {
2418 section.AddTuple(new IIsHttpHeaderTuple(sourceLineNumbers, id) 2418 section.AddSymbol(new IIsHttpHeaderSymbol(sourceLineNumbers, id)
2419 { 2419 {
2420 HttpHeader = id.Id, 2420 HttpHeader = id.Id,
2421 ParentType = (int)parentType, 2421 ParentType = (int)parentType,
@@ -2457,7 +2457,7 @@ namespace WixToolset.Iis
2457 break; 2457 break;
2458 case "Directory": 2458 case "Directory":
2459 directory = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 2459 directory = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
2460 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Directory, directory); 2460 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Directory, directory);
2461 break; 2461 break;
2462 case "DirProperties": 2462 case "DirProperties":
2463 dirProperties = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); 2463 dirProperties = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -2472,7 +2472,7 @@ namespace WixToolset.Iis
2472 } 2472 }
2473 2473
2474 parentWeb = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 2474 parentWeb = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
2475 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebSite, parentWeb); 2475 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebSite, parentWeb);
2476 break; 2476 break;
2477 default: 2477 default:
2478 this.ParseHelper.UnexpectedAttribute(element, attrib); 2478 this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -2576,12 +2576,12 @@ namespace WixToolset.Iis
2576 2576
2577 if (null != dirProperties) 2577 if (null != dirProperties)
2578 { 2578 {
2579 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebDirProperties, dirProperties); 2579 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebDirProperties, dirProperties);
2580 } 2580 }
2581 2581
2582 if (null != application) 2582 if (null != application)
2583 { 2583 {
2584 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebApplication, application); 2584 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebApplication, application);
2585 } 2585 }
2586 2586
2587 // Reference ConfigureIIs since nothing will happen without it 2587 // Reference ConfigureIIs since nothing will happen without it
@@ -2589,7 +2589,7 @@ namespace WixToolset.Iis
2589 2589
2590 if (!this.Messaging.EncounteredError) 2590 if (!this.Messaging.EncounteredError)
2591 { 2591 {
2592 section.AddTuple(new IIsWebVirtualDirTuple(sourceLineNumbers, id) 2592 section.AddSymbol(new IIsWebVirtualDirSymbol(sourceLineNumbers, id)
2593 { 2593 {
2594 ComponentRef = componentId, 2594 ComponentRef = componentId,
2595 WebRef = parentWeb, 2595 WebRef = parentWeb,
@@ -2603,7 +2603,7 @@ namespace WixToolset.Iis
2603 2603
2604 private void AddReferenceToConfigureIIs(IntermediateSection section, SourceLineNumber sourceLineNumbers) 2604 private void AddReferenceToConfigureIIs(IntermediateSection section, SourceLineNumber sourceLineNumbers)
2605 { 2605 {
2606 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "ConfigureIIs"); 2606 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "ConfigureIIs");
2607 } 2607 }
2608 } 2608 }
2609} 2609}
diff --git a/src/wixext/IIsExtensionData.cs b/src/wixext/IIsExtensionData.cs
index d1696a89..6a0e1f09 100644
--- a/src/wixext/IIsExtensionData.cs
+++ b/src/wixext/IIsExtensionData.cs
@@ -16,15 +16,15 @@ namespace WixToolset.Iis
16 /// <value>The default culture.</value> 16 /// <value>The default culture.</value>
17 public override string DefaultCulture => "en-US"; 17 public override string DefaultCulture => "en-US";
18 18
19 public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) 19 public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
20 { 20 {
21 tupleDefinition = IisTupleDefinitions.ByName(name); 21 symbolDefinition = IisSymbolDefinitions.ByName(name);
22 return tupleDefinition != null; 22 return symbolDefinition != null;
23 } 23 }
24 24
25 public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions) 25 public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
26 { 26 {
27 return Intermediate.Load(typeof(IIsExtensionData).Assembly, "WixToolset.Iis.iis.wixlib", tupleDefinitions); 27 return Intermediate.Load(typeof(IIsExtensionData).Assembly, "WixToolset.Iis.iis.wixlib", symbolDefinitions);
28 } 28 }
29 } 29 }
30} 30}
diff --git a/src/wixext/IisTableDefinitions.cs b/src/wixext/IisTableDefinitions.cs
index 6c887e96..f513152e 100644
--- a/src/wixext/IisTableDefinitions.cs
+++ b/src/wixext/IisTableDefinitions.cs
@@ -8,7 +8,7 @@ namespace WixToolset.Iis
8 { 8 {
9 public static readonly TableDefinition Certificate = new TableDefinition( 9 public static readonly TableDefinition Certificate = new TableDefinition(
10 "Certificate", 10 "Certificate",
11 IisTupleDefinitions.Certificate, 11 IisSymbolDefinitions.Certificate,
12 new[] 12 new[]
13 { 13 {
14 new ColumnDefinition("Certificate", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyColumn: 1, description: "Identifier for the certificate in the package.", modularizeType: ColumnModularizeType.Column), 14 new ColumnDefinition("Certificate", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyColumn: 1, description: "Identifier for the certificate in the package.", modularizeType: ColumnModularizeType.Column),
@@ -21,34 +21,34 @@ namespace WixToolset.Iis
21 new ColumnDefinition("CertificatePath", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Property to path of certificate.", modularizeType: ColumnModularizeType.Property), 21 new ColumnDefinition("CertificatePath", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Property to path of certificate.", modularizeType: ColumnModularizeType.Property),
22 new ColumnDefinition("PFXPassword", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Hidden property to a pfx password", modularizeType: ColumnModularizeType.Property), 22 new ColumnDefinition("PFXPassword", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Hidden property to a pfx password", modularizeType: ColumnModularizeType.Property),
23 }, 23 },
24 tupleIdIsPrimaryKey: true 24 symbolIdIsPrimaryKey: true
25 ); 25 );
26 26
27 public static readonly TableDefinition CertificateHash = new TableDefinition( 27 public static readonly TableDefinition CertificateHash = new TableDefinition(
28 "CertificateHash", 28 "CertificateHash",
29 IisTupleDefinitions.CertificateHash, 29 IisSymbolDefinitions.CertificateHash,
30 new[] 30 new[]
31 { 31 {
32 new ColumnDefinition("Certificate_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyColumn: 1, description: "Foreign key to certificate in Certificate table.", modularizeType: ColumnModularizeType.Column), 32 new ColumnDefinition("Certificate_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyColumn: 1, description: "Foreign key to certificate in Certificate table.", modularizeType: ColumnModularizeType.Column),
33 new ColumnDefinition("Hash", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Base64 encoded SHA1 hash of certificate populated at run-time."), 33 new ColumnDefinition("Hash", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Base64 encoded SHA1 hash of certificate populated at run-time."),
34 }, 34 },
35 tupleIdIsPrimaryKey: false 35 symbolIdIsPrimaryKey: false
36 ); 36 );
37 37
38 public static readonly TableDefinition IIsWebSiteCertificates = new TableDefinition( 38 public static readonly TableDefinition IIsWebSiteCertificates = new TableDefinition(
39 "IIsWebSiteCertificates", 39 "IIsWebSiteCertificates",
40 IisTupleDefinitions.IIsWebSiteCertificates, 40 IisSymbolDefinitions.IIsWebSiteCertificates,
41 new[] 41 new[]
42 { 42 {
43 new ColumnDefinition("Web_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "IIsWebSite", keyColumn: 1, description: "The index into the IIsWebSite table.", modularizeType: ColumnModularizeType.Column), 43 new ColumnDefinition("Web_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "IIsWebSite", keyColumn: 1, description: "The index into the IIsWebSite table.", modularizeType: ColumnModularizeType.Column),
44 new ColumnDefinition("Certificate_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "Certificate", keyColumn: 1, description: "The index into the Certificate table.", modularizeType: ColumnModularizeType.Column), 44 new ColumnDefinition("Certificate_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "Certificate", keyColumn: 1, description: "The index into the Certificate table.", modularizeType: ColumnModularizeType.Column),
45 }, 45 },
46 tupleIdIsPrimaryKey: false 46 symbolIdIsPrimaryKey: false
47 ); 47 );
48 48
49 public static readonly TableDefinition IIsAppPool = new TableDefinition( 49 public static readonly TableDefinition IIsAppPool = new TableDefinition(
50 "IIsAppPool", 50 "IIsAppPool",
51 IisTupleDefinitions.IIsAppPool, 51 IisSymbolDefinitions.IIsAppPool,
52 new[] 52 new[]
53 { 53 {
54 new ColumnDefinition("AppPool", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for apppool", modularizeType: ColumnModularizeType.Column), 54 new ColumnDefinition("AppPool", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for apppool", modularizeType: ColumnModularizeType.Column),
@@ -68,12 +68,12 @@ namespace WixToolset.Iis
68 new ColumnDefinition("ManagedRuntimeVersion", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies the .NET Framework version to be used by the application pool."), 68 new ColumnDefinition("ManagedRuntimeVersion", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies the .NET Framework version to be used by the application pool."),
69 new ColumnDefinition("ManagedPipelineMode", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies the request-processing mode that is used to process requests for managed content."), 69 new ColumnDefinition("ManagedPipelineMode", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies the request-processing mode that is used to process requests for managed content."),
70 }, 70 },
71 tupleIdIsPrimaryKey: true 71 symbolIdIsPrimaryKey: true
72 ); 72 );
73 73
74 public static readonly TableDefinition IIsMimeMap = new TableDefinition( 74 public static readonly TableDefinition IIsMimeMap = new TableDefinition(
75 "IIsMimeMap", 75 "IIsMimeMap",
76 IisTupleDefinitions.IIsMimeMap, 76 IisSymbolDefinitions.IIsMimeMap,
77 new[] 77 new[]
78 { 78 {
79 new ColumnDefinition("MimeMap", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for Mime Map definitions", modularizeType: ColumnModularizeType.Column), 79 new ColumnDefinition("MimeMap", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for Mime Map definitions", modularizeType: ColumnModularizeType.Column),
@@ -82,12 +82,12 @@ namespace WixToolset.Iis
82 new ColumnDefinition("MimeType", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Mime-type covered by the MimeMap."), 82 new ColumnDefinition("MimeType", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Mime-type covered by the MimeMap."),
83 new ColumnDefinition("Extension", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Extension covered by the MimeMap."), 83 new ColumnDefinition("Extension", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Extension covered by the MimeMap."),
84 }, 84 },
85 tupleIdIsPrimaryKey: true 85 symbolIdIsPrimaryKey: true
86 ); 86 );
87 87
88 public static readonly TableDefinition IIsProperty = new TableDefinition( 88 public static readonly TableDefinition IIsProperty = new TableDefinition(
89 "IIsProperty", 89 "IIsProperty",
90 IisTupleDefinitions.IIsProperty, 90 IisSymbolDefinitions.IIsProperty,
91 new[] 91 new[]
92 { 92 {
93 new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Unique name of the IIsProperty"), 93 new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Unique name of the IIsProperty"),
@@ -95,12 +95,12 @@ namespace WixToolset.Iis
95 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Attributes of the IIsProperty (unused)"), 95 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Attributes of the IIsProperty (unused)"),
96 new ColumnDefinition("Value", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Value of the IIsProperty"), 96 new ColumnDefinition("Value", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Value of the IIsProperty"),
97 }, 97 },
98 tupleIdIsPrimaryKey: true 98 symbolIdIsPrimaryKey: true
99 ); 99 );
100 100
101 public static readonly TableDefinition IIsWebDirProperties = new TableDefinition( 101 public static readonly TableDefinition IIsWebDirProperties = new TableDefinition(
102 "IIsWebDirProperties", 102 "IIsWebDirProperties",
103 IisTupleDefinitions.IIsWebDirProperties, 103 IisSymbolDefinitions.IIsWebDirProperties,
104 new[] 104 new[]
105 { 105 {
106 new ColumnDefinition("DirProperties", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for Web Properties", modularizeType: ColumnModularizeType.Column), 106 new ColumnDefinition("DirProperties", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for Web Properties", modularizeType: ColumnModularizeType.Column),
@@ -119,12 +119,12 @@ namespace WixToolset.Iis
119 new ColumnDefinition("AccessSSLFlags", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies AccessSSLFlags IIS metabase property."), 119 new ColumnDefinition("AccessSSLFlags", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies AccessSSLFlags IIS metabase property."),
120 new ColumnDefinition("AuthenticationProviders", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Comma delimited list, in order of precedence, of Windows authentication providers that IIS will attempt to use: NTLM, Kerberos, Negotiate, and others."), 120 new ColumnDefinition("AuthenticationProviders", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Comma delimited list, in order of precedence, of Windows authentication providers that IIS will attempt to use: NTLM, Kerberos, Negotiate, and others."),
121 }, 121 },
122 tupleIdIsPrimaryKey: true 122 symbolIdIsPrimaryKey: true
123 ); 123 );
124 124
125 public static readonly TableDefinition IIsWebAddress = new TableDefinition( 125 public static readonly TableDefinition IIsWebAddress = new TableDefinition(
126 "IIsWebAddress", 126 "IIsWebAddress",
127 IisTupleDefinitions.IIsWebAddress, 127 IisSymbolDefinitions.IIsWebAddress,
128 new[] 128 new[]
129 { 129 {
130 new ColumnDefinition("Address", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), 130 new ColumnDefinition("Address", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -134,12 +134,12 @@ namespace WixToolset.Iis
134 new ColumnDefinition("Header", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Special header information for the web site"), 134 new ColumnDefinition("Header", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Special header information for the web site"),
135 new ColumnDefinition("Secure", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, possibilities: "0;1", description: "Specifies whether SSL is used to communicate with web site"), 135 new ColumnDefinition("Secure", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, possibilities: "0;1", description: "Specifies whether SSL is used to communicate with web site"),
136 }, 136 },
137 tupleIdIsPrimaryKey: true 137 symbolIdIsPrimaryKey: true
138 ); 138 );
139 139
140 public static readonly TableDefinition IIsWebSite = new TableDefinition( 140 public static readonly TableDefinition IIsWebSite = new TableDefinition(
141 "IIsWebSite", 141 "IIsWebSite",
142 IisTupleDefinitions.IIsWebSite, 142 IisSymbolDefinitions.IIsWebSite,
143 new[] 143 new[]
144 { 144 {
145 new ColumnDefinition("Web", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), 145 new ColumnDefinition("Web", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -156,12 +156,12 @@ namespace WixToolset.Iis
156 new ColumnDefinition("Log_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, keyTable: "IIsWebLog", keyColumn: 1, description: "Foreign key reference to IIsWebLog data", modularizeType: ColumnModularizeType.Column), 156 new ColumnDefinition("Log_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, keyTable: "IIsWebLog", keyColumn: 1, description: "Foreign key reference to IIsWebLog data", modularizeType: ColumnModularizeType.Column),
157 new ColumnDefinition("Id", ColumnType.String, 74, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Optional number or formatted value that resolves to number that acts as the WebSite Id."), 157 new ColumnDefinition("Id", ColumnType.String, 74, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Optional number or formatted value that resolves to number that acts as the WebSite Id."),
158 }, 158 },
159 tupleIdIsPrimaryKey: true 159 symbolIdIsPrimaryKey: true
160 ); 160 );
161 161
162 public static readonly TableDefinition IIsWebApplication = new TableDefinition( 162 public static readonly TableDefinition IIsWebApplication = new TableDefinition(
163 "IIsWebApplication", 163 "IIsWebApplication",
164 IisTupleDefinitions.IIsWebApplication, 164 IisSymbolDefinitions.IIsWebApplication,
165 new[] 165 new[]
166 { 166 {
167 new ColumnDefinition("Application", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for ASP Application", modularizeType: ColumnModularizeType.Column), 167 new ColumnDefinition("Application", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for ASP Application", modularizeType: ColumnModularizeType.Column),
@@ -177,12 +177,12 @@ namespace WixToolset.Iis
177 new ColumnDefinition("ClientDebugging", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, possibilities: "0;1", description: "Specifies whether to allow ASP client-side script debugging"), 177 new ColumnDefinition("ClientDebugging", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, possibilities: "0;1", description: "Specifies whether to allow ASP client-side script debugging"),
178 new ColumnDefinition("AppPool_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsAppPool", keyColumn: 1, description: "App Pool this application should run under", modularizeType: ColumnModularizeType.Column), 178 new ColumnDefinition("AppPool_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsAppPool", keyColumn: 1, description: "App Pool this application should run under", modularizeType: ColumnModularizeType.Column),
179 }, 179 },
180 tupleIdIsPrimaryKey: true 180 symbolIdIsPrimaryKey: true
181 ); 181 );
182 182
183 public static readonly TableDefinition IIsWebApplicationExtension = new TableDefinition( 183 public static readonly TableDefinition IIsWebApplicationExtension = new TableDefinition(
184 "IIsWebApplicationExtension", 184 "IIsWebApplicationExtension",
185 IisTupleDefinitions.IIsWebApplicationExtension, 185 IisSymbolDefinitions.IIsWebApplicationExtension,
186 new[] 186 new[]
187 { 187 {
188 new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "IIsWebApplication", keyColumn: 1, description: "Foreign key referencing possible ASP application for the web site", modularizeType: ColumnModularizeType.Column), 188 new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "IIsWebApplication", keyColumn: 1, description: "Foreign key referencing possible ASP application for the web site", modularizeType: ColumnModularizeType.Column),
@@ -191,12 +191,12 @@ namespace WixToolset.Iis
191 new ColumnDefinition("Executable", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Path to extension (usually file property: [#file])", modularizeType: ColumnModularizeType.Property), 191 new ColumnDefinition("Executable", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Path to extension (usually file property: [#file])", modularizeType: ColumnModularizeType.Property),
192 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, possibilities: "1;4;5", description: "Attributes for extension: 1 == Script, 4 == Check Path Info"), 192 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, possibilities: "1;4;5", description: "Attributes for extension: 1 == Script, 4 == Check Path Info"),
193 }, 193 },
194 tupleIdIsPrimaryKey: false 194 symbolIdIsPrimaryKey: false
195 ); 195 );
196 196
197 public static readonly TableDefinition IIsFilter = new TableDefinition( 197 public static readonly TableDefinition IIsFilter = new TableDefinition(
198 "IIsFilter", 198 "IIsFilter",
199 IisTupleDefinitions.IIsFilter, 199 IisSymbolDefinitions.IIsFilter,
200 new[] 200 new[]
201 { 201 {
202 new ColumnDefinition("Filter", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), 202 new ColumnDefinition("Filter", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -208,12 +208,12 @@ namespace WixToolset.Iis
208 new ColumnDefinition("Flags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "What do all these numbers mean?"), 208 new ColumnDefinition("Flags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "What do all these numbers mean?"),
209 new ColumnDefinition("LoadOrder", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "-1 == last in order, 0 == first in order, # == place in order"), 209 new ColumnDefinition("LoadOrder", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "-1 == last in order, 0 == first in order, # == place in order"),
210 }, 210 },
211 tupleIdIsPrimaryKey: true 211 symbolIdIsPrimaryKey: true
212 ); 212 );
213 213
214 public static readonly TableDefinition IIsWebDir = new TableDefinition( 214 public static readonly TableDefinition IIsWebDir = new TableDefinition(
215 "IIsWebDir", 215 "IIsWebDir",
216 IisTupleDefinitions.IIsWebDir, 216 IisSymbolDefinitions.IIsWebDir,
217 new[] 217 new[]
218 { 218 {
219 new ColumnDefinition("WebDir", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), 219 new ColumnDefinition("WebDir", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -223,12 +223,12 @@ namespace WixToolset.Iis
223 new ColumnDefinition("DirProperties_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebDirProperties", keyColumn: 1, description: "Foreign key referencing possible security information for the virtual directory", modularizeType: ColumnModularizeType.Column), 223 new ColumnDefinition("DirProperties_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebDirProperties", keyColumn: 1, description: "Foreign key referencing possible security information for the virtual directory", modularizeType: ColumnModularizeType.Column),
224 new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebApplication", keyColumn: 1, description: "Foreign key referencing possible ASP application for the virtual directory. This column is currently unused, but maintained for compatibility reasons.", modularizeType: ColumnModularizeType.Column), 224 new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebApplication", keyColumn: 1, description: "Foreign key referencing possible ASP application for the virtual directory. This column is currently unused, but maintained for compatibility reasons.", modularizeType: ColumnModularizeType.Column),
225 }, 225 },
226 tupleIdIsPrimaryKey: true 226 symbolIdIsPrimaryKey: true
227 ); 227 );
228 228
229 public static readonly TableDefinition IIsWebError = new TableDefinition( 229 public static readonly TableDefinition IIsWebError = new TableDefinition(
230 "IIsWebError", 230 "IIsWebError",
231 IisTupleDefinitions.IIsWebError, 231 IisSymbolDefinitions.IIsWebError,
232 new[] 232 new[]
233 { 233 {
234 new ColumnDefinition("ErrorCode", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, minValue: 400, maxValue: 599, description: "HTTP status code indicating error."), 234 new ColumnDefinition("ErrorCode", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, minValue: 400, maxValue: 599, description: "HTTP status code indicating error."),
@@ -238,12 +238,12 @@ namespace WixToolset.Iis
238 new ColumnDefinition("File", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Path to file for this custom error (usually file property: [#file]). Must be null if URL is not null."), 238 new ColumnDefinition("File", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Path to file for this custom error (usually file property: [#file]). Must be null if URL is not null."),
239 new ColumnDefinition("URL", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "URL for this custom error. Must be null if File is not null."), 239 new ColumnDefinition("URL", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "URL for this custom error. Must be null if File is not null."),
240 }, 240 },
241 tupleIdIsPrimaryKey: false 241 symbolIdIsPrimaryKey: false
242 ); 242 );
243 243
244 public static readonly TableDefinition IIsHttpHeader = new TableDefinition( 244 public static readonly TableDefinition IIsHttpHeader = new TableDefinition(
245 "IIsHttpHeader", 245 "IIsHttpHeader",
246 IisTupleDefinitions.IIsHttpHeader, 246 IisSymbolDefinitions.IIsHttpHeader,
247 new[] 247 new[]
248 { 248 {
249 new ColumnDefinition("HttpHeader", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), 249 new ColumnDefinition("HttpHeader", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -254,12 +254,12 @@ namespace WixToolset.Iis
254 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 0, description: "Attributes for HTTP Header: none"), 254 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 0, description: "Attributes for HTTP Header: none"),
255 new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to add the HTTP Headers."), 255 new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to add the HTTP Headers."),
256 }, 256 },
257 tupleIdIsPrimaryKey: false 257 symbolIdIsPrimaryKey: false
258 ); 258 );
259 259
260 public static readonly TableDefinition IIsWebServiceExtension = new TableDefinition( 260 public static readonly TableDefinition IIsWebServiceExtension = new TableDefinition(
261 "IIsWebServiceExtension", 261 "IIsWebServiceExtension",
262 IisTupleDefinitions.IIsWebServiceExtension, 262 IisSymbolDefinitions.IIsWebServiceExtension,
263 new[] 263 new[]
264 { 264 {
265 new ColumnDefinition("WebServiceExtension", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), 265 new ColumnDefinition("WebServiceExtension", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -269,12 +269,12 @@ namespace WixToolset.Iis
269 new ColumnDefinition("Group", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "String used to identify groups of extensions.", modularizeType: ColumnModularizeType.Property), 269 new ColumnDefinition("Group", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "String used to identify groups of extensions.", modularizeType: ColumnModularizeType.Property),
270 new ColumnDefinition("Attributes", ColumnType.Number, 1, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 3, description: "Attributes for WebServiceExtension: 1 = Allow, 2 = UIDeletable"), 270 new ColumnDefinition("Attributes", ColumnType.Number, 1, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 3, description: "Attributes for WebServiceExtension: 1 = Allow, 2 = UIDeletable"),
271 }, 271 },
272 tupleIdIsPrimaryKey: true 272 symbolIdIsPrimaryKey: true
273 ); 273 );
274 274
275 public static readonly TableDefinition IIsWebVirtualDir = new TableDefinition( 275 public static readonly TableDefinition IIsWebVirtualDir = new TableDefinition(
276 "IIsWebVirtualDir", 276 "IIsWebVirtualDir",
277 IisTupleDefinitions.IIsWebVirtualDir, 277 IisSymbolDefinitions.IIsWebVirtualDir,
278 new[] 278 new[]
279 { 279 {
280 new ColumnDefinition("VirtualDir", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), 280 new ColumnDefinition("VirtualDir", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -285,18 +285,18 @@ namespace WixToolset.Iis
285 new ColumnDefinition("DirProperties_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebDirProperties", keyColumn: 1, description: "Foreign key referencing possible security information for the virtual directory", modularizeType: ColumnModularizeType.Column), 285 new ColumnDefinition("DirProperties_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebDirProperties", keyColumn: 1, description: "Foreign key referencing possible security information for the virtual directory", modularizeType: ColumnModularizeType.Column),
286 new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebApplication", keyColumn: 1, description: "Foreign key referencing possible ASP application for the virtual directory", modularizeType: ColumnModularizeType.Column), 286 new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebApplication", keyColumn: 1, description: "Foreign key referencing possible ASP application for the virtual directory", modularizeType: ColumnModularizeType.Column),
287 }, 287 },
288 tupleIdIsPrimaryKey: true 288 symbolIdIsPrimaryKey: true
289 ); 289 );
290 290
291 public static readonly TableDefinition IIsWebLog = new TableDefinition( 291 public static readonly TableDefinition IIsWebLog = new TableDefinition(
292 "IIsWebLog", 292 "IIsWebLog",
293 IisTupleDefinitions.IIsWebLog, 293 IisSymbolDefinitions.IIsWebLog,
294 new[] 294 new[]
295 { 295 {
296 new ColumnDefinition("Log", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), 296 new ColumnDefinition("Log", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
297 new ColumnDefinition("Format", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Type of log format"), 297 new ColumnDefinition("Format", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Type of log format"),
298 }, 298 },
299 tupleIdIsPrimaryKey: true 299 symbolIdIsPrimaryKey: true
300 ); 300 );
301 301
302 public static readonly TableDefinition[] All = new[] 302 public static readonly TableDefinition[] All = new[]
diff --git a/src/wixext/Tuples/CertificateHashTuple.cs b/src/wixext/Tuples/CertificateHashTuple.cs
index 11f0592f..866d474c 100644
--- a/src/wixext/Tuples/CertificateHashTuple.cs
+++ b/src/wixext/Tuples/CertificateHashTuple.cs
@@ -3,53 +3,53 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition CertificateHash = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition CertificateHash = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.CertificateHash.ToString(), 11 IisSymbolDefinitionType.CertificateHash.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(CertificateHashTupleFields.CertificateRef), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(CertificateHashSymbolFields.CertificateRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(CertificateHashTupleFields.Hash), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(CertificateHashSymbolFields.Hash), IntermediateFieldType.String),
16 }, 16 },
17 typeof(CertificateHashTuple)); 17 typeof(CertificateHashSymbol));
18 } 18 }
19} 19}
20 20
21namespace WixToolset.Iis.Tuples 21namespace WixToolset.Iis.Symbols
22{ 22{
23 using WixToolset.Data; 23 using WixToolset.Data;
24 24
25 public enum CertificateHashTupleFields 25 public enum CertificateHashSymbolFields
26 { 26 {
27 CertificateRef, 27 CertificateRef,
28 Hash, 28 Hash,
29 } 29 }
30 30
31 public class CertificateHashTuple : IntermediateTuple 31 public class CertificateHashSymbol : IntermediateSymbol
32 { 32 {
33 public CertificateHashTuple() : base(IisTupleDefinitions.CertificateHash, null, null) 33 public CertificateHashSymbol() : base(IisSymbolDefinitions.CertificateHash, null, null)
34 { 34 {
35 } 35 }
36 36
37 public CertificateHashTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.CertificateHash, sourceLineNumber, id) 37 public CertificateHashSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.CertificateHash, sourceLineNumber, id)
38 { 38 {
39 } 39 }
40 40
41 public IntermediateField this[CertificateHashTupleFields index] => this.Fields[(int)index]; 41 public IntermediateField this[CertificateHashSymbolFields index] => this.Fields[(int)index];
42 42
43 public string CertificateRef 43 public string CertificateRef
44 { 44 {
45 get => this.Fields[(int)CertificateHashTupleFields.CertificateRef].AsString(); 45 get => this.Fields[(int)CertificateHashSymbolFields.CertificateRef].AsString();
46 set => this.Set((int)CertificateHashTupleFields.CertificateRef, value); 46 set => this.Set((int)CertificateHashSymbolFields.CertificateRef, value);
47 } 47 }
48 48
49 public string Hash 49 public string Hash
50 { 50 {
51 get => this.Fields[(int)CertificateHashTupleFields.Hash].AsString(); 51 get => this.Fields[(int)CertificateHashSymbolFields.Hash].AsString();
52 set => this.Set((int)CertificateHashTupleFields.Hash, value); 52 set => this.Set((int)CertificateHashSymbolFields.Hash, value);
53 } 53 }
54 } 54 }
55} \ No newline at end of file 55} \ No newline at end of file
diff --git a/src/wixext/Tuples/CertificateTuple.cs b/src/wixext/Tuples/CertificateTuple.cs
index 480a3569..b80b6ba4 100644
--- a/src/wixext/Tuples/CertificateTuple.cs
+++ b/src/wixext/Tuples/CertificateTuple.cs
@@ -3,32 +3,32 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition Certificate = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition Certificate = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.Certificate.ToString(), 11 IisSymbolDefinitionType.Certificate.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(CertificateTupleFields.ComponentRef), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(CertificateSymbolFields.ComponentRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(CertificateTupleFields.Name), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(CertificateSymbolFields.Name), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(CertificateTupleFields.StoreLocation), IntermediateFieldType.Number), 16 new IntermediateFieldDefinition(nameof(CertificateSymbolFields.StoreLocation), IntermediateFieldType.Number),
17 new IntermediateFieldDefinition(nameof(CertificateTupleFields.StoreName), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(CertificateSymbolFields.StoreName), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(CertificateTupleFields.Attributes), IntermediateFieldType.Number), 18 new IntermediateFieldDefinition(nameof(CertificateSymbolFields.Attributes), IntermediateFieldType.Number),
19 new IntermediateFieldDefinition(nameof(CertificateTupleFields.BinaryRef), IntermediateFieldType.String), 19 new IntermediateFieldDefinition(nameof(CertificateSymbolFields.BinaryRef), IntermediateFieldType.String),
20 new IntermediateFieldDefinition(nameof(CertificateTupleFields.CertificatePath), IntermediateFieldType.String), 20 new IntermediateFieldDefinition(nameof(CertificateSymbolFields.CertificatePath), IntermediateFieldType.String),
21 new IntermediateFieldDefinition(nameof(CertificateTupleFields.PFXPassword), IntermediateFieldType.String), 21 new IntermediateFieldDefinition(nameof(CertificateSymbolFields.PFXPassword), IntermediateFieldType.String),
22 }, 22 },
23 typeof(CertificateTuple)); 23 typeof(CertificateSymbol));
24 } 24 }
25} 25}
26 26
27namespace WixToolset.Iis.Tuples 27namespace WixToolset.Iis.Symbols
28{ 28{
29 using WixToolset.Data; 29 using WixToolset.Data;
30 30
31 public enum CertificateTupleFields 31 public enum CertificateSymbolFields
32 { 32 {
33 ComponentRef, 33 ComponentRef,
34 Name, 34 Name,
@@ -40,64 +40,64 @@ namespace WixToolset.Iis.Tuples
40 PFXPassword, 40 PFXPassword,
41 } 41 }
42 42
43 public class CertificateTuple : IntermediateTuple 43 public class CertificateSymbol : IntermediateSymbol
44 { 44 {
45 public CertificateTuple() : base(IisTupleDefinitions.Certificate, null, null) 45 public CertificateSymbol() : base(IisSymbolDefinitions.Certificate, null, null)
46 { 46 {
47 } 47 }
48 48
49 public CertificateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.Certificate, sourceLineNumber, id) 49 public CertificateSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.Certificate, sourceLineNumber, id)
50 { 50 {
51 } 51 }
52 52
53 public IntermediateField this[CertificateTupleFields index] => this.Fields[(int)index]; 53 public IntermediateField this[CertificateSymbolFields index] => this.Fields[(int)index];
54 54
55 public string ComponentRef 55 public string ComponentRef
56 { 56 {
57 get => this.Fields[(int)CertificateTupleFields.ComponentRef].AsString(); 57 get => this.Fields[(int)CertificateSymbolFields.ComponentRef].AsString();
58 set => this.Set((int)CertificateTupleFields.ComponentRef, value); 58 set => this.Set((int)CertificateSymbolFields.ComponentRef, value);
59 } 59 }
60 60
61 public string Name 61 public string Name
62 { 62 {
63 get => this.Fields[(int)CertificateTupleFields.Name].AsString(); 63 get => this.Fields[(int)CertificateSymbolFields.Name].AsString();
64 set => this.Set((int)CertificateTupleFields.Name, value); 64 set => this.Set((int)CertificateSymbolFields.Name, value);
65 } 65 }
66 66
67 public int StoreLocation 67 public int StoreLocation
68 { 68 {
69 get => this.Fields[(int)CertificateTupleFields.StoreLocation].AsNumber(); 69 get => this.Fields[(int)CertificateSymbolFields.StoreLocation].AsNumber();
70 set => this.Set((int)CertificateTupleFields.StoreLocation, value); 70 set => this.Set((int)CertificateSymbolFields.StoreLocation, value);
71 } 71 }
72 72
73 public string StoreName 73 public string StoreName
74 { 74 {
75 get => this.Fields[(int)CertificateTupleFields.StoreName].AsString(); 75 get => this.Fields[(int)CertificateSymbolFields.StoreName].AsString();
76 set => this.Set((int)CertificateTupleFields.StoreName, value); 76 set => this.Set((int)CertificateSymbolFields.StoreName, value);
77 } 77 }
78 78
79 public int Attributes 79 public int Attributes
80 { 80 {
81 get => this.Fields[(int)CertificateTupleFields.Attributes].AsNumber(); 81 get => this.Fields[(int)CertificateSymbolFields.Attributes].AsNumber();
82 set => this.Set((int)CertificateTupleFields.Attributes, value); 82 set => this.Set((int)CertificateSymbolFields.Attributes, value);
83 } 83 }
84 84
85 public string BinaryRef 85 public string BinaryRef
86 { 86 {
87 get => this.Fields[(int)CertificateTupleFields.BinaryRef].AsString(); 87 get => this.Fields[(int)CertificateSymbolFields.BinaryRef].AsString();
88 set => this.Set((int)CertificateTupleFields.BinaryRef, value); 88 set => this.Set((int)CertificateSymbolFields.BinaryRef, value);
89 } 89 }
90 90
91 public string CertificatePath 91 public string CertificatePath
92 { 92 {
93 get => this.Fields[(int)CertificateTupleFields.CertificatePath].AsString(); 93 get => this.Fields[(int)CertificateSymbolFields.CertificatePath].AsString();
94 set => this.Set((int)CertificateTupleFields.CertificatePath, value); 94 set => this.Set((int)CertificateSymbolFields.CertificatePath, value);
95 } 95 }
96 96
97 public string PFXPassword 97 public string PFXPassword
98 { 98 {
99 get => this.Fields[(int)CertificateTupleFields.PFXPassword].AsString(); 99 get => this.Fields[(int)CertificateSymbolFields.PFXPassword].AsString();
100 set => this.Set((int)CertificateTupleFields.PFXPassword, value); 100 set => this.Set((int)CertificateSymbolFields.PFXPassword, value);
101 } 101 }
102 } 102 }
103} \ No newline at end of file 103} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsAppPoolTuple.cs b/src/wixext/Tuples/IIsAppPoolTuple.cs
index ee8dca51..a6fab136 100644
--- a/src/wixext/Tuples/IIsAppPoolTuple.cs
+++ b/src/wixext/Tuples/IIsAppPoolTuple.cs
@@ -3,39 +3,39 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsAppPool = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsAppPool = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsAppPool.ToString(), 11 IisSymbolDefinitionType.IIsAppPool.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.Name), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.Name), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.ComponentRef), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.ComponentRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.Attributes), IntermediateFieldType.Number), 16 new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.Attributes), IntermediateFieldType.Number),
17 new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.UserRef), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.UserRef), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.RecycleMinutes), IntermediateFieldType.Number), 18 new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.RecycleMinutes), IntermediateFieldType.Number),
19 new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.RecycleRequests), IntermediateFieldType.Number), 19 new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.RecycleRequests), IntermediateFieldType.Number),
20 new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.RecycleTimes), IntermediateFieldType.String), 20 new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.RecycleTimes), IntermediateFieldType.String),
21 new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.IdleTimeout), IntermediateFieldType.Number), 21 new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.IdleTimeout), IntermediateFieldType.Number),
22 new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.QueueLimit), IntermediateFieldType.Number), 22 new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.QueueLimit), IntermediateFieldType.Number),
23 new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.CPUMon), IntermediateFieldType.String), 23 new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.CPUMon), IntermediateFieldType.String),
24 new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.MaxProc), IntermediateFieldType.Number), 24 new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.MaxProc), IntermediateFieldType.Number),
25 new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.VirtualMemory), IntermediateFieldType.Number), 25 new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.VirtualMemory), IntermediateFieldType.Number),
26 new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.PrivateMemory), IntermediateFieldType.Number), 26 new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.PrivateMemory), IntermediateFieldType.Number),
27 new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.ManagedRuntimeVersion), IntermediateFieldType.String), 27 new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.ManagedRuntimeVersion), IntermediateFieldType.String),
28 new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.ManagedPipelineMode), IntermediateFieldType.String), 28 new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.ManagedPipelineMode), IntermediateFieldType.String),
29 }, 29 },
30 typeof(IIsAppPoolTuple)); 30 typeof(IIsAppPoolSymbol));
31 } 31 }
32} 32}
33 33
34namespace WixToolset.Iis.Tuples 34namespace WixToolset.Iis.Symbols
35{ 35{
36 using WixToolset.Data; 36 using WixToolset.Data;
37 37
38 public enum IIsAppPoolTupleFields 38 public enum IIsAppPoolSymbolFields
39 { 39 {
40 Name, 40 Name,
41 ComponentRef, 41 ComponentRef,
@@ -54,106 +54,106 @@ namespace WixToolset.Iis.Tuples
54 ManagedPipelineMode, 54 ManagedPipelineMode,
55 } 55 }
56 56
57 public class IIsAppPoolTuple : IntermediateTuple 57 public class IIsAppPoolSymbol : IntermediateSymbol
58 { 58 {
59 public IIsAppPoolTuple() : base(IisTupleDefinitions.IIsAppPool, null, null) 59 public IIsAppPoolSymbol() : base(IisSymbolDefinitions.IIsAppPool, null, null)
60 { 60 {
61 } 61 }
62 62
63 public IIsAppPoolTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsAppPool, sourceLineNumber, id) 63 public IIsAppPoolSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsAppPool, sourceLineNumber, id)
64 { 64 {
65 } 65 }
66 66
67 public IntermediateField this[IIsAppPoolTupleFields index] => this.Fields[(int)index]; 67 public IntermediateField this[IIsAppPoolSymbolFields index] => this.Fields[(int)index];
68 68
69 public string Name 69 public string Name
70 { 70 {
71 get => this.Fields[(int)IIsAppPoolTupleFields.Name].AsString(); 71 get => this.Fields[(int)IIsAppPoolSymbolFields.Name].AsString();
72 set => this.Set((int)IIsAppPoolTupleFields.Name, value); 72 set => this.Set((int)IIsAppPoolSymbolFields.Name, value);
73 } 73 }
74 74
75 public string ComponentRef 75 public string ComponentRef
76 { 76 {
77 get => this.Fields[(int)IIsAppPoolTupleFields.ComponentRef].AsString(); 77 get => this.Fields[(int)IIsAppPoolSymbolFields.ComponentRef].AsString();
78 set => this.Set((int)IIsAppPoolTupleFields.ComponentRef, value); 78 set => this.Set((int)IIsAppPoolSymbolFields.ComponentRef, value);
79 } 79 }
80 80
81 public int Attributes 81 public int Attributes
82 { 82 {
83 get => this.Fields[(int)IIsAppPoolTupleFields.Attributes].AsNumber(); 83 get => this.Fields[(int)IIsAppPoolSymbolFields.Attributes].AsNumber();
84 set => this.Set((int)IIsAppPoolTupleFields.Attributes, value); 84 set => this.Set((int)IIsAppPoolSymbolFields.Attributes, value);
85 } 85 }
86 86
87 public string UserRef 87 public string UserRef
88 { 88 {
89 get => this.Fields[(int)IIsAppPoolTupleFields.UserRef].AsString(); 89 get => this.Fields[(int)IIsAppPoolSymbolFields.UserRef].AsString();
90 set => this.Set((int)IIsAppPoolTupleFields.UserRef, value); 90 set => this.Set((int)IIsAppPoolSymbolFields.UserRef, value);
91 } 91 }
92 92
93 public int? RecycleMinutes 93 public int? RecycleMinutes
94 { 94 {
95 get => this.Fields[(int)IIsAppPoolTupleFields.RecycleMinutes].AsNullableNumber(); 95 get => this.Fields[(int)IIsAppPoolSymbolFields.RecycleMinutes].AsNullableNumber();
96 set => this.Set((int)IIsAppPoolTupleFields.RecycleMinutes, value); 96 set => this.Set((int)IIsAppPoolSymbolFields.RecycleMinutes, value);
97 } 97 }
98 98
99 public int? RecycleRequests 99 public int? RecycleRequests
100 { 100 {
101 get => this.Fields[(int)IIsAppPoolTupleFields.RecycleRequests].AsNullableNumber(); 101 get => this.Fields[(int)IIsAppPoolSymbolFields.RecycleRequests].AsNullableNumber();
102 set => this.Set((int)IIsAppPoolTupleFields.RecycleRequests, value); 102 set => this.Set((int)IIsAppPoolSymbolFields.RecycleRequests, value);
103 } 103 }
104 104
105 public string RecycleTimes 105 public string RecycleTimes
106 { 106 {
107 get => this.Fields[(int)IIsAppPoolTupleFields.RecycleTimes].AsString(); 107 get => this.Fields[(int)IIsAppPoolSymbolFields.RecycleTimes].AsString();
108 set => this.Set((int)IIsAppPoolTupleFields.RecycleTimes, value); 108 set => this.Set((int)IIsAppPoolSymbolFields.RecycleTimes, value);
109 } 109 }
110 110
111 public int? IdleTimeout 111 public int? IdleTimeout
112 { 112 {
113 get => this.Fields[(int)IIsAppPoolTupleFields.IdleTimeout].AsNullableNumber(); 113 get => this.Fields[(int)IIsAppPoolSymbolFields.IdleTimeout].AsNullableNumber();
114 set => this.Set((int)IIsAppPoolTupleFields.IdleTimeout, value); 114 set => this.Set((int)IIsAppPoolSymbolFields.IdleTimeout, value);
115 } 115 }
116 116
117 public int? QueueLimit 117 public int? QueueLimit
118 { 118 {
119 get => this.Fields[(int)IIsAppPoolTupleFields.QueueLimit].AsNullableNumber(); 119 get => this.Fields[(int)IIsAppPoolSymbolFields.QueueLimit].AsNullableNumber();
120 set => this.Set((int)IIsAppPoolTupleFields.QueueLimit, value); 120 set => this.Set((int)IIsAppPoolSymbolFields.QueueLimit, value);
121 } 121 }
122 122
123 public string CPUMon 123 public string CPUMon
124 { 124 {
125 get => this.Fields[(int)IIsAppPoolTupleFields.CPUMon].AsString(); 125 get => this.Fields[(int)IIsAppPoolSymbolFields.CPUMon].AsString();
126 set => this.Set((int)IIsAppPoolTupleFields.CPUMon, value); 126 set => this.Set((int)IIsAppPoolSymbolFields.CPUMon, value);
127 } 127 }
128 128
129 public int? MaxProc 129 public int? MaxProc
130 { 130 {
131 get => this.Fields[(int)IIsAppPoolTupleFields.MaxProc].AsNullableNumber(); 131 get => this.Fields[(int)IIsAppPoolSymbolFields.MaxProc].AsNullableNumber();
132 set => this.Set((int)IIsAppPoolTupleFields.MaxProc, value); 132 set => this.Set((int)IIsAppPoolSymbolFields.MaxProc, value);
133 } 133 }
134 134
135 public int? VirtualMemory 135 public int? VirtualMemory
136 { 136 {
137 get => this.Fields[(int)IIsAppPoolTupleFields.VirtualMemory].AsNullableNumber(); 137 get => this.Fields[(int)IIsAppPoolSymbolFields.VirtualMemory].AsNullableNumber();
138 set => this.Set((int)IIsAppPoolTupleFields.VirtualMemory, value); 138 set => this.Set((int)IIsAppPoolSymbolFields.VirtualMemory, value);
139 } 139 }
140 140
141 public int? PrivateMemory 141 public int? PrivateMemory
142 { 142 {
143 get => this.Fields[(int)IIsAppPoolTupleFields.PrivateMemory].AsNullableNumber(); 143 get => this.Fields[(int)IIsAppPoolSymbolFields.PrivateMemory].AsNullableNumber();
144 set => this.Set((int)IIsAppPoolTupleFields.PrivateMemory, value); 144 set => this.Set((int)IIsAppPoolSymbolFields.PrivateMemory, value);
145 } 145 }
146 146
147 public string ManagedRuntimeVersion 147 public string ManagedRuntimeVersion
148 { 148 {
149 get => this.Fields[(int)IIsAppPoolTupleFields.ManagedRuntimeVersion].AsString(); 149 get => this.Fields[(int)IIsAppPoolSymbolFields.ManagedRuntimeVersion].AsString();
150 set => this.Set((int)IIsAppPoolTupleFields.ManagedRuntimeVersion, value); 150 set => this.Set((int)IIsAppPoolSymbolFields.ManagedRuntimeVersion, value);
151 } 151 }
152 152
153 public string ManagedPipelineMode 153 public string ManagedPipelineMode
154 { 154 {
155 get => this.Fields[(int)IIsAppPoolTupleFields.ManagedPipelineMode].AsString(); 155 get => this.Fields[(int)IIsAppPoolSymbolFields.ManagedPipelineMode].AsString();
156 set => this.Set((int)IIsAppPoolTupleFields.ManagedPipelineMode, value); 156 set => this.Set((int)IIsAppPoolSymbolFields.ManagedPipelineMode, value);
157 } 157 }
158 } 158 }
159} \ No newline at end of file 159} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsFilterTuple.cs b/src/wixext/Tuples/IIsFilterTuple.cs
index e681a235..618730bf 100644
--- a/src/wixext/Tuples/IIsFilterTuple.cs
+++ b/src/wixext/Tuples/IIsFilterTuple.cs
@@ -3,31 +3,31 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsFilter = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsFilter = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsFilter.ToString(), 11 IisSymbolDefinitionType.IIsFilter.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsFilterTupleFields.Name), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(IIsFilterSymbolFields.Name), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(IIsFilterTupleFields.ComponentRef), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(IIsFilterSymbolFields.ComponentRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(IIsFilterTupleFields.Path), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(IIsFilterSymbolFields.Path), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(IIsFilterTupleFields.WebRef), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(IIsFilterSymbolFields.WebRef), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(IIsFilterTupleFields.Description), IntermediateFieldType.String), 18 new IntermediateFieldDefinition(nameof(IIsFilterSymbolFields.Description), IntermediateFieldType.String),
19 new IntermediateFieldDefinition(nameof(IIsFilterTupleFields.Flags), IntermediateFieldType.Number), 19 new IntermediateFieldDefinition(nameof(IIsFilterSymbolFields.Flags), IntermediateFieldType.Number),
20 new IntermediateFieldDefinition(nameof(IIsFilterTupleFields.LoadOrder), IntermediateFieldType.Number), 20 new IntermediateFieldDefinition(nameof(IIsFilterSymbolFields.LoadOrder), IntermediateFieldType.Number),
21 }, 21 },
22 typeof(IIsFilterTuple)); 22 typeof(IIsFilterSymbol));
23 } 23 }
24} 24}
25 25
26namespace WixToolset.Iis.Tuples 26namespace WixToolset.Iis.Symbols
27{ 27{
28 using WixToolset.Data; 28 using WixToolset.Data;
29 29
30 public enum IIsFilterTupleFields 30 public enum IIsFilterSymbolFields
31 { 31 {
32 Name, 32 Name,
33 ComponentRef, 33 ComponentRef,
@@ -38,58 +38,58 @@ namespace WixToolset.Iis.Tuples
38 LoadOrder, 38 LoadOrder,
39 } 39 }
40 40
41 public class IIsFilterTuple : IntermediateTuple 41 public class IIsFilterSymbol : IntermediateSymbol
42 { 42 {
43 public IIsFilterTuple() : base(IisTupleDefinitions.IIsFilter, null, null) 43 public IIsFilterSymbol() : base(IisSymbolDefinitions.IIsFilter, null, null)
44 { 44 {
45 } 45 }
46 46
47 public IIsFilterTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsFilter, sourceLineNumber, id) 47 public IIsFilterSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsFilter, sourceLineNumber, id)
48 { 48 {
49 } 49 }
50 50
51 public IntermediateField this[IIsFilterTupleFields index] => this.Fields[(int)index]; 51 public IntermediateField this[IIsFilterSymbolFields index] => this.Fields[(int)index];
52 52
53 public string Name 53 public string Name
54 { 54 {
55 get => this.Fields[(int)IIsFilterTupleFields.Name].AsString(); 55 get => this.Fields[(int)IIsFilterSymbolFields.Name].AsString();
56 set => this.Set((int)IIsFilterTupleFields.Name, value); 56 set => this.Set((int)IIsFilterSymbolFields.Name, value);
57 } 57 }
58 58
59 public string ComponentRef 59 public string ComponentRef
60 { 60 {
61 get => this.Fields[(int)IIsFilterTupleFields.ComponentRef].AsString(); 61 get => this.Fields[(int)IIsFilterSymbolFields.ComponentRef].AsString();
62 set => this.Set((int)IIsFilterTupleFields.ComponentRef, value); 62 set => this.Set((int)IIsFilterSymbolFields.ComponentRef, value);
63 } 63 }
64 64
65 public string Path 65 public string Path
66 { 66 {
67 get => this.Fields[(int)IIsFilterTupleFields.Path].AsString(); 67 get => this.Fields[(int)IIsFilterSymbolFields.Path].AsString();
68 set => this.Set((int)IIsFilterTupleFields.Path, value); 68 set => this.Set((int)IIsFilterSymbolFields.Path, value);
69 } 69 }
70 70
71 public string WebRef 71 public string WebRef
72 { 72 {
73 get => this.Fields[(int)IIsFilterTupleFields.WebRef].AsString(); 73 get => this.Fields[(int)IIsFilterSymbolFields.WebRef].AsString();
74 set => this.Set((int)IIsFilterTupleFields.WebRef, value); 74 set => this.Set((int)IIsFilterSymbolFields.WebRef, value);
75 } 75 }
76 76
77 public string Description 77 public string Description
78 { 78 {
79 get => this.Fields[(int)IIsFilterTupleFields.Description].AsString(); 79 get => this.Fields[(int)IIsFilterSymbolFields.Description].AsString();
80 set => this.Set((int)IIsFilterTupleFields.Description, value); 80 set => this.Set((int)IIsFilterSymbolFields.Description, value);
81 } 81 }
82 82
83 public int Flags 83 public int Flags
84 { 84 {
85 get => this.Fields[(int)IIsFilterTupleFields.Flags].AsNumber(); 85 get => this.Fields[(int)IIsFilterSymbolFields.Flags].AsNumber();
86 set => this.Set((int)IIsFilterTupleFields.Flags, value); 86 set => this.Set((int)IIsFilterSymbolFields.Flags, value);
87 } 87 }
88 88
89 public int? LoadOrder 89 public int? LoadOrder
90 { 90 {
91 get => this.Fields[(int)IIsFilterTupleFields.LoadOrder].AsNullableNumber(); 91 get => this.Fields[(int)IIsFilterSymbolFields.LoadOrder].AsNullableNumber();
92 set => this.Set((int)IIsFilterTupleFields.LoadOrder, value); 92 set => this.Set((int)IIsFilterSymbolFields.LoadOrder, value);
93 } 93 }
94 } 94 }
95} \ No newline at end of file 95} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsHttpHeaderTuple.cs b/src/wixext/Tuples/IIsHttpHeaderTuple.cs
index 43ebbe16..3ab2bf59 100644
--- a/src/wixext/Tuples/IIsHttpHeaderTuple.cs
+++ b/src/wixext/Tuples/IIsHttpHeaderTuple.cs
@@ -3,31 +3,31 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsHttpHeader = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsHttpHeader = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsHttpHeader.ToString(), 11 IisSymbolDefinitionType.IIsHttpHeader.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsHttpHeaderTupleFields.HttpHeader), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(IIsHttpHeaderSymbolFields.HttpHeader), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(IIsHttpHeaderTupleFields.ParentType), IntermediateFieldType.Number), 15 new IntermediateFieldDefinition(nameof(IIsHttpHeaderSymbolFields.ParentType), IntermediateFieldType.Number),
16 new IntermediateFieldDefinition(nameof(IIsHttpHeaderTupleFields.ParentValue), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(IIsHttpHeaderSymbolFields.ParentValue), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(IIsHttpHeaderTupleFields.Name), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(IIsHttpHeaderSymbolFields.Name), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(IIsHttpHeaderTupleFields.Value), IntermediateFieldType.String), 18 new IntermediateFieldDefinition(nameof(IIsHttpHeaderSymbolFields.Value), IntermediateFieldType.String),
19 new IntermediateFieldDefinition(nameof(IIsHttpHeaderTupleFields.Attributes), IntermediateFieldType.Number), 19 new IntermediateFieldDefinition(nameof(IIsHttpHeaderSymbolFields.Attributes), IntermediateFieldType.Number),
20 new IntermediateFieldDefinition(nameof(IIsHttpHeaderTupleFields.Sequence), IntermediateFieldType.Number), 20 new IntermediateFieldDefinition(nameof(IIsHttpHeaderSymbolFields.Sequence), IntermediateFieldType.Number),
21 }, 21 },
22 typeof(IIsHttpHeaderTuple)); 22 typeof(IIsHttpHeaderSymbol));
23 } 23 }
24} 24}
25 25
26namespace WixToolset.Iis.Tuples 26namespace WixToolset.Iis.Symbols
27{ 27{
28 using WixToolset.Data; 28 using WixToolset.Data;
29 29
30 public enum IIsHttpHeaderTupleFields 30 public enum IIsHttpHeaderSymbolFields
31 { 31 {
32 HttpHeader, 32 HttpHeader,
33 ParentType, 33 ParentType,
@@ -38,58 +38,58 @@ namespace WixToolset.Iis.Tuples
38 Sequence, 38 Sequence,
39 } 39 }
40 40
41 public class IIsHttpHeaderTuple : IntermediateTuple 41 public class IIsHttpHeaderSymbol : IntermediateSymbol
42 { 42 {
43 public IIsHttpHeaderTuple() : base(IisTupleDefinitions.IIsHttpHeader, null, null) 43 public IIsHttpHeaderSymbol() : base(IisSymbolDefinitions.IIsHttpHeader, null, null)
44 { 44 {
45 } 45 }
46 46
47 public IIsHttpHeaderTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsHttpHeader, sourceLineNumber, id) 47 public IIsHttpHeaderSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsHttpHeader, sourceLineNumber, id)
48 { 48 {
49 } 49 }
50 50
51 public IntermediateField this[IIsHttpHeaderTupleFields index] => this.Fields[(int)index]; 51 public IntermediateField this[IIsHttpHeaderSymbolFields index] => this.Fields[(int)index];
52 52
53 public string HttpHeader 53 public string HttpHeader
54 { 54 {
55 get => this.Fields[(int)IIsHttpHeaderTupleFields.HttpHeader].AsString(); 55 get => this.Fields[(int)IIsHttpHeaderSymbolFields.HttpHeader].AsString();
56 set => this.Set((int)IIsHttpHeaderTupleFields.HttpHeader, value); 56 set => this.Set((int)IIsHttpHeaderSymbolFields.HttpHeader, value);
57 } 57 }
58 58
59 public int ParentType 59 public int ParentType
60 { 60 {
61 get => this.Fields[(int)IIsHttpHeaderTupleFields.ParentType].AsNumber(); 61 get => this.Fields[(int)IIsHttpHeaderSymbolFields.ParentType].AsNumber();
62 set => this.Set((int)IIsHttpHeaderTupleFields.ParentType, value); 62 set => this.Set((int)IIsHttpHeaderSymbolFields.ParentType, value);
63 } 63 }
64 64
65 public string ParentValue 65 public string ParentValue
66 { 66 {
67 get => this.Fields[(int)IIsHttpHeaderTupleFields.ParentValue].AsString(); 67 get => this.Fields[(int)IIsHttpHeaderSymbolFields.ParentValue].AsString();
68 set => this.Set((int)IIsHttpHeaderTupleFields.ParentValue, value); 68 set => this.Set((int)IIsHttpHeaderSymbolFields.ParentValue, value);
69 } 69 }
70 70
71 public string Name 71 public string Name
72 { 72 {
73 get => this.Fields[(int)IIsHttpHeaderTupleFields.Name].AsString(); 73 get => this.Fields[(int)IIsHttpHeaderSymbolFields.Name].AsString();
74 set => this.Set((int)IIsHttpHeaderTupleFields.Name, value); 74 set => this.Set((int)IIsHttpHeaderSymbolFields.Name, value);
75 } 75 }
76 76
77 public string Value 77 public string Value
78 { 78 {
79 get => this.Fields[(int)IIsHttpHeaderTupleFields.Value].AsString(); 79 get => this.Fields[(int)IIsHttpHeaderSymbolFields.Value].AsString();
80 set => this.Set((int)IIsHttpHeaderTupleFields.Value, value); 80 set => this.Set((int)IIsHttpHeaderSymbolFields.Value, value);
81 } 81 }
82 82
83 public int Attributes 83 public int Attributes
84 { 84 {
85 get => this.Fields[(int)IIsHttpHeaderTupleFields.Attributes].AsNumber(); 85 get => this.Fields[(int)IIsHttpHeaderSymbolFields.Attributes].AsNumber();
86 set => this.Set((int)IIsHttpHeaderTupleFields.Attributes, value); 86 set => this.Set((int)IIsHttpHeaderSymbolFields.Attributes, value);
87 } 87 }
88 88
89 public int? Sequence 89 public int? Sequence
90 { 90 {
91 get => this.Fields[(int)IIsHttpHeaderTupleFields.Sequence].AsNullableNumber(); 91 get => this.Fields[(int)IIsHttpHeaderSymbolFields.Sequence].AsNullableNumber();
92 set => this.Set((int)IIsHttpHeaderTupleFields.Sequence, value); 92 set => this.Set((int)IIsHttpHeaderSymbolFields.Sequence, value);
93 } 93 }
94 } 94 }
95} \ No newline at end of file 95} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsMimeMapTuple.cs b/src/wixext/Tuples/IIsMimeMapTuple.cs
index f1a825b0..4af6f81c 100644
--- a/src/wixext/Tuples/IIsMimeMapTuple.cs
+++ b/src/wixext/Tuples/IIsMimeMapTuple.cs
@@ -3,28 +3,28 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsMimeMap = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsMimeMap = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsMimeMap.ToString(), 11 IisSymbolDefinitionType.IIsMimeMap.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsMimeMapTupleFields.ParentType), IntermediateFieldType.Number), 14 new IntermediateFieldDefinition(nameof(IIsMimeMapSymbolFields.ParentType), IntermediateFieldType.Number),
15 new IntermediateFieldDefinition(nameof(IIsMimeMapTupleFields.ParentValue), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(IIsMimeMapSymbolFields.ParentValue), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(IIsMimeMapTupleFields.MimeType), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(IIsMimeMapSymbolFields.MimeType), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(IIsMimeMapTupleFields.Extension), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(IIsMimeMapSymbolFields.Extension), IntermediateFieldType.String),
18 }, 18 },
19 typeof(IIsMimeMapTuple)); 19 typeof(IIsMimeMapSymbol));
20 } 20 }
21} 21}
22 22
23namespace WixToolset.Iis.Tuples 23namespace WixToolset.Iis.Symbols
24{ 24{
25 using WixToolset.Data; 25 using WixToolset.Data;
26 26
27 public enum IIsMimeMapTupleFields 27 public enum IIsMimeMapSymbolFields
28 { 28 {
29 ParentType, 29 ParentType,
30 ParentValue, 30 ParentValue,
@@ -32,40 +32,40 @@ namespace WixToolset.Iis.Tuples
32 Extension, 32 Extension,
33 } 33 }
34 34
35 public class IIsMimeMapTuple : IntermediateTuple 35 public class IIsMimeMapSymbol : IntermediateSymbol
36 { 36 {
37 public IIsMimeMapTuple() : base(IisTupleDefinitions.IIsMimeMap, null, null) 37 public IIsMimeMapSymbol() : base(IisSymbolDefinitions.IIsMimeMap, null, null)
38 { 38 {
39 } 39 }
40 40
41 public IIsMimeMapTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsMimeMap, sourceLineNumber, id) 41 public IIsMimeMapSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsMimeMap, sourceLineNumber, id)
42 { 42 {
43 } 43 }
44 44
45 public IntermediateField this[IIsMimeMapTupleFields index] => this.Fields[(int)index]; 45 public IntermediateField this[IIsMimeMapSymbolFields index] => this.Fields[(int)index];
46 46
47 public int ParentType 47 public int ParentType
48 { 48 {
49 get => this.Fields[(int)IIsMimeMapTupleFields.ParentType].AsNumber(); 49 get => this.Fields[(int)IIsMimeMapSymbolFields.ParentType].AsNumber();
50 set => this.Set((int)IIsMimeMapTupleFields.ParentType, value); 50 set => this.Set((int)IIsMimeMapSymbolFields.ParentType, value);
51 } 51 }
52 52
53 public string ParentValue 53 public string ParentValue
54 { 54 {
55 get => this.Fields[(int)IIsMimeMapTupleFields.ParentValue].AsString(); 55 get => this.Fields[(int)IIsMimeMapSymbolFields.ParentValue].AsString();
56 set => this.Set((int)IIsMimeMapTupleFields.ParentValue, value); 56 set => this.Set((int)IIsMimeMapSymbolFields.ParentValue, value);
57 } 57 }
58 58
59 public string MimeType 59 public string MimeType
60 { 60 {
61 get => this.Fields[(int)IIsMimeMapTupleFields.MimeType].AsString(); 61 get => this.Fields[(int)IIsMimeMapSymbolFields.MimeType].AsString();
62 set => this.Set((int)IIsMimeMapTupleFields.MimeType, value); 62 set => this.Set((int)IIsMimeMapSymbolFields.MimeType, value);
63 } 63 }
64 64
65 public string Extension 65 public string Extension
66 { 66 {
67 get => this.Fields[(int)IIsMimeMapTupleFields.Extension].AsString(); 67 get => this.Fields[(int)IIsMimeMapSymbolFields.Extension].AsString();
68 set => this.Set((int)IIsMimeMapTupleFields.Extension, value); 68 set => this.Set((int)IIsMimeMapSymbolFields.Extension, value);
69 } 69 }
70 } 70 }
71} \ No newline at end of file 71} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsPropertyTuple.cs b/src/wixext/Tuples/IIsPropertyTuple.cs
index 28e882bf..9cf67014 100644
--- a/src/wixext/Tuples/IIsPropertyTuple.cs
+++ b/src/wixext/Tuples/IIsPropertyTuple.cs
@@ -3,61 +3,61 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsProperty = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsProperty = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsProperty.ToString(), 11 IisSymbolDefinitionType.IIsProperty.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsPropertyTupleFields.ComponentRef), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(IIsPropertySymbolFields.ComponentRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(IIsPropertyTupleFields.Attributes), IntermediateFieldType.Number), 15 new IntermediateFieldDefinition(nameof(IIsPropertySymbolFields.Attributes), IntermediateFieldType.Number),
16 new IntermediateFieldDefinition(nameof(IIsPropertyTupleFields.Value), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(IIsPropertySymbolFields.Value), IntermediateFieldType.String),
17 }, 17 },
18 typeof(IIsPropertyTuple)); 18 typeof(IIsPropertySymbol));
19 } 19 }
20} 20}
21 21
22namespace WixToolset.Iis.Tuples 22namespace WixToolset.Iis.Symbols
23{ 23{
24 using WixToolset.Data; 24 using WixToolset.Data;
25 25
26 public enum IIsPropertyTupleFields 26 public enum IIsPropertySymbolFields
27 { 27 {
28 ComponentRef, 28 ComponentRef,
29 Attributes, 29 Attributes,
30 Value, 30 Value,
31 } 31 }
32 32
33 public class IIsPropertyTuple : IntermediateTuple 33 public class IIsPropertySymbol : IntermediateSymbol
34 { 34 {
35 public IIsPropertyTuple() : base(IisTupleDefinitions.IIsProperty, null, null) 35 public IIsPropertySymbol() : base(IisSymbolDefinitions.IIsProperty, null, null)
36 { 36 {
37 } 37 }
38 38
39 public IIsPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsProperty, sourceLineNumber, id) 39 public IIsPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsProperty, sourceLineNumber, id)
40 { 40 {
41 } 41 }
42 42
43 public IntermediateField this[IIsPropertyTupleFields index] => this.Fields[(int)index]; 43 public IntermediateField this[IIsPropertySymbolFields index] => this.Fields[(int)index];
44 44
45 public string ComponentRef 45 public string ComponentRef
46 { 46 {
47 get => this.Fields[(int)IIsPropertyTupleFields.ComponentRef].AsString(); 47 get => this.Fields[(int)IIsPropertySymbolFields.ComponentRef].AsString();
48 set => this.Set((int)IIsPropertyTupleFields.ComponentRef, value); 48 set => this.Set((int)IIsPropertySymbolFields.ComponentRef, value);
49 } 49 }
50 50
51 public int Attributes 51 public int Attributes
52 { 52 {
53 get => this.Fields[(int)IIsPropertyTupleFields.Attributes].AsNumber(); 53 get => this.Fields[(int)IIsPropertySymbolFields.Attributes].AsNumber();
54 set => this.Set((int)IIsPropertyTupleFields.Attributes, value); 54 set => this.Set((int)IIsPropertySymbolFields.Attributes, value);
55 } 55 }
56 56
57 public string Value 57 public string Value
58 { 58 {
59 get => this.Fields[(int)IIsPropertyTupleFields.Value].AsString(); 59 get => this.Fields[(int)IIsPropertySymbolFields.Value].AsString();
60 set => this.Set((int)IIsPropertyTupleFields.Value, value); 60 set => this.Set((int)IIsPropertySymbolFields.Value, value);
61 } 61 }
62 } 62 }
63} \ No newline at end of file 63} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebAddressTuple.cs b/src/wixext/Tuples/IIsWebAddressTuple.cs
index b6e61ccc..7111718a 100644
--- a/src/wixext/Tuples/IIsWebAddressTuple.cs
+++ b/src/wixext/Tuples/IIsWebAddressTuple.cs
@@ -3,29 +3,29 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsWebAddress = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsWebAddress = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsWebAddress.ToString(), 11 IisSymbolDefinitionType.IIsWebAddress.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsWebAddressTupleFields.WebRef), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(IIsWebAddressSymbolFields.WebRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(IIsWebAddressTupleFields.IP), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(IIsWebAddressSymbolFields.IP), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(IIsWebAddressTupleFields.Port), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(IIsWebAddressSymbolFields.Port), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(IIsWebAddressTupleFields.Header), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(IIsWebAddressSymbolFields.Header), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(IIsWebAddressTupleFields.Secure), IntermediateFieldType.Number), 18 new IntermediateFieldDefinition(nameof(IIsWebAddressSymbolFields.Secure), IntermediateFieldType.Number),
19 }, 19 },
20 typeof(IIsWebAddressTuple)); 20 typeof(IIsWebAddressSymbol));
21 } 21 }
22} 22}
23 23
24namespace WixToolset.Iis.Tuples 24namespace WixToolset.Iis.Symbols
25{ 25{
26 using WixToolset.Data; 26 using WixToolset.Data;
27 27
28 public enum IIsWebAddressTupleFields 28 public enum IIsWebAddressSymbolFields
29 { 29 {
30 WebRef, 30 WebRef,
31 IP, 31 IP,
@@ -34,46 +34,46 @@ namespace WixToolset.Iis.Tuples
34 Secure, 34 Secure,
35 } 35 }
36 36
37 public class IIsWebAddressTuple : IntermediateTuple 37 public class IIsWebAddressSymbol : IntermediateSymbol
38 { 38 {
39 public IIsWebAddressTuple() : base(IisTupleDefinitions.IIsWebAddress, null, null) 39 public IIsWebAddressSymbol() : base(IisSymbolDefinitions.IIsWebAddress, null, null)
40 { 40 {
41 } 41 }
42 42
43 public IIsWebAddressTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebAddress, sourceLineNumber, id) 43 public IIsWebAddressSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebAddress, sourceLineNumber, id)
44 { 44 {
45 } 45 }
46 46
47 public IntermediateField this[IIsWebAddressTupleFields index] => this.Fields[(int)index]; 47 public IntermediateField this[IIsWebAddressSymbolFields index] => this.Fields[(int)index];
48 48
49 public string WebRef 49 public string WebRef
50 { 50 {
51 get => this.Fields[(int)IIsWebAddressTupleFields.WebRef].AsString(); 51 get => this.Fields[(int)IIsWebAddressSymbolFields.WebRef].AsString();
52 set => this.Set((int)IIsWebAddressTupleFields.WebRef, value); 52 set => this.Set((int)IIsWebAddressSymbolFields.WebRef, value);
53 } 53 }
54 54
55 public string IP 55 public string IP
56 { 56 {
57 get => this.Fields[(int)IIsWebAddressTupleFields.IP].AsString(); 57 get => this.Fields[(int)IIsWebAddressSymbolFields.IP].AsString();
58 set => this.Set((int)IIsWebAddressTupleFields.IP, value); 58 set => this.Set((int)IIsWebAddressSymbolFields.IP, value);
59 } 59 }
60 60
61 public string Port 61 public string Port
62 { 62 {
63 get => this.Fields[(int)IIsWebAddressTupleFields.Port].AsString(); 63 get => this.Fields[(int)IIsWebAddressSymbolFields.Port].AsString();
64 set => this.Set((int)IIsWebAddressTupleFields.Port, value); 64 set => this.Set((int)IIsWebAddressSymbolFields.Port, value);
65 } 65 }
66 66
67 public string Header 67 public string Header
68 { 68 {
69 get => this.Fields[(int)IIsWebAddressTupleFields.Header].AsString(); 69 get => this.Fields[(int)IIsWebAddressSymbolFields.Header].AsString();
70 set => this.Set((int)IIsWebAddressTupleFields.Header, value); 70 set => this.Set((int)IIsWebAddressSymbolFields.Header, value);
71 } 71 }
72 72
73 public int? Secure 73 public int? Secure
74 { 74 {
75 get => this.Fields[(int)IIsWebAddressTupleFields.Secure].AsNullableNumber(); 75 get => this.Fields[(int)IIsWebAddressSymbolFields.Secure].AsNullableNumber();
76 set => this.Set((int)IIsWebAddressTupleFields.Secure, value); 76 set => this.Set((int)IIsWebAddressSymbolFields.Secure, value);
77 } 77 }
78 } 78 }
79} \ No newline at end of file 79} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebApplicationExtensionTuple.cs b/src/wixext/Tuples/IIsWebApplicationExtensionTuple.cs
index 8ab78dad..4283d702 100644
--- a/src/wixext/Tuples/IIsWebApplicationExtensionTuple.cs
+++ b/src/wixext/Tuples/IIsWebApplicationExtensionTuple.cs
@@ -3,29 +3,29 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsWebApplicationExtension = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsWebApplicationExtension = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsWebApplicationExtension.ToString(), 11 IisSymbolDefinitionType.IIsWebApplicationExtension.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionTupleFields.ApplicationRef), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionSymbolFields.ApplicationRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionTupleFields.Extension), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionSymbolFields.Extension), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionTupleFields.Verbs), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionSymbolFields.Verbs), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionTupleFields.Executable), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionSymbolFields.Executable), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionTupleFields.Attributes), IntermediateFieldType.Number), 18 new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionSymbolFields.Attributes), IntermediateFieldType.Number),
19 }, 19 },
20 typeof(IIsWebApplicationExtensionTuple)); 20 typeof(IIsWebApplicationExtensionSymbol));
21 } 21 }
22} 22}
23 23
24namespace WixToolset.Iis.Tuples 24namespace WixToolset.Iis.Symbols
25{ 25{
26 using WixToolset.Data; 26 using WixToolset.Data;
27 27
28 public enum IIsWebApplicationExtensionTupleFields 28 public enum IIsWebApplicationExtensionSymbolFields
29 { 29 {
30 ApplicationRef, 30 ApplicationRef,
31 Extension, 31 Extension,
@@ -34,46 +34,46 @@ namespace WixToolset.Iis.Tuples
34 Attributes, 34 Attributes,
35 } 35 }
36 36
37 public class IIsWebApplicationExtensionTuple : IntermediateTuple 37 public class IIsWebApplicationExtensionSymbol : IntermediateSymbol
38 { 38 {
39 public IIsWebApplicationExtensionTuple() : base(IisTupleDefinitions.IIsWebApplicationExtension, null, null) 39 public IIsWebApplicationExtensionSymbol() : base(IisSymbolDefinitions.IIsWebApplicationExtension, null, null)
40 { 40 {
41 } 41 }
42 42
43 public IIsWebApplicationExtensionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebApplicationExtension, sourceLineNumber, id) 43 public IIsWebApplicationExtensionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebApplicationExtension, sourceLineNumber, id)
44 { 44 {
45 } 45 }
46 46
47 public IntermediateField this[IIsWebApplicationExtensionTupleFields index] => this.Fields[(int)index]; 47 public IntermediateField this[IIsWebApplicationExtensionSymbolFields index] => this.Fields[(int)index];
48 48
49 public string ApplicationRef 49 public string ApplicationRef
50 { 50 {
51 get => this.Fields[(int)IIsWebApplicationExtensionTupleFields.ApplicationRef].AsString(); 51 get => this.Fields[(int)IIsWebApplicationExtensionSymbolFields.ApplicationRef].AsString();
52 set => this.Set((int)IIsWebApplicationExtensionTupleFields.ApplicationRef, value); 52 set => this.Set((int)IIsWebApplicationExtensionSymbolFields.ApplicationRef, value);
53 } 53 }
54 54
55 public string Extension 55 public string Extension
56 { 56 {
57 get => this.Fields[(int)IIsWebApplicationExtensionTupleFields.Extension].AsString(); 57 get => this.Fields[(int)IIsWebApplicationExtensionSymbolFields.Extension].AsString();
58 set => this.Set((int)IIsWebApplicationExtensionTupleFields.Extension, value); 58 set => this.Set((int)IIsWebApplicationExtensionSymbolFields.Extension, value);
59 } 59 }
60 60
61 public string Verbs 61 public string Verbs
62 { 62 {
63 get => this.Fields[(int)IIsWebApplicationExtensionTupleFields.Verbs].AsString(); 63 get => this.Fields[(int)IIsWebApplicationExtensionSymbolFields.Verbs].AsString();
64 set => this.Set((int)IIsWebApplicationExtensionTupleFields.Verbs, value); 64 set => this.Set((int)IIsWebApplicationExtensionSymbolFields.Verbs, value);
65 } 65 }
66 66
67 public string Executable 67 public string Executable
68 { 68 {
69 get => this.Fields[(int)IIsWebApplicationExtensionTupleFields.Executable].AsString(); 69 get => this.Fields[(int)IIsWebApplicationExtensionSymbolFields.Executable].AsString();
70 set => this.Set((int)IIsWebApplicationExtensionTupleFields.Executable, value); 70 set => this.Set((int)IIsWebApplicationExtensionSymbolFields.Executable, value);
71 } 71 }
72 72
73 public int Attributes 73 public int Attributes
74 { 74 {
75 get => this.Fields[(int)IIsWebApplicationExtensionTupleFields.Attributes].AsNumber(); 75 get => this.Fields[(int)IIsWebApplicationExtensionSymbolFields.Attributes].AsNumber();
76 set => this.Set((int)IIsWebApplicationExtensionTupleFields.Attributes, value); 76 set => this.Set((int)IIsWebApplicationExtensionSymbolFields.Attributes, value);
77 } 77 }
78 } 78 }
79} \ No newline at end of file 79} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebApplicationTuple.cs b/src/wixext/Tuples/IIsWebApplicationTuple.cs
index 31ea955e..2f6f87de 100644
--- a/src/wixext/Tuples/IIsWebApplicationTuple.cs
+++ b/src/wixext/Tuples/IIsWebApplicationTuple.cs
@@ -3,35 +3,35 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsWebApplication = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsWebApplication = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsWebApplication.ToString(), 11 IisSymbolDefinitionType.IIsWebApplication.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.Name), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.Name), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.Isolation), IntermediateFieldType.Number), 15 new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.Isolation), IntermediateFieldType.Number),
16 new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.AllowSessions), IntermediateFieldType.Number), 16 new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.AllowSessions), IntermediateFieldType.Number),
17 new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.SessionTimeout), IntermediateFieldType.Number), 17 new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.SessionTimeout), IntermediateFieldType.Number),
18 new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.Buffer), IntermediateFieldType.Number), 18 new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.Buffer), IntermediateFieldType.Number),
19 new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.ParentPaths), IntermediateFieldType.Number), 19 new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.ParentPaths), IntermediateFieldType.Number),
20 new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.DefaultScript), IntermediateFieldType.String), 20 new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.DefaultScript), IntermediateFieldType.String),
21 new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.ScriptTimeout), IntermediateFieldType.Number), 21 new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.ScriptTimeout), IntermediateFieldType.Number),
22 new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.ServerDebugging), IntermediateFieldType.Number), 22 new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.ServerDebugging), IntermediateFieldType.Number),
23 new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.ClientDebugging), IntermediateFieldType.Number), 23 new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.ClientDebugging), IntermediateFieldType.Number),
24 new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.AppPoolRef), IntermediateFieldType.String), 24 new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.AppPoolRef), IntermediateFieldType.String),
25 }, 25 },
26 typeof(IIsWebApplicationTuple)); 26 typeof(IIsWebApplicationSymbol));
27 } 27 }
28} 28}
29 29
30namespace WixToolset.Iis.Tuples 30namespace WixToolset.Iis.Symbols
31{ 31{
32 using WixToolset.Data; 32 using WixToolset.Data;
33 33
34 public enum IIsWebApplicationTupleFields 34 public enum IIsWebApplicationSymbolFields
35 { 35 {
36 Name, 36 Name,
37 Isolation, 37 Isolation,
@@ -46,82 +46,82 @@ namespace WixToolset.Iis.Tuples
46 AppPoolRef, 46 AppPoolRef,
47 } 47 }
48 48
49 public class IIsWebApplicationTuple : IntermediateTuple 49 public class IIsWebApplicationSymbol : IntermediateSymbol
50 { 50 {
51 public IIsWebApplicationTuple() : base(IisTupleDefinitions.IIsWebApplication, null, null) 51 public IIsWebApplicationSymbol() : base(IisSymbolDefinitions.IIsWebApplication, null, null)
52 { 52 {
53 } 53 }
54 54
55 public IIsWebApplicationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebApplication, sourceLineNumber, id) 55 public IIsWebApplicationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebApplication, sourceLineNumber, id)
56 { 56 {
57 } 57 }
58 58
59 public IntermediateField this[IIsWebApplicationTupleFields index] => this.Fields[(int)index]; 59 public IntermediateField this[IIsWebApplicationSymbolFields index] => this.Fields[(int)index];
60 60
61 public string Name 61 public string Name
62 { 62 {
63 get => this.Fields[(int)IIsWebApplicationTupleFields.Name].AsString(); 63 get => this.Fields[(int)IIsWebApplicationSymbolFields.Name].AsString();
64 set => this.Set((int)IIsWebApplicationTupleFields.Name, value); 64 set => this.Set((int)IIsWebApplicationSymbolFields.Name, value);
65 } 65 }
66 66
67 public int Isolation 67 public int Isolation
68 { 68 {
69 get => this.Fields[(int)IIsWebApplicationTupleFields.Isolation].AsNumber(); 69 get => this.Fields[(int)IIsWebApplicationSymbolFields.Isolation].AsNumber();
70 set => this.Set((int)IIsWebApplicationTupleFields.Isolation, value); 70 set => this.Set((int)IIsWebApplicationSymbolFields.Isolation, value);
71 } 71 }
72 72
73 public int? AllowSessions 73 public int? AllowSessions
74 { 74 {
75 get => this.Fields[(int)IIsWebApplicationTupleFields.AllowSessions].AsNullableNumber(); 75 get => this.Fields[(int)IIsWebApplicationSymbolFields.AllowSessions].AsNullableNumber();
76 set => this.Set((int)IIsWebApplicationTupleFields.AllowSessions, value); 76 set => this.Set((int)IIsWebApplicationSymbolFields.AllowSessions, value);
77 } 77 }
78 78
79 public int? SessionTimeout 79 public int? SessionTimeout
80 { 80 {
81 get => this.Fields[(int)IIsWebApplicationTupleFields.SessionTimeout].AsNullableNumber(); 81 get => this.Fields[(int)IIsWebApplicationSymbolFields.SessionTimeout].AsNullableNumber();
82 set => this.Set((int)IIsWebApplicationTupleFields.SessionTimeout, value); 82 set => this.Set((int)IIsWebApplicationSymbolFields.SessionTimeout, value);
83 } 83 }
84 84
85 public int? Buffer 85 public int? Buffer
86 { 86 {
87 get => this.Fields[(int)IIsWebApplicationTupleFields.Buffer].AsNullableNumber(); 87 get => this.Fields[(int)IIsWebApplicationSymbolFields.Buffer].AsNullableNumber();
88 set => this.Set((int)IIsWebApplicationTupleFields.Buffer, value); 88 set => this.Set((int)IIsWebApplicationSymbolFields.Buffer, value);
89 } 89 }
90 90
91 public int? ParentPaths 91 public int? ParentPaths
92 { 92 {
93 get => this.Fields[(int)IIsWebApplicationTupleFields.ParentPaths].AsNullableNumber(); 93 get => this.Fields[(int)IIsWebApplicationSymbolFields.ParentPaths].AsNullableNumber();
94 set => this.Set((int)IIsWebApplicationTupleFields.ParentPaths, value); 94 set => this.Set((int)IIsWebApplicationSymbolFields.ParentPaths, value);
95 } 95 }
96 96
97 public string DefaultScript 97 public string DefaultScript
98 { 98 {
99 get => this.Fields[(int)IIsWebApplicationTupleFields.DefaultScript].AsString(); 99 get => this.Fields[(int)IIsWebApplicationSymbolFields.DefaultScript].AsString();
100 set => this.Set((int)IIsWebApplicationTupleFields.DefaultScript, value); 100 set => this.Set((int)IIsWebApplicationSymbolFields.DefaultScript, value);
101 } 101 }
102 102
103 public int? ScriptTimeout 103 public int? ScriptTimeout
104 { 104 {
105 get => this.Fields[(int)IIsWebApplicationTupleFields.ScriptTimeout].AsNullableNumber(); 105 get => this.Fields[(int)IIsWebApplicationSymbolFields.ScriptTimeout].AsNullableNumber();
106 set => this.Set((int)IIsWebApplicationTupleFields.ScriptTimeout, value); 106 set => this.Set((int)IIsWebApplicationSymbolFields.ScriptTimeout, value);
107 } 107 }
108 108
109 public int? ServerDebugging 109 public int? ServerDebugging
110 { 110 {
111 get => this.Fields[(int)IIsWebApplicationTupleFields.ServerDebugging].AsNullableNumber(); 111 get => this.Fields[(int)IIsWebApplicationSymbolFields.ServerDebugging].AsNullableNumber();
112 set => this.Set((int)IIsWebApplicationTupleFields.ServerDebugging, value); 112 set => this.Set((int)IIsWebApplicationSymbolFields.ServerDebugging, value);
113 } 113 }
114 114
115 public int? ClientDebugging 115 public int? ClientDebugging
116 { 116 {
117 get => this.Fields[(int)IIsWebApplicationTupleFields.ClientDebugging].AsNullableNumber(); 117 get => this.Fields[(int)IIsWebApplicationSymbolFields.ClientDebugging].AsNullableNumber();
118 set => this.Set((int)IIsWebApplicationTupleFields.ClientDebugging, value); 118 set => this.Set((int)IIsWebApplicationSymbolFields.ClientDebugging, value);
119 } 119 }
120 120
121 public string AppPoolRef 121 public string AppPoolRef
122 { 122 {
123 get => this.Fields[(int)IIsWebApplicationTupleFields.AppPoolRef].AsString(); 123 get => this.Fields[(int)IIsWebApplicationSymbolFields.AppPoolRef].AsString();
124 set => this.Set((int)IIsWebApplicationTupleFields.AppPoolRef, value); 124 set => this.Set((int)IIsWebApplicationSymbolFields.AppPoolRef, value);
125 } 125 }
126 } 126 }
127} \ No newline at end of file 127} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebDirPropertiesTuple.cs b/src/wixext/Tuples/IIsWebDirPropertiesTuple.cs
index 48e2c932..42d2dead 100644
--- a/src/wixext/Tuples/IIsWebDirPropertiesTuple.cs
+++ b/src/wixext/Tuples/IIsWebDirPropertiesTuple.cs
@@ -3,38 +3,38 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsWebDirProperties = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsWebDirProperties = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsWebDirProperties.ToString(), 11 IisSymbolDefinitionType.IIsWebDirProperties.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.Access), IntermediateFieldType.Number), 14 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.Access), IntermediateFieldType.Number),
15 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.Authorization), IntermediateFieldType.Number), 15 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.Authorization), IntermediateFieldType.Number),
16 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.AnonymousUserRef), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.AnonymousUserRef), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.IIsControlledPassword), IntermediateFieldType.Number), 17 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.IIsControlledPassword), IntermediateFieldType.Number),
18 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.LogVisits), IntermediateFieldType.Number), 18 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.LogVisits), IntermediateFieldType.Number),
19 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.Index), IntermediateFieldType.Number), 19 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.Index), IntermediateFieldType.Number),
20 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.DefaultDoc), IntermediateFieldType.String), 20 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.DefaultDoc), IntermediateFieldType.String),
21 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.AspDetailedError), IntermediateFieldType.Number), 21 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.AspDetailedError), IntermediateFieldType.Number),
22 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.HttpExpires), IntermediateFieldType.String), 22 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.HttpExpires), IntermediateFieldType.String),
23 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.CacheControlMaxAge), IntermediateFieldType.Number), 23 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.CacheControlMaxAge), IntermediateFieldType.Number),
24 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.CacheControlCustom), IntermediateFieldType.String), 24 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.CacheControlCustom), IntermediateFieldType.String),
25 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.NoCustomError), IntermediateFieldType.Number), 25 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.NoCustomError), IntermediateFieldType.Number),
26 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.AccessSSLFlags), IntermediateFieldType.Number), 26 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.AccessSSLFlags), IntermediateFieldType.Number),
27 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.AuthenticationProviders), IntermediateFieldType.String), 27 new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.AuthenticationProviders), IntermediateFieldType.String),
28 }, 28 },
29 typeof(IIsWebDirPropertiesTuple)); 29 typeof(IIsWebDirPropertiesSymbol));
30 } 30 }
31} 31}
32 32
33namespace WixToolset.Iis.Tuples 33namespace WixToolset.Iis.Symbols
34{ 34{
35 using WixToolset.Data; 35 using WixToolset.Data;
36 36
37 public enum IIsWebDirPropertiesTupleFields 37 public enum IIsWebDirPropertiesSymbolFields
38 { 38 {
39 Access, 39 Access,
40 Authorization, 40 Authorization,
@@ -52,100 +52,100 @@ namespace WixToolset.Iis.Tuples
52 AuthenticationProviders, 52 AuthenticationProviders,
53 } 53 }
54 54
55 public class IIsWebDirPropertiesTuple : IntermediateTuple 55 public class IIsWebDirPropertiesSymbol : IntermediateSymbol
56 { 56 {
57 public IIsWebDirPropertiesTuple() : base(IisTupleDefinitions.IIsWebDirProperties, null, null) 57 public IIsWebDirPropertiesSymbol() : base(IisSymbolDefinitions.IIsWebDirProperties, null, null)
58 { 58 {
59 } 59 }
60 60
61 public IIsWebDirPropertiesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebDirProperties, sourceLineNumber, id) 61 public IIsWebDirPropertiesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebDirProperties, sourceLineNumber, id)
62 { 62 {
63 } 63 }
64 64
65 public IntermediateField this[IIsWebDirPropertiesTupleFields index] => this.Fields[(int)index]; 65 public IntermediateField this[IIsWebDirPropertiesSymbolFields index] => this.Fields[(int)index];
66 66
67 public int? Access 67 public int? Access
68 { 68 {
69 get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Access].AsNullableNumber(); 69 get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.Access].AsNullableNumber();
70 set => this.Set((int)IIsWebDirPropertiesTupleFields.Access, value); 70 set => this.Set((int)IIsWebDirPropertiesSymbolFields.Access, value);
71 } 71 }
72 72
73 public int? Authorization 73 public int? Authorization
74 { 74 {
75 get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Authorization].AsNullableNumber(); 75 get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.Authorization].AsNullableNumber();
76 set => this.Set((int)IIsWebDirPropertiesTupleFields.Authorization, value); 76 set => this.Set((int)IIsWebDirPropertiesSymbolFields.Authorization, value);
77 } 77 }
78 78
79 public string AnonymousUserRef 79 public string AnonymousUserRef
80 { 80 {
81 get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AnonymousUserRef].AsString(); 81 get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.AnonymousUserRef].AsString();
82 set => this.Set((int)IIsWebDirPropertiesTupleFields.AnonymousUserRef, value); 82 set => this.Set((int)IIsWebDirPropertiesSymbolFields.AnonymousUserRef, value);
83 } 83 }
84 84
85 public int? IIsControlledPassword 85 public int? IIsControlledPassword
86 { 86 {
87 get => this.Fields[(int)IIsWebDirPropertiesTupleFields.IIsControlledPassword].AsNullableNumber(); 87 get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.IIsControlledPassword].AsNullableNumber();
88 set => this.Set((int)IIsWebDirPropertiesTupleFields.IIsControlledPassword, value); 88 set => this.Set((int)IIsWebDirPropertiesSymbolFields.IIsControlledPassword, value);
89 } 89 }
90 90
91 public int? LogVisits 91 public int? LogVisits
92 { 92 {
93 get => this.Fields[(int)IIsWebDirPropertiesTupleFields.LogVisits].AsNullableNumber(); 93 get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.LogVisits].AsNullableNumber();
94 set => this.Set((int)IIsWebDirPropertiesTupleFields.LogVisits, value); 94 set => this.Set((int)IIsWebDirPropertiesSymbolFields.LogVisits, value);
95 } 95 }
96 96
97 public int? Index 97 public int? Index
98 { 98 {
99 get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Index].AsNullableNumber(); 99 get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.Index].AsNullableNumber();
100 set => this.Set((int)IIsWebDirPropertiesTupleFields.Index, value); 100 set => this.Set((int)IIsWebDirPropertiesSymbolFields.Index, value);
101 } 101 }
102 102
103 public string DefaultDoc 103 public string DefaultDoc
104 { 104 {
105 get => this.Fields[(int)IIsWebDirPropertiesTupleFields.DefaultDoc].AsString(); 105 get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.DefaultDoc].AsString();
106 set => this.Set((int)IIsWebDirPropertiesTupleFields.DefaultDoc, value); 106 set => this.Set((int)IIsWebDirPropertiesSymbolFields.DefaultDoc, value);
107 } 107 }
108 108
109 public int? AspDetailedError 109 public int? AspDetailedError
110 { 110 {
111 get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AspDetailedError].AsNullableNumber(); 111 get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.AspDetailedError].AsNullableNumber();
112 set => this.Set((int)IIsWebDirPropertiesTupleFields.AspDetailedError, value); 112 set => this.Set((int)IIsWebDirPropertiesSymbolFields.AspDetailedError, value);
113 } 113 }
114 114
115 public string HttpExpires 115 public string HttpExpires
116 { 116 {
117 get => this.Fields[(int)IIsWebDirPropertiesTupleFields.HttpExpires].AsString(); 117 get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.HttpExpires].AsString();
118 set => this.Set((int)IIsWebDirPropertiesTupleFields.HttpExpires, value); 118 set => this.Set((int)IIsWebDirPropertiesSymbolFields.HttpExpires, value);
119 } 119 }
120 120
121 public int? CacheControlMaxAge 121 public int? CacheControlMaxAge
122 { 122 {
123 get => this.Fields[(int)IIsWebDirPropertiesTupleFields.CacheControlMaxAge].AsNullableNumber(); 123 get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.CacheControlMaxAge].AsNullableNumber();
124 set => this.Set((int)IIsWebDirPropertiesTupleFields.CacheControlMaxAge, value); 124 set => this.Set((int)IIsWebDirPropertiesSymbolFields.CacheControlMaxAge, value);
125 } 125 }
126 126
127 public string CacheControlCustom 127 public string CacheControlCustom
128 { 128 {
129 get => this.Fields[(int)IIsWebDirPropertiesTupleFields.CacheControlCustom].AsString(); 129 get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.CacheControlCustom].AsString();
130 set => this.Set((int)IIsWebDirPropertiesTupleFields.CacheControlCustom, value); 130 set => this.Set((int)IIsWebDirPropertiesSymbolFields.CacheControlCustom, value);
131 } 131 }
132 132
133 public int? NoCustomError 133 public int? NoCustomError
134 { 134 {
135 get => this.Fields[(int)IIsWebDirPropertiesTupleFields.NoCustomError].AsNullableNumber(); 135 get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.NoCustomError].AsNullableNumber();
136 set => this.Set((int)IIsWebDirPropertiesTupleFields.NoCustomError, value); 136 set => this.Set((int)IIsWebDirPropertiesSymbolFields.NoCustomError, value);
137 } 137 }
138 138
139 public int? AccessSSLFlags 139 public int? AccessSSLFlags
140 { 140 {
141 get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AccessSSLFlags].AsNullableNumber(); 141 get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.AccessSSLFlags].AsNullableNumber();
142 set => this.Set((int)IIsWebDirPropertiesTupleFields.AccessSSLFlags, value); 142 set => this.Set((int)IIsWebDirPropertiesSymbolFields.AccessSSLFlags, value);
143 } 143 }
144 144
145 public string AuthenticationProviders 145 public string AuthenticationProviders
146 { 146 {
147 get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AuthenticationProviders].AsString(); 147 get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.AuthenticationProviders].AsString();
148 set => this.Set((int)IIsWebDirPropertiesTupleFields.AuthenticationProviders, value); 148 set => this.Set((int)IIsWebDirPropertiesSymbolFields.AuthenticationProviders, value);
149 } 149 }
150 } 150 }
151} \ No newline at end of file 151} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebDirTuple.cs b/src/wixext/Tuples/IIsWebDirTuple.cs
index 471fe223..7f257f14 100644
--- a/src/wixext/Tuples/IIsWebDirTuple.cs
+++ b/src/wixext/Tuples/IIsWebDirTuple.cs
@@ -3,29 +3,29 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsWebDir = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsWebDir = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsWebDir.ToString(), 11 IisSymbolDefinitionType.IIsWebDir.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsWebDirTupleFields.ComponentRef), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(IIsWebDirSymbolFields.ComponentRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(IIsWebDirTupleFields.WebRef), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(IIsWebDirSymbolFields.WebRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(IIsWebDirTupleFields.Path), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(IIsWebDirSymbolFields.Path), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(IIsWebDirTupleFields.DirPropertiesRef), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(IIsWebDirSymbolFields.DirPropertiesRef), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(IIsWebDirTupleFields.ApplicationRef), IntermediateFieldType.String), 18 new IntermediateFieldDefinition(nameof(IIsWebDirSymbolFields.ApplicationRef), IntermediateFieldType.String),
19 }, 19 },
20 typeof(IIsWebDirTuple)); 20 typeof(IIsWebDirSymbol));
21 } 21 }
22} 22}
23 23
24namespace WixToolset.Iis.Tuples 24namespace WixToolset.Iis.Symbols
25{ 25{
26 using WixToolset.Data; 26 using WixToolset.Data;
27 27
28 public enum IIsWebDirTupleFields 28 public enum IIsWebDirSymbolFields
29 { 29 {
30 ComponentRef, 30 ComponentRef,
31 WebRef, 31 WebRef,
@@ -34,46 +34,46 @@ namespace WixToolset.Iis.Tuples
34 ApplicationRef, 34 ApplicationRef,
35 } 35 }
36 36
37 public class IIsWebDirTuple : IntermediateTuple 37 public class IIsWebDirSymbol : IntermediateSymbol
38 { 38 {
39 public IIsWebDirTuple() : base(IisTupleDefinitions.IIsWebDir, null, null) 39 public IIsWebDirSymbol() : base(IisSymbolDefinitions.IIsWebDir, null, null)
40 { 40 {
41 } 41 }
42 42
43 public IIsWebDirTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebDir, sourceLineNumber, id) 43 public IIsWebDirSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebDir, sourceLineNumber, id)
44 { 44 {
45 } 45 }
46 46
47 public IntermediateField this[IIsWebDirTupleFields index] => this.Fields[(int)index]; 47 public IntermediateField this[IIsWebDirSymbolFields index] => this.Fields[(int)index];
48 48
49 public string ComponentRef 49 public string ComponentRef
50 { 50 {
51 get => this.Fields[(int)IIsWebDirTupleFields.ComponentRef].AsString(); 51 get => this.Fields[(int)IIsWebDirSymbolFields.ComponentRef].AsString();
52 set => this.Set((int)IIsWebDirTupleFields.ComponentRef, value); 52 set => this.Set((int)IIsWebDirSymbolFields.ComponentRef, value);
53 } 53 }
54 54
55 public string WebRef 55 public string WebRef
56 { 56 {
57 get => this.Fields[(int)IIsWebDirTupleFields.WebRef].AsString(); 57 get => this.Fields[(int)IIsWebDirSymbolFields.WebRef].AsString();
58 set => this.Set((int)IIsWebDirTupleFields.WebRef, value); 58 set => this.Set((int)IIsWebDirSymbolFields.WebRef, value);
59 } 59 }
60 60
61 public string Path 61 public string Path
62 { 62 {
63 get => this.Fields[(int)IIsWebDirTupleFields.Path].AsString(); 63 get => this.Fields[(int)IIsWebDirSymbolFields.Path].AsString();
64 set => this.Set((int)IIsWebDirTupleFields.Path, value); 64 set => this.Set((int)IIsWebDirSymbolFields.Path, value);
65 } 65 }
66 66
67 public string DirPropertiesRef 67 public string DirPropertiesRef
68 { 68 {
69 get => this.Fields[(int)IIsWebDirTupleFields.DirPropertiesRef].AsString(); 69 get => this.Fields[(int)IIsWebDirSymbolFields.DirPropertiesRef].AsString();
70 set => this.Set((int)IIsWebDirTupleFields.DirPropertiesRef, value); 70 set => this.Set((int)IIsWebDirSymbolFields.DirPropertiesRef, value);
71 } 71 }
72 72
73 public string ApplicationRef 73 public string ApplicationRef
74 { 74 {
75 get => this.Fields[(int)IIsWebDirTupleFields.ApplicationRef].AsString(); 75 get => this.Fields[(int)IIsWebDirSymbolFields.ApplicationRef].AsString();
76 set => this.Set((int)IIsWebDirTupleFields.ApplicationRef, value); 76 set => this.Set((int)IIsWebDirSymbolFields.ApplicationRef, value);
77 } 77 }
78 } 78 }
79} \ No newline at end of file 79} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebErrorTuple.cs b/src/wixext/Tuples/IIsWebErrorTuple.cs
index ba6b2722..f8488fed 100644
--- a/src/wixext/Tuples/IIsWebErrorTuple.cs
+++ b/src/wixext/Tuples/IIsWebErrorTuple.cs
@@ -3,30 +3,30 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsWebError = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsWebError = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsWebError.ToString(), 11 IisSymbolDefinitionType.IIsWebError.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsWebErrorTupleFields.ErrorCode), IntermediateFieldType.Number), 14 new IntermediateFieldDefinition(nameof(IIsWebErrorSymbolFields.ErrorCode), IntermediateFieldType.Number),
15 new IntermediateFieldDefinition(nameof(IIsWebErrorTupleFields.SubCode), IntermediateFieldType.Number), 15 new IntermediateFieldDefinition(nameof(IIsWebErrorSymbolFields.SubCode), IntermediateFieldType.Number),
16 new IntermediateFieldDefinition(nameof(IIsWebErrorTupleFields.ParentType), IntermediateFieldType.Number), 16 new IntermediateFieldDefinition(nameof(IIsWebErrorSymbolFields.ParentType), IntermediateFieldType.Number),
17 new IntermediateFieldDefinition(nameof(IIsWebErrorTupleFields.ParentValue), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(IIsWebErrorSymbolFields.ParentValue), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(IIsWebErrorTupleFields.File), IntermediateFieldType.String), 18 new IntermediateFieldDefinition(nameof(IIsWebErrorSymbolFields.File), IntermediateFieldType.String),
19 new IntermediateFieldDefinition(nameof(IIsWebErrorTupleFields.URL), IntermediateFieldType.String), 19 new IntermediateFieldDefinition(nameof(IIsWebErrorSymbolFields.URL), IntermediateFieldType.String),
20 }, 20 },
21 typeof(IIsWebErrorTuple)); 21 typeof(IIsWebErrorSymbol));
22 } 22 }
23} 23}
24 24
25namespace WixToolset.Iis.Tuples 25namespace WixToolset.Iis.Symbols
26{ 26{
27 using WixToolset.Data; 27 using WixToolset.Data;
28 28
29 public enum IIsWebErrorTupleFields 29 public enum IIsWebErrorSymbolFields
30 { 30 {
31 ErrorCode, 31 ErrorCode,
32 SubCode, 32 SubCode,
@@ -36,52 +36,52 @@ namespace WixToolset.Iis.Tuples
36 URL, 36 URL,
37 } 37 }
38 38
39 public class IIsWebErrorTuple : IntermediateTuple 39 public class IIsWebErrorSymbol : IntermediateSymbol
40 { 40 {
41 public IIsWebErrorTuple() : base(IisTupleDefinitions.IIsWebError, null, null) 41 public IIsWebErrorSymbol() : base(IisSymbolDefinitions.IIsWebError, null, null)
42 { 42 {
43 } 43 }
44 44
45 public IIsWebErrorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebError, sourceLineNumber, id) 45 public IIsWebErrorSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebError, sourceLineNumber, id)
46 { 46 {
47 } 47 }
48 48
49 public IntermediateField this[IIsWebErrorTupleFields index] => this.Fields[(int)index]; 49 public IntermediateField this[IIsWebErrorSymbolFields index] => this.Fields[(int)index];
50 50
51 public int ErrorCode 51 public int ErrorCode
52 { 52 {
53 get => this.Fields[(int)IIsWebErrorTupleFields.ErrorCode].AsNumber(); 53 get => this.Fields[(int)IIsWebErrorSymbolFields.ErrorCode].AsNumber();
54 set => this.Set((int)IIsWebErrorTupleFields.ErrorCode, value); 54 set => this.Set((int)IIsWebErrorSymbolFields.ErrorCode, value);
55 } 55 }
56 56
57 public int SubCode 57 public int SubCode
58 { 58 {
59 get => this.Fields[(int)IIsWebErrorTupleFields.SubCode].AsNumber(); 59 get => this.Fields[(int)IIsWebErrorSymbolFields.SubCode].AsNumber();
60 set => this.Set((int)IIsWebErrorTupleFields.SubCode, value); 60 set => this.Set((int)IIsWebErrorSymbolFields.SubCode, value);
61 } 61 }
62 62
63 public int ParentType 63 public int ParentType
64 { 64 {
65 get => this.Fields[(int)IIsWebErrorTupleFields.ParentType].AsNumber(); 65 get => this.Fields[(int)IIsWebErrorSymbolFields.ParentType].AsNumber();
66 set => this.Set((int)IIsWebErrorTupleFields.ParentType, value); 66 set => this.Set((int)IIsWebErrorSymbolFields.ParentType, value);
67 } 67 }
68 68
69 public string ParentValue 69 public string ParentValue
70 { 70 {
71 get => this.Fields[(int)IIsWebErrorTupleFields.ParentValue].AsString(); 71 get => this.Fields[(int)IIsWebErrorSymbolFields.ParentValue].AsString();
72 set => this.Set((int)IIsWebErrorTupleFields.ParentValue, value); 72 set => this.Set((int)IIsWebErrorSymbolFields.ParentValue, value);
73 } 73 }
74 74
75 public string File 75 public string File
76 { 76 {
77 get => this.Fields[(int)IIsWebErrorTupleFields.File].AsString(); 77 get => this.Fields[(int)IIsWebErrorSymbolFields.File].AsString();
78 set => this.Set((int)IIsWebErrorTupleFields.File, value); 78 set => this.Set((int)IIsWebErrorSymbolFields.File, value);
79 } 79 }
80 80
81 public string URL 81 public string URL
82 { 82 {
83 get => this.Fields[(int)IIsWebErrorTupleFields.URL].AsString(); 83 get => this.Fields[(int)IIsWebErrorSymbolFields.URL].AsString();
84 set => this.Set((int)IIsWebErrorTupleFields.URL, value); 84 set => this.Set((int)IIsWebErrorSymbolFields.URL, value);
85 } 85 }
86 } 86 }
87} \ No newline at end of file 87} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebLogTuple.cs b/src/wixext/Tuples/IIsWebLogTuple.cs
index ec912ac5..409dc673 100644
--- a/src/wixext/Tuples/IIsWebLogTuple.cs
+++ b/src/wixext/Tuples/IIsWebLogTuple.cs
@@ -3,45 +3,45 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsWebLog = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsWebLog = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsWebLog.ToString(), 11 IisSymbolDefinitionType.IIsWebLog.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsWebLogTupleFields.Format), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(IIsWebLogSymbolFields.Format), IntermediateFieldType.String),
15 }, 15 },
16 typeof(IIsWebLogTuple)); 16 typeof(IIsWebLogSymbol));
17 } 17 }
18} 18}
19 19
20namespace WixToolset.Iis.Tuples 20namespace WixToolset.Iis.Symbols
21{ 21{
22 using WixToolset.Data; 22 using WixToolset.Data;
23 23
24 public enum IIsWebLogTupleFields 24 public enum IIsWebLogSymbolFields
25 { 25 {
26 Format, 26 Format,
27 } 27 }
28 28
29 public class IIsWebLogTuple : IntermediateTuple 29 public class IIsWebLogSymbol : IntermediateSymbol
30 { 30 {
31 public IIsWebLogTuple() : base(IisTupleDefinitions.IIsWebLog, null, null) 31 public IIsWebLogSymbol() : base(IisSymbolDefinitions.IIsWebLog, null, null)
32 { 32 {
33 } 33 }
34 34
35 public IIsWebLogTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebLog, sourceLineNumber, id) 35 public IIsWebLogSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebLog, sourceLineNumber, id)
36 { 36 {
37 } 37 }
38 38
39 public IntermediateField this[IIsWebLogTupleFields index] => this.Fields[(int)index]; 39 public IntermediateField this[IIsWebLogSymbolFields index] => this.Fields[(int)index];
40 40
41 public string Format 41 public string Format
42 { 42 {
43 get => this.Fields[(int)IIsWebLogTupleFields.Format].AsString(); 43 get => this.Fields[(int)IIsWebLogSymbolFields.Format].AsString();
44 set => this.Set((int)IIsWebLogTupleFields.Format, value); 44 set => this.Set((int)IIsWebLogSymbolFields.Format, value);
45 } 45 }
46 } 46 }
47} \ No newline at end of file 47} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebServiceExtensionTuple.cs b/src/wixext/Tuples/IIsWebServiceExtensionTuple.cs
index 82d9c82a..44922357 100644
--- a/src/wixext/Tuples/IIsWebServiceExtensionTuple.cs
+++ b/src/wixext/Tuples/IIsWebServiceExtensionTuple.cs
@@ -3,29 +3,29 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsWebServiceExtension = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsWebServiceExtension = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsWebServiceExtension.ToString(), 11 IisSymbolDefinitionType.IIsWebServiceExtension.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionTupleFields.ComponentRef), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionSymbolFields.ComponentRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionTupleFields.File), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionSymbolFields.File), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionTupleFields.Description), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionSymbolFields.Description), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionTupleFields.Group), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionSymbolFields.Group), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionTupleFields.Attributes), IntermediateFieldType.Number), 18 new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionSymbolFields.Attributes), IntermediateFieldType.Number),
19 }, 19 },
20 typeof(IIsWebServiceExtensionTuple)); 20 typeof(IIsWebServiceExtensionSymbol));
21 } 21 }
22} 22}
23 23
24namespace WixToolset.Iis.Tuples 24namespace WixToolset.Iis.Symbols
25{ 25{
26 using WixToolset.Data; 26 using WixToolset.Data;
27 27
28 public enum IIsWebServiceExtensionTupleFields 28 public enum IIsWebServiceExtensionSymbolFields
29 { 29 {
30 ComponentRef, 30 ComponentRef,
31 File, 31 File,
@@ -34,46 +34,46 @@ namespace WixToolset.Iis.Tuples
34 Attributes, 34 Attributes,
35 } 35 }
36 36
37 public class IIsWebServiceExtensionTuple : IntermediateTuple 37 public class IIsWebServiceExtensionSymbol : IntermediateSymbol
38 { 38 {
39 public IIsWebServiceExtensionTuple() : base(IisTupleDefinitions.IIsWebServiceExtension, null, null) 39 public IIsWebServiceExtensionSymbol() : base(IisSymbolDefinitions.IIsWebServiceExtension, null, null)
40 { 40 {
41 } 41 }
42 42
43 public IIsWebServiceExtensionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebServiceExtension, sourceLineNumber, id) 43 public IIsWebServiceExtensionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebServiceExtension, sourceLineNumber, id)
44 { 44 {
45 } 45 }
46 46
47 public IntermediateField this[IIsWebServiceExtensionTupleFields index] => this.Fields[(int)index]; 47 public IntermediateField this[IIsWebServiceExtensionSymbolFields index] => this.Fields[(int)index];
48 48
49 public string ComponentRef 49 public string ComponentRef
50 { 50 {
51 get => this.Fields[(int)IIsWebServiceExtensionTupleFields.ComponentRef].AsString(); 51 get => this.Fields[(int)IIsWebServiceExtensionSymbolFields.ComponentRef].AsString();
52 set => this.Set((int)IIsWebServiceExtensionTupleFields.ComponentRef, value); 52 set => this.Set((int)IIsWebServiceExtensionSymbolFields.ComponentRef, value);
53 } 53 }
54 54
55 public string File 55 public string File
56 { 56 {
57 get => this.Fields[(int)IIsWebServiceExtensionTupleFields.File].AsString(); 57 get => this.Fields[(int)IIsWebServiceExtensionSymbolFields.File].AsString();
58 set => this.Set((int)IIsWebServiceExtensionTupleFields.File, value); 58 set => this.Set((int)IIsWebServiceExtensionSymbolFields.File, value);
59 } 59 }
60 60
61 public string Description 61 public string Description
62 { 62 {
63 get => this.Fields[(int)IIsWebServiceExtensionTupleFields.Description].AsString(); 63 get => this.Fields[(int)IIsWebServiceExtensionSymbolFields.Description].AsString();
64 set => this.Set((int)IIsWebServiceExtensionTupleFields.Description, value); 64 set => this.Set((int)IIsWebServiceExtensionSymbolFields.Description, value);
65 } 65 }
66 66
67 public string Group 67 public string Group
68 { 68 {
69 get => this.Fields[(int)IIsWebServiceExtensionTupleFields.Group].AsString(); 69 get => this.Fields[(int)IIsWebServiceExtensionSymbolFields.Group].AsString();
70 set => this.Set((int)IIsWebServiceExtensionTupleFields.Group, value); 70 set => this.Set((int)IIsWebServiceExtensionSymbolFields.Group, value);
71 } 71 }
72 72
73 public int Attributes 73 public int Attributes
74 { 74 {
75 get => this.Fields[(int)IIsWebServiceExtensionTupleFields.Attributes].AsNumber(); 75 get => this.Fields[(int)IIsWebServiceExtensionSymbolFields.Attributes].AsNumber();
76 set => this.Set((int)IIsWebServiceExtensionTupleFields.Attributes, value); 76 set => this.Set((int)IIsWebServiceExtensionSymbolFields.Attributes, value);
77 } 77 }
78 } 78 }
79} \ No newline at end of file 79} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebSiteCertificatesTuple.cs b/src/wixext/Tuples/IIsWebSiteCertificatesTuple.cs
index 7e4879d7..851ce556 100644
--- a/src/wixext/Tuples/IIsWebSiteCertificatesTuple.cs
+++ b/src/wixext/Tuples/IIsWebSiteCertificatesTuple.cs
@@ -3,53 +3,53 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsWebSiteCertificates = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsWebSiteCertificates = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsWebSiteCertificates.ToString(), 11 IisSymbolDefinitionType.IIsWebSiteCertificates.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsWebSiteCertificatesTupleFields.WebRef), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(IIsWebSiteCertificatesSymbolFields.WebRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(IIsWebSiteCertificatesTupleFields.CertificateRef), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(IIsWebSiteCertificatesSymbolFields.CertificateRef), IntermediateFieldType.String),
16 }, 16 },
17 typeof(IIsWebSiteCertificatesTuple)); 17 typeof(IIsWebSiteCertificatesSymbol));
18 } 18 }
19} 19}
20 20
21namespace WixToolset.Iis.Tuples 21namespace WixToolset.Iis.Symbols
22{ 22{
23 using WixToolset.Data; 23 using WixToolset.Data;
24 24
25 public enum IIsWebSiteCertificatesTupleFields 25 public enum IIsWebSiteCertificatesSymbolFields
26 { 26 {
27 WebRef, 27 WebRef,
28 CertificateRef, 28 CertificateRef,
29 } 29 }
30 30
31 public class IIsWebSiteCertificatesTuple : IntermediateTuple 31 public class IIsWebSiteCertificatesSymbol : IntermediateSymbol
32 { 32 {
33 public IIsWebSiteCertificatesTuple() : base(IisTupleDefinitions.IIsWebSiteCertificates, null, null) 33 public IIsWebSiteCertificatesSymbol() : base(IisSymbolDefinitions.IIsWebSiteCertificates, null, null)
34 { 34 {
35 } 35 }
36 36
37 public IIsWebSiteCertificatesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebSiteCertificates, sourceLineNumber, id) 37 public IIsWebSiteCertificatesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebSiteCertificates, sourceLineNumber, id)
38 { 38 {
39 } 39 }
40 40
41 public IntermediateField this[IIsWebSiteCertificatesTupleFields index] => this.Fields[(int)index]; 41 public IntermediateField this[IIsWebSiteCertificatesSymbolFields index] => this.Fields[(int)index];
42 42
43 public string WebRef 43 public string WebRef
44 { 44 {
45 get => this.Fields[(int)IIsWebSiteCertificatesTupleFields.WebRef].AsString(); 45 get => this.Fields[(int)IIsWebSiteCertificatesSymbolFields.WebRef].AsString();
46 set => this.Set((int)IIsWebSiteCertificatesTupleFields.WebRef, value); 46 set => this.Set((int)IIsWebSiteCertificatesSymbolFields.WebRef, value);
47 } 47 }
48 48
49 public string CertificateRef 49 public string CertificateRef
50 { 50 {
51 get => this.Fields[(int)IIsWebSiteCertificatesTupleFields.CertificateRef].AsString(); 51 get => this.Fields[(int)IIsWebSiteCertificatesSymbolFields.CertificateRef].AsString();
52 set => this.Set((int)IIsWebSiteCertificatesTupleFields.CertificateRef, value); 52 set => this.Set((int)IIsWebSiteCertificatesSymbolFields.CertificateRef, value);
53 } 53 }
54 } 54 }
55} \ No newline at end of file 55} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebSiteTuple.cs b/src/wixext/Tuples/IIsWebSiteTuple.cs
index 1cce69fb..ceba2ea0 100644
--- a/src/wixext/Tuples/IIsWebSiteTuple.cs
+++ b/src/wixext/Tuples/IIsWebSiteTuple.cs
@@ -3,36 +3,36 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsWebSite = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsWebSite = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsWebSite.ToString(), 11 IisSymbolDefinitionType.IIsWebSite.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.ComponentRef), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.ComponentRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.Description), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.Description), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.ConnectionTimeout), IntermediateFieldType.Number), 16 new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.ConnectionTimeout), IntermediateFieldType.Number),
17 new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.DirectoryRef), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.DirectoryRef), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.State), IntermediateFieldType.Number), 18 new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.State), IntermediateFieldType.Number),
19 new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.Attributes), IntermediateFieldType.Number), 19 new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.Attributes), IntermediateFieldType.Number),
20 new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.KeyAddressRef), IntermediateFieldType.String), 20 new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.KeyAddressRef), IntermediateFieldType.String),
21 new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.DirPropertiesRef), IntermediateFieldType.String), 21 new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.DirPropertiesRef), IntermediateFieldType.String),
22 new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.ApplicationRef), IntermediateFieldType.String), 22 new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.ApplicationRef), IntermediateFieldType.String),
23 new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.Sequence), IntermediateFieldType.Number), 23 new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.Sequence), IntermediateFieldType.Number),
24 new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.LogRef), IntermediateFieldType.String), 24 new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.LogRef), IntermediateFieldType.String),
25 new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.WebsiteId), IntermediateFieldType.String), 25 new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.WebsiteId), IntermediateFieldType.String),
26 }, 26 },
27 typeof(IIsWebSiteTuple)); 27 typeof(IIsWebSiteSymbol));
28 } 28 }
29} 29}
30 30
31namespace WixToolset.Iis.Tuples 31namespace WixToolset.Iis.Symbols
32{ 32{
33 using WixToolset.Data; 33 using WixToolset.Data;
34 34
35 public enum IIsWebSiteTupleFields 35 public enum IIsWebSiteSymbolFields
36 { 36 {
37 ComponentRef, 37 ComponentRef,
38 Description, 38 Description,
@@ -48,88 +48,88 @@ namespace WixToolset.Iis.Tuples
48 WebsiteId, 48 WebsiteId,
49 } 49 }
50 50
51 public class IIsWebSiteTuple : IntermediateTuple 51 public class IIsWebSiteSymbol : IntermediateSymbol
52 { 52 {
53 public IIsWebSiteTuple() : base(IisTupleDefinitions.IIsWebSite, null, null) 53 public IIsWebSiteSymbol() : base(IisSymbolDefinitions.IIsWebSite, null, null)
54 { 54 {
55 } 55 }
56 56
57 public IIsWebSiteTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebSite, sourceLineNumber, id) 57 public IIsWebSiteSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebSite, sourceLineNumber, id)
58 { 58 {
59 } 59 }
60 60
61 public IntermediateField this[IIsWebSiteTupleFields index] => this.Fields[(int)index]; 61 public IntermediateField this[IIsWebSiteSymbolFields index] => this.Fields[(int)index];
62 62
63 public string ComponentRef 63 public string ComponentRef
64 { 64 {
65 get => this.Fields[(int)IIsWebSiteTupleFields.ComponentRef].AsString(); 65 get => this.Fields[(int)IIsWebSiteSymbolFields.ComponentRef].AsString();
66 set => this.Set((int)IIsWebSiteTupleFields.ComponentRef, value); 66 set => this.Set((int)IIsWebSiteSymbolFields.ComponentRef, value);
67 } 67 }
68 68
69 public string Description 69 public string Description
70 { 70 {
71 get => this.Fields[(int)IIsWebSiteTupleFields.Description].AsString(); 71 get => this.Fields[(int)IIsWebSiteSymbolFields.Description].AsString();
72 set => this.Set((int)IIsWebSiteTupleFields.Description, value); 72 set => this.Set((int)IIsWebSiteSymbolFields.Description, value);
73 } 73 }
74 74
75 public int? ConnectionTimeout 75 public int? ConnectionTimeout
76 { 76 {
77 get => this.Fields[(int)IIsWebSiteTupleFields.ConnectionTimeout].AsNullableNumber(); 77 get => this.Fields[(int)IIsWebSiteSymbolFields.ConnectionTimeout].AsNullableNumber();
78 set => this.Set((int)IIsWebSiteTupleFields.ConnectionTimeout, value); 78 set => this.Set((int)IIsWebSiteSymbolFields.ConnectionTimeout, value);
79 } 79 }
80 80
81 public string DirectoryRef 81 public string DirectoryRef
82 { 82 {
83 get => this.Fields[(int)IIsWebSiteTupleFields.DirectoryRef].AsString(); 83 get => this.Fields[(int)IIsWebSiteSymbolFields.DirectoryRef].AsString();
84 set => this.Set((int)IIsWebSiteTupleFields.DirectoryRef, value); 84 set => this.Set((int)IIsWebSiteSymbolFields.DirectoryRef, value);
85 } 85 }
86 86
87 public int? State 87 public int? State
88 { 88 {
89 get => this.Fields[(int)IIsWebSiteTupleFields.State].AsNullableNumber(); 89 get => this.Fields[(int)IIsWebSiteSymbolFields.State].AsNullableNumber();
90 set => this.Set((int)IIsWebSiteTupleFields.State, value); 90 set => this.Set((int)IIsWebSiteSymbolFields.State, value);
91 } 91 }
92 92
93 public int Attributes 93 public int Attributes
94 { 94 {
95 get => this.Fields[(int)IIsWebSiteTupleFields.Attributes].AsNumber(); 95 get => this.Fields[(int)IIsWebSiteSymbolFields.Attributes].AsNumber();
96 set => this.Set((int)IIsWebSiteTupleFields.Attributes, value); 96 set => this.Set((int)IIsWebSiteSymbolFields.Attributes, value);
97 } 97 }
98 98
99 public string KeyAddressRef 99 public string KeyAddressRef
100 { 100 {
101 get => this.Fields[(int)IIsWebSiteTupleFields.KeyAddressRef].AsString(); 101 get => this.Fields[(int)IIsWebSiteSymbolFields.KeyAddressRef].AsString();
102 set => this.Set((int)IIsWebSiteTupleFields.KeyAddressRef, value); 102 set => this.Set((int)IIsWebSiteSymbolFields.KeyAddressRef, value);
103 } 103 }
104 104
105 public string DirPropertiesRef 105 public string DirPropertiesRef
106 { 106 {
107 get => this.Fields[(int)IIsWebSiteTupleFields.DirPropertiesRef].AsString(); 107 get => this.Fields[(int)IIsWebSiteSymbolFields.DirPropertiesRef].AsString();
108 set => this.Set((int)IIsWebSiteTupleFields.DirPropertiesRef, value); 108 set => this.Set((int)IIsWebSiteSymbolFields.DirPropertiesRef, value);
109 } 109 }
110 110
111 public string ApplicationRef 111 public string ApplicationRef
112 { 112 {
113 get => this.Fields[(int)IIsWebSiteTupleFields.ApplicationRef].AsString(); 113 get => this.Fields[(int)IIsWebSiteSymbolFields.ApplicationRef].AsString();
114 set => this.Set((int)IIsWebSiteTupleFields.ApplicationRef, value); 114 set => this.Set((int)IIsWebSiteSymbolFields.ApplicationRef, value);
115 } 115 }
116 116
117 public int? Sequence 117 public int? Sequence
118 { 118 {
119 get => this.Fields[(int)IIsWebSiteTupleFields.Sequence].AsNullableNumber(); 119 get => this.Fields[(int)IIsWebSiteSymbolFields.Sequence].AsNullableNumber();
120 set => this.Set((int)IIsWebSiteTupleFields.Sequence, value); 120 set => this.Set((int)IIsWebSiteSymbolFields.Sequence, value);
121 } 121 }
122 122
123 public string LogRef 123 public string LogRef
124 { 124 {
125 get => this.Fields[(int)IIsWebSiteTupleFields.LogRef].AsString(); 125 get => this.Fields[(int)IIsWebSiteSymbolFields.LogRef].AsString();
126 set => this.Set((int)IIsWebSiteTupleFields.LogRef, value); 126 set => this.Set((int)IIsWebSiteSymbolFields.LogRef, value);
127 } 127 }
128 128
129 public string WebsiteId 129 public string WebsiteId
130 { 130 {
131 get => this.Fields[(int)IIsWebSiteTupleFields.WebsiteId].AsString(); 131 get => this.Fields[(int)IIsWebSiteSymbolFields.WebsiteId].AsString();
132 set => this.Set((int)IIsWebSiteTupleFields.WebsiteId, value); 132 set => this.Set((int)IIsWebSiteSymbolFields.WebsiteId, value);
133 } 133 }
134 } 134 }
135} \ No newline at end of file 135} \ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebVirtualDirTuple.cs b/src/wixext/Tuples/IIsWebVirtualDirTuple.cs
index 3a624b80..bfc29e84 100644
--- a/src/wixext/Tuples/IIsWebVirtualDirTuple.cs
+++ b/src/wixext/Tuples/IIsWebVirtualDirTuple.cs
@@ -3,30 +3,30 @@
3namespace WixToolset.Iis 3namespace WixToolset.Iis
4{ 4{
5 using WixToolset.Data; 5 using WixToolset.Data;
6 using WixToolset.Iis.Tuples; 6 using WixToolset.Iis.Symbols;
7 7
8 public static partial class IisTupleDefinitions 8 public static partial class IisSymbolDefinitions
9 { 9 {
10 public static readonly IntermediateTupleDefinition IIsWebVirtualDir = new IntermediateTupleDefinition( 10 public static readonly IntermediateSymbolDefinition IIsWebVirtualDir = new IntermediateSymbolDefinition(
11 IisTupleDefinitionType.IIsWebVirtualDir.ToString(), 11 IisSymbolDefinitionType.IIsWebVirtualDir.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(IIsWebVirtualDirTupleFields.ComponentRef), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(IIsWebVirtualDirSymbolFields.ComponentRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(IIsWebVirtualDirTupleFields.WebRef), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(IIsWebVirtualDirSymbolFields.WebRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(IIsWebVirtualDirTupleFields.Alias), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(IIsWebVirtualDirSymbolFields.Alias), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(IIsWebVirtualDirTupleFields.DirectoryRef), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(IIsWebVirtualDirSymbolFields.DirectoryRef), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(IIsWebVirtualDirTupleFields.DirPropertiesRef), IntermediateFieldType.String), 18 new IntermediateFieldDefinition(nameof(IIsWebVirtualDirSymbolFields.DirPropertiesRef), IntermediateFieldType.String),
19 new IntermediateFieldDefinition(nameof(IIsWebVirtualDirTupleFields.ApplicationRef), IntermediateFieldType.String), 19 new IntermediateFieldDefinition(nameof(IIsWebVirtualDirSymbolFields.ApplicationRef), IntermediateFieldType.String),
20 }, 20 },
21 typeof(IIsWebVirtualDirTuple)); 21 typeof(IIsWebVirtualDirSymbol));
22 } 22 }
23} 23}
24 24
25namespace WixToolset.Iis.Tuples 25namespace WixToolset.Iis.Symbols
26{ 26{
27 using WixToolset.Data; 27 using WixToolset.Data;
28 28
29 public enum IIsWebVirtualDirTupleFields 29 public enum IIsWebVirtualDirSymbolFields
30 { 30 {
31 ComponentRef, 31 ComponentRef,
32 WebRef, 32 WebRef,
@@ -36,52 +36,52 @@ namespace WixToolset.Iis.Tuples
36 ApplicationRef, 36 ApplicationRef,
37 } 37 }
38 38
39 public class IIsWebVirtualDirTuple : IntermediateTuple 39 public class IIsWebVirtualDirSymbol : IntermediateSymbol
40 { 40 {
41 public IIsWebVirtualDirTuple() : base(IisTupleDefinitions.IIsWebVirtualDir, null, null) 41 public IIsWebVirtualDirSymbol() : base(IisSymbolDefinitions.IIsWebVirtualDir, null, null)
42 { 42 {
43 } 43 }
44 44
45 public IIsWebVirtualDirTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebVirtualDir, sourceLineNumber, id) 45 public IIsWebVirtualDirSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebVirtualDir, sourceLineNumber, id)
46 { 46 {
47 } 47 }
48 48
49 public IntermediateField this[IIsWebVirtualDirTupleFields index] => this.Fields[(int)index]; 49 public IntermediateField this[IIsWebVirtualDirSymbolFields index] => this.Fields[(int)index];
50 50
51 public string ComponentRef 51 public string ComponentRef
52 { 52 {
53 get => this.Fields[(int)IIsWebVirtualDirTupleFields.ComponentRef].AsString(); 53 get => this.Fields[(int)IIsWebVirtualDirSymbolFields.ComponentRef].AsString();
54 set => this.Set((int)IIsWebVirtualDirTupleFields.ComponentRef, value); 54 set => this.Set((int)IIsWebVirtualDirSymbolFields.ComponentRef, value);
55 } 55 }
56 56
57 public string WebRef 57 public string WebRef
58 { 58 {
59 get => this.Fields[(int)IIsWebVirtualDirTupleFields.WebRef].AsString(); 59 get => this.Fields[(int)IIsWebVirtualDirSymbolFields.WebRef].AsString();
60 set => this.Set((int)IIsWebVirtualDirTupleFields.WebRef, value); 60 set => this.Set((int)IIsWebVirtualDirSymbolFields.WebRef, value);
61 } 61 }
62 62
63 public string Alias 63 public string Alias
64 { 64 {
65 get => this.Fields[(int)IIsWebVirtualDirTupleFields.Alias].AsString(); 65 get => this.Fields[(int)IIsWebVirtualDirSymbolFields.Alias].AsString();
66 set => this.Set((int)IIsWebVirtualDirTupleFields.Alias, value); 66 set => this.Set((int)IIsWebVirtualDirSymbolFields.Alias, value);
67 } 67 }
68 68
69 public string DirectoryRef 69 public string DirectoryRef
70 { 70 {
71 get => this.Fields[(int)IIsWebVirtualDirTupleFields.DirectoryRef].AsString(); 71 get => this.Fields[(int)IIsWebVirtualDirSymbolFields.DirectoryRef].AsString();
72 set => this.Set((int)IIsWebVirtualDirTupleFields.DirectoryRef, value); 72 set => this.Set((int)IIsWebVirtualDirSymbolFields.DirectoryRef, value);
73 } 73 }
74 74
75 public string DirPropertiesRef 75 public string DirPropertiesRef
76 { 76 {
77 get => this.Fields[(int)IIsWebVirtualDirTupleFields.DirPropertiesRef].AsString(); 77 get => this.Fields[(int)IIsWebVirtualDirSymbolFields.DirPropertiesRef].AsString();
78 set => this.Set((int)IIsWebVirtualDirTupleFields.DirPropertiesRef, value); 78 set => this.Set((int)IIsWebVirtualDirSymbolFields.DirPropertiesRef, value);
79 } 79 }
80 80
81 public string ApplicationRef 81 public string ApplicationRef
82 { 82 {
83 get => this.Fields[(int)IIsWebVirtualDirTupleFields.ApplicationRef].AsString(); 83 get => this.Fields[(int)IIsWebVirtualDirSymbolFields.ApplicationRef].AsString();
84 set => this.Set((int)IIsWebVirtualDirTupleFields.ApplicationRef, value); 84 set => this.Set((int)IIsWebVirtualDirSymbolFields.ApplicationRef, value);
85 } 85 }
86 } 86 }
87} \ No newline at end of file 87} \ No newline at end of file
diff --git a/src/wixext/Tuples/IisTupleDefinitions.cs b/src/wixext/Tuples/IisTupleDefinitions.cs
index 4017fa27..d6ed80a2 100644
--- a/src/wixext/Tuples/IisTupleDefinitions.cs
+++ b/src/wixext/Tuples/IisTupleDefinitions.cs
@@ -5,7 +5,7 @@ namespace WixToolset.Iis
5 using System; 5 using System;
6 using WixToolset.Data; 6 using WixToolset.Data;
7 7
8 public enum IisTupleDefinitionType 8 public enum IisSymbolDefinitionType
9 { 9 {
10 Certificate, 10 Certificate,
11 CertificateHash, 11 CertificateHash,
@@ -27,13 +27,13 @@ namespace WixToolset.Iis
27 IIsWebVirtualDir, 27 IIsWebVirtualDir,
28 } 28 }
29 29
30 public static partial class IisTupleDefinitions 30 public static partial class IisSymbolDefinitions
31 { 31 {
32 public static readonly Version Version = new Version("4.0.0"); 32 public static readonly Version Version = new Version("4.0.0");
33 33
34 public static IntermediateTupleDefinition ByName(string name) 34 public static IntermediateSymbolDefinition ByName(string name)
35 { 35 {
36 if (!Enum.TryParse(name, out IisTupleDefinitionType type)) 36 if (!Enum.TryParse(name, out IisSymbolDefinitionType type))
37 { 37 {
38 return null; 38 return null;
39 } 39 }
@@ -41,63 +41,63 @@ namespace WixToolset.Iis
41 return ByType(type); 41 return ByType(type);
42 } 42 }
43 43
44 public static IntermediateTupleDefinition ByType(IisTupleDefinitionType type) 44 public static IntermediateSymbolDefinition ByType(IisSymbolDefinitionType type)
45 { 45 {
46 switch (type) 46 switch (type)
47 { 47 {
48 case IisTupleDefinitionType.Certificate: 48 case IisSymbolDefinitionType.Certificate:
49 return IisTupleDefinitions.Certificate; 49 return IisSymbolDefinitions.Certificate;
50 50
51 case IisTupleDefinitionType.CertificateHash: 51 case IisSymbolDefinitionType.CertificateHash:
52 return IisTupleDefinitions.CertificateHash; 52 return IisSymbolDefinitions.CertificateHash;
53 53
54 case IisTupleDefinitionType.IIsAppPool: 54 case IisSymbolDefinitionType.IIsAppPool:
55 return IisTupleDefinitions.IIsAppPool; 55 return IisSymbolDefinitions.IIsAppPool;
56 56
57 case IisTupleDefinitionType.IIsFilter: 57 case IisSymbolDefinitionType.IIsFilter:
58 return IisTupleDefinitions.IIsFilter; 58 return IisSymbolDefinitions.IIsFilter;
59 59
60 case IisTupleDefinitionType.IIsHttpHeader: 60 case IisSymbolDefinitionType.IIsHttpHeader:
61 return IisTupleDefinitions.IIsHttpHeader; 61 return IisSymbolDefinitions.IIsHttpHeader;
62 62
63 case IisTupleDefinitionType.IIsMimeMap: 63 case IisSymbolDefinitionType.IIsMimeMap:
64 return IisTupleDefinitions.IIsMimeMap; 64 return IisSymbolDefinitions.IIsMimeMap;
65 65
66 case IisTupleDefinitionType.IIsProperty: 66 case IisSymbolDefinitionType.IIsProperty:
67 return IisTupleDefinitions.IIsProperty; 67 return IisSymbolDefinitions.IIsProperty;
68 68
69 case IisTupleDefinitionType.IIsWebAddress: 69 case IisSymbolDefinitionType.IIsWebAddress:
70 return IisTupleDefinitions.IIsWebAddress; 70 return IisSymbolDefinitions.IIsWebAddress;
71 71
72 case IisTupleDefinitionType.IIsWebApplication: 72 case IisSymbolDefinitionType.IIsWebApplication:
73 return IisTupleDefinitions.IIsWebApplication; 73 return IisSymbolDefinitions.IIsWebApplication;
74 74
75 case IisTupleDefinitionType.IIsWebApplicationExtension: 75 case IisSymbolDefinitionType.IIsWebApplicationExtension:
76 return IisTupleDefinitions.IIsWebApplicationExtension; 76 return IisSymbolDefinitions.IIsWebApplicationExtension;
77 77
78 case IisTupleDefinitionType.IIsWebDir: 78 case IisSymbolDefinitionType.IIsWebDir:
79 return IisTupleDefinitions.IIsWebDir; 79 return IisSymbolDefinitions.IIsWebDir;
80 80
81 case IisTupleDefinitionType.IIsWebDirProperties: 81 case IisSymbolDefinitionType.IIsWebDirProperties:
82 return IisTupleDefinitions.IIsWebDirProperties; 82 return IisSymbolDefinitions.IIsWebDirProperties;
83 83
84 case IisTupleDefinitionType.IIsWebError: 84 case IisSymbolDefinitionType.IIsWebError:
85 return IisTupleDefinitions.IIsWebError; 85 return IisSymbolDefinitions.IIsWebError;
86 86
87 case IisTupleDefinitionType.IIsWebLog: 87 case IisSymbolDefinitionType.IIsWebLog:
88 return IisTupleDefinitions.IIsWebLog; 88 return IisSymbolDefinitions.IIsWebLog;
89 89
90 case IisTupleDefinitionType.IIsWebServiceExtension: 90 case IisSymbolDefinitionType.IIsWebServiceExtension:
91 return IisTupleDefinitions.IIsWebServiceExtension; 91 return IisSymbolDefinitions.IIsWebServiceExtension;
92 92
93 case IisTupleDefinitionType.IIsWebSite: 93 case IisSymbolDefinitionType.IIsWebSite:
94 return IisTupleDefinitions.IIsWebSite; 94 return IisSymbolDefinitions.IIsWebSite;
95 95
96 case IisTupleDefinitionType.IIsWebSiteCertificates: 96 case IisSymbolDefinitionType.IIsWebSiteCertificates:
97 return IisTupleDefinitions.IIsWebSiteCertificates; 97 return IisSymbolDefinitions.IIsWebSiteCertificates;
98 98
99 case IisTupleDefinitionType.IIsWebVirtualDir: 99 case IisSymbolDefinitionType.IIsWebVirtualDir:
100 return IisTupleDefinitions.IIsWebVirtualDir; 100 return IisSymbolDefinitions.IIsWebVirtualDir;
101 101
102 default: 102 default:
103 throw new ArgumentOutOfRangeException(nameof(type)); 103 throw new ArgumentOutOfRangeException(nameof(type));
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 18:05:57 +0000