From 881f9d05042b72ea34382fc0c148a8cfbca06c9c Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Mon, 13 Apr 2020 20:06:13 +1000
Subject: Update dependencies.

---
 appveyor.yml                                               | 2 --
 src/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs | 2 +-
 src/wixext/DifxAppTableDefinitions.cs                      | 2 +-
 src/wixext/Tuples/MsiDriverPackagesTuple.cs                | 4 ++--
 src/wixlib/difxapp.wixproj                                 | 4 ++--
 src/wixlib/packages.config                                 | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 522e5af3..7c686b04 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,8 +33,6 @@ skip_tags: true
 artifacts:
 - path: build\Release\**\*.nupkg
   name: nuget
-- path: build\Release\**\*.msi
-  name: msi
 
 notifications:
 - provider: Slack
diff --git a/src/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs b/src/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs
index 64acec91..f5166453 100644
--- a/src/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs
+++ b/src/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs
@@ -24,7 +24,7 @@ namespace WixToolsetTest.DifxApp
                 "CustomAction:MsiProcessDrivers\t1\tDIFxApp.dll\tProcessDriverPackages\t",
                 "CustomAction:MsiRollbackInstall\t3329\tDIFxAppA.dll\tRollbackInstall\t",
                 "CustomAction:MsiUninstallDrivers\t3073\tDIFxAppA.dll\tUninstallDriverPackages\t",
-            }, results.OrderBy(s => s).ToArray());
+            }, results);
         }
 
         private static void Build(string[] args)
diff --git a/src/wixext/DifxAppTableDefinitions.cs b/src/wixext/DifxAppTableDefinitions.cs
index 1ee33196..8c92c94f 100644
--- a/src/wixext/DifxAppTableDefinitions.cs
+++ b/src/wixext/DifxAppTableDefinitions.cs
@@ -8,13 +8,13 @@ namespace WixToolset.DifxApp
     {
         public static readonly TableDefinition MsiDriverPackages = new TableDefinition(
             "MsiDriverPackages",
+            DifxAppTupleDefinitions.MsiDriverPackages,
             new[]
             {
                 new ColumnDefinition("Component", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Name of the component that represents the driver package", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Flags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 31, description: "Flags for installing and uninstalling driver packages"),
                 new ColumnDefinition("Sequence", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, description: "Order in which the driver packages are processed"),
             },
-            tupleDefinitionName: DifxAppTupleDefinitions.MsiDriverPackages.Name,
             tupleIdIsPrimaryKey: false
         );
 
diff --git a/src/wixext/Tuples/MsiDriverPackagesTuple.cs b/src/wixext/Tuples/MsiDriverPackagesTuple.cs
index a1063972..9c57e47c 100644
--- a/src/wixext/Tuples/MsiDriverPackagesTuple.cs
+++ b/src/wixext/Tuples/MsiDriverPackagesTuple.cs
@@ -54,9 +54,9 @@ namespace WixToolset.DifxApp.Tuples
             set => this.Set((int)MsiDriverPackagesTupleFields.Flags, value);
         }
 
-        public int Sequence
+        public int? Sequence
         {
-            get => this.Fields[(int)MsiDriverPackagesTupleFields.Sequence].AsNumber();
+            get => this.Fields[(int)MsiDriverPackagesTupleFields.Sequence].AsNullableNumber();
             set => this.Set((int)MsiDriverPackagesTupleFields.Sequence, value);
         }
     }
diff --git a/src/wixlib/difxapp.wixproj b/src/wixlib/difxapp.wixproj
index a7f60ea5..c5c745ae 100644
--- a/src/wixlib/difxapp.wixproj
+++ b/src/wixlib/difxapp.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>{5066EB93-D8F7-4FAE-B687-024D7A81BD95}</ProjectGuid>
@@ -33,7 +33,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
-- 
cgit v1.2.3-55-g6feb