From 89bbda630ba953e202289aa8a8dd0dad47c9c994 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 13 Apr 2020 18:13:23 +1000 Subject: Update dependencies. --- appveyor.yml | 5 +++++ src/Cpp.Build.props | 18 ------------------ src/wixext/Tuples/HelpFileTuple.cs | 4 ++-- src/wixext/VSTableDefinitions.cs | 12 ++++++------ src/wixlib/packages.config | 2 +- src/wixlib/vs.wixproj | 4 ++-- 6 files changed, 16 insertions(+), 29 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 @@ MultiThreadedDebug - - - - MultiThreadedDebugDll - - MinSpace @@ -89,16 +83,4 @@ true - - - - MultiThreadedDll - - - - - $(LinkKeyFile) - $(LinkDelaySign) - - diff --git a/src/wixext/Tuples/HelpFileTuple.cs b/src/wixext/Tuples/HelpFileTuple.cs index 9ea5e8e3..49d3bc44 100644 --- a/src/wixext/Tuples/HelpFileTuple.cs +++ b/src/wixext/Tuples/HelpFileTuple.cs @@ -56,9 +56,9 @@ namespace WixToolset.VisualStudio.Tuples set => this.Set((int)HelpFileTupleFields.HelpFileName, value); } - public int LangID + public int? LangID { - get => this.Fields[(int)HelpFileTupleFields.LangID].AsNumber(); + get => this.Fields[(int)HelpFileTupleFields.LangID].AsNullableNumber(); set => this.Set((int)HelpFileTupleFields.LangID, value); } diff --git a/src/wixext/VSTableDefinitions.cs b/src/wixext/VSTableDefinitions.cs index f630f138..bbc74b96 100644 --- a/src/wixext/VSTableDefinitions.cs +++ b/src/wixext/VSTableDefinitions.cs @@ -8,6 +8,7 @@ namespace WixToolset.VisualStudio { public static readonly TableDefinition HelpFile = new TableDefinition( "HelpFile", + VSTupleDefinitions.HelpFile, new[] { new ColumnDefinition("HelpFileKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpFile Table (required).", modularizeType: ColumnModularizeType.Column), @@ -19,46 +20,46 @@ namespace WixToolset.VisualStudio new ColumnDefinition("File_HxR", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxR (Attributes) file (optional).", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("File_Samples", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for a file that is in the 'root' of the samples directory for this HelpFile (optional).", modularizeType: ColumnModularizeType.Column), }, - tupleDefinitionName: VSTupleDefinitions.HelpFile.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition HelpFileToNamespace = new TableDefinition( "HelpFileToNamespace", + VSTupleDefinitions.HelpFileToNamespace, new[] { new ColumnDefinition("HelpFile_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpFile", keyColumn: 1, description: "Foreign key into HelpFile table (required).", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table (required)."), }, - tupleDefinitionName: VSTupleDefinitions.HelpFileToNamespace.Name, tupleIdIsPrimaryKey: false ); public static readonly TableDefinition HelpFilter = new TableDefinition( "HelpFilter", + VSTupleDefinitions.HelpFilter, new[] { new ColumnDefinition("FilterKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpFilter (required).", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Friendly name for Filter (required)."), new ColumnDefinition("QueryString", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Query String for Help Filter (optional)."), }, - tupleDefinitionName: VSTupleDefinitions.HelpFilter.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition HelpFilterToNamespace = new TableDefinition( "HelpFilterToNamespace", + VSTupleDefinitions.HelpFilterToNamespace, new[] { new ColumnDefinition("HelpFilter_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpFilter", keyColumn: 1, description: "Foreign key into HelpFilter table (required).", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table (required)."), }, - tupleDefinitionName: VSTupleDefinitions.HelpFilterToNamespace.Name, tupleIdIsPrimaryKey: false ); public static readonly TableDefinition HelpNamespace = new TableDefinition( "HelpNamespace", + VSTupleDefinitions.HelpNamespace, new[] { new ColumnDefinition("NamespaceKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpNamespace (required)."), @@ -66,12 +67,12 @@ namespace WixToolset.VisualStudio new ColumnDefinition("File_Collection", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxC (Collection) file (required).", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Friendly name for Namespace (optional)."), }, - tupleDefinitionName: VSTupleDefinitions.HelpNamespace.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition HelpPlugin = new TableDefinition( "HelpPlugin", + VSTupleDefinitions.HelpPlugin, new[] { new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table for the child namespace that will be plugged into the parent namespace (required)."), @@ -80,7 +81,6 @@ namespace WixToolset.VisualStudio new ColumnDefinition("File_HxA", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxA (Attributes) file of child namespace (optional).", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("File_ParentHxT", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxT file of parent namespace that now includes the new child namespace (optional).", modularizeType: ColumnModularizeType.Column), }, - tupleDefinitionName: VSTupleDefinitions.HelpPlugin.Name, tupleIdIsPrimaryKey: false ); 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 @@  - + \ No newline at end of file diff --git a/src/wixlib/vs.wixproj b/src/wixlib/vs.wixproj index 6987eaa1..fccbdfc0 100644 --- a/src/wixlib/vs.wixproj +++ b/src/wixlib/vs.wixproj @@ -1,7 +1,7 @@ - + {14345C9D-8AF8-435A-BB1B-E067CE7EB321} @@ -52,7 +52,7 @@ 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}. - + \ No newline at end of file -- cgit v1.2.3-55-g6feb