6 files changed, 19 insertions, 32 deletions

diff --git a/appveyor.yml b/appveyor.yml
index bbf880f0..7c686b04 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,6 +3,11 @@
 #  Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml
 #  then update all of the repos.
 
+branches:
+  only:
+    - master
+    - develop
+
 image: Visual Studio 2019
 
 version: 0.0.0.{build}
diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 44a042c7..9b7a1bb5 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -70,12 +70,6 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
-    <ClCompile>
-      <BasicRuntimeChecks></BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
     <ClCompile>
       <Optimization>MinSpace</Optimization>
@@ -89,16 +83,4 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
-    <ClCompile>
-      <BasicRuntimeChecks></BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
-    <Link>
-      <KeyFile>$(LinkKeyFile)</KeyFile>
-      <DelaySign>$(LinkDelaySign)</DelaySign>
-    </Link>
-  </ItemDefinitionGroup>
 </Project>
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);
         }
 
diff --git a/src/wixlib/msmq.wixproj b/src/wixlib/msmq.wixproj
index ee078ea6..2808d4de 100644
--- a/src/wixlib/msmq.wixproj
+++ b/src/wixlib/msmq.wixproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
 <Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
-  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0084\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0084\build\WixToolset.MSBuild.props')" />
+  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props')" />
   <Import Project="..\FindLocalWix.props" />
   <PropertyGroup>
     <ProjectGuid>{42493058-5FC8-4F85-9884-FF3190E084B6}</ProjectGuid>
@@ -34,7 +34,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0084\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0084\build\WixToolset.MSBuild.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props'))" />
   </Target>
   <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
 </Project>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
index e1b601f6..1e5a9850 100644
--- a/src/wixlib/packages.config
+++ b/src/wixlib/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
-  <package id="WixToolset.MSBuild" version="4.0.0-build-0084" developmentDependency="true" targetFramework="net40" />
+  <package id="WixToolset.MSBuild" version="4.0.0-build-0086" developmentDependency="true" targetFramework="net40" />
 </packages>
\ No newline at end of file