Update dependencies.
Sean Hall committed
Apr 13, 2020 at 19:22 UTC
3271bb37b4320b293881808be63142f912b85266
6 files changed
+19
-32
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/MsmqTableDefinitions.cs
+3
-3
@@ -8,6 +8,7 @@ namespace WixToolset.Msmq
8
{
9
public static readonly TableDefinition MessageQueue = new TableDefinition(
10
"MessageQueue",
11
+ MsmqTupleDefinitions.MessageQueue,
12
new[]
13
{
14
new ColumnDefinition("MessageQueue", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -22,12 +23,12 @@ namespace WixToolset.Msmq
23
new ColumnDefinition("ServiceTypeGuid", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
24
new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
25
},
25
- tupleDefinitionName: MsmqTupleDefinitions.MessageQueue.Name,
26
tupleIdIsPrimaryKey: true
27
);
28
29
public static readonly TableDefinition MessageQueueUserPermission = new TableDefinition(
30
"MessageQueueUserPermission",
31
+ MsmqTupleDefinitions.MessageQueueUserPermission,
32
new[]
33
{
34
new ColumnDefinition("MessageQueueUserPermission", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -36,12 +37,12 @@ namespace WixToolset.Msmq
37
new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
38
new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
39
},
39
- tupleDefinitionName: MsmqTupleDefinitions.MessageQueueUserPermission.Name,
40
tupleIdIsPrimaryKey: true
41
);
42
43
public static readonly TableDefinition MessageQueueGroupPermission = new TableDefinition(
44
"MessageQueueGroupPermission",
45
+ MsmqTupleDefinitions.MessageQueueGroupPermission,
46
new[]
47
{
48
new ColumnDefinition("MessageQueueGroupPermission", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -50,7 +51,6 @@ namespace WixToolset.Msmq
51
new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
52
new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
53
},
53
- tupleDefinitionName: MsmqTupleDefinitions.MessageQueueGroupPermission.Name,
54
tupleIdIsPrimaryKey: true
55
);
56
src/wixext/Tuples/MessageQueueTuple.cs
+8
-8
@@ -62,15 +62,15 @@ namespace WixToolset.Msmq.Tuples
62
set => this.Set((int)MessageQueueTupleFields.ComponentRef, value);
63
}
64
65
- public int BasePriority
65
+ public int? BasePriority
66
{
67
- get => this.Fields[(int)MessageQueueTupleFields.BasePriority].AsNumber();
67
+ get => this.Fields[(int)MessageQueueTupleFields.BasePriority].AsNullableNumber();
68
set => this.Set((int)MessageQueueTupleFields.BasePriority, value);
69
}
70
71
- public int JournalQuota
71
+ public int? JournalQuota
72
{
73
- get => this.Fields[(int)MessageQueueTupleFields.JournalQuota].AsNumber();
73
+ get => this.Fields[(int)MessageQueueTupleFields.JournalQuota].AsNullableNumber();
74
set => this.Set((int)MessageQueueTupleFields.JournalQuota, value);
75
}
76
@@ -92,15 +92,15 @@ namespace WixToolset.Msmq.Tuples
92
set => this.Set((int)MessageQueueTupleFields.PathName, value);
93
}
94
95
- public int PrivLevel
95
+ public int? PrivLevel
96
{
97
- get => this.Fields[(int)MessageQueueTupleFields.PrivLevel].AsNumber();
97
+ get => this.Fields[(int)MessageQueueTupleFields.PrivLevel].AsNullableNumber();
98
set => this.Set((int)MessageQueueTupleFields.PrivLevel, value);
99
}
100
101
- public int Quota
101
+ public int? Quota
102
{
103
- get => this.Fields[(int)MessageQueueTupleFields.Quota].AsNumber();
103
+ get => this.Fields[(int)MessageQueueTupleFields.Quota].AsNullableNumber();
104
set => this.Set((int)MessageQueueTupleFields.Quota, value);
105
}
106
src/wixlib/msmq.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>{42493058-5FC8-4F85-9884-FF3190E084B6}</ProjectGuid>
@@ -34,7 +34,7 @@
34
<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>
35
</PropertyGroup>
36
<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'))" />
37
- <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'))" />
37
+ <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'))" />
38
</Target>
39
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
40
</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