From e9d10933bedb8215ec50ca85db272d6647426b31 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Thu, 5 Mar 2020 19:48:12 -0500 Subject: Version extension ids. Partial fix for wixtoolset/issues#5933. --- src/wixext/Tuples/EventManifestTuple.cs | 10 +++--- src/wixext/Tuples/FileSharePermissionsTuple.cs | 20 ++++++------ src/wixext/Tuples/FileShareTuple.cs | 44 ++++++-------------------- src/wixext/Tuples/GroupTuple.cs | 10 +++--- src/wixext/Tuples/PerfmonManifestTuple.cs | 10 +++--- src/wixext/Tuples/PerfmonTuple.cs | 10 +++--- src/wixext/Tuples/PerformanceCategoryTuple.cs | 18 +++-------- src/wixext/Tuples/SecureObjectsTuple.cs | 18 +++-------- src/wixext/Tuples/ServiceConfigTuple.cs | 10 +++--- src/wixext/Tuples/UserGroupTuple.cs | 20 ++++++------ src/wixext/Tuples/UserTuple.cs | 18 +++-------- src/wixext/Tuples/WixCloseApplicationTuple.cs | 8 ----- src/wixext/Tuples/WixFormatFilesTuple.cs | 20 ++++++------ src/wixext/Tuples/WixInternetShortcutTuple.cs | 28 ++++++---------- src/wixext/Tuples/WixRemoveFolderExTuple.cs | 18 +++-------- src/wixext/Tuples/WixRestartResourceTuple.cs | 18 +++-------- src/wixext/Tuples/WixTouchFileTuple.cs | 18 +++-------- src/wixext/Tuples/XmlConfigTuple.cs | 18 +++-------- src/wixext/Tuples/XmlFileTuple.cs | 18 +++-------- 19 files changed, 115 insertions(+), 219 deletions(-) (limited to 'src/wixext/Tuples') diff --git a/src/wixext/Tuples/EventManifestTuple.cs b/src/wixext/Tuples/EventManifestTuple.cs index b74d2d59..364604be 100644 --- a/src/wixext/Tuples/EventManifestTuple.cs +++ b/src/wixext/Tuples/EventManifestTuple.cs @@ -11,7 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.EventManifest.ToString(), new[] { - new IntermediateFieldDefinition(nameof(EventManifestTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(EventManifestTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(EventManifestTupleFields.File), IntermediateFieldType.String), }, typeof(EventManifestTuple)); @@ -24,7 +24,7 @@ namespace WixToolset.Util.Tuples public enum EventManifestTupleFields { - Component_, + ComponentRef, File, } @@ -40,10 +40,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[EventManifestTupleFields index] => this.Fields[(int)index]; - public string Component_ + public string ComponentRef { - get => this.Fields[(int)EventManifestTupleFields.Component_].AsString(); - set => this.Set((int)EventManifestTupleFields.Component_, value); + get => this.Fields[(int)EventManifestTupleFields.ComponentRef].AsString(); + set => this.Set((int)EventManifestTupleFields.ComponentRef, value); } public string File diff --git a/src/wixext/Tuples/FileSharePermissionsTuple.cs b/src/wixext/Tuples/FileSharePermissionsTuple.cs index 3f037e0e..1db01b98 100644 --- a/src/wixext/Tuples/FileSharePermissionsTuple.cs +++ b/src/wixext/Tuples/FileSharePermissionsTuple.cs @@ -11,8 +11,8 @@ namespace WixToolset.Util UtilTupleDefinitionType.FileSharePermissions.ToString(), new[] { - new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.FileShare_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.User_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.FileShareRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.UserRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(FileSharePermissionsTupleFields.Permissions), IntermediateFieldType.Number), }, typeof(FileSharePermissionsTuple)); @@ -25,8 +25,8 @@ namespace WixToolset.Util.Tuples public enum FileSharePermissionsTupleFields { - FileShare_, - User_, + FileShareRef, + UserRef, Permissions, } @@ -42,16 +42,16 @@ namespace WixToolset.Util.Tuples public IntermediateField this[FileSharePermissionsTupleFields index] => this.Fields[(int)index]; - public string FileShare_ + public string FileShareRef { - get => this.Fields[(int)FileSharePermissionsTupleFields.FileShare_].AsString(); - set => this.Set((int)FileSharePermissionsTupleFields.FileShare_, value); + get => this.Fields[(int)FileSharePermissionsTupleFields.FileShareRef].AsString(); + set => this.Set((int)FileSharePermissionsTupleFields.FileShareRef, value); } - public string User_ + public string UserRef { - get => this.Fields[(int)FileSharePermissionsTupleFields.User_].AsString(); - set => this.Set((int)FileSharePermissionsTupleFields.User_, value); + get => this.Fields[(int)FileSharePermissionsTupleFields.UserRef].AsString(); + set => this.Set((int)FileSharePermissionsTupleFields.UserRef, value); } public int Permissions diff --git a/src/wixext/Tuples/FileShareTuple.cs b/src/wixext/Tuples/FileShareTuple.cs index 5a31b6fa..6a04f6af 100644 --- a/src/wixext/Tuples/FileShareTuple.cs +++ b/src/wixext/Tuples/FileShareTuple.cs @@ -11,13 +11,10 @@ namespace WixToolset.Util UtilTupleDefinitionType.FileShare.ToString(), new[] { - new IntermediateFieldDefinition(nameof(FileShareTupleFields.FileShare), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(FileShareTupleFields.ShareName), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileShareTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(FileShareTupleFields.Description), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareTupleFields.Directory_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareTupleFields.User_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileShareTupleFields.Permissions), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(FileShareTupleFields.DirectoryRef), IntermediateFieldType.String), }, typeof(FileShareTuple)); } @@ -29,13 +26,10 @@ namespace WixToolset.Util.Tuples public enum FileShareTupleFields { - FileShare, ShareName, - Component_, + ComponentRef, Description, - Directory_, - User_, - Permissions, + DirectoryRef, } public class FileShareTuple : IntermediateTuple @@ -50,22 +44,16 @@ namespace WixToolset.Util.Tuples public IntermediateField this[FileShareTupleFields index] => this.Fields[(int)index]; - public string FileShare - { - get => this.Fields[(int)FileShareTupleFields.FileShare].AsString(); - set => this.Set((int)FileShareTupleFields.FileShare, value); - } - public string ShareName { get => this.Fields[(int)FileShareTupleFields.ShareName].AsString(); set => this.Set((int)FileShareTupleFields.ShareName, value); } - public string Component_ + public string ComponentRef { - get => this.Fields[(int)FileShareTupleFields.Component_].AsString(); - set => this.Set((int)FileShareTupleFields.Component_, value); + get => this.Fields[(int)FileShareTupleFields.ComponentRef].AsString(); + set => this.Set((int)FileShareTupleFields.ComponentRef, value); } public string Description @@ -74,22 +62,10 @@ namespace WixToolset.Util.Tuples set => this.Set((int)FileShareTupleFields.Description, value); } - public string Directory_ - { - get => this.Fields[(int)FileShareTupleFields.Directory_].AsString(); - set => this.Set((int)FileShareTupleFields.Directory_, value); - } - - public string User_ - { - get => this.Fields[(int)FileShareTupleFields.User_].AsString(); - set => this.Set((int)FileShareTupleFields.User_, value); - } - - public int? Permissions + public string DirectoryRef { - get => this.Fields[(int)FileShareTupleFields.Permissions].AsNullableNumber(); - set => this.Set((int)FileShareTupleFields.Permissions, value); + get => this.Fields[(int)FileShareTupleFields.DirectoryRef].AsString(); + set => this.Set((int)FileShareTupleFields.DirectoryRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/GroupTuple.cs b/src/wixext/Tuples/GroupTuple.cs index 97335714..6061b1f4 100644 --- a/src/wixext/Tuples/GroupTuple.cs +++ b/src/wixext/Tuples/GroupTuple.cs @@ -12,7 +12,7 @@ namespace WixToolset.Util new[] { new IntermediateFieldDefinition(nameof(GroupTupleFields.Group), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(GroupTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(GroupTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(GroupTupleFields.Name), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(GroupTupleFields.Domain), IntermediateFieldType.String), }, @@ -27,7 +27,7 @@ namespace WixToolset.Util.Tuples public enum GroupTupleFields { Group, - Component_, + ComponentRef, Name, Domain, } @@ -50,10 +50,10 @@ namespace WixToolset.Util.Tuples set => this.Set((int)GroupTupleFields.Group, value); } - public string Component_ + public string ComponentRef { - get => this.Fields[(int)GroupTupleFields.Component_].AsString(); - set => this.Set((int)GroupTupleFields.Component_, value); + get => this.Fields[(int)GroupTupleFields.ComponentRef].AsString(); + set => this.Set((int)GroupTupleFields.ComponentRef, value); } public string Name diff --git a/src/wixext/Tuples/PerfmonManifestTuple.cs b/src/wixext/Tuples/PerfmonManifestTuple.cs index 3f6cb8cc..9520105a 100644 --- a/src/wixext/Tuples/PerfmonManifestTuple.cs +++ b/src/wixext/Tuples/PerfmonManifestTuple.cs @@ -11,7 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.PerfmonManifest.ToString(), new[] { - new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.File), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(PerfmonManifestTupleFields.ResourceFileDirectory), IntermediateFieldType.String), }, @@ -25,7 +25,7 @@ namespace WixToolset.Util.Tuples public enum PerfmonManifestTupleFields { - Component_, + ComponentRef, File, ResourceFileDirectory, } @@ -42,10 +42,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[PerfmonManifestTupleFields index] => this.Fields[(int)index]; - public string Component_ + public string ComponentRef { - get => this.Fields[(int)PerfmonManifestTupleFields.Component_].AsString(); - set => this.Set((int)PerfmonManifestTupleFields.Component_, value); + get => this.Fields[(int)PerfmonManifestTupleFields.ComponentRef].AsString(); + set => this.Set((int)PerfmonManifestTupleFields.ComponentRef, value); } public string File diff --git a/src/wixext/Tuples/PerfmonTuple.cs b/src/wixext/Tuples/PerfmonTuple.cs index 00ea818b..1fb6ef6b 100644 --- a/src/wixext/Tuples/PerfmonTuple.cs +++ b/src/wixext/Tuples/PerfmonTuple.cs @@ -11,7 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.Perfmon.ToString(), new[] { - new IntermediateFieldDefinition(nameof(PerfmonTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(PerfmonTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(PerfmonTupleFields.File), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(PerfmonTupleFields.Name), IntermediateFieldType.String), }, @@ -25,7 +25,7 @@ namespace WixToolset.Util.Tuples public enum PerfmonTupleFields { - Component_, + ComponentRef, File, Name, } @@ -42,10 +42,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[PerfmonTupleFields index] => this.Fields[(int)index]; - public string Component_ + public string ComponentRef { - get => this.Fields[(int)PerfmonTupleFields.Component_].AsString(); - set => this.Set((int)PerfmonTupleFields.Component_, value); + get => this.Fields[(int)PerfmonTupleFields.ComponentRef].AsString(); + set => this.Set((int)PerfmonTupleFields.ComponentRef, value); } public string File diff --git a/src/wixext/Tuples/PerformanceCategoryTuple.cs b/src/wixext/Tuples/PerformanceCategoryTuple.cs index ec2ba73d..16705466 100644 --- a/src/wixext/Tuples/PerformanceCategoryTuple.cs +++ b/src/wixext/Tuples/PerformanceCategoryTuple.cs @@ -11,8 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.PerformanceCategory.ToString(), new[] { - new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.PerformanceCategory), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(PerformanceCategoryTupleFields.Component_), IntermediateFieldType.String), + 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), @@ -27,8 +26,7 @@ namespace WixToolset.Util.Tuples public enum PerformanceCategoryTupleFields { - PerformanceCategory, - Component_, + ComponentRef, Name, IniData, ConstantData, @@ -46,16 +44,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[PerformanceCategoryTupleFields index] => this.Fields[(int)index]; - public string PerformanceCategory + public string ComponentRef { - get => this.Fields[(int)PerformanceCategoryTupleFields.PerformanceCategory].AsString(); - set => this.Set((int)PerformanceCategoryTupleFields.PerformanceCategory, value); - } - - public string Component_ - { - get => this.Fields[(int)PerformanceCategoryTupleFields.Component_].AsString(); - set => this.Set((int)PerformanceCategoryTupleFields.Component_, value); + get => this.Fields[(int)PerformanceCategoryTupleFields.ComponentRef].AsString(); + set => this.Set((int)PerformanceCategoryTupleFields.ComponentRef, value); } public string Name diff --git a/src/wixext/Tuples/SecureObjectsTuple.cs b/src/wixext/Tuples/SecureObjectsTuple.cs index f54b23d8..920fe7b3 100644 --- a/src/wixext/Tuples/SecureObjectsTuple.cs +++ b/src/wixext/Tuples/SecureObjectsTuple.cs @@ -11,12 +11,11 @@ namespace WixToolset.Util UtilTupleDefinitionType.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.Permission), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.ComponentRef), IntermediateFieldType.String), }, typeof(SecureObjectsTuple)); } @@ -28,12 +27,11 @@ namespace WixToolset.Util.Tuples public enum SecureObjectsTupleFields { - SecureObject, Table, Domain, User, Permission, - Component_, + ComponentRef, } public class SecureObjectsTuple : IntermediateTuple @@ -48,12 +46,6 @@ namespace WixToolset.Util.Tuples public IntermediateField this[SecureObjectsTupleFields index] => this.Fields[(int)index]; - public string SecureObject - { - get => this.Fields[(int)SecureObjectsTupleFields.SecureObject].AsString(); - set => this.Set((int)SecureObjectsTupleFields.SecureObject, value); - } - public string Table { get => this.Fields[(int)SecureObjectsTupleFields.Table].AsString(); @@ -78,10 +70,10 @@ namespace WixToolset.Util.Tuples set => this.Set((int)SecureObjectsTupleFields.Permission, value); } - public string Component_ + public string ComponentRef { - get => this.Fields[(int)SecureObjectsTupleFields.Component_].AsString(); - set => this.Set((int)SecureObjectsTupleFields.Component_, value); + get => this.Fields[(int)SecureObjectsTupleFields.ComponentRef].AsString(); + set => this.Set((int)SecureObjectsTupleFields.ComponentRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/ServiceConfigTuple.cs b/src/wixext/Tuples/ServiceConfigTuple.cs index 74d96bca..e5fc3992 100644 --- a/src/wixext/Tuples/ServiceConfigTuple.cs +++ b/src/wixext/Tuples/ServiceConfigTuple.cs @@ -12,7 +12,7 @@ namespace WixToolset.Util new[] { new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ServiceName), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.Component_), 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), @@ -33,7 +33,7 @@ namespace WixToolset.Util.Tuples public enum ServiceConfigTupleFields { ServiceName, - Component_, + ComponentRef, NewService, FirstFailureActionType, SecondFailureActionType, @@ -62,10 +62,10 @@ namespace WixToolset.Util.Tuples set => this.Set((int)ServiceConfigTupleFields.ServiceName, value); } - public string Component_ + public string ComponentRef { - get => this.Fields[(int)ServiceConfigTupleFields.Component_].AsString(); - set => this.Set((int)ServiceConfigTupleFields.Component_, value); + get => this.Fields[(int)ServiceConfigTupleFields.ComponentRef].AsString(); + set => this.Set((int)ServiceConfigTupleFields.ComponentRef, value); } public int NewService diff --git a/src/wixext/Tuples/UserGroupTuple.cs b/src/wixext/Tuples/UserGroupTuple.cs index 0386a26e..30c5e9ff 100644 --- a/src/wixext/Tuples/UserGroupTuple.cs +++ b/src/wixext/Tuples/UserGroupTuple.cs @@ -11,8 +11,8 @@ namespace WixToolset.Util UtilTupleDefinitionType.UserGroup.ToString(), new[] { - new IntermediateFieldDefinition(nameof(UserGroupTupleFields.User_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserGroupTupleFields.Group_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserGroupTupleFields.UserRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(UserGroupTupleFields.GroupRef), IntermediateFieldType.String), }, typeof(UserGroupTuple)); } @@ -24,8 +24,8 @@ namespace WixToolset.Util.Tuples public enum UserGroupTupleFields { - User_, - Group_, + UserRef, + GroupRef, } public class UserGroupTuple : IntermediateTuple @@ -40,16 +40,16 @@ namespace WixToolset.Util.Tuples public IntermediateField this[UserGroupTupleFields index] => this.Fields[(int)index]; - public string User_ + public string UserRef { - get => this.Fields[(int)UserGroupTupleFields.User_].AsString(); - set => this.Set((int)UserGroupTupleFields.User_, value); + get => this.Fields[(int)UserGroupTupleFields.UserRef].AsString(); + set => this.Set((int)UserGroupTupleFields.UserRef, value); } - public string Group_ + public string GroupRef { - get => this.Fields[(int)UserGroupTupleFields.Group_].AsString(); - set => this.Set((int)UserGroupTupleFields.Group_, value); + get => this.Fields[(int)UserGroupTupleFields.GroupRef].AsString(); + set => this.Set((int)UserGroupTupleFields.GroupRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/UserTuple.cs b/src/wixext/Tuples/UserTuple.cs index e8c5315c..f11ed78b 100644 --- a/src/wixext/Tuples/UserTuple.cs +++ b/src/wixext/Tuples/UserTuple.cs @@ -11,8 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.User.ToString(), new[] { - new IntermediateFieldDefinition(nameof(UserTupleFields.User), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(UserTupleFields.Component_), IntermediateFieldType.String), + 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), @@ -28,8 +27,7 @@ namespace WixToolset.Util.Tuples public enum UserTupleFields { - User, - Component_, + ComponentRef, Name, Domain, Password, @@ -48,16 +46,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[UserTupleFields index] => this.Fields[(int)index]; - public string User + public string ComponentRef { - get => this.Fields[(int)UserTupleFields.User].AsString(); - set => this.Set((int)UserTupleFields.User, value); - } - - public string Component_ - { - get => this.Fields[(int)UserTupleFields.Component_].AsString(); - set => this.Set((int)UserTupleFields.Component_, value); + get => this.Fields[(int)UserTupleFields.ComponentRef].AsString(); + set => this.Set((int)UserTupleFields.ComponentRef, value); } public string Name diff --git a/src/wixext/Tuples/WixCloseApplicationTuple.cs b/src/wixext/Tuples/WixCloseApplicationTuple.cs index c2095d93..cc91c326 100644 --- a/src/wixext/Tuples/WixCloseApplicationTuple.cs +++ b/src/wixext/Tuples/WixCloseApplicationTuple.cs @@ -11,7 +11,6 @@ namespace WixToolset.Util UtilTupleDefinitionType.WixCloseApplication.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.WixCloseApplication), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Target), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Description), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixCloseApplicationTupleFields.Condition), IntermediateFieldType.String), @@ -31,7 +30,6 @@ namespace WixToolset.Util.Tuples public enum WixCloseApplicationTupleFields { - WixCloseApplication, Target, Description, Condition, @@ -54,12 +52,6 @@ namespace WixToolset.Util.Tuples public IntermediateField this[WixCloseApplicationTupleFields index] => this.Fields[(int)index]; - public string WixCloseApplication - { - get => this.Fields[(int)WixCloseApplicationTupleFields.WixCloseApplication].AsString(); - set => this.Set((int)WixCloseApplicationTupleFields.WixCloseApplication, value); - } - public string Target { get => this.Fields[(int)WixCloseApplicationTupleFields.Target].AsString(); diff --git a/src/wixext/Tuples/WixFormatFilesTuple.cs b/src/wixext/Tuples/WixFormatFilesTuple.cs index 7fc092b0..8e7db0c6 100644 --- a/src/wixext/Tuples/WixFormatFilesTuple.cs +++ b/src/wixext/Tuples/WixFormatFilesTuple.cs @@ -11,8 +11,8 @@ namespace WixToolset.Util UtilTupleDefinitionType.WixFormatFiles.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.Binary_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.File_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.BinaryRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixFormatFilesTupleFields.FileRef), IntermediateFieldType.String), }, typeof(WixFormatFilesTuple)); } @@ -24,8 +24,8 @@ namespace WixToolset.Util.Tuples public enum WixFormatFilesTupleFields { - Binary_, - File_, + BinaryRef, + FileRef, } public class WixFormatFilesTuple : IntermediateTuple @@ -40,16 +40,16 @@ namespace WixToolset.Util.Tuples public IntermediateField this[WixFormatFilesTupleFields index] => this.Fields[(int)index]; - public string Binary_ + public string BinaryRef { - get => this.Fields[(int)WixFormatFilesTupleFields.Binary_].AsString(); - set => this.Set((int)WixFormatFilesTupleFields.Binary_, value); + get => this.Fields[(int)WixFormatFilesTupleFields.BinaryRef].AsString(); + set => this.Set((int)WixFormatFilesTupleFields.BinaryRef, value); } - public string File_ + public string FileRef { - get => this.Fields[(int)WixFormatFilesTupleFields.File_].AsString(); - set => this.Set((int)WixFormatFilesTupleFields.File_, value); + get => this.Fields[(int)WixFormatFilesTupleFields.FileRef].AsString(); + set => this.Set((int)WixFormatFilesTupleFields.FileRef, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixInternetShortcutTuple.cs b/src/wixext/Tuples/WixInternetShortcutTuple.cs index 5c29cda6..935d9462 100644 --- a/src/wixext/Tuples/WixInternetShortcutTuple.cs +++ b/src/wixext/Tuples/WixInternetShortcutTuple.cs @@ -11,9 +11,8 @@ namespace WixToolset.Util UtilTupleDefinitionType.WixInternetShortcut.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.WixInternetShortcut), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Component_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixInternetShortcutTupleFields.Directory_), IntermediateFieldType.String), + 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), @@ -30,9 +29,8 @@ namespace WixToolset.Util.Tuples public enum WixInternetShortcutTupleFields { - WixInternetShortcut, - Component_, - Directory_, + ComponentRef, + DirectoryRef, Name, Target, Attributes, @@ -52,22 +50,16 @@ namespace WixToolset.Util.Tuples public IntermediateField this[WixInternetShortcutTupleFields index] => this.Fields[(int)index]; - public string WixInternetShortcut + public string ComponentRef { - get => this.Fields[(int)WixInternetShortcutTupleFields.WixInternetShortcut].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.WixInternetShortcut, value); + get => this.Fields[(int)WixInternetShortcutTupleFields.ComponentRef].AsString(); + set => this.Set((int)WixInternetShortcutTupleFields.ComponentRef, value); } - public string Component_ + public string DirectoryRef { - get => this.Fields[(int)WixInternetShortcutTupleFields.Component_].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.Component_, value); - } - - public string Directory_ - { - get => this.Fields[(int)WixInternetShortcutTupleFields.Directory_].AsString(); - set => this.Set((int)WixInternetShortcutTupleFields.Directory_, value); + get => this.Fields[(int)WixInternetShortcutTupleFields.DirectoryRef].AsString(); + set => this.Set((int)WixInternetShortcutTupleFields.DirectoryRef, value); } public string Name diff --git a/src/wixext/Tuples/WixRemoveFolderExTuple.cs b/src/wixext/Tuples/WixRemoveFolderExTuple.cs index 35e22e2d..d43c59c3 100644 --- a/src/wixext/Tuples/WixRemoveFolderExTuple.cs +++ b/src/wixext/Tuples/WixRemoveFolderExTuple.cs @@ -11,8 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.WixRemoveFolderEx.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.WixRemoveFolderEx), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.Property), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixRemoveFolderExTupleFields.InstallMode), IntermediateFieldType.Number), }, @@ -26,8 +25,7 @@ namespace WixToolset.Util.Tuples public enum WixRemoveFolderExTupleFields { - WixRemoveFolderEx, - Component_, + ComponentRef, Property, InstallMode, } @@ -44,16 +42,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[WixRemoveFolderExTupleFields index] => this.Fields[(int)index]; - public string WixRemoveFolderEx + public string ComponentRef { - get => this.Fields[(int)WixRemoveFolderExTupleFields.WixRemoveFolderEx].AsString(); - set => this.Set((int)WixRemoveFolderExTupleFields.WixRemoveFolderEx, value); - } - - public string Component_ - { - get => this.Fields[(int)WixRemoveFolderExTupleFields.Component_].AsString(); - set => this.Set((int)WixRemoveFolderExTupleFields.Component_, value); + get => this.Fields[(int)WixRemoveFolderExTupleFields.ComponentRef].AsString(); + set => this.Set((int)WixRemoveFolderExTupleFields.ComponentRef, value); } public string Property diff --git a/src/wixext/Tuples/WixRestartResourceTuple.cs b/src/wixext/Tuples/WixRestartResourceTuple.cs index 828d9d15..92091c3d 100644 --- a/src/wixext/Tuples/WixRestartResourceTuple.cs +++ b/src/wixext/Tuples/WixRestartResourceTuple.cs @@ -11,8 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.WixRestartResource.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.WixRestartResource), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.Resource), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixRestartResourceTupleFields.Attributes), IntermediateFieldType.Number), }, @@ -26,8 +25,7 @@ namespace WixToolset.Util.Tuples public enum WixRestartResourceTupleFields { - WixRestartResource, - Component_, + ComponentRef, Resource, Attributes, } @@ -44,16 +42,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[WixRestartResourceTupleFields index] => this.Fields[(int)index]; - public string WixRestartResource + public string ComponentRef { - get => this.Fields[(int)WixRestartResourceTupleFields.WixRestartResource].AsString(); - set => this.Set((int)WixRestartResourceTupleFields.WixRestartResource, value); - } - - public string Component_ - { - get => this.Fields[(int)WixRestartResourceTupleFields.Component_].AsString(); - set => this.Set((int)WixRestartResourceTupleFields.Component_, value); + get => this.Fields[(int)WixRestartResourceTupleFields.ComponentRef].AsString(); + set => this.Set((int)WixRestartResourceTupleFields.ComponentRef, value); } public string Resource diff --git a/src/wixext/Tuples/WixTouchFileTuple.cs b/src/wixext/Tuples/WixTouchFileTuple.cs index f87f396e..0a152dec 100644 --- a/src/wixext/Tuples/WixTouchFileTuple.cs +++ b/src/wixext/Tuples/WixTouchFileTuple.cs @@ -11,8 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.WixTouchFile.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.WixTouchFile), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.Path), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixTouchFileTupleFields.Attributes), IntermediateFieldType.Number), }, @@ -26,8 +25,7 @@ namespace WixToolset.Util.Tuples public enum WixTouchFileTupleFields { - WixTouchFile, - Component_, + ComponentRef, Path, Attributes, } @@ -44,16 +42,10 @@ namespace WixToolset.Util.Tuples public IntermediateField this[WixTouchFileTupleFields index] => this.Fields[(int)index]; - public string WixTouchFile + public string ComponentRef { - get => this.Fields[(int)WixTouchFileTupleFields.WixTouchFile].AsString(); - set => this.Set((int)WixTouchFileTupleFields.WixTouchFile, value); - } - - public string Component_ - { - get => this.Fields[(int)WixTouchFileTupleFields.Component_].AsString(); - set => this.Set((int)WixTouchFileTupleFields.Component_, value); + get => this.Fields[(int)WixTouchFileTupleFields.ComponentRef].AsString(); + set => this.Set((int)WixTouchFileTupleFields.ComponentRef, value); } public string Path diff --git a/src/wixext/Tuples/XmlConfigTuple.cs b/src/wixext/Tuples/XmlConfigTuple.cs index 093299b2..0eb49cac 100644 --- a/src/wixext/Tuples/XmlConfigTuple.cs +++ b/src/wixext/Tuples/XmlConfigTuple.cs @@ -11,14 +11,13 @@ namespace WixToolset.Util UtilTupleDefinitionType.XmlConfig.ToString(), new[] { - new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.XmlConfig), IntermediateFieldType.String), 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.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlConfigTupleFields.Sequence), IntermediateFieldType.Number), }, typeof(XmlConfigTuple)); @@ -31,14 +30,13 @@ namespace WixToolset.Util.Tuples public enum XmlConfigTupleFields { - XmlConfig, File, ElementPath, VerifyPath, Name, Value, Flags, - Component_, + ComponentRef, Sequence, } @@ -54,12 +52,6 @@ namespace WixToolset.Util.Tuples public IntermediateField this[XmlConfigTupleFields index] => this.Fields[(int)index]; - public string XmlConfig - { - get => this.Fields[(int)XmlConfigTupleFields.XmlConfig].AsString(); - set => this.Set((int)XmlConfigTupleFields.XmlConfig, value); - } - public string File { get => this.Fields[(int)XmlConfigTupleFields.File].AsString(); @@ -96,10 +88,10 @@ namespace WixToolset.Util.Tuples set => this.Set((int)XmlConfigTupleFields.Flags, value); } - public string Component_ + public string ComponentRef { - get => this.Fields[(int)XmlConfigTupleFields.Component_].AsString(); - set => this.Set((int)XmlConfigTupleFields.Component_, value); + get => this.Fields[(int)XmlConfigTupleFields.ComponentRef].AsString(); + set => this.Set((int)XmlConfigTupleFields.ComponentRef, value); } public int Sequence diff --git a/src/wixext/Tuples/XmlFileTuple.cs b/src/wixext/Tuples/XmlFileTuple.cs index 27ea7119..e0b3bbd7 100644 --- a/src/wixext/Tuples/XmlFileTuple.cs +++ b/src/wixext/Tuples/XmlFileTuple.cs @@ -11,13 +11,12 @@ namespace WixToolset.Util UtilTupleDefinitionType.XmlFile.ToString(), new[] { - new IntermediateFieldDefinition(nameof(XmlFileTupleFields.XmlFile), IntermediateFieldType.String), 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.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(XmlFileTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(XmlFileTupleFields.Sequence), IntermediateFieldType.Number), }, typeof(XmlFileTuple)); @@ -30,13 +29,12 @@ namespace WixToolset.Util.Tuples public enum XmlFileTupleFields { - XmlFile, File, ElementPath, Name, Value, Flags, - Component_, + ComponentRef, Sequence, } @@ -52,12 +50,6 @@ namespace WixToolset.Util.Tuples public IntermediateField this[XmlFileTupleFields index] => this.Fields[(int)index]; - public string XmlFile - { - get => this.Fields[(int)XmlFileTupleFields.XmlFile].AsString(); - set => this.Set((int)XmlFileTupleFields.XmlFile, value); - } - public string File { get => this.Fields[(int)XmlFileTupleFields.File].AsString(); @@ -88,10 +80,10 @@ namespace WixToolset.Util.Tuples set => this.Set((int)XmlFileTupleFields.Flags, value); } - public string Component_ + public string ComponentRef { - get => this.Fields[(int)XmlFileTupleFields.Component_].AsString(); - set => this.Set((int)XmlFileTupleFields.Component_, value); + get => this.Fields[(int)XmlFileTupleFields.ComponentRef].AsString(); + set => this.Set((int)XmlFileTupleFields.ComponentRef, value); } public int Sequence -- cgit v1.2.3-55-g6feb