Update dependencies.
Sean Hall committed
Apr 13, 2020 at 20:19 UTC
1b4d8735b5778a144036c34176001fc641deee82
6 files changed
+30
-50
appveyor.yml
-2
@@ -33,8 +33,6 @@ skip_tags: true
33
artifacts:
34
- path: build\Release\**\*.nupkg
35
name: nuget
36
-- path: build\Release\**\*.msi
37
- name: msi
36
37
notifications:
38
- provider: Slack
src/Cpp.Build.props
-18
@@ -72,12 +72,6 @@
72
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
73
</ClCompile>
74
</ItemDefinitionGroup>
75
- <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
76
- <ClCompile>
77
- <BasicRuntimeChecks></BasicRuntimeChecks>
78
- <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
79
- </ClCompile>
80
- </ItemDefinitionGroup>
75
<ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
76
<ClCompile>
77
<Optimization>MinSpace</Optimization>
@@ -91,16 +85,4 @@
85
<OptimizeReferences>true</OptimizeReferences>
86
</Link>
87
</ItemDefinitionGroup>
94
- <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
95
- <ClCompile>
96
- <BasicRuntimeChecks></BasicRuntimeChecks>
97
- <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
98
- </ClCompile>
99
- </ItemDefinitionGroup>
100
- <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
101
- <Link>
102
- <KeyFile>$(LinkKeyFile)</KeyFile>
103
- <DelaySign>$(LinkDelaySign)</DelaySign>
104
- </Link>
105
- </ItemDefinitionGroup>
88
</Project>
src/wixext/ComPlusTableDefinitions.cs
+25
-25
@@ -8,6 +8,7 @@ namespace WixToolset.ComPlus
8
{
9
public static readonly TableDefinition ComPlusPartition = new TableDefinition(
10
"ComPlusPartition",
11
+ ComPlusTupleDefinitions.ComPlusPartition,
12
new[]
13
{
14
new ColumnDefinition("Partition", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -15,24 +16,24 @@ namespace WixToolset.ComPlus
16
new ColumnDefinition("Id", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
17
new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
18
},
18
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusPartition.Name,
19
tupleIdIsPrimaryKey: true
20
);
21
22
public static readonly TableDefinition ComPlusPartitionProperty = new TableDefinition(
23
"ComPlusPartitionProperty",
24
+ ComPlusTupleDefinitions.ComPlusPartitionProperty,
25
new[]
26
{
27
new ColumnDefinition("Partition_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusPartition", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
28
new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
29
new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
30
},
30
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusPartitionProperty.Name,
31
tupleIdIsPrimaryKey: false
32
);
33
34
public static readonly TableDefinition ComPlusPartitionRole = new TableDefinition(
35
"ComPlusPartitionRole",
36
+ ComPlusTupleDefinitions.ComPlusPartitionRole,
37
new[]
38
{
39
new ColumnDefinition("PartitionRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -40,12 +41,12 @@ namespace WixToolset.ComPlus
41
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
42
new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
43
},
43
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusPartitionRole.Name,
44
tupleIdIsPrimaryKey: true
45
);
46
47
public static readonly TableDefinition ComPlusUserInPartitionRole = new TableDefinition(
48
"ComPlusUserInPartitionRole",
49
+ ComPlusTupleDefinitions.ComPlusUserInPartitionRole,
50
new[]
51
{
52
new ColumnDefinition("UserInPartitionRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -53,12 +54,12 @@ namespace WixToolset.ComPlus
54
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
55
new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
56
},
56
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusUserInPartitionRole.Name,
57
tupleIdIsPrimaryKey: true
58
);
59
60
public static readonly TableDefinition ComPlusGroupInPartitionRole = new TableDefinition(
61
"ComPlusGroupInPartitionRole",
62
+ ComPlusTupleDefinitions.ComPlusGroupInPartitionRole,
63
new[]
64
{
65
new ColumnDefinition("GroupInPartitionRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -66,12 +67,12 @@ namespace WixToolset.ComPlus
67
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
68
new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
69
},
69
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusGroupInPartitionRole.Name,
70
tupleIdIsPrimaryKey: true
71
);
72
73
public static readonly TableDefinition ComPlusPartitionUser = new TableDefinition(
74
"ComPlusPartitionUser",
75
+ ComPlusTupleDefinitions.ComPlusPartitionUser,
76
new[]
77
{
78
new ColumnDefinition("PartitionUser", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -79,12 +80,12 @@ namespace WixToolset.ComPlus
80
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
81
new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
82
},
82
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusPartitionUser.Name,
83
tupleIdIsPrimaryKey: true
84
);
85
86
public static readonly TableDefinition ComPlusApplication = new TableDefinition(
87
"ComPlusApplication",
88
+ ComPlusTupleDefinitions.ComPlusApplication,
89
new[]
90
{
91
new ColumnDefinition("Application", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -93,24 +94,24 @@ namespace WixToolset.ComPlus
94
new ColumnDefinition("Id", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
95
new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
96
},
96
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusApplication.Name,
97
tupleIdIsPrimaryKey: true
98
);
99
100
public static readonly TableDefinition ComPlusApplicationProperty = new TableDefinition(
101
"ComPlusApplicationProperty",
102
+ ComPlusTupleDefinitions.ComPlusApplicationProperty,
103
new[]
104
{
105
new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplication", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
106
new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
107
new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
108
},
108
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusApplicationProperty.Name,
109
tupleIdIsPrimaryKey: false
110
);
111
112
public static readonly TableDefinition ComPlusApplicationRole = new TableDefinition(
113
"ComPlusApplicationRole",
114
+ ComPlusTupleDefinitions.ComPlusApplicationRole,
115
new[]
116
{
117
new ColumnDefinition("ApplicationRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -118,24 +119,24 @@ namespace WixToolset.ComPlus
119
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
120
new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
121
},
121
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusApplicationRole.Name,
122
tupleIdIsPrimaryKey: true
123
);
124
125
public static readonly TableDefinition ComPlusApplicationRoleProperty = new TableDefinition(
126
"ComPlusApplicationRoleProperty",
127
+ ComPlusTupleDefinitions.ComPlusApplicationRoleProperty,
128
new[]
129
{
130
new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
131
new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
132
new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
133
},
133
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusApplicationRoleProperty.Name,
134
tupleIdIsPrimaryKey: false
135
);
136
137
public static readonly TableDefinition ComPlusUserInApplicationRole = new TableDefinition(
138
"ComPlusUserInApplicationRole",
139
+ ComPlusTupleDefinitions.ComPlusUserInApplicationRole,
140
new[]
141
{
142
new ColumnDefinition("UserInApplicationRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -143,12 +144,12 @@ namespace WixToolset.ComPlus
144
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
145
new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
146
},
146
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusUserInApplicationRole.Name,
147
tupleIdIsPrimaryKey: true
148
);
149
150
public static readonly TableDefinition ComPlusGroupInApplicationRole = new TableDefinition(
151
"ComPlusGroupInApplicationRole",
152
+ ComPlusTupleDefinitions.ComPlusGroupInApplicationRole,
153
new[]
154
{
155
new ColumnDefinition("GroupInApplicationRole", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -156,12 +157,12 @@ namespace WixToolset.ComPlus
157
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
158
new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
159
},
159
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusGroupInApplicationRole.Name,
160
tupleIdIsPrimaryKey: true
161
);
162
163
public static readonly TableDefinition ComPlusAssembly = new TableDefinition(
164
"ComPlusAssembly",
165
+ ComPlusTupleDefinitions.ComPlusAssembly,
166
new[]
167
{
168
new ColumnDefinition("Assembly", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -173,47 +174,47 @@ namespace WixToolset.ComPlus
174
new ColumnDefinition("PSDllPath", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
175
new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
176
},
176
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusAssembly.Name,
177
tupleIdIsPrimaryKey: true
178
);
179
180
public static readonly TableDefinition ComPlusAssemblyDependency = new TableDefinition(
181
"ComPlusAssemblyDependency",
182
+ ComPlusTupleDefinitions.ComPlusAssemblyDependency,
183
new[]
184
{
185
new ColumnDefinition("Assembly_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusAssembly", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
186
new ColumnDefinition("RequiredAssembly_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusAssembly", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
187
},
187
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusAssemblyDependency.Name,
188
tupleIdIsPrimaryKey: false
189
);
190
191
public static readonly TableDefinition ComPlusComponent = new TableDefinition(
192
"ComPlusComponent",
193
+ ComPlusTupleDefinitions.ComPlusComponent,
194
new[]
195
{
196
new ColumnDefinition("ComPlusComponent", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
197
new ColumnDefinition("Assembly_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusAssembly", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
198
new ColumnDefinition("CLSID", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
199
},
199
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusComponent.Name,
200
tupleIdIsPrimaryKey: true
201
);
202
203
public static readonly TableDefinition ComPlusComponentProperty = new TableDefinition(
204
"ComPlusComponentProperty",
205
+ ComPlusTupleDefinitions.ComPlusComponentProperty,
206
new[]
207
{
208
new ColumnDefinition("ComPlusComponent_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusComponent", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
209
new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
210
new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
211
},
211
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusComponentProperty.Name,
212
tupleIdIsPrimaryKey: false
213
);
214
215
public static readonly TableDefinition ComPlusRoleForComponent = new TableDefinition(
216
"ComPlusRoleForComponent",
217
+ ComPlusTupleDefinitions.ComPlusRoleForComponent,
218
new[]
219
{
220
new ColumnDefinition("RoleForComponent", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -221,36 +222,36 @@ namespace WixToolset.ComPlus
222
new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
223
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
224
},
224
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusRoleForComponent.Name,
225
tupleIdIsPrimaryKey: true
226
);
227
228
public static readonly TableDefinition ComPlusInterface = new TableDefinition(
229
"ComPlusInterface",
230
+ ComPlusTupleDefinitions.ComPlusInterface,
231
new[]
232
{
233
new ColumnDefinition("Interface", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
234
new ColumnDefinition("ComPlusComponent_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusComponent", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
235
new ColumnDefinition("IID", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
236
},
236
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusInterface.Name,
237
tupleIdIsPrimaryKey: true
238
);
239
240
public static readonly TableDefinition ComPlusInterfaceProperty = new TableDefinition(
241
"ComPlusInterfaceProperty",
242
+ ComPlusTupleDefinitions.ComPlusInterfaceProperty,
243
new[]
244
{
245
new ColumnDefinition("Interface_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusInterface", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
246
new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
247
new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
248
},
248
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusInterfaceProperty.Name,
249
tupleIdIsPrimaryKey: false
250
);
251
252
public static readonly TableDefinition ComPlusRoleForInterface = new TableDefinition(
253
"ComPlusRoleForInterface",
254
+ ComPlusTupleDefinitions.ComPlusRoleForInterface,
255
new[]
256
{
257
new ColumnDefinition("RoleForInterface", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -258,12 +259,12 @@ namespace WixToolset.ComPlus
259
new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
260
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
261
},
261
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusRoleForInterface.Name,
262
tupleIdIsPrimaryKey: true
263
);
264
265
public static readonly TableDefinition ComPlusMethod = new TableDefinition(
266
"ComPlusMethod",
267
+ ComPlusTupleDefinitions.ComPlusMethod,
268
new[]
269
{
270
new ColumnDefinition("Method", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -271,24 +272,24 @@ namespace WixToolset.ComPlus
272
new ColumnDefinition("Index", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown),
273
new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
274
},
274
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusMethod.Name,
275
tupleIdIsPrimaryKey: true
276
);
277
278
public static readonly TableDefinition ComPlusMethodProperty = new TableDefinition(
279
"ComPlusMethodProperty",
280
+ ComPlusTupleDefinitions.ComPlusMethodProperty,
281
new[]
282
{
283
new ColumnDefinition("Method_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusMethod", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
284
new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
285
new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
286
},
286
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusMethodProperty.Name,
287
tupleIdIsPrimaryKey: false
288
);
289
290
public static readonly TableDefinition ComPlusRoleForMethod = new TableDefinition(
291
"ComPlusRoleForMethod",
292
+ ComPlusTupleDefinitions.ComPlusRoleForMethod,
293
new[]
294
{
295
new ColumnDefinition("RoleForMethod", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -296,12 +297,12 @@ namespace WixToolset.ComPlus
297
new ColumnDefinition("ApplicationRole_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusApplicationRole", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
298
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
299
},
299
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusRoleForMethod.Name,
300
tupleIdIsPrimaryKey: true
301
);
302
303
public static readonly TableDefinition ComPlusSubscription = new TableDefinition(
304
"ComPlusSubscription",
305
+ ComPlusTupleDefinitions.ComPlusSubscription,
306
new[]
307
{
308
new ColumnDefinition("Subscription", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -312,19 +313,18 @@ namespace WixToolset.ComPlus
313
new ColumnDefinition("EventCLSID", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
314
new ColumnDefinition("PublisherID", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
315
},
315
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusSubscription.Name,
316
tupleIdIsPrimaryKey: false
317
);
318
319
public static readonly TableDefinition ComPlusSubscriptionProperty = new TableDefinition(
320
"ComPlusSubscriptionProperty",
321
+ ComPlusTupleDefinitions.ComPlusSubscriptionProperty,
322
new[]
323
{
324
new ColumnDefinition("Subscription_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "ComPlusSubscription", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
325
new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
326
new ColumnDefinition("Value", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
327
},
327
- tupleDefinitionName: ComPlusTupleDefinitions.ComPlusSubscriptionProperty.Name,
328
tupleIdIsPrimaryKey: false
329
);
330
src/wixext/Tuples/ComPlusMethodTuple.cs
+2
-2
@@ -48,9 +48,9 @@ namespace WixToolset.ComPlus.Tuples
48
set => this.Set((int)ComPlusMethodTupleFields.InterfaceRef, value);
49
}
50
51
- public int Index
51
+ public int? Index
52
{
53
- get => this.Fields[(int)ComPlusMethodTupleFields.Index].AsNumber();
53
+ get => this.Fields[(int)ComPlusMethodTupleFields.Index].AsNullableNumber();
54
set => this.Set((int)ComPlusMethodTupleFields.Index, value);
55
}
56
src/wixlib/complus.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>{E191E61E-E098-4F71-888F-51A79F952022}</ProjectGuid>
@@ -30,7 +30,7 @@
30
<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>
31
</PropertyGroup>
32
<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'))" />
33
- <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'))" />
33
+ <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'))" />
34
</Target>
35
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
36
</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