From 3271bb37b4320b293881808be63142f912b85266 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Mon, 13 Apr 2020 19:22:38 +1000
Subject: Update dependencies.

---
 src/wixext/MsmqTableDefinitions.cs     |  6 +++---
 src/wixext/Tuples/MessageQueueTuple.cs | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/wixext')

diff --git a/src/wixext/MsmqTableDefinitions.cs b/src/wixext/MsmqTableDefinitions.cs
index 00149ffa..30e8d2da 100644
--- a/src/wixext/MsmqTableDefinitions.cs
+++ b/src/wixext/MsmqTableDefinitions.cs
@@ -8,6 +8,7 @@ namespace WixToolset.Msmq
     {
         public static readonly TableDefinition MessageQueue = new TableDefinition(
             "MessageQueue",
+            MsmqTupleDefinitions.MessageQueue,
             new[]
             {
                 new ColumnDefinition("MessageQueue", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -22,12 +23,12 @@ namespace WixToolset.Msmq
                 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",
+            MsmqTupleDefinitions.MessageQueueUserPermission,
             new[]
             {
                 new ColumnDefinition("MessageQueueUserPermission", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -36,12 +37,12 @@ namespace WixToolset.Msmq
                 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",
+            MsmqTupleDefinitions.MessageQueueGroupPermission,
             new[]
             {
                 new ColumnDefinition("MessageQueueGroupPermission", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -50,7 +51,6 @@ namespace WixToolset.Msmq
                 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
         );
 
diff --git a/src/wixext/Tuples/MessageQueueTuple.cs b/src/wixext/Tuples/MessageQueueTuple.cs
index afbd1b7a..32125c0f 100644
--- a/src/wixext/Tuples/MessageQueueTuple.cs
+++ b/src/wixext/Tuples/MessageQueueTuple.cs
@@ -62,15 +62,15 @@ namespace WixToolset.Msmq.Tuples
             set => this.Set((int)MessageQueueTupleFields.ComponentRef, value);
         }
 
-        public int BasePriority
+        public int? BasePriority
         {
-            get => this.Fields[(int)MessageQueueTupleFields.BasePriority].AsNumber();
+            get => this.Fields[(int)MessageQueueTupleFields.BasePriority].AsNullableNumber();
             set => this.Set((int)MessageQueueTupleFields.BasePriority, value);
         }
 
-        public int JournalQuota
+        public int? JournalQuota
         {
-            get => this.Fields[(int)MessageQueueTupleFields.JournalQuota].AsNumber();
+            get => this.Fields[(int)MessageQueueTupleFields.JournalQuota].AsNullableNumber();
             set => this.Set((int)MessageQueueTupleFields.JournalQuota, value);
         }
 
@@ -92,15 +92,15 @@ namespace WixToolset.Msmq.Tuples
             set => this.Set((int)MessageQueueTupleFields.PathName, value);
         }
 
-        public int PrivLevel
+        public int? PrivLevel
         {
-            get => this.Fields[(int)MessageQueueTupleFields.PrivLevel].AsNumber();
+            get => this.Fields[(int)MessageQueueTupleFields.PrivLevel].AsNullableNumber();
             set => this.Set((int)MessageQueueTupleFields.PrivLevel, value);
         }
 
-        public int Quota
+        public int? Quota
         {
-            get => this.Fields[(int)MessageQueueTupleFields.Quota].AsNumber();
+            get => this.Fields[(int)MessageQueueTupleFields.Quota].AsNullableNumber();
             set => this.Set((int)MessageQueueTupleFields.Quota, value);
         }
 
-- 
cgit v1.2.3-55-g6feb