Update dependencies.
Sean Hall committed
Apr 13, 2020 at 20:06 UTC
881f9d05042b72ea34382fc0c148a8cfbca06c9c
6 files changed
+7
-9
appveyor.yml
-2
@@ -33,8 +33,6 @@ skip_tags: true
33
artifacts:
34
- path: build\Release\**\*.nupkg
35
name: nuget
36
-- path: build\Release\**\*.msi
37
- name: msi
36
37
notifications:
38
- provider: Slack
src/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs
+1
-1
@@ -24,7 +24,7 @@ namespace WixToolsetTest.DifxApp
24
"CustomAction:MsiProcessDrivers\t1\tDIFxApp.dll\tProcessDriverPackages\t",
25
"CustomAction:MsiRollbackInstall\t3329\tDIFxAppA.dll\tRollbackInstall\t",
26
"CustomAction:MsiUninstallDrivers\t3073\tDIFxAppA.dll\tUninstallDriverPackages\t",
27
- }, results.OrderBy(s => s).ToArray());
27
+ }, results);
28
}
29
30
private static void Build(string[] args)
src/wixext/DifxAppTableDefinitions.cs
+1
-1
@@ -8,13 +8,13 @@ namespace WixToolset.DifxApp
8
{
9
public static readonly TableDefinition MsiDriverPackages = new TableDefinition(
10
"MsiDriverPackages",
11
+ DifxAppTupleDefinitions.MsiDriverPackages,
12
new[]
13
{
14
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),
15
new ColumnDefinition("Flags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 31, description: "Flags for installing and uninstalling driver packages"),
16
new ColumnDefinition("Sequence", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, description: "Order in which the driver packages are processed"),
17
},
17
- tupleDefinitionName: DifxAppTupleDefinitions.MsiDriverPackages.Name,
18
tupleIdIsPrimaryKey: false
19
);
20
src/wixext/Tuples/MsiDriverPackagesTuple.cs
+2
-2
@@ -54,9 +54,9 @@ namespace WixToolset.DifxApp.Tuples
54
set => this.Set((int)MsiDriverPackagesTupleFields.Flags, value);
55
}
56
57
- public int Sequence
57
+ public int? Sequence
58
{
59
- get => this.Fields[(int)MsiDriverPackagesTupleFields.Sequence].AsNumber();
59
+ get => this.Fields[(int)MsiDriverPackagesTupleFields.Sequence].AsNullableNumber();
60
set => this.Set((int)MsiDriverPackagesTupleFields.Sequence, value);
61
}
62
}
src/wixlib/difxapp.wixproj
+2
-2
@@ -1,7 +1,7 @@
1
<?xml version="1.0" encoding="utf-8" ?>
2
<!-- 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. -->
3
<Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
4
- <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')" />
4
+ <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')" />
5
<Import Project="..\FindLocalWix.props" />
6
<PropertyGroup>
7
<ProjectGuid>{5066EB93-D8F7-4FAE-B687-024D7A81BD95}</ProjectGuid>
@@ -33,7 +33,7 @@
33
<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>
34
</PropertyGroup>
35
<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'))" />
36
- <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'))" />
36
+ <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'))" />
37
</Target>
38
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
39
</Project>
src/wixlib/packages.config
+1
-1
@@ -1,5 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
4
- <package id="WixToolset.MSBuild" version="4.0.0-build-0084" developmentDependency="true" targetFramework="net40" />
4
+ <package id="WixToolset.MSBuild" version="4.0.0-build-0086" developmentDependency="true" targetFramework="net40" />
5
</packages>
\ No newline at end of file