diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-04-13 20:06:13 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-04-13 20:06:13 +1000 |
commit | 881f9d05042b72ea34382fc0c148a8cfbca06c9c (patch) | |
tree | c3607834e9b8c79c10b5d7c58ae9ab2b86bfc6c6 | |
parent | a10c87c97c270b9c6c923fbb4e61e2fe779d9107 (diff) | |
download | wix-881f9d05042b72ea34382fc0c148a8cfbca06c9c.tar.gz wix-881f9d05042b72ea34382fc0c148a8cfbca06c9c.tar.bz2 wix-881f9d05042b72ea34382fc0c148a8cfbca06c9c.zip |
Update dependencies.
-rw-r--r-- | appveyor.yml | 2 | ||||
-rw-r--r-- | src/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs | 2 | ||||
-rw-r--r-- | src/wixext/DifxAppTableDefinitions.cs | 2 | ||||
-rw-r--r-- | src/wixext/Tuples/MsiDriverPackagesTuple.cs | 4 | ||||
-rw-r--r-- | src/wixlib/difxapp.wixproj | 4 | ||||
-rw-r--r-- | 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 | |||
33 | artifacts: | 33 | artifacts: |
34 | - path: build\Release\**\*.nupkg | 34 | - path: build\Release\**\*.nupkg |
35 | name: nuget | 35 | name: nuget |
36 | - path: build\Release\**\*.msi | ||
37 | name: msi | ||
38 | 36 | ||
39 | notifications: | 37 | notifications: |
40 | - provider: Slack | 38 | - 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 | |||
24 | "CustomAction:MsiProcessDrivers\t1\tDIFxApp.dll\tProcessDriverPackages\t", | 24 | "CustomAction:MsiProcessDrivers\t1\tDIFxApp.dll\tProcessDriverPackages\t", |
25 | "CustomAction:MsiRollbackInstall\t3329\tDIFxAppA.dll\tRollbackInstall\t", | 25 | "CustomAction:MsiRollbackInstall\t3329\tDIFxAppA.dll\tRollbackInstall\t", |
26 | "CustomAction:MsiUninstallDrivers\t3073\tDIFxAppA.dll\tUninstallDriverPackages\t", | 26 | "CustomAction:MsiUninstallDrivers\t3073\tDIFxAppA.dll\tUninstallDriverPackages\t", |
27 | }, results.OrderBy(s => s).ToArray()); | 27 | }, results); |
28 | } | 28 | } |
29 | 29 | ||
30 | private static void Build(string[] args) | 30 | 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 | |||
8 | { | 8 | { |
9 | public static readonly TableDefinition MsiDriverPackages = new TableDefinition( | 9 | public static readonly TableDefinition MsiDriverPackages = new TableDefinition( |
10 | "MsiDriverPackages", | 10 | "MsiDriverPackages", |
11 | DifxAppTupleDefinitions.MsiDriverPackages, | ||
11 | new[] | 12 | new[] |
12 | { | 13 | { |
13 | 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), | 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), |
14 | new ColumnDefinition("Flags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 31, description: "Flags for installing and uninstalling driver packages"), | 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"), |
15 | new ColumnDefinition("Sequence", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, description: "Order in which the driver packages are processed"), | 16 | new ColumnDefinition("Sequence", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, description: "Order in which the driver packages are processed"), |
16 | }, | 17 | }, |
17 | tupleDefinitionName: DifxAppTupleDefinitions.MsiDriverPackages.Name, | ||
18 | tupleIdIsPrimaryKey: false | 18 | tupleIdIsPrimaryKey: false |
19 | ); | 19 | ); |
20 | 20 | ||
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 | |||
54 | set => this.Set((int)MsiDriverPackagesTupleFields.Flags, value); | 54 | set => this.Set((int)MsiDriverPackagesTupleFields.Flags, value); |
55 | } | 55 | } |
56 | 56 | ||
57 | public int Sequence | 57 | public int? Sequence |
58 | { | 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); | 60 | set => this.Set((int)MsiDriverPackagesTupleFields.Sequence, value); |
61 | } | 61 | } |
62 | } | 62 | } |
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 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | 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. --> | 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"> | 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" /> | 5 | <Import Project="..\FindLocalWix.props" /> |
6 | <PropertyGroup> | 6 | <PropertyGroup> |
7 | <ProjectGuid>{5066EB93-D8F7-4FAE-B687-024D7A81BD95}</ProjectGuid> | 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> | 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> | 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'))" /> | 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> | 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')" /> | 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> | 39 | </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 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <packages> | 2 | <packages> |
3 | <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" /> | 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 | 5 | </packages> \ No newline at end of file |