Update dependencies.
Sean Hall committed
Apr 13, 2020 at 19:42 UTC
836cb478b674e866e1430c03afb9651e85b48f2a
5 files changed
+10
-23
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/HttpTableDefinitions.cs
+2
-2
@@ -8,6 +8,7 @@ namespace WixToolset.Http
8
{
9
public static readonly TableDefinition WixHttpUrlReservation = new TableDefinition(
10
"WixHttpUrlReservation",
11
+ HttpTupleDefinitions.WixHttpUrlReservation,
12
new[]
13
{
14
new ColumnDefinition("WixHttpUrlReservation", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column),
@@ -16,12 +17,12 @@ namespace WixToolset.Http
17
new ColumnDefinition("Url", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "URL to be reserved.", modularizeType: ColumnModularizeType.Property),
18
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing the component that controls the URL reservation.", modularizeType: ColumnModularizeType.Column),
19
},
19
- tupleDefinitionName: HttpTupleDefinitions.WixHttpUrlReservation.Name,
20
tupleIdIsPrimaryKey: true
21
);
22
23
public static readonly TableDefinition WixHttpUrlAce = new TableDefinition(
24
"WixHttpUrlAce",
25
+ HttpTupleDefinitions.WixHttpUrlAce,
26
new[]
27
{
28
new ColumnDefinition("WixHttpUrlAce", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column),
@@ -29,7 +30,6 @@ namespace WixToolset.Http
30
new ColumnDefinition("SecurityPrincipal", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The security principal for this ACE.", modularizeType: ColumnModularizeType.Property),
31
new ColumnDefinition("Rights", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 1073741824, description: "The rights for this ACE."),
32
},
32
- tupleDefinitionName: HttpTupleDefinitions.WixHttpUrlAce.Name,
33
tupleIdIsPrimaryKey: true
34
);
35
src/wixlib/http.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>{055C1517-4CED-4199-BCDE-A383E5C4EF78}</ProjectGuid>
@@ -36,7 +36,7 @@
36
<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>
37
</PropertyGroup>
38
<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'))" />
39
- <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'))" />
39
+ <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'))" />
40
</Target>
41
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
42
</Project>
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