From f468dc2a5a1fc9b89e019054c0187463c81faec2 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 10 Apr 2020 10:00:51 +1000
Subject: Modernize MsmqCompiler and tuples.

---
 src/wixext/Tuples/MessageQueueTuple.cs | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'src/wixext/Tuples/MessageQueueTuple.cs')

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
-- 
cgit v1.2.3-55-g6feb