From 10f90c4a1fbac76278c3cccd565f7767060c8d5c Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 13 Apr 2020 18:55:48 +1000 Subject: Update dependencies. --- appveyor.yml | 5 +++++ src/Cpp.Build.props | 18 ------------------ src/wixext/SqlTableDefinitions.cs | 8 ++++---- src/wixext/Tuples/SqlScriptTuple.cs | 4 ++-- src/wixext/Tuples/SqlStringTuple.cs | 4 ++-- src/wixlib/packages.config | 2 +- src/wixlib/sql.wixproj | 4 ++-- 7 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/SqlTableDefinitions.cs b/src/wixext/SqlTableDefinitions.cs index e980aaae..3d1daee0 100644 --- a/src/wixext/SqlTableDefinitions.cs +++ b/src/wixext/SqlTableDefinitions.cs @@ -8,6 +8,7 @@ namespace WixToolset.Sql { public static readonly TableDefinition SqlDatabase = new TableDefinition( "SqlDatabase", + SqlTupleDefinitions.SqlDatabase, new[] { new ColumnDefinition("SqlDb", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), @@ -20,12 +21,12 @@ namespace WixToolset.Sql new ColumnDefinition("FileSpec_Log", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "SqlFileSpec", keyColumn: 1, description: "Foreign key referencing SqlFileSpec.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 255, description: "1 == create on install, 2 == drop on uninstall, 4 == continue on error, 8 == drop on install, 16 == create on uninstall, 32 == confirm update existing table, 64 == create on reinstall, 128 == drop on reinstall"), }, - tupleDefinitionName: "SqlDatabase", tupleIdIsPrimaryKey: true ); public static readonly TableDefinition SqlFileSpec = new TableDefinition( "SqlFileSpec", + SqlTupleDefinitions.SqlFileSpec, new[] { new ColumnDefinition("FileSpec", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column), @@ -35,12 +36,12 @@ namespace WixToolset.Sql new ColumnDefinition("MaxSize", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Maximum size for file", modularizeType: ColumnModularizeType.Property), new ColumnDefinition("GrowthSize", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Size file should grow when necessary", modularizeType: ColumnModularizeType.Property), }, - tupleDefinitionName: "SqlFileSpec", tupleIdIsPrimaryKey: true ); public static readonly TableDefinition SqlScript = new TableDefinition( "SqlScript", + SqlTupleDefinitions.SqlScript, new[] { new ColumnDefinition("Script", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token"), @@ -51,12 +52,12 @@ namespace WixToolset.Sql new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, possibilities: "1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16;17;18;19;20;21;22;23;24;25;26;27;28;29;30;31", description: "1 == execute on install, 2 == execute on uninstall, 4 == continue on error, 8 == rollback on install, 16 == rollback on uninstall"), new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute SQL Queries in"), }, - tupleDefinitionName: "SqlScript", tupleIdIsPrimaryKey: true ); public static readonly TableDefinition SqlString = new TableDefinition( "SqlString", + SqlTupleDefinitions.SqlString, new[] { new ColumnDefinition("String", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Id for the SqlString", modularizeType: ColumnModularizeType.Column), @@ -67,7 +68,6 @@ namespace WixToolset.Sql new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, possibilities: "1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16;17;18;19;20;21;22;23;24;25;26;27;28;29;30;31", description: "1 == execute on install, 2 == execute on uninstall, 4 == continue on error, 8 == rollback on install, 16 == rollback on uninstall"), new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute SQL Queries in"), }, - tupleDefinitionName: "SqlString", tupleIdIsPrimaryKey: true ); diff --git a/src/wixext/Tuples/SqlScriptTuple.cs b/src/wixext/Tuples/SqlScriptTuple.cs index de76d49d..6e4e484b 100644 --- a/src/wixext/Tuples/SqlScriptTuple.cs +++ b/src/wixext/Tuples/SqlScriptTuple.cs @@ -78,9 +78,9 @@ namespace WixToolset.Sql.Tuples set => this.Set((int)SqlScriptTupleFields.Attributes, value); } - public int Sequence + public int? Sequence { - get => this.Fields[(int)SqlScriptTupleFields.Sequence].AsNumber(); + get => this.Fields[(int)SqlScriptTupleFields.Sequence].AsNullableNumber(); set => this.Set((int)SqlScriptTupleFields.Sequence, value); } } diff --git a/src/wixext/Tuples/SqlStringTuple.cs b/src/wixext/Tuples/SqlStringTuple.cs index 77882d33..7a73f271 100644 --- a/src/wixext/Tuples/SqlStringTuple.cs +++ b/src/wixext/Tuples/SqlStringTuple.cs @@ -78,9 +78,9 @@ namespace WixToolset.Sql.Tuples set => this.Set((int)SqlStringTupleFields.Attributes, value); } - public int Sequence + public int? Sequence { - get => this.Fields[(int)SqlStringTupleFields.Sequence].AsNumber(); + get => this.Fields[(int)SqlStringTupleFields.Sequence].AsNullableNumber(); set => this.Set((int)SqlStringTupleFields.Sequence, value); } } diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index d73f4d3a..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/sql.wixproj b/src/wixlib/sql.wixproj index 7274acff..e4efb34e 100644 --- a/src/wixlib/sql.wixproj +++ b/src/wixlib/sql.wixproj @@ -1,7 +1,7 @@ - + {9ACF1A20-D801-45CC-A463-F9D13E506AA3} @@ -40,7 +40,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