Update dependencies.
Sean Hall committed
Apr 13, 2020 at 18:25 UTC
dbdd133ea6891b55d6c1494055e45eab676f0418
11 files changed
+45
-58
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/SecureObjectsTuple.cs
+2
-2
@@ -72,9 +72,9 @@ namespace WixToolset.Util.Tuples
72
set => this.Set((int)SecureObjectsTupleFields.User, value);
73
}
74
75
- public int Permission
75
+ public int? Permission
76
{
77
- get => this.Fields[(int)SecureObjectsTupleFields.Permission].AsNumber();
77
+ get => this.Fields[(int)SecureObjectsTupleFields.Permission].AsNullableNumber();
78
set => this.Set((int)SecureObjectsTupleFields.Permission, value);
79
}
80
src/wixext/Tuples/ServiceConfigTuple.cs
+4
-4
@@ -92,15 +92,15 @@ namespace WixToolset.Util.Tuples
92
set => this.Set((int)ServiceConfigTupleFields.ThirdFailureActionType, value);
93
}
94
95
- public int ResetPeriodInDays
95
+ public int? ResetPeriodInDays
96
{
97
- get => this.Fields[(int)ServiceConfigTupleFields.ResetPeriodInDays].AsNumber();
97
+ get => this.Fields[(int)ServiceConfigTupleFields.ResetPeriodInDays].AsNullableNumber();
98
set => this.Set((int)ServiceConfigTupleFields.ResetPeriodInDays, value);
99
}
100
101
- public int RestartServiceDelayInSeconds
101
+ public int? RestartServiceDelayInSeconds
102
{
103
- get => this.Fields[(int)ServiceConfigTupleFields.RestartServiceDelayInSeconds].AsNumber();
103
+ get => this.Fields[(int)ServiceConfigTupleFields.RestartServiceDelayInSeconds].AsNullableNumber();
104
set => this.Set((int)ServiceConfigTupleFields.RestartServiceDelayInSeconds, value);
105
}
106
src/wixext/Tuples/WixCloseApplicationTuple.cs
+6
-6
@@ -76,9 +76,9 @@ namespace WixToolset.Util.Tuples
76
set => this.Set((int)WixCloseApplicationTupleFields.Attributes, value);
77
}
78
79
- public int Sequence
79
+ public int? Sequence
80
{
81
- get => this.Fields[(int)WixCloseApplicationTupleFields.Sequence].AsNumber();
81
+ get => this.Fields[(int)WixCloseApplicationTupleFields.Sequence].AsNullableNumber();
82
set => this.Set((int)WixCloseApplicationTupleFields.Sequence, value);
83
}
84
@@ -88,15 +88,15 @@ namespace WixToolset.Util.Tuples
88
set => this.Set((int)WixCloseApplicationTupleFields.Property, value);
89
}
90
91
- public int TerminateExitCode
91
+ public int? TerminateExitCode
92
{
93
- get => this.Fields[(int)WixCloseApplicationTupleFields.TerminateExitCode].AsNumber();
93
+ get => this.Fields[(int)WixCloseApplicationTupleFields.TerminateExitCode].AsNullableNumber();
94
set => this.Set((int)WixCloseApplicationTupleFields.TerminateExitCode, value);
95
}
96
97
- public int Timeout
97
+ public int? Timeout
98
{
99
- get => this.Fields[(int)WixCloseApplicationTupleFields.Timeout].AsNumber();
99
+ get => this.Fields[(int)WixCloseApplicationTupleFields.Timeout].AsNullableNumber();
100
set => this.Set((int)WixCloseApplicationTupleFields.Timeout, value);
101
}
102
}
src/wixext/Tuples/WixInternetShortcutTuple.cs
+2
-2
@@ -86,9 +86,9 @@ namespace WixToolset.Util.Tuples
86
set => this.Set((int)WixInternetShortcutTupleFields.IconFile, value);
87
}
88
89
- public int IconIndex
89
+ public int? IconIndex
90
{
91
- get => this.Fields[(int)WixInternetShortcutTupleFields.IconIndex].AsNumber();
91
+ get => this.Fields[(int)WixInternetShortcutTupleFields.IconIndex].AsNullableNumber();
92
set => this.Set((int)WixInternetShortcutTupleFields.IconIndex, value);
93
}
94
}
src/wixext/Tuples/XmlConfigTuple.cs
+2
-2
@@ -94,9 +94,9 @@ namespace WixToolset.Util.Tuples
94
set => this.Set((int)XmlConfigTupleFields.ComponentRef, value);
95
}
96
97
- public int Sequence
97
+ public int? Sequence
98
{
99
- get => this.Fields[(int)XmlConfigTupleFields.Sequence].AsNumber();
99
+ get => this.Fields[(int)XmlConfigTupleFields.Sequence].AsNullableNumber();
100
set => this.Set((int)XmlConfigTupleFields.Sequence, value);
101
}
102
}
src/wixext/Tuples/XmlFileTuple.cs
+2
-2
@@ -86,9 +86,9 @@ namespace WixToolset.Util.Tuples
86
set => this.Set((int)XmlFileTupleFields.ComponentRef, value);
87
}
88
89
- public int Sequence
89
+ public int? Sequence
90
{
91
- get => this.Fields[(int)XmlFileTupleFields.Sequence].AsNumber();
91
+ get => this.Fields[(int)XmlFileTupleFields.Sequence].AsNullableNumber();
92
set => this.Set((int)XmlFileTupleFields.Sequence, value);
93
}
94
}
src/wixext/UtilTableDefinitions.cs
+19
-19
@@ -8,6 +8,7 @@ namespace WixToolset.Util
8
{
9
public static readonly TableDefinition Wix4CloseApplication = new TableDefinition(
10
"Wix4CloseApplication",
11
+ UtilTupleDefinitions.WixCloseApplication,
12
new[]
13
{
14
new ColumnDefinition("Wix4CloseApplication", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column),
@@ -20,12 +21,12 @@ namespace WixToolset.Util
21
new ColumnDefinition("TerminateExitCode", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "Exit code to return from a terminated application."),
22
new ColumnDefinition("Timeout", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 1, maxValue: 2147483647, description: "Timeout in milliseconds before scheduling restart or terminating application."),
23
},
23
- tupleDefinitionName: UtilTupleDefinitions.WixCloseApplication.Name,
24
tupleIdIsPrimaryKey: true
25
);
26
27
public static readonly TableDefinition Wix4RemoveFolderEx = new TableDefinition(
28
"Wix4RemoveFolderEx",
29
+ UtilTupleDefinitions.WixRemoveFolderEx,
30
new[]
31
{
32
new ColumnDefinition("Wix4RemoveFolderEx", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the WixRemoveFolderEx row in the package.", modularizeType: ColumnModularizeType.Column),
@@ -33,12 +34,12 @@ namespace WixToolset.Util
34
new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of Property that contains the root of the directory tree to remove.", modularizeType: ColumnModularizeType.Property),
35
new ColumnDefinition("InstallMode", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 3, description: "1 == Remove only when the associated component is being installed (msiInstallStateLocal or msiInstallStateSource), 2 == Remove only when the associated component is being removed (msiInstallStateAbsent), 3 = Remove in either of the above cases."),
36
},
36
- tupleDefinitionName: UtilTupleDefinitions.WixRemoveFolderEx.Name,
37
tupleIdIsPrimaryKey: true
38
);
39
40
public static readonly TableDefinition Wix4RestartResource = new TableDefinition(
41
"Wix4RestartResource",
42
+ UtilTupleDefinitions.WixRestartResource,
43
new[]
44
{
45
new ColumnDefinition("Wix4RestartResource", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier.", modularizeType: ColumnModularizeType.Column),
@@ -46,12 +47,12 @@ namespace WixToolset.Util
47
new ColumnDefinition("Resource", ColumnType.String, 0, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "The resource to be registered with the Restart Manager.", modularizeType: ColumnModularizeType.Property),
48
new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the type of resource and flags used for processing."),
49
},
49
- tupleDefinitionName: UtilTupleDefinitions.WixRestartResource.Name,
50
tupleIdIsPrimaryKey: true
51
);
52
53
public static readonly TableDefinition Wix4FileShare = new TableDefinition(
54
"Wix4FileShare",
55
+ UtilTupleDefinitions.FileShare,
56
new[]
57
{
58
new ColumnDefinition("Wix4FileShare", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized identifier", modularizeType: ColumnModularizeType.Column),
@@ -60,24 +61,24 @@ namespace WixToolset.Util
61
new ColumnDefinition("Description", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Description string displayed for the file share"),
62
new ColumnDefinition("Directory_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Directory", keyColumn: 1, description: "Foreign key referencing directory that the share is created on", modularizeType: ColumnModularizeType.Column),
63
},
63
- tupleDefinitionName: UtilTupleDefinitions.FileShare.Name,
64
tupleIdIsPrimaryKey: true
65
);
66
67
public static readonly TableDefinition Wix4FileSharePermissions = new TableDefinition(
68
"Wix4FileSharePermissions",
69
+ UtilTupleDefinitions.FileSharePermissions,
70
new[]
71
{
72
new ColumnDefinition("Wix4FileShare_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "FileShare", keyColumn: 1, description: "FileShare that these premissions are to be applied to.", modularizeType: ColumnModularizeType.Column),
73
new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", description: "User that these premissions are to apply to.", modularizeType: ColumnModularizeType.Column),
74
new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Permissions int, as in EXPLICIT_ACCESS.grfAccessPermissions in MSDN"),
75
},
75
- tupleDefinitionName: UtilTupleDefinitions.FileSharePermissions.Name,
76
tupleIdIsPrimaryKey: false
77
);
78
79
public static readonly TableDefinition Wix4Group = new TableDefinition(
80
"Wix4Group",
81
+ UtilTupleDefinitions.Group,
82
new[]
83
{
84
new ColumnDefinition("Wix4Group", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -85,12 +86,12 @@ namespace WixToolset.Util
86
new ColumnDefinition("Name", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Group name", modularizeType: ColumnModularizeType.Property),
87
new ColumnDefinition("Domain", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Group domain", modularizeType: ColumnModularizeType.Property),
88
},
88
- tupleDefinitionName: UtilTupleDefinitions.Group.Name,
89
tupleIdIsPrimaryKey: true
90
);
91
92
public static readonly TableDefinition Wix4InternetShortcut = new TableDefinition(
93
"Wix4InternetShortcut",
94
+ UtilTupleDefinitions.WixInternetShortcut,
95
new[]
96
{
97
new ColumnDefinition("Wix4InternetShortcut", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column),
@@ -102,12 +103,12 @@ namespace WixToolset.Util
103
new ColumnDefinition("IconFile", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Icon file for shortcut"),
104
new ColumnDefinition("IconIndex", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Index of the icon being referenced."),
105
},
105
- tupleDefinitionName: UtilTupleDefinitions.WixInternetShortcut.Name,
106
tupleIdIsPrimaryKey: true
107
);
108
109
public static readonly TableDefinition Wix4PerformanceCategory = new TableDefinition(
110
"Wix4PerformanceCategory",
111
+ UtilTupleDefinitions.PerformanceCategory,
112
new[]
113
{
114
new ColumnDefinition("Wix4PerformanceCategory", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in table.", modularizeType: ColumnModularizeType.Column),
@@ -116,47 +117,47 @@ namespace WixToolset.Util
117
new ColumnDefinition("IniData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .ini file."),
118
new ColumnDefinition("ConstantData", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Data that goes into the performance counter .h file."),
119
},
119
- tupleDefinitionName: UtilTupleDefinitions.PerformanceCategory.Name,
120
tupleIdIsPrimaryKey: true
121
);
122
123
public static readonly TableDefinition Wix4Perfmon = new TableDefinition(
124
"Wix4Perfmon",
125
+ UtilTupleDefinitions.Perfmon,
126
new[]
127
{
128
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column),
129
new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of .INI file", modularizeType: ColumnModularizeType.Property),
130
new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, description: "Service name in registry"),
131
},
131
- tupleDefinitionName: UtilTupleDefinitions.Perfmon.Name,
132
tupleIdIsPrimaryKey: false
133
);
134
135
public static readonly TableDefinition Wix4PerfmonManifest = new TableDefinition(
136
"Wix4PerfmonManifest",
137
+ UtilTupleDefinitions.PerfmonManifest,
138
new[]
139
{
140
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column),
141
new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of perfmon manifest file", modularizeType: ColumnModularizeType.Property),
142
new ColumnDefinition("ResourceFileDirectory", ColumnType.String, 255, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "The path of the Resource File Directory"),
143
},
143
- tupleDefinitionName: UtilTupleDefinitions.PerfmonManifest.Name,
144
tupleIdIsPrimaryKey: false
145
);
146
147
public static readonly TableDefinition Wix4EventManifest = new TableDefinition(
148
"Wix4EventManifest",
149
+ UtilTupleDefinitions.EventManifest,
150
new[]
151
{
152
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Component used to determine install state", modularizeType: ColumnModularizeType.Column),
153
new ColumnDefinition("File", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Name of event manifest file", modularizeType: ColumnModularizeType.Property),
154
},
154
- tupleDefinitionName: UtilTupleDefinitions.EventManifest.Name,
155
tupleIdIsPrimaryKey: false
156
);
157
158
public static readonly TableDefinition Wix4SecureObject = new TableDefinition(
159
"Wix4SecureObject",
160
+ UtilTupleDefinitions.SecureObjects,
161
new[]
162
{
163
new ColumnDefinition("Wix4SecureObject", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token in Table", modularizeType: ColumnModularizeType.Column),
@@ -166,12 +167,12 @@ namespace WixToolset.Util
167
new ColumnDefinition("Permission", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: -2147483647, maxValue: 2147483647, description: "Permissions to grant to User"),
168
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table used to determine install state", modularizeType: ColumnModularizeType.Column),
169
},
169
- tupleDefinitionName: UtilTupleDefinitions.SecureObjects.Name,
170
tupleIdIsPrimaryKey: false
171
);
172
173
public static readonly TableDefinition Wix4ServiceConfig = new TableDefinition(
174
"Wix4ServiceConfig",
175
+ UtilTupleDefinitions.ServiceConfig,
176
new[]
177
{
178
new ColumnDefinition("ServiceName", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Formatted, description: "Primary key, non-localized token"),
@@ -185,12 +186,12 @@ namespace WixToolset.Util
186
new ColumnDefinition("ProgramCommandLine", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Command line for program to run if failure action is RUN_COMMAND."),
187
new ColumnDefinition("RebootMessage", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Message to show to users when rebooting if failure action is REBOOT."),
188
},
188
- tupleDefinitionName: UtilTupleDefinitions.ServiceConfig.Name,
189
tupleIdIsPrimaryKey: false
190
);
191
192
public static readonly TableDefinition Wix4TouchFile = new TableDefinition(
193
"Wix4TouchFile",
194
+ UtilTupleDefinitions.WixTouchFile,
195
new[]
196
{
197
new ColumnDefinition("Wix4TouchFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Identifier for the Wix4TouchFile row in the package.", modularizeType: ColumnModularizeType.Column),
@@ -198,12 +199,12 @@ namespace WixToolset.Util
199
new ColumnDefinition("Path", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Formatted column that resolves to the path to touch.", modularizeType: ColumnModularizeType.Property),
200
new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 1, maxValue: 63, description: "1 == Touch only when the associated component is being installed, 2 == Touch only when the associated component is being repaired , 4 == Touch only when the associated component is being removed, 16 = path is in 64-bit location, 32 = touching the file is vital."),
201
},
201
- tupleDefinitionName: UtilTupleDefinitions.WixTouchFile.Name,
202
tupleIdIsPrimaryKey: true
203
);
204
205
public static readonly TableDefinition Wix4User = new TableDefinition(
206
"Wix4User",
207
+ UtilTupleDefinitions.User,
208
new[]
209
{
210
new ColumnDefinition("Wix4User", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -213,23 +214,23 @@ namespace WixToolset.Util
214
new ColumnDefinition("Password", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "User password", modularizeType: ColumnModularizeType.Property),
215
new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 65535, description: "Attributes describing how to create the user"),
216
},
216
- tupleDefinitionName: UtilTupleDefinitions.User.Name,
217
tupleIdIsPrimaryKey: true
218
);
219
220
public static readonly TableDefinition Wix4UserGroup = new TableDefinition(
221
"Wix4UserGroup",
222
+ UtilTupleDefinitions.UserGroup,
223
new[]
224
{
225
new ColumnDefinition("Wix4User_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", keyColumn: 1, description: "User to be joined to a Group.", modularizeType: ColumnModularizeType.Column),
226
new ColumnDefinition("Wix4Group_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4Group", keyColumn: 1, description: "Group to join User to.", modularizeType: ColumnModularizeType.Column),
227
},
227
- tupleDefinitionName: UtilTupleDefinitions.UserGroup.Name,
228
tupleIdIsPrimaryKey: false
229
);
230
231
public static readonly TableDefinition Wix4XmlFile = new TableDefinition(
232
"Wix4XmlFile",
233
+ UtilTupleDefinitions.XmlFile,
234
new[]
235
{
236
new ColumnDefinition("Wix4XmlFile", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -241,12 +242,12 @@ namespace WixToolset.Util
242
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column),
243
new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."),
244
},
244
- tupleDefinitionName: UtilTupleDefinitions.XmlFile.Name,
245
tupleIdIsPrimaryKey: true
246
);
247
248
public static readonly TableDefinition Wix4XmlConfig = new TableDefinition(
249
"Wix4XmlConfig",
250
+ UtilTupleDefinitions.XmlConfig,
251
new[]
252
{
253
new ColumnDefinition("Wix4XmlConfig", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token.", modularizeType: ColumnModularizeType.Column),
@@ -259,18 +260,17 @@ namespace WixToolset.Util
260
new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Foreign key into the Component table referencing component that controls the installing of the .XML value.", modularizeType: ColumnModularizeType.Column),
261
new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute the XML modifications."),
262
},
262
- tupleDefinitionName: UtilTupleDefinitions.XmlConfig.Name,
263
tupleIdIsPrimaryKey: true
264
);
265
266
public static readonly TableDefinition Wix4FormatFile = new TableDefinition(
267
"Wix4FormatFile",
268
+ UtilTupleDefinitions.WixFormatFiles,
269
new[]
270
{
271
new ColumnDefinition("Binary_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Binary", keyColumn: 1, description: "Binary data to be formatted.", modularizeType: ColumnModularizeType.Column),
272
new ColumnDefinition("File_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "File whose component controls the custom action and where the formatted data is written.", modularizeType: ColumnModularizeType.Column),
273
},
273
- tupleDefinitionName: UtilTupleDefinitions.WixFormatFiles.Name,
274
tupleIdIsPrimaryKey: false
275
);
276
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/util.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>{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}</ProjectGuid>
@@ -50,7 +50,7 @@
50
<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>
51
</PropertyGroup>
52
<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'))" />
53
- <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'))" />
53
+ <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'))" />
54
</Target>
55
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
56
</Project>