Update dependencies.
Sean Hall committed
Apr 13, 2020 at 18:55 UTC
10f90c4a1fbac76278c3cccd565f7767060c8d5c
7 files changed
+16
-29
appveyor.yml
+5
@@ -3,6 +3,11 @@
3
# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml
4
# then update all of the repos.
5
6
+branches:
7
+ only:
8
+ - master
9
+ - develop
10
+
11
image: Visual Studio 2019
12
13
version: 0.0.0.{build}
src/Cpp.Build.props
-18
@@ -70,12 +70,6 @@
70
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
71
</ClCompile>
72
</ItemDefinitionGroup>
73
- <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
74
- <ClCompile>
75
- <BasicRuntimeChecks></BasicRuntimeChecks>
76
- <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
77
- </ClCompile>
78
- </ItemDefinitionGroup>
73
<ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
74
<ClCompile>
75
<Optimization>MinSpace</Optimization>
@@ -89,16 +83,4 @@
83
<OptimizeReferences>true</OptimizeReferences>
84
</Link>
85
</ItemDefinitionGroup>
92
- <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
93
- <ClCompile>
94
- <BasicRuntimeChecks></BasicRuntimeChecks>
95
- <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
96
- </ClCompile>
97
- </ItemDefinitionGroup>
98
- <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
99
- <Link>
100
- <KeyFile>$(LinkKeyFile)</KeyFile>
101
- <DelaySign>$(LinkDelaySign)</DelaySign>
102
- </Link>
103
- </ItemDefinitionGroup>
86
</Project>
src/wixext/SqlTableDefinitions.cs
+4
-4
@@ -8,6 +8,7 @@ namespace WixToolset.Sql
8
{
9
public static readonly TableDefinition SqlDatabase = new TableDefinition(
10
"SqlDatabase",
11
+ SqlTupleDefinitions.SqlDatabase,
12
new[]
13
{
14
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
21
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),
22
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"),
23
},
23
- tupleDefinitionName: "SqlDatabase",
24
tupleIdIsPrimaryKey: true
25
);
26
27
public static readonly TableDefinition SqlFileSpec = new TableDefinition(
28
"SqlFileSpec",
29
+ SqlTupleDefinitions.SqlFileSpec,
30
new[]
31
{
32
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
36
new ColumnDefinition("MaxSize", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Maximum size for file", modularizeType: ColumnModularizeType.Property),
37
new ColumnDefinition("GrowthSize", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Size file should grow when necessary", modularizeType: ColumnModularizeType.Property),
38
},
38
- tupleDefinitionName: "SqlFileSpec",
39
tupleIdIsPrimaryKey: true
40
);
41
42
public static readonly TableDefinition SqlScript = new TableDefinition(
43
"SqlScript",
44
+ SqlTupleDefinitions.SqlScript,
45
new[]
46
{
47
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
52
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"),
53
new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute SQL Queries in"),
54
},
54
- tupleDefinitionName: "SqlScript",
55
tupleIdIsPrimaryKey: true
56
);
57
58
public static readonly TableDefinition SqlString = new TableDefinition(
59
"SqlString",
60
+ SqlTupleDefinitions.SqlString,
61
new[]
62
{
63
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
68
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"),
69
new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute SQL Queries in"),
70
},
70
- tupleDefinitionName: "SqlString",
71
tupleIdIsPrimaryKey: true
72
);
73
src/wixext/Tuples/SqlScriptTuple.cs
+2
-2
@@ -78,9 +78,9 @@ namespace WixToolset.Sql.Tuples
78
set => this.Set((int)SqlScriptTupleFields.Attributes, value);
79
}
80
81
- public int Sequence
81
+ public int? Sequence
82
{
83
- get => this.Fields[(int)SqlScriptTupleFields.Sequence].AsNumber();
83
+ get => this.Fields[(int)SqlScriptTupleFields.Sequence].AsNullableNumber();
84
set => this.Set((int)SqlScriptTupleFields.Sequence, value);
85
}
86
}
src/wixext/Tuples/SqlStringTuple.cs
+2
-2
@@ -78,9 +78,9 @@ namespace WixToolset.Sql.Tuples
78
set => this.Set((int)SqlStringTupleFields.Attributes, value);
79
}
80
81
- public int Sequence
81
+ public int? Sequence
82
{
83
- get => this.Fields[(int)SqlStringTupleFields.Sequence].AsNumber();
83
+ get => this.Fields[(int)SqlStringTupleFields.Sequence].AsNullableNumber();
84
set => this.Set((int)SqlStringTupleFields.Sequence, value);
85
}
86
}
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-0083" 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
src/wixlib/sql.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-0083\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\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>{9ACF1A20-D801-45CC-A463-F9D13E506AA3}</ProjectGuid>
@@ -40,7 +40,7 @@
40
<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>
41
</PropertyGroup>
42
<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'))" />
43
- <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\build\WixToolset.MSBuild.props'))" />
43
+ <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'))" />
44
</Target>
45
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
46
</Project>
\ No newline at end of file