From f468dc2a5a1fc9b89e019054c0187463c81faec2 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 10 Apr 2020 10:00:51 +1000 Subject: Modernize MsmqCompiler and tuples. --- .../WixToolsetTest.Msmq/MsmqExtensionFixture.cs | 4 +- src/wixext/MsmqCompiler.cs | 98 ++++++++++++---------- src/wixext/MsmqTableDefinitions.cs | 64 ++++++++++++++ src/wixext/MsmqWindowsInstallerBackendExtension.cs | 23 +---- .../Tuples/MessageQueueGroupPermissionTuple.cs | 38 ++++----- src/wixext/Tuples/MessageQueueTuple.cs | 18 ++-- .../Tuples/MessageQueueUserPermissionTuple.cs | 38 ++++----- src/wixext/WixToolset.Msmq.wixext.csproj | 1 - src/wixext/tables.xml | 54 ------------ 9 files changed, 155 insertions(+), 183 deletions(-) create mode 100644 src/wixext/MsmqTableDefinitions.cs delete mode 100644 src/wixext/tables.xml diff --git a/src/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs b/src/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs index af64517d..057b0a9d 100644 --- a/src/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs +++ b/src/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs @@ -19,8 +19,8 @@ namespace WixToolsetTest.Msmq var results = build.BuildAndQuery(Build, "MessageQueue"); Assert.Equal(new[] { - "MessageQueue:TestMQ\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t0\t0\tMQLabel\t\tMQPath\t0\t0\t\t0", - }, results.OrderBy(s => s).ToArray()); + "MessageQueue:TestMQ\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t\t\tMQLabel\t\tMQPath\t\t\t\t0", + }, results); } private static void Build(string[] args) diff --git a/src/wixext/MsmqCompiler.cs b/src/wixext/MsmqCompiler.cs index 5365f0fb..15c3f3ca 100644 --- a/src/wixext/MsmqCompiler.cs +++ b/src/wixext/MsmqCompiler.cs @@ -7,6 +7,7 @@ namespace WixToolset.Msmq using System.Xml.Linq; using WixToolset.Data; using WixToolset.Extensibility; + using WixToolset.Msmq.Tuples; /// /// The compiler for the WiX Toolset MSMQ Extension. @@ -69,8 +70,8 @@ namespace WixToolset.Msmq switch (parentElement.Name.LocalName) { case "Component": - string componentId = context["ComponentId"]; - string directoryId = context["DirectoryId"]; + var componentId = context["ComponentId"]; + var directoryId = context["DirectoryId"]; switch (element.Name.LocalName) { @@ -98,20 +99,20 @@ namespace WixToolset.Msmq /// Identifier of parent component. private void ParseMessageQueueElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentId) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); Identifier id = null; - int basePriority = CompilerConstants.IntegerNotSet; - int journalQuota = CompilerConstants.IntegerNotSet; + var basePriority = CompilerConstants.IntegerNotSet; + var journalQuota = CompilerConstants.IntegerNotSet; string label = null; string multicastAddress = null; string pathName = null; - int privLevel = CompilerConstants.IntegerNotSet; - int quota = CompilerConstants.IntegerNotSet; + var privLevel = CompilerConstants.IntegerNotSet; + var quota = CompilerConstants.IntegerNotSet; string serviceTypeGuid = null; int attributes = 0; - foreach (XAttribute attrib in node.Attributes()) + foreach (var attrib in node.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -156,7 +157,7 @@ namespace WixToolset.Msmq pathName = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; case "PrivLevel": - string privLevelAttr = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + var privLevelAttr = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); switch (privLevelAttr) { case "none": @@ -200,7 +201,7 @@ namespace WixToolset.Msmq } } - foreach (XElement child in node.Elements()) + foreach (var child in node.Elements()) { if (this.Namespace == child.Name.Namespace) { @@ -220,32 +221,36 @@ namespace WixToolset.Msmq } } - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "MessageQueue", id); - row.Set(1, componentId); + var tuple = section.AddTuple(new MessageQueueTuple(sourceLineNumbers, id) + { + ComponentRef = componentId, + Label = label, + MulticastAddress = multicastAddress, + PathName = pathName, + ServiceTypeGuid = serviceTypeGuid, + Attributes = attributes, + }); + if (CompilerConstants.IntegerNotSet != basePriority) { - row.Set(2, basePriority); + tuple.BasePriority = basePriority; } if (CompilerConstants.IntegerNotSet != journalQuota) { - row.Set(3, journalQuota); + tuple.JournalQuota = journalQuota; } - row.Set(4, label); - row.Set(5, multicastAddress); - row.Set(6, pathName); + if (CompilerConstants.IntegerNotSet != privLevel) { - row.Set(7, privLevel); + tuple.PrivLevel = privLevel; } if (CompilerConstants.IntegerNotSet != quota) { - row.Set(8, quota); + tuple.Quota = quota; } - row.Set(9, serviceTypeGuid); - row.Set(10, attributes); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "MessageQueuingInstall"); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "MessageQueuingUninstall"); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "MessageQueuingInstall"); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "MessageQueuingUninstall"); } /// @@ -256,14 +261,14 @@ namespace WixToolset.Msmq /// Optional identifier of parent message queue. private void ParseMessageQueuePermissionElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentId, string messageQueueId) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); Identifier id = null; string user = null; string group = null; int permissions = 0; - foreach (XAttribute attrib in node.Attributes()) + foreach (var attrib in node.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -278,7 +283,7 @@ namespace WixToolset.Msmq this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } messageQueueId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "MessageQueue", messageQueueId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, MsmqTupleDefinitions.MessageQueue, messageQueueId); break; case "User": if (null != group) @@ -467,6 +472,11 @@ namespace WixToolset.Msmq } } + if (null == id) + { + id = this.ParseHelper.CreateIdentifier("mqp", componentId, messageQueueId, user, group); + } + if (null == messageQueueId) { this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "MessageQueue")); @@ -480,19 +490,23 @@ namespace WixToolset.Msmq if (null != user) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "MessageQueueUserPermission", id); - row.Set(1, componentId); - row.Set(2, messageQueueId); - row.Set(3, user); - row.Set(4, permissions); + section.AddTuple(new MessageQueueUserPermissionTuple(sourceLineNumbers, id) + { + ComponentRef = componentId, + MessageQueueRef = messageQueueId, + UserRef = user, + Permissions = permissions, + }); } if (null != group) { - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "MessageQueueGroupPermission", id); - row.Set(1, componentId); - row.Set(2, messageQueueId); - row.Set(3, group); - row.Set(4, permissions); + section.AddTuple(new MessageQueueGroupPermissionTuple(sourceLineNumbers, id) + { + ComponentRef = componentId, + MessageQueueRef = messageQueueId, + GroupRef = group, + Permissions = permissions, + }); } } @@ -504,19 +518,11 @@ namespace WixToolset.Msmq /// string TryFormatGuidValue(string val) { - try - { - Guid guid = new Guid(val); - return guid.ToString("B").ToUpper(); - } - catch (FormatException) - { - return val; - } - catch (OverflowException) + if (!Guid.TryParse(val, out var guid)) { return val; } + return guid.ToString("B").ToUpper(); } } } diff --git a/src/wixext/MsmqTableDefinitions.cs b/src/wixext/MsmqTableDefinitions.cs new file mode 100644 index 00000000..00149ffa --- /dev/null +++ b/src/wixext/MsmqTableDefinitions.cs @@ -0,0 +1,64 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. + +namespace WixToolset.Msmq +{ + using WixToolset.Data.WindowsInstaller; + + public static class MsmqTableDefinitions + { + public static readonly TableDefinition MessageQueue = new TableDefinition( + "MessageQueue", + new[] + { + new ColumnDefinition("MessageQueue", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("BasePriority", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown), + new ColumnDefinition("JournalQuota", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown), + new ColumnDefinition("Label", ColumnType.Localized, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("MulticastAddress", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("PathName", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("PrivLevel", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown), + new ColumnDefinition("Quota", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown), + new ColumnDefinition("ServiceTypeGuid", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property), + new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown), + }, + tupleDefinitionName: MsmqTupleDefinitions.MessageQueue.Name, + tupleIdIsPrimaryKey: true + ); + + public static readonly TableDefinition MessageQueueUserPermission = new TableDefinition( + "MessageQueueUserPermission", + new[] + { + new ColumnDefinition("MessageQueueUserPermission", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("MessageQueue_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "MessageQueue", keyColumn: 1, modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown), + }, + tupleDefinitionName: MsmqTupleDefinitions.MessageQueueUserPermission.Name, + tupleIdIsPrimaryKey: true + ); + + public static readonly TableDefinition MessageQueueGroupPermission = new TableDefinition( + "MessageQueueGroupPermission", + new[] + { + new ColumnDefinition("MessageQueueGroupPermission", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("MessageQueue_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "MessageQueue", keyColumn: 1, modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column), + new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown), + }, + tupleDefinitionName: MsmqTupleDefinitions.MessageQueueGroupPermission.Name, + tupleIdIsPrimaryKey: true + ); + + public static readonly TableDefinition[] All = new[] + { + MessageQueue, + MessageQueueUserPermission, + MessageQueueGroupPermission, + }; + } +} diff --git a/src/wixext/MsmqWindowsInstallerBackendExtension.cs b/src/wixext/MsmqWindowsInstallerBackendExtension.cs index 4debafeb..3f83db56 100644 --- a/src/wixext/MsmqWindowsInstallerBackendExtension.cs +++ b/src/wixext/MsmqWindowsInstallerBackendExtension.cs @@ -1,32 +1,13 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. +// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. namespace WixToolset.Msmq { using System.Collections.Generic; - using System.Linq; - using System.Xml; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; public class MsmqWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension { - public MsmqWindowsInstallerBackendBinderExtension() - { - - } - - private static readonly TableDefinition[] Tables = LoadTables(); - - public override IEnumerable TableDefinitions => Tables; - - private static TableDefinition[] LoadTables() - { - using (var resourceStream = typeof(MsmqWindowsInstallerBackendBinderExtension).Assembly.GetManifestResourceStream("WixToolset.Msmq.tables.xml")) - using (var reader = XmlReader.Create(resourceStream)) - { - var tables = TableDefinitionCollection.Load(reader); - return tables.ToArray(); - } - } + public override IEnumerable TableDefinitions => MsmqTableDefinitions.All; } } diff --git a/src/wixext/Tuples/MessageQueueGroupPermissionTuple.cs b/src/wixext/Tuples/MessageQueueGroupPermissionTuple.cs index cc690f9a..0b1794fd 100644 --- a/src/wixext/Tuples/MessageQueueGroupPermissionTuple.cs +++ b/src/wixext/Tuples/MessageQueueGroupPermissionTuple.cs @@ -11,10 +11,9 @@ namespace WixToolset.Msmq MsmqTupleDefinitionType.MessageQueueGroupPermission.ToString(), new[] { - new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.MessageQueueGroupPermission), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.Component_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.MessageQueue_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.Group_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.MessageQueueRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.GroupRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.Permissions), IntermediateFieldType.Number), }, typeof(MessageQueueGroupPermissionTuple)); @@ -27,10 +26,9 @@ namespace WixToolset.Msmq.Tuples public enum MessageQueueGroupPermissionTupleFields { - MessageQueueGroupPermission, - Component_, - MessageQueue_, - Group_, + ComponentRef, + MessageQueueRef, + GroupRef, Permissions, } @@ -46,28 +44,22 @@ namespace WixToolset.Msmq.Tuples public IntermediateField this[MessageQueueGroupPermissionTupleFields index] => this.Fields[(int)index]; - public string MessageQueueGroupPermission + public string ComponentRef { - get => this.Fields[(int)MessageQueueGroupPermissionTupleFields.MessageQueueGroupPermission].AsString(); - set => this.Set((int)MessageQueueGroupPermissionTupleFields.MessageQueueGroupPermission, value); + get => this.Fields[(int)MessageQueueGroupPermissionTupleFields.ComponentRef].AsString(); + set => this.Set((int)MessageQueueGroupPermissionTupleFields.ComponentRef, value); } - public string Component_ + public string MessageQueueRef { - get => this.Fields[(int)MessageQueueGroupPermissionTupleFields.Component_].AsString(); - set => this.Set((int)MessageQueueGroupPermissionTupleFields.Component_, value); + get => this.Fields[(int)MessageQueueGroupPermissionTupleFields.MessageQueueRef].AsString(); + set => this.Set((int)MessageQueueGroupPermissionTupleFields.MessageQueueRef, value); } - public string MessageQueue_ + public string GroupRef { - get => this.Fields[(int)MessageQueueGroupPermissionTupleFields.MessageQueue_].AsString(); - set => this.Set((int)MessageQueueGroupPermissionTupleFields.MessageQueue_, value); - } - - public string Group_ - { - get => this.Fields[(int)MessageQueueGroupPermissionTupleFields.Group_].AsString(); - set => this.Set((int)MessageQueueGroupPermissionTupleFields.Group_, value); + get => this.Fields[(int)MessageQueueGroupPermissionTupleFields.GroupRef].AsString(); + set => this.Set((int)MessageQueueGroupPermissionTupleFields.GroupRef, value); } public int Permissions diff --git a/src/wixext/Tuples/MessageQueueTuple.cs b/src/wixext/Tuples/MessageQueueTuple.cs index 86f7f2a4..afbd1b7a 100644 --- a/src/wixext/Tuples/MessageQueueTuple.cs +++ b/src/wixext/Tuples/MessageQueueTuple.cs @@ -11,8 +11,7 @@ namespace WixToolset.Msmq MsmqTupleDefinitionType.MessageQueue.ToString(), new[] { - new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.MessageQueue), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.Component_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.ComponentRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.BasePriority), IntermediateFieldType.Number), new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.JournalQuota), IntermediateFieldType.Number), new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.Label), IntermediateFieldType.String), @@ -33,8 +32,7 @@ namespace WixToolset.Msmq.Tuples public enum MessageQueueTupleFields { - MessageQueue, - Component_, + ComponentRef, BasePriority, JournalQuota, Label, @@ -58,16 +56,10 @@ namespace WixToolset.Msmq.Tuples public IntermediateField this[MessageQueueTupleFields index] => this.Fields[(int)index]; - public string MessageQueue + public string ComponentRef { - get => this.Fields[(int)MessageQueueTupleFields.MessageQueue].AsString(); - set => this.Set((int)MessageQueueTupleFields.MessageQueue, value); - } - - public string Component_ - { - get => this.Fields[(int)MessageQueueTupleFields.Component_].AsString(); - set => this.Set((int)MessageQueueTupleFields.Component_, value); + get => this.Fields[(int)MessageQueueTupleFields.ComponentRef].AsString(); + set => this.Set((int)MessageQueueTupleFields.ComponentRef, value); } public int BasePriority diff --git a/src/wixext/Tuples/MessageQueueUserPermissionTuple.cs b/src/wixext/Tuples/MessageQueueUserPermissionTuple.cs index 8c5e6ade..c6d5a45a 100644 --- a/src/wixext/Tuples/MessageQueueUserPermissionTuple.cs +++ b/src/wixext/Tuples/MessageQueueUserPermissionTuple.cs @@ -11,10 +11,9 @@ namespace WixToolset.Msmq MsmqTupleDefinitionType.MessageQueueUserPermission.ToString(), new[] { - new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.MessageQueueUserPermission), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.Component_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.MessageQueue_), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.User_), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.MessageQueueRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.UserRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.Permissions), IntermediateFieldType.Number), }, typeof(MessageQueueUserPermissionTuple)); @@ -27,10 +26,9 @@ namespace WixToolset.Msmq.Tuples public enum MessageQueueUserPermissionTupleFields { - MessageQueueUserPermission, - Component_, - MessageQueue_, - User_, + ComponentRef, + MessageQueueRef, + UserRef, Permissions, } @@ -46,28 +44,22 @@ namespace WixToolset.Msmq.Tuples public IntermediateField this[MessageQueueUserPermissionTupleFields index] => this.Fields[(int)index]; - public string MessageQueueUserPermission + public string ComponentRef { - get => this.Fields[(int)MessageQueueUserPermissionTupleFields.MessageQueueUserPermission].AsString(); - set => this.Set((int)MessageQueueUserPermissionTupleFields.MessageQueueUserPermission, value); + get => this.Fields[(int)MessageQueueUserPermissionTupleFields.ComponentRef].AsString(); + set => this.Set((int)MessageQueueUserPermissionTupleFields.ComponentRef, value); } - public string Component_ + public string MessageQueueRef { - get => this.Fields[(int)MessageQueueUserPermissionTupleFields.Component_].AsString(); - set => this.Set((int)MessageQueueUserPermissionTupleFields.Component_, value); + get => this.Fields[(int)MessageQueueUserPermissionTupleFields.MessageQueueRef].AsString(); + set => this.Set((int)MessageQueueUserPermissionTupleFields.MessageQueueRef, value); } - public string MessageQueue_ + public string UserRef { - get => this.Fields[(int)MessageQueueUserPermissionTupleFields.MessageQueue_].AsString(); - set => this.Set((int)MessageQueueUserPermissionTupleFields.MessageQueue_, value); - } - - public string User_ - { - get => this.Fields[(int)MessageQueueUserPermissionTupleFields.User_].AsString(); - set => this.Set((int)MessageQueueUserPermissionTupleFields.User_, value); + get => this.Fields[(int)MessageQueueUserPermissionTupleFields.UserRef].AsString(); + set => this.Set((int)MessageQueueUserPermissionTupleFields.UserRef, value); } public int Permissions diff --git a/src/wixext/WixToolset.Msmq.wixext.csproj b/src/wixext/WixToolset.Msmq.wixext.csproj index 2db75ff7..4c421bac 100644 --- a/src/wixext/WixToolset.Msmq.wixext.csproj +++ b/src/wixext/WixToolset.Msmq.wixext.csproj @@ -14,7 +14,6 @@ - diff --git a/src/wixext/tables.xml b/src/wixext/tables.xml deleted file mode 100644 index 5fdd1fad..00000000 --- a/src/wixext/tables.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3-55-g6feb