From 238d3caad2d0595c6276fdf7565d45466ce0fe72 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 26 Jun 2020 10:16:32 -0700 Subject: The Great Tuple to Symbol Rename (tm) --- .../WixToolsetTest.Util/UtilExtensionFixture.cs | 2 +- src/wixext/Tuples/EventManifestTuple.cs | 34 +++--- src/wixext/Tuples/FileSharePermissionsTuple.cs | 40 +++---- src/wixext/Tuples/FileShareTuple.cs | 46 ++++---- src/wixext/Tuples/GroupTuple.cs | 40 +++---- src/wixext/Tuples/PerfmonManifestTuple.cs | 40 +++---- src/wixext/Tuples/PerfmonTuple.cs | 40 +++---- src/wixext/Tuples/PerformanceCategoryTuple.cs | 46 ++++---- src/wixext/Tuples/SecureObjectsTuple.cs | 64 +++++------ src/wixext/Tuples/ServiceConfigTuple.cs | 82 +++++++------- src/wixext/Tuples/UserGroupTuple.cs | 34 +++--- src/wixext/Tuples/UserTuple.cs | 52 ++++----- src/wixext/Tuples/UtilTupleDefinitions.cs | 94 ++++++++-------- src/wixext/Tuples/WixCloseApplicationTuple.cs | 70 ++++++------ src/wixext/Tuples/WixDetectSHA2SupportTuple.cs | 20 ++-- src/wixext/Tuples/WixFormatFilesTuple.cs | 34 +++--- src/wixext/Tuples/WixInternetShortcutTuple.cs | 64 +++++------ src/wixext/Tuples/WixRemoveFolderExTuple.cs | 40 +++---- src/wixext/Tuples/WixRestartResourceTuple.cs | 40 +++---- src/wixext/Tuples/WixTouchFileTuple.cs | 40 +++---- src/wixext/Tuples/XmlConfigTuple.cs | 70 ++++++------ src/wixext/Tuples/XmlFileTuple.cs | 64 +++++------ src/wixext/UtilCompiler.cs | 124 ++++++++++----------- src/wixext/UtilExtensionData.cs | 10 +- src/wixext/UtilTableDefinitions.cs | 76 ++++++------- src/wixext/WixToolset.Util.wixext.csproj | 8 +- 26 files changed, 637 insertions(+), 637 deletions(-) (limited to 'src') diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 75e0b14f..9c83209b 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -7,7 +7,7 @@ namespace WixToolsetTest.Util using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Util; using Xunit; diff --git a/src/wixext/Tuples/EventManifestTuple.cs b/src/wixext/Tuples/EventManifestTuple.cs index 364604be..ccd3c899 100644 --- a/src/wixext/Tuples/EventManifestTuple.cs +++ b/src/wixext/Tuples/EventManifestTuple.cs @@ -3,53 +3,53 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition EventManifest = new IntermediateTupleDefinition( - UtilTupleDefinitionType.EventManifest.ToString(), + public static readonly IntermediateSymbolDefinition EventManifest = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.EventManifest.ToString(), new[] { - new IntermediateFieldDefinition(nameof(EventManifestTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(EventManifestTupleFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(EventManifestSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(EventManifestSymbolFields.File), IntermediateFieldType.String), }, - typeof(EventManifestTuple)); + typeof(EventManifestSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum EventManifestTupleFields + public enum EventManifestSymbolFields { ComponentRef, File, } - public class EventManifestTuple : IntermediateTuple + public class EventManifestSymbol : IntermediateSymbol { - public EventManifestTuple() : base(UtilTupleDefinitions.EventManifest, null, null) + public EventManifestSymbol() : base(UtilSymbolDefinitions.EventManifest, null, null) { } - public EventManifestTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.EventManifest, sourceLineNumber, id) + public EventManifestSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.EventManifest, sourceLineNumber, id) { } - public IntermediateField this[EventManifestTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[EventManifestSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)EventManifestTupleFields.ComponentRef].AsString(); - set => this.Set((int)EventManifestTupleFields.ComponentRef, value); + get => this.Fields[(int)EventManifestSymbolFields.ComponentRef].AsString(); + set => this.Set((int)EventManifestSymbolFields.ComponentRef, value); } public string File { - get => this.Fields[(int)EventManifestTupleFields.File].AsString(); - set => this.Set((int)EventManifestTupleFields.File, value); + get => this.Fields[(int)EventManifestSymbolFields.File].AsString(); + set => this.Set((int)EventManifestSymbolFields.File, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/FileSharePermissionsTuple.cs b/src/wixext/Tuples/FileSharePermissionsTuple.cs index 1db01b98..3db92f22 100644 --- a/src/wixext/Tuples/FileSharePermissionsTuple.cs +++ b/src/wixext/Tuples/FileSharePermissionsTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition FileSharePermissions = new IntermediateTupleDefinition( - UtilTupleDefinitionType.FileSharePermissions.ToString(), + public static readonly IntermediateSymbolDefinition FileSharePermissions = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.FileSharePermissions.ToString(), new[] { - new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.FileShareRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.UserRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.Permissions), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.FileShareRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.UserRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileSharePermissionsSymbolFields.Permissions), IntermediateFieldType.Number), }, - typeof(FileSharePermissionsTuple)); + typeof(FileSharePermissionsSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum FileSharePermissionsTupleFields + public enum FileSharePermissionsSymbolFields { FileShareRef, UserRef, Permissions, } - public class FileSharePermissionsTuple : IntermediateTuple + public class FileSharePermissionsSymbol : IntermediateSymbol { - public FileSharePermissionsTuple() : base(UtilTupleDefinitions.FileSharePermissions, null, null) + public FileSharePermissionsSymbol() : base(UtilSymbolDefinitions.FileSharePermissions, null, null) { } - public FileSharePermissionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.FileSharePermissions, sourceLineNumber, id) + public FileSharePermissionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.FileSharePermissions, sourceLineNumber, id) { } - public IntermediateField this[FileSharePermissionsTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[FileSharePermissionsSymbolFields index] => this.Fields[(int)index]; public string FileShareRef { - get => this.Fields[(int)FileSharePermissionsTupleFields.FileShareRef].AsString(); - set => this.Set((int)FileSharePermissionsTupleFields.FileShareRef, value); + get => this.Fields[(int)FileSharePermissionsSymbolFields.FileShareRef].AsString(); + set => this.Set((int)FileSharePermissionsSymbolFields.FileShareRef, value); } public string UserRef { - get => this.Fields[(int)FileSharePermissionsTupleFields.UserRef].AsString(); - set => this.Set((int)FileSharePermissionsTupleFields.UserRef, value); + get => this.Fields[(int)FileSharePermissionsSymbolFields.UserRef].AsString(); + set => this.Set((int)FileSharePermissionsSymbolFields.UserRef, value); } public int Permissions { - get => this.Fields[(int)FileSharePermissionsTupleFields.Permissions].AsNumber(); - set => this.Set((int)FileSharePermissionsTupleFields.Permissions, value); + get => this.Fields[(int)FileSharePermissionsSymbolFields.Permissions].AsNumber(); + set => this.Set((int)FileSharePermissionsSymbolFields.Permissions, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/FileShareTuple.cs b/src/wixext/Tuples/FileShareTuple.cs index 6a04f6af..c956ff42 100644 --- a/src/wixext/Tuples/FileShareTuple.cs +++ b/src/wixext/Tuples/FileShareTuple.cs @@ -3,28 +3,28 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition FileShare = new IntermediateTupleDefinition( - UtilTupleDefinitionType.FileShare.ToString(), + public static readonly IntermediateSymbolDefinition FileShare = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.FileShare.ToString(), new[] { - new IntermediateFieldDefinition(nameof(FileShareTupleFields.ShareName), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareTupleFields.Description), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareTupleFields.DirectoryRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.ShareName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.Description), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareSymbolFields.DirectoryRef), IntermediateFieldType.String), }, - typeof(FileShareTuple)); + typeof(FileShareSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum FileShareTupleFields + public enum FileShareSymbolFields { ShareName, ComponentRef, @@ -32,40 +32,40 @@ namespace WixToolset.Util.Tuples DirectoryRef, } - public class FileShareTuple : IntermediateTuple + public class FileShareSymbol : IntermediateSymbol { - public FileShareTuple() : base(UtilTupleDefinitions.FileShare, null, null) + public FileShareSymbol() : base(UtilSymbolDefinitions.FileShare, null, null) { } - public FileShareTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.FileShare, sourceLineNumber, id) + public FileShareSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.FileShare, sourceLineNumber, id) { } - public IntermediateField this[FileShareTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[FileShareSymbolFields index] => this.Fields[(int)index]; public string ShareName { - get => this.Fields[(int)FileShareTupleFields.ShareName].AsString(); - set => this.Set((int)FileShareTupleFields.ShareName, value); + get => this.Fields[(int)FileShareSymbolFields.ShareName].AsString(); + set => this.Set((int)FileShareSymbolFields.ShareName, value); } public string ComponentRef { - get => this.Fields[(int)FileShareTupleFields.ComponentRef].AsString(); - set => this.Set((int)FileShareTupleFields.ComponentRef, value); + get => this.Fields[(int)FileShareSymbolFields.ComponentRef].AsString(); + set => this.Set((int)FileShareSymbolFields.ComponentRef, value); } public string Description { - get => this.Fields[(int)FileShareTupleFields.Description].AsString(); - set => this.Set((int)FileShareTupleFields.Description, value); + get => this.Fields[(int)FileShareSymbolFields.Description].AsString(); + set => this.Set((int)FileShareSymbolFields.Description, value); } public string DirectoryRef { - get => this.Fields[(int)FileShareTupleFields.DirectoryRef].AsString(); - set => this.Set((int)FileShareTupleFields.DirectoryRef, value); + get => this.Fields[(int)FileShareSymbolFields.DirectoryRef].AsString(); + set => this.Set((int)FileShareSymbolFields.DirectoryRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/GroupTuple.cs b/src/wixext/Tuples/GroupTuple.cs index 2b270103..b378db44 100644 --- a/src/wixext/Tuples/GroupTuple.cs +++ b/src/wixext/Tuples/GroupTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition Group = new IntermediateTupleDefinition( - UtilTupleDefinitionType.Group.ToString(), + public static readonly IntermediateSymbolDefinition Group = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.Group.ToString(), new[] { - new IntermediateFieldDefinition(nameof(GroupTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(GroupTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(GroupTupleFields.Domain), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(GroupSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(GroupSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(GroupSymbolFields.Domain), IntermediateFieldType.String), }, - typeof(GroupTuple)); + typeof(GroupSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum GroupTupleFields + public enum GroupSymbolFields { ComponentRef, Name, Domain, } - public class GroupTuple : IntermediateTuple + public class GroupSymbol : IntermediateSymbol { - public GroupTuple() : base(UtilTupleDefinitions.Group, null, null) + public GroupSymbol() : base(UtilSymbolDefinitions.Group, null, null) { } - public GroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.Group, sourceLineNumber, id) + public GroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.Group, sourceLineNumber, id) { } - public IntermediateField this[GroupTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[GroupSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)GroupTupleFields.ComponentRef].AsString(); - set => this.Set((int)GroupTupleFields.ComponentRef, value); + get => this.Fields[(int)GroupSymbolFields.ComponentRef].AsString(); + set => this.Set((int)GroupSymbolFields.ComponentRef, value); } public string Name { - get => this.Fields[(int)GroupTupleFields.Name].AsString(); - set => this.Set((int)GroupTupleFields.Name, value); + get => this.Fields[(int)GroupSymbolFields.Name].AsString(); + set => this.Set((int)GroupSymbolFields.Name, value); } public string Domain { - get => this.Fields[(int)GroupTupleFields.Domain].AsString(); - set => this.Set((int)GroupTupleFields.Domain, value); + get => this.Fields[(int)GroupSymbolFields.Domain].AsString(); + set => this.Set((int)GroupSymbolFields.Domain, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/PerfmonManifestTuple.cs b/src/wixext/Tuples/PerfmonManifestTuple.cs index 9520105a..03fef14e 100644 --- a/src/wixext/Tuples/PerfmonManifestTuple.cs +++ b/src/wixext/Tuples/PerfmonManifestTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition PerfmonManifest = new IntermediateTupleDefinition( - UtilTupleDefinitionType.PerfmonManifest.ToString(), + public static readonly IntermediateSymbolDefinition PerfmonManifest = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.PerfmonManifest.ToString(), new[] { - new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.ResourceFileDirectory), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonManifestSymbolFields.ResourceFileDirectory), IntermediateFieldType.String), }, - typeof(PerfmonManifestTuple)); + typeof(PerfmonManifestSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum PerfmonManifestTupleFields + public enum PerfmonManifestSymbolFields { ComponentRef, File, ResourceFileDirectory, } - public class PerfmonManifestTuple : IntermediateTuple + public class PerfmonManifestSymbol : IntermediateSymbol { - public PerfmonManifestTuple() : base(UtilTupleDefinitions.PerfmonManifest, null, null) + public PerfmonManifestSymbol() : base(UtilSymbolDefinitions.PerfmonManifest, null, null) { } - public PerfmonManifestTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.PerfmonManifest, sourceLineNumber, id) + public PerfmonManifestSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.PerfmonManifest, sourceLineNumber, id) { } - public IntermediateField this[PerfmonManifestTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[PerfmonManifestSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)PerfmonManifestTupleFields.ComponentRef].AsString(); - set => this.Set((int)PerfmonManifestTupleFields.ComponentRef, value); + get => this.Fields[(int)PerfmonManifestSymbolFields.ComponentRef].AsString(); + set => this.Set((int)PerfmonManifestSymbolFields.ComponentRef, value); } public string File { - get => this.Fields[(int)PerfmonManifestTupleFields.File].AsString(); - set => this.Set((int)PerfmonManifestTupleFields.File, value); + get => this.Fields[(int)PerfmonManifestSymbolFields.File].AsString(); + set => this.Set((int)PerfmonManifestSymbolFields.File, value); } public string ResourceFileDirectory { - get => this.Fields[(int)PerfmonManifestTupleFields.ResourceFileDirectory].AsString(); - set => this.Set((int)PerfmonManifestTupleFields.ResourceFileDirectory, value); + get => this.Fields[(int)PerfmonManifestSymbolFields.ResourceFileDirectory].AsString(); + set => this.Set((int)PerfmonManifestSymbolFields.ResourceFileDirectory, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/PerfmonTuple.cs b/src/wixext/Tuples/PerfmonTuple.cs index 1fb6ef6b..6784ebd1 100644 --- a/src/wixext/Tuples/PerfmonTuple.cs +++ b/src/wixext/Tuples/PerfmonTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition Perfmon = new IntermediateTupleDefinition( - UtilTupleDefinitionType.Perfmon.ToString(), + public static readonly IntermediateSymbolDefinition Perfmon = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.Perfmon.ToString(), new[] { - new IntermediateFieldDefinition(nameof(PerfmonTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonTupleFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerfmonTupleFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonSymbolFields.Name), IntermediateFieldType.String), }, - typeof(PerfmonTuple)); + typeof(PerfmonSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum PerfmonTupleFields + public enum PerfmonSymbolFields { ComponentRef, File, Name, } - public class PerfmonTuple : IntermediateTuple + public class PerfmonSymbol : IntermediateSymbol { - public PerfmonTuple() : base(UtilTupleDefinitions.Perfmon, null, null) + public PerfmonSymbol() : base(UtilSymbolDefinitions.Perfmon, null, null) { } - public PerfmonTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.Perfmon, sourceLineNumber, id) + public PerfmonSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.Perfmon, sourceLineNumber, id) { } - public IntermediateField this[PerfmonTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[PerfmonSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)PerfmonTupleFields.ComponentRef].AsString(); - set => this.Set((int)PerfmonTupleFields.ComponentRef, value); + get => this.Fields[(int)PerfmonSymbolFields.ComponentRef].AsString(); + set => this.Set((int)PerfmonSymbolFields.ComponentRef, value); } public string File { - get => this.Fields[(int)PerfmonTupleFields.File].AsString(); - set => this.Set((int)PerfmonTupleFields.File, value); + get => this.Fields[(int)PerfmonSymbolFields.File].AsString(); + set => this.Set((int)PerfmonSymbolFields.File, value); } public string Name { - get => this.Fields[(int)PerfmonTupleFields.Name].AsString(); - set => this.Set((int)PerfmonTupleFields.Name, value); + get => this.Fields[(int)PerfmonSymbolFields.Name].AsString(); + set => this.Set((int)PerfmonSymbolFields.Name, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/PerformanceCategoryTuple.cs b/src/wixext/Tuples/PerformanceCategoryTuple.cs index 16705466..5ecf388c 100644 --- a/src/wixext/Tuples/PerformanceCategoryTuple.cs +++ b/src/wixext/Tuples/PerformanceCategoryTuple.cs @@ -3,28 +3,28 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition PerformanceCategory = new IntermediateTupleDefinition( - UtilTupleDefinitionType.PerformanceCategory.ToString(), + public static readonly IntermediateSymbolDefinition PerformanceCategory = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.PerformanceCategory.ToString(), new[] { - new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.IniData), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.ConstantData), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.IniData), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerformanceCategorySymbolFields.ConstantData), IntermediateFieldType.String), }, - typeof(PerformanceCategoryTuple)); + typeof(PerformanceCategorySymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum PerformanceCategoryTupleFields + public enum PerformanceCategorySymbolFields { ComponentRef, Name, @@ -32,40 +32,40 @@ namespace WixToolset.Util.Tuples ConstantData, } - public class PerformanceCategoryTuple : IntermediateTuple + public class PerformanceCategorySymbol : IntermediateSymbol { - public PerformanceCategoryTuple() : base(UtilTupleDefinitions.PerformanceCategory, null, null) + public PerformanceCategorySymbol() : base(UtilSymbolDefinitions.PerformanceCategory, null, null) { } - public PerformanceCategoryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.PerformanceCategory, sourceLineNumber, id) + public PerformanceCategorySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.PerformanceCategory, sourceLineNumber, id) { } - public IntermediateField this[PerformanceCategoryTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[PerformanceCategorySymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)PerformanceCategoryTupleFields.ComponentRef].AsString(); - set => this.Set((int)PerformanceCategoryTupleFields.ComponentRef, value); + get => this.Fields[(int)PerformanceCategorySymbolFields.ComponentRef].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.ComponentRef, value); } public string Name { - get => this.Fields[(int)PerformanceCategoryTupleFields.Name].AsString(); - set => this.Set((int)PerformanceCategoryTupleFields.Name, value); + get => this.Fields[(int)PerformanceCategorySymbolFields.Name].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.Name, value); } public string IniData { - get => this.Fields[(int)PerformanceCategoryTupleFields.IniData].AsString(); - set => this.Set((int)PerformanceCategoryTupleFields.IniData, value); + get => this.Fields[(int)PerformanceCategorySymbolFields.IniData].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.IniData, value); } public string ConstantData { - get => this.Fields[(int)PerformanceCategoryTupleFields.ConstantData].AsString(); - set => this.Set((int)PerformanceCategoryTupleFields.ConstantData, value); + get => this.Fields[(int)PerformanceCategorySymbolFields.ConstantData].AsString(); + set => this.Set((int)PerformanceCategorySymbolFields.ConstantData, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/SecureObjectsTuple.cs b/src/wixext/Tuples/SecureObjectsTuple.cs index 95c24979..b90df521 100644 --- a/src/wixext/Tuples/SecureObjectsTuple.cs +++ b/src/wixext/Tuples/SecureObjectsTuple.cs @@ -3,31 +3,31 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition SecureObjects = new IntermediateTupleDefinition( - UtilTupleDefinitionType.SecureObjects.ToString(), + public static readonly IntermediateSymbolDefinition SecureObjects = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.SecureObjects.ToString(), new[] { - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.SecureObject), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Table), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Domain), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.User), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Attributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Permission), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.SecureObject), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Table), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Domain), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.User), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.Permission), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(SecureObjectsSymbolFields.ComponentRef), IntermediateFieldType.String), }, - typeof(SecureObjectsTuple)); + typeof(SecureObjectsSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum SecureObjectsTupleFields + public enum SecureObjectsSymbolFields { SecureObject, Table, @@ -38,58 +38,58 @@ namespace WixToolset.Util.Tuples ComponentRef, } - public class SecureObjectsTuple : IntermediateTuple + public class SecureObjectsSymbol : IntermediateSymbol { - public SecureObjectsTuple() : base(UtilTupleDefinitions.SecureObjects, null, null) + public SecureObjectsSymbol() : base(UtilSymbolDefinitions.SecureObjects, null, null) { } - public SecureObjectsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.SecureObjects, sourceLineNumber, id) + public SecureObjectsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.SecureObjects, sourceLineNumber, id) { } - public IntermediateField this[SecureObjectsTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[SecureObjectsSymbolFields index] => this.Fields[(int)index]; public string SecureObject { - get => this.Fields[(int)SecureObjectsTupleFields.SecureObject].AsString(); - set => this.Set((int)SecureObjectsTupleFields.SecureObject, value); + get => this.Fields[(int)SecureObjectsSymbolFields.SecureObject].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.SecureObject, value); } public string Table { - get => this.Fields[(int)SecureObjectsTupleFields.Table].AsString(); - set => this.Set((int)SecureObjectsTupleFields.Table, value); + get => this.Fields[(int)SecureObjectsSymbolFields.Table].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.Table, value); } public string Domain { - get => this.Fields[(int)SecureObjectsTupleFields.Domain].AsString(); - set => this.Set((int)SecureObjectsTupleFields.Domain, value); + get => this.Fields[(int)SecureObjectsSymbolFields.Domain].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.Domain, value); } public string User { - get => this.Fields[(int)SecureObjectsTupleFields.User].AsString(); - set => this.Set((int)SecureObjectsTupleFields.User, value); + get => this.Fields[(int)SecureObjectsSymbolFields.User].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.User, value); } public int Attributes { - get => this.Fields[(int)SecureObjectsTupleFields.Attributes].AsNumber(); - set => this.Set((int)SecureObjectsTupleFields.Attributes, value); + get => this.Fields[(int)SecureObjectsSymbolFields.Attributes].AsNumber(); + set => this.Set((int)SecureObjectsSymbolFields.Attributes, value); } public int? Permission { - get => this.Fields[(int)SecureObjectsTupleFields.Permission].AsNullableNumber(); - set => this.Set((int)SecureObjectsTupleFields.Permission, value); + get => this.Fields[(int)SecureObjectsSymbolFields.Permission].AsNullableNumber(); + set => this.Set((int)SecureObjectsSymbolFields.Permission, value); } public string ComponentRef { - get => this.Fields[(int)SecureObjectsTupleFields.ComponentRef].AsString(); - set => this.Set((int)SecureObjectsTupleFields.ComponentRef, value); + get => this.Fields[(int)SecureObjectsSymbolFields.ComponentRef].AsString(); + set => this.Set((int)SecureObjectsSymbolFields.ComponentRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ServiceConfigTuple.cs b/src/wixext/Tuples/ServiceConfigTuple.cs index 714396bc..3a877f9b 100644 --- a/src/wixext/Tuples/ServiceConfigTuple.cs +++ b/src/wixext/Tuples/ServiceConfigTuple.cs @@ -3,34 +3,34 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition ServiceConfig = new IntermediateTupleDefinition( - UtilTupleDefinitionType.ServiceConfig.ToString(), + public static readonly IntermediateSymbolDefinition ServiceConfig = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.ServiceConfig.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ServiceName), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.NewService), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.FirstFailureActionType), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.SecondFailureActionType), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ThirdFailureActionType), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ResetPeriodInDays), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.RestartServiceDelayInSeconds), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ProgramCommandLine), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.RebootMessage), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ServiceName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.NewService), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.FirstFailureActionType), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.SecondFailureActionType), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ThirdFailureActionType), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ResetPeriodInDays), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RestartServiceDelayInSeconds), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ProgramCommandLine), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RebootMessage), IntermediateFieldType.String), }, - typeof(ServiceConfigTuple)); + typeof(ServiceConfigSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum ServiceConfigTupleFields + public enum ServiceConfigSymbolFields { ServiceName, ComponentRef, @@ -44,76 +44,76 @@ namespace WixToolset.Util.Tuples RebootMessage, } - public class ServiceConfigTuple : IntermediateTuple + public class ServiceConfigSymbol : IntermediateSymbol { - public ServiceConfigTuple() : base(UtilTupleDefinitions.ServiceConfig, null, null) + public ServiceConfigSymbol() : base(UtilSymbolDefinitions.ServiceConfig, null, null) { } - public ServiceConfigTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.ServiceConfig, sourceLineNumber, id) + public ServiceConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.ServiceConfig, sourceLineNumber, id) { } - public IntermediateField this[ServiceConfigTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ServiceConfigSymbolFields index] => this.Fields[(int)index]; public string ServiceName { - get => this.Fields[(int)ServiceConfigTupleFields.ServiceName].AsString(); - set => this.Set((int)ServiceConfigTupleFields.ServiceName, value); + get => this.Fields[(int)ServiceConfigSymbolFields.ServiceName].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ServiceName, value); } public string ComponentRef { - get => this.Fields[(int)ServiceConfigTupleFields.ComponentRef].AsString(); - set => this.Set((int)ServiceConfigTupleFields.ComponentRef, value); + get => this.Fields[(int)ServiceConfigSymbolFields.ComponentRef].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ComponentRef, value); } public int NewService { - get => this.Fields[(int)ServiceConfigTupleFields.NewService].AsNumber(); - set => this.Set((int)ServiceConfigTupleFields.NewService, value); + get => this.Fields[(int)ServiceConfigSymbolFields.NewService].AsNumber(); + set => this.Set((int)ServiceConfigSymbolFields.NewService, value); } public string FirstFailureActionType { - get => this.Fields[(int)ServiceConfigTupleFields.FirstFailureActionType].AsString(); - set => this.Set((int)ServiceConfigTupleFields.FirstFailureActionType, value); + get => this.Fields[(int)ServiceConfigSymbolFields.FirstFailureActionType].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.FirstFailureActionType, value); } public string SecondFailureActionType { - get => this.Fields[(int)ServiceConfigTupleFields.SecondFailureActionType].AsString(); - set => this.Set((int)ServiceConfigTupleFields.SecondFailureActionType, value); + get => this.Fields[(int)ServiceConfigSymbolFields.SecondFailureActionType].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.SecondFailureActionType, value); } public string ThirdFailureActionType { - get => this.Fields[(int)ServiceConfigTupleFields.ThirdFailureActionType].AsString(); - set => this.Set((int)ServiceConfigTupleFields.ThirdFailureActionType, value); + get => this.Fields[(int)ServiceConfigSymbolFields.ThirdFailureActionType].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ThirdFailureActionType, value); } public int? ResetPeriodInDays { - get => this.Fields[(int)ServiceConfigTupleFields.ResetPeriodInDays].AsNullableNumber(); - set => this.Set((int)ServiceConfigTupleFields.ResetPeriodInDays, value); + get => this.Fields[(int)ServiceConfigSymbolFields.ResetPeriodInDays].AsNullableNumber(); + set => this.Set((int)ServiceConfigSymbolFields.ResetPeriodInDays, value); } public int? RestartServiceDelayInSeconds { - get => this.Fields[(int)ServiceConfigTupleFields.RestartServiceDelayInSeconds].AsNullableNumber(); - set => this.Set((int)ServiceConfigTupleFields.RestartServiceDelayInSeconds, value); + get => this.Fields[(int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds].AsNullableNumber(); + set => this.Set((int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds, value); } public string ProgramCommandLine { - get => this.Fields[(int)ServiceConfigTupleFields.ProgramCommandLine].AsString(); - set => this.Set((int)ServiceConfigTupleFields.ProgramCommandLine, value); + get => this.Fields[(int)ServiceConfigSymbolFields.ProgramCommandLine].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.ProgramCommandLine, value); } public string RebootMessage { - get => this.Fields[(int)ServiceConfigTupleFields.RebootMessage].AsString(); - set => this.Set((int)ServiceConfigTupleFields.RebootMessage, value); + get => this.Fields[(int)ServiceConfigSymbolFields.RebootMessage].AsString(); + set => this.Set((int)ServiceConfigSymbolFields.RebootMessage, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/UserGroupTuple.cs b/src/wixext/Tuples/UserGroupTuple.cs index 30c5e9ff..c8f3998e 100644 --- a/src/wixext/Tuples/UserGroupTuple.cs +++ b/src/wixext/Tuples/UserGroupTuple.cs @@ -3,53 +3,53 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition UserGroup = new IntermediateTupleDefinition( - UtilTupleDefinitionType.UserGroup.ToString(), + public static readonly IntermediateSymbolDefinition UserGroup = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.UserGroup.ToString(), new[] { - new IntermediateFieldDefinition(nameof(UserGroupTupleFields.UserRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserGroupTupleFields.GroupRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserGroupSymbolFields.UserRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserGroupSymbolFields.GroupRef), IntermediateFieldType.String), }, - typeof(UserGroupTuple)); + typeof(UserGroupSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum UserGroupTupleFields + public enum UserGroupSymbolFields { UserRef, GroupRef, } - public class UserGroupTuple : IntermediateTuple + public class UserGroupSymbol : IntermediateSymbol { - public UserGroupTuple() : base(UtilTupleDefinitions.UserGroup, null, null) + public UserGroupSymbol() : base(UtilSymbolDefinitions.UserGroup, null, null) { } - public UserGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.UserGroup, sourceLineNumber, id) + public UserGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.UserGroup, sourceLineNumber, id) { } - public IntermediateField this[UserGroupTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[UserGroupSymbolFields index] => this.Fields[(int)index]; public string UserRef { - get => this.Fields[(int)UserGroupTupleFields.UserRef].AsString(); - set => this.Set((int)UserGroupTupleFields.UserRef, value); + get => this.Fields[(int)UserGroupSymbolFields.UserRef].AsString(); + set => this.Set((int)UserGroupSymbolFields.UserRef, value); } public string GroupRef { - get => this.Fields[(int)UserGroupTupleFields.GroupRef].AsString(); - set => this.Set((int)UserGroupTupleFields.GroupRef, value); + get => this.Fields[(int)UserGroupSymbolFields.GroupRef].AsString(); + set => this.Set((int)UserGroupSymbolFields.GroupRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/UserTuple.cs b/src/wixext/Tuples/UserTuple.cs index f11ed78b..5f00064b 100644 --- a/src/wixext/Tuples/UserTuple.cs +++ b/src/wixext/Tuples/UserTuple.cs @@ -3,29 +3,29 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition User = new IntermediateTupleDefinition( - UtilTupleDefinitionType.User.ToString(), + public static readonly IntermediateSymbolDefinition User = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.User.ToString(), new[] { - new IntermediateFieldDefinition(nameof(UserTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserTupleFields.Domain), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserTupleFields.Password), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserTupleFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(UserSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Domain), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Password), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserSymbolFields.Attributes), IntermediateFieldType.Number), }, - typeof(UserTuple)); + typeof(UserSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum UserTupleFields + public enum UserSymbolFields { ComponentRef, Name, @@ -34,46 +34,46 @@ namespace WixToolset.Util.Tuples Attributes, } - public class UserTuple : IntermediateTuple + public class UserSymbol : IntermediateSymbol { - public UserTuple() : base(UtilTupleDefinitions.User, null, null) + public UserSymbol() : base(UtilSymbolDefinitions.User, null, null) { } - public UserTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.User, sourceLineNumber, id) + public UserSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.User, sourceLineNumber, id) { } - public IntermediateField this[UserTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[UserSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)UserTupleFields.ComponentRef].AsString(); - set => this.Set((int)UserTupleFields.ComponentRef, value); + get => this.Fields[(int)UserSymbolFields.ComponentRef].AsString(); + set => this.Set((int)UserSymbolFields.ComponentRef, value); } public string Name { - get => this.Fields[(int)UserTupleFields.Name].AsString(); - set => this.Set((int)UserTupleFields.Name, value); + get => this.Fields[(int)UserSymbolFields.Name].AsString(); + set => this.Set((int)UserSymbolFields.Name, value); } public string Domain { - get => this.Fields[(int)UserTupleFields.Domain].AsString(); - set => this.Set((int)UserTupleFields.Domain, value); + get => this.Fields[(int)UserSymbolFields.Domain].AsString(); + set => this.Set((int)UserSymbolFields.Domain, value); } public string Password { - get => this.Fields[(int)UserTupleFields.Password].AsString(); - set => this.Set((int)UserTupleFields.Password, value); + get => this.Fields[(int)UserSymbolFields.Password].AsString(); + set => this.Set((int)UserSymbolFields.Password, value); } public int Attributes { - get => this.Fields[(int)UserTupleFields.Attributes].AsNumber(); - set => this.Set((int)UserTupleFields.Attributes, value); + get => this.Fields[(int)UserSymbolFields.Attributes].AsNumber(); + set => this.Set((int)UserSymbolFields.Attributes, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/UtilTupleDefinitions.cs b/src/wixext/Tuples/UtilTupleDefinitions.cs index ece64502..ae9c4c81 100644 --- a/src/wixext/Tuples/UtilTupleDefinitions.cs +++ b/src/wixext/Tuples/UtilTupleDefinitions.cs @@ -6,7 +6,7 @@ namespace WixToolset.Util using WixToolset.Data; using WixToolset.Data.Burn; - public enum UtilTupleDefinitionType + public enum UtilSymbolDefinitionType { EventManifest, FileShare, @@ -30,13 +30,13 @@ namespace WixToolset.Util XmlFile, } - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { public static readonly Version Version = new Version("4.0.0"); - public static IntermediateTupleDefinition ByName(string name) + public static IntermediateSymbolDefinition ByName(string name) { - if (!Enum.TryParse(name, out UtilTupleDefinitionType type)) + if (!Enum.TryParse(name, out UtilSymbolDefinitionType type)) { return null; } @@ -44,78 +44,78 @@ namespace WixToolset.Util return ByType(type); } - public static IntermediateTupleDefinition ByType(UtilTupleDefinitionType type) + public static IntermediateSymbolDefinition ByType(UtilSymbolDefinitionType type) { switch (type) { - case UtilTupleDefinitionType.EventManifest: - return UtilTupleDefinitions.EventManifest; + case UtilSymbolDefinitionType.EventManifest: + return UtilSymbolDefinitions.EventManifest; - case UtilTupleDefinitionType.FileShare: - return UtilTupleDefinitions.FileShare; + case UtilSymbolDefinitionType.FileShare: + return UtilSymbolDefinitions.FileShare; - case UtilTupleDefinitionType.FileSharePermissions: - return UtilTupleDefinitions.FileSharePermissions; + case UtilSymbolDefinitionType.FileSharePermissions: + return UtilSymbolDefinitions.FileSharePermissions; - case UtilTupleDefinitionType.Group: - return UtilTupleDefinitions.Group; + case UtilSymbolDefinitionType.Group: + return UtilSymbolDefinitions.Group; - case UtilTupleDefinitionType.Perfmon: - return UtilTupleDefinitions.Perfmon; + case UtilSymbolDefinitionType.Perfmon: + return UtilSymbolDefinitions.Perfmon; - case UtilTupleDefinitionType.PerfmonManifest: - return UtilTupleDefinitions.PerfmonManifest; + case UtilSymbolDefinitionType.PerfmonManifest: + return UtilSymbolDefinitions.PerfmonManifest; - case UtilTupleDefinitionType.PerformanceCategory: - return UtilTupleDefinitions.PerformanceCategory; + case UtilSymbolDefinitionType.PerformanceCategory: + return UtilSymbolDefinitions.PerformanceCategory; - case UtilTupleDefinitionType.SecureObjects: - return UtilTupleDefinitions.SecureObjects; + case UtilSymbolDefinitionType.SecureObjects: + return UtilSymbolDefinitions.SecureObjects; - case UtilTupleDefinitionType.ServiceConfig: - return UtilTupleDefinitions.ServiceConfig; + case UtilSymbolDefinitionType.ServiceConfig: + return UtilSymbolDefinitions.ServiceConfig; - case UtilTupleDefinitionType.User: - return UtilTupleDefinitions.User; + case UtilSymbolDefinitionType.User: + return UtilSymbolDefinitions.User; - case UtilTupleDefinitionType.UserGroup: - return UtilTupleDefinitions.UserGroup; + case UtilSymbolDefinitionType.UserGroup: + return UtilSymbolDefinitions.UserGroup; - case UtilTupleDefinitionType.WixCloseApplication: - return UtilTupleDefinitions.WixCloseApplication; + case UtilSymbolDefinitionType.WixCloseApplication: + return UtilSymbolDefinitions.WixCloseApplication; - case UtilTupleDefinitionType.WixDetectSHA2Support: - return UtilTupleDefinitions.WixDetectSHA2Support; + case UtilSymbolDefinitionType.WixDetectSHA2Support: + return UtilSymbolDefinitions.WixDetectSHA2Support; - case UtilTupleDefinitionType.WixFormatFiles: - return UtilTupleDefinitions.WixFormatFiles; + case UtilSymbolDefinitionType.WixFormatFiles: + return UtilSymbolDefinitions.WixFormatFiles; - case UtilTupleDefinitionType.WixInternetShortcut: - return UtilTupleDefinitions.WixInternetShortcut; + case UtilSymbolDefinitionType.WixInternetShortcut: + return UtilSymbolDefinitions.WixInternetShortcut; - case UtilTupleDefinitionType.WixRemoveFolderEx: - return UtilTupleDefinitions.WixRemoveFolderEx; + case UtilSymbolDefinitionType.WixRemoveFolderEx: + return UtilSymbolDefinitions.WixRemoveFolderEx; - case UtilTupleDefinitionType.WixRestartResource: - return UtilTupleDefinitions.WixRestartResource; + case UtilSymbolDefinitionType.WixRestartResource: + return UtilSymbolDefinitions.WixRestartResource; - case UtilTupleDefinitionType.WixTouchFile: - return UtilTupleDefinitions.WixTouchFile; + case UtilSymbolDefinitionType.WixTouchFile: + return UtilSymbolDefinitions.WixTouchFile; - case UtilTupleDefinitionType.XmlConfig: - return UtilTupleDefinitions.XmlConfig; + case UtilSymbolDefinitionType.XmlConfig: + return UtilSymbolDefinitions.XmlConfig; - case UtilTupleDefinitionType.XmlFile: - return UtilTupleDefinitions.XmlFile; + case UtilSymbolDefinitionType.XmlFile: + return UtilSymbolDefinitions.XmlFile; default: throw new ArgumentOutOfRangeException(nameof(type)); } } - static UtilTupleDefinitions() + static UtilSymbolDefinitions() { - WixDetectSHA2Support.AddTag(BurnConstants.BundleExtensionSearchTupleDefinitionTag); + WixDetectSHA2Support.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag); } } } diff --git a/src/wixext/Tuples/WixCloseApplicationTuple.cs b/src/wixext/Tuples/WixCloseApplicationTuple.cs index 2deebbae..0738e3e4 100644 --- a/src/wixext/Tuples/WixCloseApplicationTuple.cs +++ b/src/wixext/Tuples/WixCloseApplicationTuple.cs @@ -3,32 +3,32 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixCloseApplication = new IntermediateTupleDefinition( - UtilTupleDefinitionType.WixCloseApplication.ToString(), + public static readonly IntermediateSymbolDefinition WixCloseApplication = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixCloseApplication.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Target), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Description), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Condition), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Attributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Sequence), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Property), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.TerminateExitCode), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Timeout), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Target), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Description), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Condition), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Sequence), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Property), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.TerminateExitCode), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCloseApplicationSymbolFields.Timeout), IntermediateFieldType.Number), }, - typeof(WixCloseApplicationTuple)); + typeof(WixCloseApplicationSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum WixCloseApplicationTupleFields + public enum WixCloseApplicationSymbolFields { Target, Description, @@ -40,64 +40,64 @@ namespace WixToolset.Util.Tuples Timeout, } - public class WixCloseApplicationTuple : IntermediateTuple + public class WixCloseApplicationSymbol : IntermediateSymbol { - public WixCloseApplicationTuple() : base(UtilTupleDefinitions.WixCloseApplication, null, null) + public WixCloseApplicationSymbol() : base(UtilSymbolDefinitions.WixCloseApplication, null, null) { } - public WixCloseApplicationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixCloseApplication, sourceLineNumber, id) + public WixCloseApplicationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixCloseApplication, sourceLineNumber, id) { } - public IntermediateField this[WixCloseApplicationTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixCloseApplicationSymbolFields index] => this.Fields[(int)index]; public string Target { - get => this.Fields[(int)WixCloseApplicationTupleFields.Target].AsString(); - set => this.Set((int)WixCloseApplicationTupleFields.Target, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.Target].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Target, value); } public string Description { - get => this.Fields[(int)WixCloseApplicationTupleFields.Description].AsString(); - set => this.Set((int)WixCloseApplicationTupleFields.Description, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.Description].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Description, value); } public string Condition { - get => this.Fields[(int)WixCloseApplicationTupleFields.Condition].AsString(); - set => this.Set((int)WixCloseApplicationTupleFields.Condition, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.Condition].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Condition, value); } public int Attributes { - get => this.Fields[(int)WixCloseApplicationTupleFields.Attributes].AsNumber(); - set => this.Set((int)WixCloseApplicationTupleFields.Attributes, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.Attributes, value); } public int? Sequence { - get => this.Fields[(int)WixCloseApplicationTupleFields.Sequence].AsNullableNumber(); - set => this.Set((int)WixCloseApplicationTupleFields.Sequence, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.Sequence].AsNullableNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.Sequence, value); } public string Property { - get => this.Fields[(int)WixCloseApplicationTupleFields.Property].AsString(); - set => this.Set((int)WixCloseApplicationTupleFields.Property, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.Property].AsString(); + set => this.Set((int)WixCloseApplicationSymbolFields.Property, value); } public int? TerminateExitCode { - get => this.Fields[(int)WixCloseApplicationTupleFields.TerminateExitCode].AsNullableNumber(); - set => this.Set((int)WixCloseApplicationTupleFields.TerminateExitCode, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.TerminateExitCode].AsNullableNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.TerminateExitCode, value); } public int? Timeout { - get => this.Fields[(int)WixCloseApplicationTupleFields.Timeout].AsNullableNumber(); - set => this.Set((int)WixCloseApplicationTupleFields.Timeout, value); + get => this.Fields[(int)WixCloseApplicationSymbolFields.Timeout].AsNullableNumber(); + set => this.Set((int)WixCloseApplicationSymbolFields.Timeout, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs b/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs index 38b76ff2..b518ba3b 100644 --- a/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs +++ b/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs @@ -3,31 +3,31 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixDetectSHA2Support = new IntermediateTupleDefinition( - UtilTupleDefinitionType.WixDetectSHA2Support.ToString(), + public static readonly IntermediateSymbolDefinition WixDetectSHA2Support = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixDetectSHA2Support.ToString(), new IntermediateFieldDefinition[0], - typeof(WixDetectSHA2SupportTuple)); + typeof(WixDetectSHA2SupportSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public class WixDetectSHA2SupportTuple : IntermediateTuple + public class WixDetectSHA2SupportSymbol : IntermediateSymbol { - public WixDetectSHA2SupportTuple() : base(UtilTupleDefinitions.WixDetectSHA2Support, null, null) + public WixDetectSHA2SupportSymbol() : base(UtilSymbolDefinitions.WixDetectSHA2Support, null, null) { } - public WixDetectSHA2SupportTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixDetectSHA2Support, sourceLineNumber, id) + public WixDetectSHA2SupportSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixDetectSHA2Support, sourceLineNumber, id) { } - public IntermediateField this[GroupTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[GroupSymbolFields index] => this.Fields[(int)index]; } } diff --git a/src/wixext/Tuples/WixFormatFilesTuple.cs b/src/wixext/Tuples/WixFormatFilesTuple.cs index 8e7db0c6..38a9b8ff 100644 --- a/src/wixext/Tuples/WixFormatFilesTuple.cs +++ b/src/wixext/Tuples/WixFormatFilesTuple.cs @@ -3,53 +3,53 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixFormatFiles = new IntermediateTupleDefinition( - UtilTupleDefinitionType.WixFormatFiles.ToString(), + public static readonly IntermediateSymbolDefinition WixFormatFiles = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixFormatFiles.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.BinaryRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.FileRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFormatFilesSymbolFields.BinaryRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFormatFilesSymbolFields.FileRef), IntermediateFieldType.String), }, - typeof(WixFormatFilesTuple)); + typeof(WixFormatFilesSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum WixFormatFilesTupleFields + public enum WixFormatFilesSymbolFields { BinaryRef, FileRef, } - public class WixFormatFilesTuple : IntermediateTuple + public class WixFormatFilesSymbol : IntermediateSymbol { - public WixFormatFilesTuple() : base(UtilTupleDefinitions.WixFormatFiles, null, null) + public WixFormatFilesSymbol() : base(UtilSymbolDefinitions.WixFormatFiles, null, null) { } - public WixFormatFilesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixFormatFiles, sourceLineNumber, id) + public WixFormatFilesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixFormatFiles, sourceLineNumber, id) { } - public IntermediateField this[WixFormatFilesTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixFormatFilesSymbolFields index] => this.Fields[(int)index]; public string BinaryRef { - get => this.Fields[(int)WixFormatFilesTupleFields.BinaryRef].AsString(); - set => this.Set((int)WixFormatFilesTupleFields.BinaryRef, value); + get => this.Fields[(int)WixFormatFilesSymbolFields.BinaryRef].AsString(); + set => this.Set((int)WixFormatFilesSymbolFields.BinaryRef, value); } public string FileRef { - get => this.Fields[(int)WixFormatFilesTupleFields.FileRef].AsString(); - set => this.Set((int)WixFormatFilesTupleFields.FileRef, value); + get => this.Fields[(int)WixFormatFilesSymbolFields.FileRef].AsString(); + set => this.Set((int)WixFormatFilesSymbolFields.FileRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixInternetShortcutTuple.cs b/src/wixext/Tuples/WixInternetShortcutTuple.cs index b0dff121..e8265e02 100644 --- a/src/wixext/Tuples/WixInternetShortcutTuple.cs +++ b/src/wixext/Tuples/WixInternetShortcutTuple.cs @@ -3,31 +3,31 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixInternetShortcut = new IntermediateTupleDefinition( - UtilTupleDefinitionType.WixInternetShortcut.ToString(), + public static readonly IntermediateSymbolDefinition WixInternetShortcut = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixInternetShortcut.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.DirectoryRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Target), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Attributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.IconFile), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.IconIndex), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.DirectoryRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Target), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.IconFile), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixInternetShortcutSymbolFields.IconIndex), IntermediateFieldType.Number), }, - typeof(WixInternetShortcutTuple)); + typeof(WixInternetShortcutSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum WixInternetShortcutTupleFields + public enum WixInternetShortcutSymbolFields { ComponentRef, DirectoryRef, @@ -38,58 +38,58 @@ namespace WixToolset.Util.Tuples IconIndex, } - public class WixInternetShortcutTuple : IntermediateTuple + public class WixInternetShortcutSymbol : IntermediateSymbol { - public WixInternetShortcutTuple() : base(UtilTupleDefinitions.WixInternetShortcut, null, null) + public WixInternetShortcutSymbol() : base(UtilSymbolDefinitions.WixInternetShortcut, null, null) { } - public WixInternetShortcutTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixInternetShortcut, sourceLineNumber, id) + public WixInternetShortcutSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixInternetShortcut, sourceLineNumber, id) { } - public IntermediateField this[WixInternetShortcutTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixInternetShortcutSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)WixInternetShortcutTupleFields.ComponentRef].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.ComponentRef, value); + get => this.Fields[(int)WixInternetShortcutSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.ComponentRef, value); } public string DirectoryRef { - get => this.Fields[(int)WixInternetShortcutTupleFields.DirectoryRef].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.DirectoryRef, value); + get => this.Fields[(int)WixInternetShortcutSymbolFields.DirectoryRef].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.DirectoryRef, value); } public string Name { - get => this.Fields[(int)WixInternetShortcutTupleFields.Name].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.Name, value); + get => this.Fields[(int)WixInternetShortcutSymbolFields.Name].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.Name, value); } public string Target { - get => this.Fields[(int)WixInternetShortcutTupleFields.Target].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.Target, value); + get => this.Fields[(int)WixInternetShortcutSymbolFields.Target].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.Target, value); } public int Attributes { - get => this.Fields[(int)WixInternetShortcutTupleFields.Attributes].AsNumber(); - set => this.Set((int)WixInternetShortcutTupleFields.Attributes, value); + get => this.Fields[(int)WixInternetShortcutSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixInternetShortcutSymbolFields.Attributes, value); } public string IconFile { - get => this.Fields[(int)WixInternetShortcutTupleFields.IconFile].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.IconFile, value); + get => this.Fields[(int)WixInternetShortcutSymbolFields.IconFile].AsString(); + set => this.Set((int)WixInternetShortcutSymbolFields.IconFile, value); } public int? IconIndex { - get => this.Fields[(int)WixInternetShortcutTupleFields.IconIndex].AsNullableNumber(); - set => this.Set((int)WixInternetShortcutTupleFields.IconIndex, value); + get => this.Fields[(int)WixInternetShortcutSymbolFields.IconIndex].AsNullableNumber(); + set => this.Set((int)WixInternetShortcutSymbolFields.IconIndex, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixRemoveFolderExTuple.cs b/src/wixext/Tuples/WixRemoveFolderExTuple.cs index d43c59c3..0c50ab8e 100644 --- a/src/wixext/Tuples/WixRemoveFolderExTuple.cs +++ b/src/wixext/Tuples/WixRemoveFolderExTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixRemoveFolderEx = new IntermediateTupleDefinition( - UtilTupleDefinitionType.WixRemoveFolderEx.ToString(), + public static readonly IntermediateSymbolDefinition WixRemoveFolderEx = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixRemoveFolderEx.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.Property), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.InstallMode), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.Property), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExSymbolFields.InstallMode), IntermediateFieldType.Number), }, - typeof(WixRemoveFolderExTuple)); + typeof(WixRemoveFolderExSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum WixRemoveFolderExTupleFields + public enum WixRemoveFolderExSymbolFields { ComponentRef, Property, InstallMode, } - public class WixRemoveFolderExTuple : IntermediateTuple + public class WixRemoveFolderExSymbol : IntermediateSymbol { - public WixRemoveFolderExTuple() : base(UtilTupleDefinitions.WixRemoveFolderEx, null, null) + public WixRemoveFolderExSymbol() : base(UtilSymbolDefinitions.WixRemoveFolderEx, null, null) { } - public WixRemoveFolderExTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixRemoveFolderEx, sourceLineNumber, id) + public WixRemoveFolderExSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRemoveFolderEx, sourceLineNumber, id) { } - public IntermediateField this[WixRemoveFolderExTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixRemoveFolderExSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)WixRemoveFolderExTupleFields.ComponentRef].AsString(); - set => this.Set((int)WixRemoveFolderExTupleFields.ComponentRef, value); + get => this.Fields[(int)WixRemoveFolderExSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixRemoveFolderExSymbolFields.ComponentRef, value); } public string Property { - get => this.Fields[(int)WixRemoveFolderExTupleFields.Property].AsString(); - set => this.Set((int)WixRemoveFolderExTupleFields.Property, value); + get => this.Fields[(int)WixRemoveFolderExSymbolFields.Property].AsString(); + set => this.Set((int)WixRemoveFolderExSymbolFields.Property, value); } public int InstallMode { - get => this.Fields[(int)WixRemoveFolderExTupleFields.InstallMode].AsNumber(); - set => this.Set((int)WixRemoveFolderExTupleFields.InstallMode, value); + get => this.Fields[(int)WixRemoveFolderExSymbolFields.InstallMode].AsNumber(); + set => this.Set((int)WixRemoveFolderExSymbolFields.InstallMode, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixRestartResourceTuple.cs b/src/wixext/Tuples/WixRestartResourceTuple.cs index 92091c3d..7f76f1b8 100644 --- a/src/wixext/Tuples/WixRestartResourceTuple.cs +++ b/src/wixext/Tuples/WixRestartResourceTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixRestartResource = new IntermediateTupleDefinition( - UtilTupleDefinitionType.WixRestartResource.ToString(), + public static readonly IntermediateSymbolDefinition WixRestartResource = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixRestartResource.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.Resource), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.Resource), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRestartResourceSymbolFields.Attributes), IntermediateFieldType.Number), }, - typeof(WixRestartResourceTuple)); + typeof(WixRestartResourceSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum WixRestartResourceTupleFields + public enum WixRestartResourceSymbolFields { ComponentRef, Resource, Attributes, } - public class WixRestartResourceTuple : IntermediateTuple + public class WixRestartResourceSymbol : IntermediateSymbol { - public WixRestartResourceTuple() : base(UtilTupleDefinitions.WixRestartResource, null, null) + public WixRestartResourceSymbol() : base(UtilSymbolDefinitions.WixRestartResource, null, null) { } - public WixRestartResourceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixRestartResource, sourceLineNumber, id) + public WixRestartResourceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixRestartResource, sourceLineNumber, id) { } - public IntermediateField this[WixRestartResourceTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixRestartResourceSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)WixRestartResourceTupleFields.ComponentRef].AsString(); - set => this.Set((int)WixRestartResourceTupleFields.ComponentRef, value); + get => this.Fields[(int)WixRestartResourceSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixRestartResourceSymbolFields.ComponentRef, value); } public string Resource { - get => this.Fields[(int)WixRestartResourceTupleFields.Resource].AsString(); - set => this.Set((int)WixRestartResourceTupleFields.Resource, value); + get => this.Fields[(int)WixRestartResourceSymbolFields.Resource].AsString(); + set => this.Set((int)WixRestartResourceSymbolFields.Resource, value); } public int Attributes { - get => this.Fields[(int)WixRestartResourceTupleFields.Attributes].AsNumber(); - set => this.Set((int)WixRestartResourceTupleFields.Attributes, value); + get => this.Fields[(int)WixRestartResourceSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixRestartResourceSymbolFields.Attributes, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixTouchFileTuple.cs b/src/wixext/Tuples/WixTouchFileTuple.cs index 0a152dec..447c21ba 100644 --- a/src/wixext/Tuples/WixTouchFileTuple.cs +++ b/src/wixext/Tuples/WixTouchFileTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixTouchFile = new IntermediateTupleDefinition( - UtilTupleDefinitionType.WixTouchFile.ToString(), + public static readonly IntermediateSymbolDefinition WixTouchFile = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.WixTouchFile.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.Path), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.Path), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixTouchFileSymbolFields.Attributes), IntermediateFieldType.Number), }, - typeof(WixTouchFileTuple)); + typeof(WixTouchFileSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum WixTouchFileTupleFields + public enum WixTouchFileSymbolFields { ComponentRef, Path, Attributes, } - public class WixTouchFileTuple : IntermediateTuple + public class WixTouchFileSymbol : IntermediateSymbol { - public WixTouchFileTuple() : base(UtilTupleDefinitions.WixTouchFile, null, null) + public WixTouchFileSymbol() : base(UtilSymbolDefinitions.WixTouchFile, null, null) { } - public WixTouchFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixTouchFile, sourceLineNumber, id) + public WixTouchFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.WixTouchFile, sourceLineNumber, id) { } - public IntermediateField this[WixTouchFileTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixTouchFileSymbolFields index] => this.Fields[(int)index]; public string ComponentRef { - get => this.Fields[(int)WixTouchFileTupleFields.ComponentRef].AsString(); - set => this.Set((int)WixTouchFileTupleFields.ComponentRef, value); + get => this.Fields[(int)WixTouchFileSymbolFields.ComponentRef].AsString(); + set => this.Set((int)WixTouchFileSymbolFields.ComponentRef, value); } public string Path { - get => this.Fields[(int)WixTouchFileTupleFields.Path].AsString(); - set => this.Set((int)WixTouchFileTupleFields.Path, value); + get => this.Fields[(int)WixTouchFileSymbolFields.Path].AsString(); + set => this.Set((int)WixTouchFileSymbolFields.Path, value); } public int Attributes { - get => this.Fields[(int)WixTouchFileTupleFields.Attributes].AsNumber(); - set => this.Set((int)WixTouchFileTupleFields.Attributes, value); + get => this.Fields[(int)WixTouchFileSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixTouchFileSymbolFields.Attributes, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/XmlConfigTuple.cs b/src/wixext/Tuples/XmlConfigTuple.cs index 291a686c..ca1cf047 100644 --- a/src/wixext/Tuples/XmlConfigTuple.cs +++ b/src/wixext/Tuples/XmlConfigTuple.cs @@ -3,32 +3,32 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition XmlConfig = new IntermediateTupleDefinition( - UtilTupleDefinitionType.XmlConfig.ToString(), + public static readonly IntermediateSymbolDefinition XmlConfig = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.XmlConfig.ToString(), new[] { - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.ElementPath), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.VerifyPath), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Value), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Flags), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Sequence), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ElementPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.VerifyPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Flags), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigSymbolFields.Sequence), IntermediateFieldType.Number), }, - typeof(XmlConfigTuple)); + typeof(XmlConfigSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum XmlConfigTupleFields + public enum XmlConfigSymbolFields { File, ElementPath, @@ -40,64 +40,64 @@ namespace WixToolset.Util.Tuples Sequence, } - public class XmlConfigTuple : IntermediateTuple + public class XmlConfigSymbol : IntermediateSymbol { - public XmlConfigTuple() : base(UtilTupleDefinitions.XmlConfig, null, null) + public XmlConfigSymbol() : base(UtilSymbolDefinitions.XmlConfig, null, null) { } - public XmlConfigTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.XmlConfig, sourceLineNumber, id) + public XmlConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.XmlConfig, sourceLineNumber, id) { } - public IntermediateField this[XmlConfigTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[XmlConfigSymbolFields index] => this.Fields[(int)index]; public string File { - get => this.Fields[(int)XmlConfigTupleFields.File].AsString(); - set => this.Set((int)XmlConfigTupleFields.File, value); + get => this.Fields[(int)XmlConfigSymbolFields.File].AsString(); + set => this.Set((int)XmlConfigSymbolFields.File, value); } public string ElementPath { - get => this.Fields[(int)XmlConfigTupleFields.ElementPath].AsString(); - set => this.Set((int)XmlConfigTupleFields.ElementPath, value); + get => this.Fields[(int)XmlConfigSymbolFields.ElementPath].AsString(); + set => this.Set((int)XmlConfigSymbolFields.ElementPath, value); } public string VerifyPath { - get => this.Fields[(int)XmlConfigTupleFields.VerifyPath].AsString(); - set => this.Set((int)XmlConfigTupleFields.VerifyPath, value); + get => this.Fields[(int)XmlConfigSymbolFields.VerifyPath].AsString(); + set => this.Set((int)XmlConfigSymbolFields.VerifyPath, value); } public string Name { - get => this.Fields[(int)XmlConfigTupleFields.Name].AsString(); - set => this.Set((int)XmlConfigTupleFields.Name, value); + get => this.Fields[(int)XmlConfigSymbolFields.Name].AsString(); + set => this.Set((int)XmlConfigSymbolFields.Name, value); } public string Value { - get => this.Fields[(int)XmlConfigTupleFields.Value].AsString(); - set => this.Set((int)XmlConfigTupleFields.Value, value); + get => this.Fields[(int)XmlConfigSymbolFields.Value].AsString(); + set => this.Set((int)XmlConfigSymbolFields.Value, value); } public int Flags { - get => this.Fields[(int)XmlConfigTupleFields.Flags].AsNumber(); - set => this.Set((int)XmlConfigTupleFields.Flags, value); + get => this.Fields[(int)XmlConfigSymbolFields.Flags].AsNumber(); + set => this.Set((int)XmlConfigSymbolFields.Flags, value); } public string ComponentRef { - get => this.Fields[(int)XmlConfigTupleFields.ComponentRef].AsString(); - set => this.Set((int)XmlConfigTupleFields.ComponentRef, value); + get => this.Fields[(int)XmlConfigSymbolFields.ComponentRef].AsString(); + set => this.Set((int)XmlConfigSymbolFields.ComponentRef, value); } public int? Sequence { - get => this.Fields[(int)XmlConfigTupleFields.Sequence].AsNullableNumber(); - set => this.Set((int)XmlConfigTupleFields.Sequence, value); + get => this.Fields[(int)XmlConfigSymbolFields.Sequence].AsNullableNumber(); + set => this.Set((int)XmlConfigSymbolFields.Sequence, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/XmlFileTuple.cs b/src/wixext/Tuples/XmlFileTuple.cs index e44979ca..7d5d991b 100644 --- a/src/wixext/Tuples/XmlFileTuple.cs +++ b/src/wixext/Tuples/XmlFileTuple.cs @@ -3,31 +3,31 @@ namespace WixToolset.Util { using WixToolset.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; - public static partial class UtilTupleDefinitions + public static partial class UtilSymbolDefinitions { - public static readonly IntermediateTupleDefinition XmlFile = new IntermediateTupleDefinition( - UtilTupleDefinitionType.XmlFile.ToString(), + public static readonly IntermediateSymbolDefinition XmlFile = new IntermediateSymbolDefinition( + UtilSymbolDefinitionType.XmlFile.ToString(), new[] { - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.File), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.ElementPath), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Name), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Value), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Flags), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Sequence), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.File), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.ElementPath), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Flags), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileSymbolFields.Sequence), IntermediateFieldType.Number), }, - typeof(XmlFileTuple)); + typeof(XmlFileSymbol)); } } -namespace WixToolset.Util.Tuples +namespace WixToolset.Util.Symbols { using WixToolset.Data; - public enum XmlFileTupleFields + public enum XmlFileSymbolFields { File, ElementPath, @@ -38,58 +38,58 @@ namespace WixToolset.Util.Tuples Sequence, } - public class XmlFileTuple : IntermediateTuple + public class XmlFileSymbol : IntermediateSymbol { - public XmlFileTuple() : base(UtilTupleDefinitions.XmlFile, null, null) + public XmlFileSymbol() : base(UtilSymbolDefinitions.XmlFile, null, null) { } - public XmlFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.XmlFile, sourceLineNumber, id) + public XmlFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.XmlFile, sourceLineNumber, id) { } - public IntermediateField this[XmlFileTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[XmlFileSymbolFields index] => this.Fields[(int)index]; public string File { - get => this.Fields[(int)XmlFileTupleFields.File].AsString(); - set => this.Set((int)XmlFileTupleFields.File, value); + get => this.Fields[(int)XmlFileSymbolFields.File].AsString(); + set => this.Set((int)XmlFileSymbolFields.File, value); } public string ElementPath { - get => this.Fields[(int)XmlFileTupleFields.ElementPath].AsString(); - set => this.Set((int)XmlFileTupleFields.ElementPath, value); + get => this.Fields[(int)XmlFileSymbolFields.ElementPath].AsString(); + set => this.Set((int)XmlFileSymbolFields.ElementPath, value); } public string Name { - get => this.Fields[(int)XmlFileTupleFields.Name].AsString(); - set => this.Set((int)XmlFileTupleFields.Name, value); + get => this.Fields[(int)XmlFileSymbolFields.Name].AsString(); + set => this.Set((int)XmlFileSymbolFields.Name, value); } public string Value { - get => this.Fields[(int)XmlFileTupleFields.Value].AsString(); - set => this.Set((int)XmlFileTupleFields.Value, value); + get => this.Fields[(int)XmlFileSymbolFields.Value].AsString(); + set => this.Set((int)XmlFileSymbolFields.Value, value); } public int Flags { - get => this.Fields[(int)XmlFileTupleFields.Flags].AsNumber(); - set => this.Set((int)XmlFileTupleFields.Flags, value); + get => this.Fields[(int)XmlFileSymbolFields.Flags].AsNumber(); + set => this.Set((int)XmlFileSymbolFields.Flags, value); } public string ComponentRef { - get => this.Fields[(int)XmlFileTupleFields.ComponentRef].AsString(); - set => this.Set((int)XmlFileTupleFields.ComponentRef, value); + get => this.Fields[(int)XmlFileSymbolFields.ComponentRef].AsString(); + set => this.Set((int)XmlFileSymbolFields.ComponentRef, value); } public int? Sequence { - get => this.Fields[(int)XmlFileTupleFields.Sequence].AsNullableNumber(); - set => this.Set((int)XmlFileTupleFields.Sequence, value); + get => this.Fields[(int)XmlFileSymbolFields.Sequence].AsNullableNumber(); + set => this.Set((int)XmlFileSymbolFields.Sequence, value); } } } \ No newline at end of file diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 273a03c7..f7f37fab 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -11,10 +11,10 @@ namespace WixToolset.Util using System.Text.RegularExpressions; using System.Xml.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; - using WixToolset.Util.Tuples; + using WixToolset.Util.Symbols; /// /// The compiler for the WiX Toolset Utility Extension. @@ -447,7 +447,7 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); if (!this.Messaging.EncounteredError) { @@ -465,7 +465,7 @@ namespace WixToolset.Util break; } - section.AddTuple(new WixComponentSearchTuple(sourceLineNumbers, id) + section.AddSymbol(new WixComponentSearchSymbol(sourceLineNumbers, id) { Guid = guid, ProductCode = productCode, @@ -491,7 +491,7 @@ namespace WixToolset.Util { case "Id": refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixComponentSearch, refId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixComponentSearch, refId); break; default: this.ParseHelper.UnexpectedAttribute(element, attrib); @@ -549,11 +549,11 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, UtilConstants.UtilBundleExtensionId); + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, UtilConstants.UtilBundleExtensionId); if (!this.Messaging.EncounteredError) { - section.AddTuple(new WixDetectSHA2SupportTuple(sourceLineNumbers, id)); + section.AddSymbol(new WixDetectSHA2SupportSymbol(sourceLineNumbers, id)); } } @@ -573,7 +573,7 @@ namespace WixToolset.Util { case "Id": var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.WixDetectSHA2Support, refId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.WixDetectSHA2Support, refId); break; default: this.ParseHelper.UnexpectedAttribute(element, attrib); @@ -706,26 +706,26 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); string eventSourceKey = $@"SYSTEM\CurrentControlSet\Services\EventLog\{logName}\{sourceName}"; - var id = this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "EventMessageFile", String.Concat("#%", eventMessageFile), componentId, false); + var id = this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "EventMessageFile", String.Concat("#%", eventMessageFile), componentId, false); if (null != categoryMessageFile) { - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryMessageFile", String.Concat("#%", categoryMessageFile), componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryMessageFile", String.Concat("#%", categoryMessageFile), componentId, false); } if (CompilerConstants.IntegerNotSet != categoryCount) { - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryCount", String.Concat("#", categoryCount), componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "CategoryCount", String.Concat("#", categoryCount), componentId, false); } if (null != parameterMessageFile) { - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "ParameterMessageFile", String.Concat("#%", parameterMessageFile), componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "ParameterMessageFile", String.Concat("#%", parameterMessageFile), componentId, false); } if (0 != typesSupported) { - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "TypesSupported", String.Concat("#", typesSupported), componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, eventSourceKey, "TypesSupported", String.Concat("#", typesSupported), componentId, false); } var componentKeyPath = this.CreateComponentKeyPath(); @@ -879,7 +879,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = section.AddTuple(new WixCloseApplicationTuple(sourceLineNumbers, id) + var symbol = section.AddSymbol(new WixCloseApplicationSymbol(sourceLineNumbers, id) { Target = target, Description = description, @@ -889,15 +889,15 @@ namespace WixToolset.Util }); if (CompilerConstants.IntegerNotSet != sequence) { - tuple.Sequence = sequence; + symbol.Sequence = sequence; } if (CompilerConstants.IntegerNotSet != terminateExitCode) { - tuple.TerminateExitCode = terminateExitCode; + symbol.TerminateExitCode = terminateExitCode; } if (CompilerConstants.IntegerNotSet != timeout) { - tuple.Timeout = timeout * 1000; // make the timeout milliseconds in the table. + symbol.Timeout = timeout * 1000; // make the timeout milliseconds in the table. } } } @@ -962,7 +962,7 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); if (!this.Messaging.EncounteredError) { @@ -994,7 +994,7 @@ namespace WixToolset.Util { case "Id": var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixSearch, refId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixSearch, refId); break; default: this.ParseHelper.UnexpectedAttribute(node, attrib); @@ -1072,7 +1072,7 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); - this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, node.Name.LocalName, id, variable, condition, after, null); + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, node.Name.LocalName, id, variable, condition, after, null); if (!this.Messaging.EncounteredError) { @@ -1100,7 +1100,7 @@ namespace WixToolset.Util /// private void CreateWixFileSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string path, WixFileSearchAttributes attributes) { - section.AddTuple(new WixFileSearchTuple(sourceLineNumbers, id) + section.AddSymbol(new WixFileSearchSymbol(sourceLineNumbers, id) { Path = path, Attributes = attributes, @@ -1186,7 +1186,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new FileShareTuple(sourceLineNumbers, id) + section.AddSymbol(new FileShareSymbol(sourceLineNumbers, id) { ShareName = name, ComponentRef = componentId, @@ -1215,7 +1215,7 @@ namespace WixToolset.Util { case "User": user = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.User, user); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.User, user); break; default: var attribValue = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); @@ -1255,7 +1255,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new FileSharePermissionsTuple(sourceLineNumbers) + section.AddSymbol(new FileSharePermissionsSymbol(sourceLineNumbers) { FileShareRef = fileShareId.Id, UserRef = user, @@ -1311,7 +1311,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new GroupTuple(sourceLineNumbers, id) + section.AddSymbol(new GroupSymbol(sourceLineNumbers, id) { ComponentRef = componentId, Name = name, @@ -1338,7 +1338,7 @@ namespace WixToolset.Util { case "Id": groupId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.Group, groupId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.Group, groupId); break; default: this.ParseHelper.UnexpectedAttribute(element, attrib); @@ -1355,7 +1355,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new UserGroupTuple(sourceLineNumbers) + section.AddSymbol(new UserGroupSymbol(sourceLineNumbers) { UserRef = userId, GroupRef = groupId, @@ -1478,7 +1478,7 @@ namespace WixToolset.Util // add the appropriate extension based on type of shortcut name = String.Concat(name, InternetShortcutType.Url == type ? ".url" : ".lnk"); - section.AddTuple(new WixInternetShortcutTuple(sourceLineNumbers, shortcutId) + section.AddSymbol(new WixInternetShortcutSymbol(sourceLineNumbers, shortcutId) { ComponentRef = componentId, DirectoryRef = directoryId, @@ -1495,7 +1495,7 @@ namespace WixToolset.Util this.ParseHelper.EnsureTable(section, sourceLineNumbers, "CreateFolder"); // use built-in MSI functionality to remove the shortcuts rather than doing so via CA - section.AddTuple(new RemoveFileTuple(sourceLineNumbers, shortcutId) + section.AddSymbol(new RemoveFileSymbol(sourceLineNumbers, shortcutId) { ComponentRef = componentId, DirProperty = directoryId, @@ -1653,7 +1653,7 @@ namespace WixToolset.Util sbSymbolicConstants.AppendFormat("#define LAST_{0}_COUNTER_OFFSET {1}\r\n", objectName, symbolConstantsCounter); // Add the calculated INI and H strings to the PerformanceCategory table. - section.AddTuple(new PerformanceCategoryTuple(sourceLineNumbers, id) + section.AddSymbol(new PerformanceCategorySymbol(sourceLineNumbers, id) { ComponentRef = componentId, Name = name, @@ -1666,15 +1666,15 @@ namespace WixToolset.Util var linkageKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Linkage", escapedName); var performanceKey = String.Format(@"SYSTEM\CurrentControlSet\Services\{0}\Performance", escapedName); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, linkageKey, "Export", escapedName, componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "-", null, componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Library", library, componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Open", openEntryPoint, componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Collect", collectEntryPoint, componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Close", closeEntryPoint, componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "IsMultiInstance", YesNoType.Yes == multiInstance ? "#1" : "#0", componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Names", sbCounterNames.ToString(), componentId, false); - this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, linkageKey, "Export", escapedName, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "-", null, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Library", library, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Open", openEntryPoint, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Collect", collectEntryPoint, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Close", closeEntryPoint, componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "IsMultiInstance", YesNoType.Yes == multiInstance ? "#1" : "#0", componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Names", sbCounterNames.ToString(), componentId, false); + this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); } this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); @@ -2148,7 +2148,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new PerfmonTuple(sourceLineNumbers) + section.AddSymbol(new PerfmonSymbol(sourceLineNumbers) { ComponentRef = componentId, File = $"[#{fileId}]", @@ -2196,7 +2196,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new PerfmonManifestTuple(sourceLineNumbers) + section.AddSymbol(new PerfmonManifestSymbol(sourceLineNumbers) { ComponentRef = componentId, File = $"[#{fileId}]", @@ -2250,13 +2250,13 @@ namespace WixToolset.Util { this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFormatFiles", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); - section.AddTuple(new WixFormatFilesTuple(sourceLineNumbers) + section.AddSymbol(new WixFormatFilesSymbol(sourceLineNumbers) { BinaryRef = binaryId, FileRef = fileId, }); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Binary, binaryId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, binaryId); } } @@ -2303,7 +2303,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new EventManifestTuple(sourceLineNumbers) + section.AddSymbol(new EventManifestSymbol(sourceLineNumbers) { ComponentRef = componentId, File = $"[#{fileId}]", @@ -2311,7 +2311,7 @@ namespace WixToolset.Util if (null != messageFile) { - section.AddTuple(new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}MessageFile")) + section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}MessageFile")) { File = $"[#{fileId}]", ElementPath = "/*/*/*/*[\\[]@messageFileName[\\]]", @@ -2323,7 +2323,7 @@ namespace WixToolset.Util } if (null != parameterFile) { - section.AddTuple(new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ParameterFile")) + section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ParameterFile")) { File = $"[#{fileId}]", ElementPath = "/*/*/*/*[\\[]@parameterFileName[\\]]", @@ -2335,7 +2335,7 @@ namespace WixToolset.Util } if (null != resourceFile) { - section.AddTuple(new XmlFileTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ResourceFile")) + section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, $"Config_{fileId}ResourceFile")) { File = $"[#{fileId}]", ElementPath = "/*/*/*/*[\\[]@resourceFileName[\\]]", @@ -2463,7 +2463,7 @@ namespace WixToolset.Util this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user); - section.AddTuple(new SecureObjectsTuple(sourceLineNumbers, id) + section.AddSymbol(new SecureObjectsSymbol(sourceLineNumbers, id) { SecureObject = objectId, Table = tableName, @@ -2550,7 +2550,7 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); if (!this.Messaging.EncounteredError) { @@ -2577,7 +2577,7 @@ namespace WixToolset.Util attributes |= WixProductSearchAttributes.UpgradeCode; } - section.AddTuple(new WixProductSearchTuple(sourceLineNumbers, id) + section.AddSymbol(new WixProductSearchSymbol(sourceLineNumbers, id) { Guid = productCode ?? upgradeCode, Attributes = attributes, @@ -2720,11 +2720,11 @@ namespace WixToolset.Util this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); - this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null); if (!this.Messaging.EncounteredError) { - section.AddTuple(new WixRegistrySearchTuple(sourceLineNumbers, id) + section.AddSymbol(new WixRegistrySearchSymbol(sourceLineNumbers, id) { Root = root.Value, Key = key, @@ -2811,7 +2811,7 @@ namespace WixToolset.Util { this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); - section.AddTuple(new WixRemoveFolderExTuple(sourceLineNumbers, id) + section.AddSymbol(new WixRemoveFolderExSymbol(sourceLineNumbers, id) { ComponentRef = componentId, Property = property, @@ -2887,7 +2887,7 @@ namespace WixToolset.Util { this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); - section.AddTuple(new WixRestartResourceTuple(sourceLineNumbers, id) + section.AddSymbol(new WixRestartResourceSymbol(sourceLineNumbers, id) { ComponentRef = componentId, Resource = resource, @@ -2979,7 +2979,7 @@ namespace WixToolset.Util { this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); - section.AddTuple(new ServiceConfigTuple(sourceLineNumbers) + section.AddSymbol(new ServiceConfigSymbol(sourceLineNumbers) { ServiceName = serviceName, ComponentRef = componentId, @@ -3074,7 +3074,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new WixTouchFileTuple(sourceLineNumbers, id) + section.AddSymbol(new WixTouchFileSymbol(sourceLineNumbers, id) { ComponentRef = componentId, Path = path, @@ -3290,7 +3290,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - section.AddTuple(new UserTuple(sourceLineNumbers, id) + section.AddSymbol(new UserSymbol(sourceLineNumbers, id) { ComponentRef = componentId, Name = name, @@ -3424,7 +3424,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = section.AddTuple(new XmlFileTuple(sourceLineNumbers, id) + var symbol = section.AddSymbol(new XmlFileSymbol(sourceLineNumbers, id) { File = file, ElementPath = elementPath, @@ -3435,7 +3435,7 @@ namespace WixToolset.Util }); if (-1 != sequence) { - tuple.Sequence = sequence; + symbol.Sequence = sequence; } } @@ -3603,7 +3603,7 @@ namespace WixToolset.Util this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttributes(sourceLineNumbers, element.Name.LocalName, "ElementId", "Action", "Node", "On")); } - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilTupleDefinitions.XmlConfig, elementId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.XmlConfig, elementId); } var innerText = this.ParseHelper.GetTrimmedInnerText(element); @@ -3653,7 +3653,7 @@ namespace WixToolset.Util if (!this.Messaging.EncounteredError) { - var tuple = section.AddTuple(new XmlConfigTuple(sourceLineNumbers, id) + var symbol = section.AddSymbol(new XmlConfigSymbol(sourceLineNumbers, id) { File = file, ElementPath = elementId ?? elementPath, @@ -3665,7 +3665,7 @@ namespace WixToolset.Util }); if (CompilerConstants.IntegerNotSet != sequence) { - tuple.Sequence = sequence; + symbol.Sequence = sequence; } } diff --git a/src/wixext/UtilExtensionData.cs b/src/wixext/UtilExtensionData.cs index 55c9b046..d3ca3358 100644 --- a/src/wixext/UtilExtensionData.cs +++ b/src/wixext/UtilExtensionData.cs @@ -9,15 +9,15 @@ namespace WixToolset.Util { public override string DefaultCulture => "en-US"; - public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) + public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) { - tupleDefinition = UtilTupleDefinitions.ByName(name); - return tupleDefinition != null; + symbolDefinition = UtilSymbolDefinitions.ByName(name); + return symbolDefinition != null; } - public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions) + public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) { - return Intermediate.Load(typeof(UtilExtensionData).Assembly, "WixToolset.Util.util.wixlib", tupleDefinitions); + return Intermediate.Load(typeof(UtilExtensionData).Assembly, "WixToolset.Util.util.wixlib", symbolDefinitions); } } } diff --git a/src/wixext/UtilTableDefinitions.cs b/src/wixext/UtilTableDefinitions.cs index 4dfeb4bd..ef5bfeec 100644 --- a/src/wixext/UtilTableDefinitions.cs +++ b/src/wixext/UtilTableDefinitions.cs @@ -8,7 +8,7 @@ namespace WixToolset.Util { public static readonly TableDefinition Wix4CloseApplication = new TableDefinition( "Wix4CloseApplication", - UtilTupleDefinitions.WixCloseApplication, + UtilSymbolDefinitions.WixCloseApplication, new[] { new ColumnDefinition("Wix4CloseApplication", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), @@ -21,12 +21,12 @@ namespace WixToolset.Util new ColumnDefinition("TerminateExitCode", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "Exit code to return from a terminated application."), new ColumnDefinition("Timeout", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 1, maxValue: 2147483647, description: "Timeout in milliseconds before scheduling restart or terminating application."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4RemoveFolderEx = new TableDefinition( "Wix4RemoveFolderEx", - UtilTupleDefinitions.WixRemoveFolderEx, + UtilSymbolDefinitions.WixRemoveFolderEx, new[] { new ColumnDefinition("Wix4RemoveFolderEx", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the WixRemoveFolderEx row in the package.", modularizeType: ColumnModularizeType.Column), @@ -34,12 +34,12 @@ namespace WixToolset.Util new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of Property that contains the root of the directory tree to remove.", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 3, description: "1 == Remove only when the associated component is being installed (msiInstallStateLocal or msiInstallStateSource), 2 == Remove only when the associated component is being removed (msiInstallStateAbsent), 3 = Remove in either of the above cases."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4RestartResource = new TableDefinition( "Wix4RestartResource", - UtilTupleDefinitions.WixRestartResource, + UtilSymbolDefinitions.WixRestartResource, new[] { new ColumnDefinition("Wix4RestartResource", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier.", modularizeType: ColumnModularizeType.Column), @@ -47,12 +47,12 @@ namespace WixToolset.Util new ColumnDefinition("Resource", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The resource to be registered with the Restart Manager.", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the type of resource and flags used for processing."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4FileShare = new TableDefinition( "Wix4FileShare", - UtilTupleDefinitions.FileShare, + UtilSymbolDefinitions.FileShare, new[] { new ColumnDefinition("Wix4FileShare", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier", modularizeType: ColumnModularizeType.Column), @@ -61,24 +61,24 @@ namespace WixToolset.Util new ColumnDefinition("Description", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Description string displayed for the file share"), new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Foreign key referencing directory that the share is created on", modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4FileSharePermissions = new TableDefinition( "Wix4FileSharePermissions", - UtilTupleDefinitions.FileSharePermissions, + UtilSymbolDefinitions.FileSharePermissions, new[] { new ColumnDefinition("Wix4FileShare_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "FileShare", keyColumn: 1, description: "FileShare that these premissions are to be applied to.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", description: "User that these premissions are to apply to.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Permissions int, as in EXPLICIT_ACCESS.grfAccessPermissions in MSDN"), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4Group = new TableDefinition( "Wix4Group", - UtilTupleDefinitions.Group, + UtilSymbolDefinitions.Group, new[] { new ColumnDefinition("Wix4Group", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), @@ -86,12 +86,12 @@ namespace WixToolset.Util new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Group name", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Group domain", modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4InternetShortcut = new TableDefinition( "Wix4InternetShortcut", - UtilTupleDefinitions.WixInternetShortcut, + UtilSymbolDefinitions.WixInternetShortcut, new[] { new ColumnDefinition("Wix4InternetShortcut", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), @@ -103,12 +103,12 @@ namespace WixToolset.Util new ColumnDefinition("IconFile", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Icon file for shortcut"), new ColumnDefinition("IconIndex", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Index of the icon being referenced."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4PerformanceCategory = new TableDefinition( "Wix4PerformanceCategory", - UtilTupleDefinitions.PerformanceCategory, + UtilSymbolDefinitions.PerformanceCategory, new[] { new ColumnDefinition("Wix4PerformanceCategory", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column), @@ -117,47 +117,47 @@ namespace WixToolset.Util new ColumnDefinition("IniData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .ini file."), new ColumnDefinition("ConstantData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .h file."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4Perfmon = new TableDefinition( "Wix4Perfmon", - UtilTupleDefinitions.Perfmon, + UtilSymbolDefinitions.Perfmon, new[] { new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of .INI file", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Service name in registry"), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4PerfmonManifest = new TableDefinition( "Wix4PerfmonManifest", - UtilTupleDefinitions.PerfmonManifest, + UtilSymbolDefinitions.PerfmonManifest, new[] { new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of perfmon manifest file", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("ResourceFileDirectory", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "The path of the Resource File Directory"), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4EventManifest = new TableDefinition( "Wix4EventManifest", - UtilTupleDefinitions.EventManifest, + UtilSymbolDefinitions.EventManifest, new[] { new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of event manifest file", modularizeType: ColumnModularizeType.Property), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4SecureObject = new TableDefinition( "Wix4SecureObject", - UtilTupleDefinitions.SecureObjects, + UtilSymbolDefinitions.SecureObjects, new[] { new ColumnDefinition("Wix4SecureObject", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in Table", modularizeType: ColumnModularizeType.Column), @@ -168,12 +168,12 @@ namespace WixToolset.Util new ColumnDefinition("Permission", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -2147483647, maxValue: 2147483647, description: "Permissions to grant to User"), new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4ServiceConfig = new TableDefinition( "Wix4ServiceConfig", - UtilTupleDefinitions.ServiceConfig, + UtilSymbolDefinitions.ServiceConfig, new[] { new ColumnDefinition("ServiceName", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Primary key, non-localized token"), @@ -187,12 +187,12 @@ namespace WixToolset.Util new ColumnDefinition("ProgramCommandLine", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Command line for program to run if failure action is RUN_COMMAND."), new ColumnDefinition("RebootMessage", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Message to show to users when rebooting if failure action is REBOOT."), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4TouchFile = new TableDefinition( "Wix4TouchFile", - UtilTupleDefinitions.WixTouchFile, + UtilSymbolDefinitions.WixTouchFile, new[] { new ColumnDefinition("Wix4TouchFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the Wix4TouchFile row in the package.", modularizeType: ColumnModularizeType.Column), @@ -200,12 +200,12 @@ namespace WixToolset.Util new ColumnDefinition("Path", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Formatted column that resolves to the path to touch.", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 63, description: "1 == Touch only when the associated component is being installed, 2 == Touch only when the associated component is being repaired , 4 == Touch only when the associated component is being removed, 16 = path is in 64-bit location, 32 = touching the file is vital."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4User = new TableDefinition( "Wix4User", - UtilTupleDefinitions.User, + UtilSymbolDefinitions.User, new[] { new ColumnDefinition("Wix4User", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), @@ -215,23 +215,23 @@ namespace WixToolset.Util new ColumnDefinition("Password", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "User password", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 65535, description: "Attributes describing how to create the user"), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4UserGroup = new TableDefinition( "Wix4UserGroup", - UtilTupleDefinitions.UserGroup, + UtilSymbolDefinitions.UserGroup, new[] { new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", keyColumn: 1, description: "User to be joined to a Group.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Wix4Group_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4Group", keyColumn: 1, description: "Group to join User to.", modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition Wix4XmlFile = new TableDefinition( "Wix4XmlFile", - UtilTupleDefinitions.XmlFile, + UtilSymbolDefinitions.XmlFile, new[] { new ColumnDefinition("Wix4XmlFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column), @@ -243,12 +243,12 @@ namespace WixToolset.Util new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4XmlConfig = new TableDefinition( "Wix4XmlConfig", - UtilTupleDefinitions.XmlConfig, + UtilSymbolDefinitions.XmlConfig, new[] { new ColumnDefinition("Wix4XmlConfig", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column), @@ -261,18 +261,18 @@ namespace WixToolset.Util new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition Wix4FormatFile = new TableDefinition( "Wix4FormatFile", - UtilTupleDefinitions.WixFormatFiles, + UtilSymbolDefinitions.WixFormatFiles, new[] { new ColumnDefinition("Binary_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Binary", keyColumn: 1, description: "Binary data to be formatted.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "File whose component controls the custom action and where the formatted data is written.", modularizeType: ColumnModularizeType.Column), }, - tupleIdIsPrimaryKey: false + symbolIdIsPrimaryKey: false ); public static readonly TableDefinition[] All = new[] diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index 0b362643..acadce55 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -20,16 +20,16 @@ - - - + - + + + -- cgit v1.2.3-55-g6feb