Update dependencies.
Sean Hall committed
Apr 13, 2020 at 18:13 UTC
89bbda630ba953e202289aa8a8dd0dad47c9c994
6 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/Tuples/HelpFileTuple.cs
+2
-2
@@ -56,9 +56,9 @@ namespace WixToolset.VisualStudio.Tuples
56
set => this.Set((int)HelpFileTupleFields.HelpFileName, value);
57
}
58
59
- public int LangID
59
+ public int? LangID
60
{
61
- get => this.Fields[(int)HelpFileTupleFields.LangID].AsNumber();
61
+ get => this.Fields[(int)HelpFileTupleFields.LangID].AsNullableNumber();
62
set => this.Set((int)HelpFileTupleFields.LangID, value);
63
}
64
src/wixext/VSTableDefinitions.cs
+6
-6
@@ -8,6 +8,7 @@ namespace WixToolset.VisualStudio
8
{
9
public static readonly TableDefinition HelpFile = new TableDefinition(
10
"HelpFile",
11
+ VSTupleDefinitions.HelpFile,
12
new[]
13
{
14
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
20
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),
21
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),
22
},
22
- tupleDefinitionName: VSTupleDefinitions.HelpFile.Name,
23
tupleIdIsPrimaryKey: true
24
);
25
26
public static readonly TableDefinition HelpFileToNamespace = new TableDefinition(
27
"HelpFileToNamespace",
28
+ VSTupleDefinitions.HelpFileToNamespace,
29
new[]
30
{
31
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),
32
new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table (required)."),
33
},
33
- tupleDefinitionName: VSTupleDefinitions.HelpFileToNamespace.Name,
34
tupleIdIsPrimaryKey: false
35
);
36
37
public static readonly TableDefinition HelpFilter = new TableDefinition(
38
"HelpFilter",
39
+ VSTupleDefinitions.HelpFilter,
40
new[]
41
{
42
new ColumnDefinition("FilterKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpFilter (required).", modularizeType: ColumnModularizeType.Column),
43
new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Friendly name for Filter (required)."),
44
new ColumnDefinition("QueryString", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Query String for Help Filter (optional)."),
45
},
45
- tupleDefinitionName: VSTupleDefinitions.HelpFilter.Name,
46
tupleIdIsPrimaryKey: true
47
);
48
49
public static readonly TableDefinition HelpFilterToNamespace = new TableDefinition(
50
"HelpFilterToNamespace",
51
+ VSTupleDefinitions.HelpFilterToNamespace,
52
new[]
53
{
54
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),
55
new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table (required)."),
56
},
56
- tupleDefinitionName: VSTupleDefinitions.HelpFilterToNamespace.Name,
57
tupleIdIsPrimaryKey: false
58
);
59
60
public static readonly TableDefinition HelpNamespace = new TableDefinition(
61
"HelpNamespace",
62
+ VSTupleDefinitions.HelpNamespace,
63
new[]
64
{
65
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
67
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),
68
new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Friendly name for Namespace (optional)."),
69
},
69
- tupleDefinitionName: VSTupleDefinitions.HelpNamespace.Name,
70
tupleIdIsPrimaryKey: true
71
);
72
73
public static readonly TableDefinition HelpPlugin = new TableDefinition(
74
"HelpPlugin",
75
+ VSTupleDefinitions.HelpPlugin,
76
new[]
77
{
78
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
81
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),
82
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),
83
},
83
- tupleDefinitionName: VSTupleDefinitions.HelpPlugin.Name,
84
tupleIdIsPrimaryKey: false
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-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
src/wixlib/vs.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>{14345C9D-8AF8-435A-BB1B-E067CE7EB321}</ProjectGuid>
@@ -52,7 +52,7 @@
52
<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>
53
</PropertyGroup>
54
<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'))" />
55
- <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'))" />
55
+ <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'))" />
56
</Target>
57
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
58
</Project>
\ No newline at end of file