Update dependencies.
Sean Hall committed
Apr 13, 2020 at 19:35 UTC
9339c0c40679098a63e3e6b47f1f9ab8d3a848fb
13 files changed
+85
-98
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/test/WixToolsetTest.Iis/IisExtensionFixture.cs
+1
-1
@@ -20,7 +20,7 @@ namespace WixToolsetTest.Iis
20
Assert.Equal(new[]
21
{
22
"IIsWebAddress:TestAddress\tTest\t\t[PORT]\t\t0",
23
- }, results.OrderBy(s => s).ToArray());
23
+ }, results);
24
}
25
26
private static void Build(string[] args)
src/wixext/IisTableDefinitions.cs
+18
-18
@@ -8,6 +8,7 @@ namespace WixToolset.Iis
8
{
9
public static readonly TableDefinition Certificate = new TableDefinition(
10
"Certificate",
11
+ IisTupleDefinitions.Certificate,
12
new[]
13
{
14
new ColumnDefinition("Certificate", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyColumn: 1, description: "Identifier for the certificate in the package.", modularizeType: ColumnModularizeType.Column),
@@ -20,34 +21,34 @@ namespace WixToolset.Iis
21
new ColumnDefinition("CertificatePath", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Property to path of certificate.", modularizeType: ColumnModularizeType.Property),
22
new ColumnDefinition("PFXPassword", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Hidden property to a pfx password", modularizeType: ColumnModularizeType.Property),
23
},
23
- tupleDefinitionName: "Certificate",
24
tupleIdIsPrimaryKey: true
25
);
26
27
public static readonly TableDefinition CertificateHash = new TableDefinition(
28
"CertificateHash",
29
+ IisTupleDefinitions.CertificateHash,
30
new[]
31
{
32
new ColumnDefinition("Certificate_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyColumn: 1, description: "Foreign key to certificate in Certificate table.", modularizeType: ColumnModularizeType.Column),
33
new ColumnDefinition("Hash", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Base64 encoded SHA1 hash of certificate populated at run-time."),
34
},
34
- tupleDefinitionName: "CertificateHash",
35
tupleIdIsPrimaryKey: false
36
);
37
38
public static readonly TableDefinition IIsWebSiteCertificates = new TableDefinition(
39
"IIsWebSiteCertificates",
40
+ IisTupleDefinitions.IIsWebSiteCertificates,
41
new[]
42
{
43
new ColumnDefinition("Web_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "IIsWebSite", keyColumn: 1, description: "The index into the IIsWebSite table.", modularizeType: ColumnModularizeType.Column),
44
new ColumnDefinition("Certificate_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "Certificate", keyColumn: 1, description: "The index into the Certificate table.", modularizeType: ColumnModularizeType.Column),
45
},
45
- tupleDefinitionName: "IIsWebSiteCertificates",
46
tupleIdIsPrimaryKey: false
47
);
48
49
public static readonly TableDefinition IIsAppPool = new TableDefinition(
50
"IIsAppPool",
51
+ IisTupleDefinitions.IIsAppPool,
52
new[]
53
{
54
new ColumnDefinition("AppPool", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for apppool", modularizeType: ColumnModularizeType.Column),
@@ -67,12 +68,12 @@ namespace WixToolset.Iis
68
new ColumnDefinition("ManagedRuntimeVersion", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies the .NET Framework version to be used by the application pool."),
69
new ColumnDefinition("ManagedPipelineMode", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies the request-processing mode that is used to process requests for managed content."),
70
},
70
- tupleDefinitionName: "IIsAppPool",
71
tupleIdIsPrimaryKey: true
72
);
73
74
public static readonly TableDefinition IIsMimeMap = new TableDefinition(
75
"IIsMimeMap",
76
+ IisTupleDefinitions.IIsMimeMap,
77
new[]
78
{
79
new ColumnDefinition("MimeMap", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for Mime Map definitions", modularizeType: ColumnModularizeType.Column),
@@ -81,12 +82,12 @@ namespace WixToolset.Iis
82
new ColumnDefinition("MimeType", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Mime-type covered by the MimeMap."),
83
new ColumnDefinition("Extension", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Extension covered by the MimeMap."),
84
},
84
- tupleDefinitionName: "IIsMimeMap",
85
tupleIdIsPrimaryKey: true
86
);
87
88
public static readonly TableDefinition IIsProperty = new TableDefinition(
89
"IIsProperty",
90
+ IisTupleDefinitions.IIsProperty,
91
new[]
92
{
93
new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Unique name of the IIsProperty"),
@@ -94,12 +95,12 @@ namespace WixToolset.Iis
95
new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Attributes of the IIsProperty (unused)"),
96
new ColumnDefinition("Value", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Value of the IIsProperty"),
97
},
97
- tupleDefinitionName: "IIsProperty",
98
tupleIdIsPrimaryKey: true
99
);
100
101
public static readonly TableDefinition IIsWebDirProperties = new TableDefinition(
102
"IIsWebDirProperties",
103
+ IisTupleDefinitions.IIsWebDirProperties,
104
new[]
105
{
106
new ColumnDefinition("DirProperties", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for Web Properties", modularizeType: ColumnModularizeType.Column),
@@ -118,12 +119,12 @@ namespace WixToolset.Iis
119
new ColumnDefinition("AccessSSLFlags", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies AccessSSLFlags IIS metabase property."),
120
new ColumnDefinition("AuthenticationProviders", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Comma delimited list, in order of precedence, of Windows authentication providers that IIS will attempt to use: NTLM, Kerberos, Negotiate, and others."),
121
},
121
- tupleDefinitionName: "IIsWebDirProperties",
122
tupleIdIsPrimaryKey: true
123
);
124
125
public static readonly TableDefinition IIsWebAddress = new TableDefinition(
126
"IIsWebAddress",
127
+ IisTupleDefinitions.IIsWebAddress,
128
new[]
129
{
130
new ColumnDefinition("Address", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -133,12 +134,12 @@ namespace WixToolset.Iis
134
new ColumnDefinition("Header", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Special header information for the web site"),
135
new ColumnDefinition("Secure", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, possibilities: "0;1", description: "Specifies whether SSL is used to communicate with web site"),
136
},
136
- tupleDefinitionName: "IIsWebAddress",
137
tupleIdIsPrimaryKey: true
138
);
139
140
public static readonly TableDefinition IIsWebSite = new TableDefinition(
141
"IIsWebSite",
142
+ IisTupleDefinitions.IIsWebSite,
143
new[]
144
{
145
new ColumnDefinition("Web", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -155,12 +156,12 @@ namespace WixToolset.Iis
156
new ColumnDefinition("Log_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, keyTable: "IIsWebLog", keyColumn: 1, description: "Foreign key reference to IIsWebLog data", modularizeType: ColumnModularizeType.Column),
157
new ColumnDefinition("Id", ColumnType.String, 74, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Optional number or formatted value that resolves to number that acts as the WebSite Id."),
158
},
158
- tupleDefinitionName: "IIsWebSite",
159
tupleIdIsPrimaryKey: true
160
);
161
162
public static readonly TableDefinition IIsWebApplication = new TableDefinition(
163
"IIsWebApplication",
164
+ IisTupleDefinitions.IIsWebApplication,
165
new[]
166
{
167
new ColumnDefinition("Application", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for ASP Application", modularizeType: ColumnModularizeType.Column),
@@ -176,12 +177,12 @@ namespace WixToolset.Iis
177
new ColumnDefinition("ClientDebugging", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, possibilities: "0;1", description: "Specifies whether to allow ASP client-side script debugging"),
178
new ColumnDefinition("AppPool_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsAppPool", keyColumn: 1, description: "App Pool this application should run under", modularizeType: ColumnModularizeType.Column),
179
},
179
- tupleDefinitionName: "IIsWebApplication",
180
tupleIdIsPrimaryKey: true
181
);
182
183
public static readonly TableDefinition IIsWebApplicationExtension = new TableDefinition(
184
"IIsWebApplicationExtension",
185
+ IisTupleDefinitions.IIsWebApplicationExtension,
186
new[]
187
{
188
new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "IIsWebApplication", keyColumn: 1, description: "Foreign key referencing possible ASP application for the web site", modularizeType: ColumnModularizeType.Column),
@@ -190,12 +191,12 @@ namespace WixToolset.Iis
191
new ColumnDefinition("Executable", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Path to extension (usually file property: [#file])", modularizeType: ColumnModularizeType.Property),
192
new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, possibilities: "1;4;5", description: "Attributes for extension: 1 == Script, 4 == Check Path Info"),
193
},
193
- tupleDefinitionName: "IIsWebApplicationExtension",
194
tupleIdIsPrimaryKey: false
195
);
196
197
public static readonly TableDefinition IIsFilter = new TableDefinition(
198
"IIsFilter",
199
+ IisTupleDefinitions.IIsFilter,
200
new[]
201
{
202
new ColumnDefinition("Filter", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -207,12 +208,12 @@ namespace WixToolset.Iis
208
new ColumnDefinition("Flags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "What do all these numbers mean?"),
209
new ColumnDefinition("LoadOrder", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "-1 == last in order, 0 == first in order, # == place in order"),
210
},
210
- tupleDefinitionName: "IIsFilter",
211
tupleIdIsPrimaryKey: true
212
);
213
214
public static readonly TableDefinition IIsWebDir = new TableDefinition(
215
"IIsWebDir",
216
+ IisTupleDefinitions.IIsWebDir,
217
new[]
218
{
219
new ColumnDefinition("WebDir", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -222,12 +223,12 @@ namespace WixToolset.Iis
223
new ColumnDefinition("DirProperties_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebDirProperties", keyColumn: 1, description: "Foreign key referencing possible security information for the virtual directory", modularizeType: ColumnModularizeType.Column),
224
new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebApplication", keyColumn: 1, description: "Foreign key referencing possible ASP application for the virtual directory. This column is currently unused, but maintained for compatibility reasons.", modularizeType: ColumnModularizeType.Column),
225
},
225
- tupleDefinitionName: "IIsWebDir",
226
tupleIdIsPrimaryKey: true
227
);
228
229
public static readonly TableDefinition IIsWebError = new TableDefinition(
230
"IIsWebError",
231
+ IisTupleDefinitions.IIsWebError,
232
new[]
233
{
234
new ColumnDefinition("ErrorCode", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, minValue: 400, maxValue: 599, description: "HTTP status code indicating error."),
@@ -237,12 +238,12 @@ namespace WixToolset.Iis
238
new ColumnDefinition("File", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Path to file for this custom error (usually file property: [#file]). Must be null if URL is not null."),
239
new ColumnDefinition("URL", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "URL for this custom error. Must be null if File is not null."),
240
},
240
- tupleDefinitionName: "IIsWebError",
241
tupleIdIsPrimaryKey: false
242
);
243
244
public static readonly TableDefinition IIsHttpHeader = new TableDefinition(
245
"IIsHttpHeader",
246
+ IisTupleDefinitions.IIsHttpHeader,
247
new[]
248
{
249
new ColumnDefinition("HttpHeader", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -253,12 +254,12 @@ namespace WixToolset.Iis
254
new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 0, description: "Attributes for HTTP Header: none"),
255
new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to add the HTTP Headers."),
256
},
256
- tupleDefinitionName: "IIsHttpHeader",
257
tupleIdIsPrimaryKey: false
258
);
259
260
public static readonly TableDefinition IIsWebServiceExtension = new TableDefinition(
261
"IIsWebServiceExtension",
262
+ IisTupleDefinitions.IIsWebServiceExtension,
263
new[]
264
{
265
new ColumnDefinition("WebServiceExtension", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -268,12 +269,12 @@ namespace WixToolset.Iis
269
new ColumnDefinition("Group", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "String used to identify groups of extensions.", modularizeType: ColumnModularizeType.Property),
270
new ColumnDefinition("Attributes", ColumnType.Number, 1, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 3, description: "Attributes for WebServiceExtension: 1 = Allow, 2 = UIDeletable"),
271
},
271
- tupleDefinitionName: "IIsWebServiceExtension",
272
tupleIdIsPrimaryKey: true
273
);
274
275
public static readonly TableDefinition IIsWebVirtualDir = new TableDefinition(
276
"IIsWebVirtualDir",
277
+ IisTupleDefinitions.IIsWebVirtualDir,
278
new[]
279
{
280
new ColumnDefinition("VirtualDir", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -284,18 +285,17 @@ namespace WixToolset.Iis
285
new ColumnDefinition("DirProperties_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebDirProperties", keyColumn: 1, description: "Foreign key referencing possible security information for the virtual directory", modularizeType: ColumnModularizeType.Column),
286
new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebApplication", keyColumn: 1, description: "Foreign key referencing possible ASP application for the virtual directory", modularizeType: ColumnModularizeType.Column),
287
},
287
- tupleDefinitionName: "IIsWebVirtualDir",
288
tupleIdIsPrimaryKey: true
289
);
290
291
public static readonly TableDefinition IIsWebLog = new TableDefinition(
292
"IIsWebLog",
293
+ IisTupleDefinitions.IIsWebLog,
294
new[]
295
{
296
new ColumnDefinition("Log", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
297
new ColumnDefinition("Format", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Type of log format"),
298
},
298
- tupleDefinitionName: "IIsWebLog",
299
tupleIdIsPrimaryKey: true
300
);
301
src/wixext/Tuples/IIsAppPoolTuple.cs
+14
-14
@@ -90,15 +90,15 @@ namespace WixToolset.Iis.Tuples
90
set => this.Set((int)IIsAppPoolTupleFields.UserRef, value);
91
}
92
93
- public int RecycleMinutes
93
+ public int? RecycleMinutes
94
{
95
- get => this.Fields[(int)IIsAppPoolTupleFields.RecycleMinutes].AsNumber();
95
+ get => this.Fields[(int)IIsAppPoolTupleFields.RecycleMinutes].AsNullableNumber();
96
set => this.Set((int)IIsAppPoolTupleFields.RecycleMinutes, value);
97
}
98
99
- public int RecycleRequests
99
+ public int? RecycleRequests
100
{
101
- get => this.Fields[(int)IIsAppPoolTupleFields.RecycleRequests].AsNumber();
101
+ get => this.Fields[(int)IIsAppPoolTupleFields.RecycleRequests].AsNullableNumber();
102
set => this.Set((int)IIsAppPoolTupleFields.RecycleRequests, value);
103
}
104
@@ -108,15 +108,15 @@ namespace WixToolset.Iis.Tuples
108
set => this.Set((int)IIsAppPoolTupleFields.RecycleTimes, value);
109
}
110
111
- public int IdleTimeout
111
+ public int? IdleTimeout
112
{
113
- get => this.Fields[(int)IIsAppPoolTupleFields.IdleTimeout].AsNumber();
113
+ get => this.Fields[(int)IIsAppPoolTupleFields.IdleTimeout].AsNullableNumber();
114
set => this.Set((int)IIsAppPoolTupleFields.IdleTimeout, value);
115
}
116
117
- public int QueueLimit
117
+ public int? QueueLimit
118
{
119
- get => this.Fields[(int)IIsAppPoolTupleFields.QueueLimit].AsNumber();
119
+ get => this.Fields[(int)IIsAppPoolTupleFields.QueueLimit].AsNullableNumber();
120
set => this.Set((int)IIsAppPoolTupleFields.QueueLimit, value);
121
}
122
@@ -126,21 +126,21 @@ namespace WixToolset.Iis.Tuples
126
set => this.Set((int)IIsAppPoolTupleFields.CPUMon, value);
127
}
128
129
- public int MaxProc
129
+ public int? MaxProc
130
{
131
- get => this.Fields[(int)IIsAppPoolTupleFields.MaxProc].AsNumber();
131
+ get => this.Fields[(int)IIsAppPoolTupleFields.MaxProc].AsNullableNumber();
132
set => this.Set((int)IIsAppPoolTupleFields.MaxProc, value);
133
}
134
135
- public int VirtualMemory
135
+ public int? VirtualMemory
136
{
137
- get => this.Fields[(int)IIsAppPoolTupleFields.VirtualMemory].AsNumber();
137
+ get => this.Fields[(int)IIsAppPoolTupleFields.VirtualMemory].AsNullableNumber();
138
set => this.Set((int)IIsAppPoolTupleFields.VirtualMemory, value);
139
}
140
141
- public int PrivateMemory
141
+ public int? PrivateMemory
142
{
143
- get => this.Fields[(int)IIsAppPoolTupleFields.PrivateMemory].AsNumber();
143
+ get => this.Fields[(int)IIsAppPoolTupleFields.PrivateMemory].AsNullableNumber();
144
set => this.Set((int)IIsAppPoolTupleFields.PrivateMemory, value);
145
}
146
src/wixext/Tuples/IIsFilterTuple.cs
+2
-2
@@ -86,9 +86,9 @@ namespace WixToolset.Iis.Tuples
86
set => this.Set((int)IIsFilterTupleFields.Flags, value);
87
}
88
89
- public int LoadOrder
89
+ public int? LoadOrder
90
{
91
- get => this.Fields[(int)IIsFilterTupleFields.LoadOrder].AsNumber();
91
+ get => this.Fields[(int)IIsFilterTupleFields.LoadOrder].AsNullableNumber();
92
set => this.Set((int)IIsFilterTupleFields.LoadOrder, value);
93
}
94
}
src/wixext/Tuples/IIsHttpHeaderTuple.cs
+2
-2
@@ -86,9 +86,9 @@ namespace WixToolset.Iis.Tuples
86
set => this.Set((int)IIsHttpHeaderTupleFields.Attributes, value);
87
}
88
89
- public int Sequence
89
+ public int? Sequence
90
{
91
- get => this.Fields[(int)IIsHttpHeaderTupleFields.Sequence].AsNumber();
91
+ get => this.Fields[(int)IIsHttpHeaderTupleFields.Sequence].AsNullableNumber();
92
set => this.Set((int)IIsHttpHeaderTupleFields.Sequence, value);
93
}
94
}
src/wixext/Tuples/IIsWebAddressTuple.cs
+2
-2
@@ -70,9 +70,9 @@ namespace WixToolset.Iis.Tuples
70
set => this.Set((int)IIsWebAddressTupleFields.Header, value);
71
}
72
73
- public int Secure
73
+ public int? Secure
74
{
75
- get => this.Fields[(int)IIsWebAddressTupleFields.Secure].AsNumber();
75
+ get => this.Fields[(int)IIsWebAddressTupleFields.Secure].AsNullableNumber();
76
set => this.Set((int)IIsWebAddressTupleFields.Secure, value);
77
}
78
}
src/wixext/Tuples/IIsWebApplicationTuple.cs
+14
-14
@@ -70,27 +70,27 @@ namespace WixToolset.Iis.Tuples
70
set => this.Set((int)IIsWebApplicationTupleFields.Isolation, value);
71
}
72
73
- public int AllowSessions
73
+ public int? AllowSessions
74
{
75
- get => this.Fields[(int)IIsWebApplicationTupleFields.AllowSessions].AsNumber();
75
+ get => this.Fields[(int)IIsWebApplicationTupleFields.AllowSessions].AsNullableNumber();
76
set => this.Set((int)IIsWebApplicationTupleFields.AllowSessions, value);
77
}
78
79
- public int SessionTimeout
79
+ public int? SessionTimeout
80
{
81
- get => this.Fields[(int)IIsWebApplicationTupleFields.SessionTimeout].AsNumber();
81
+ get => this.Fields[(int)IIsWebApplicationTupleFields.SessionTimeout].AsNullableNumber();
82
set => this.Set((int)IIsWebApplicationTupleFields.SessionTimeout, value);
83
}
84
85
- public int Buffer
85
+ public int? Buffer
86
{
87
- get => this.Fields[(int)IIsWebApplicationTupleFields.Buffer].AsNumber();
87
+ get => this.Fields[(int)IIsWebApplicationTupleFields.Buffer].AsNullableNumber();
88
set => this.Set((int)IIsWebApplicationTupleFields.Buffer, value);
89
}
90
91
- public int ParentPaths
91
+ public int? ParentPaths
92
{
93
- get => this.Fields[(int)IIsWebApplicationTupleFields.ParentPaths].AsNumber();
93
+ get => this.Fields[(int)IIsWebApplicationTupleFields.ParentPaths].AsNullableNumber();
94
set => this.Set((int)IIsWebApplicationTupleFields.ParentPaths, value);
95
}
96
@@ -100,21 +100,21 @@ namespace WixToolset.Iis.Tuples
100
set => this.Set((int)IIsWebApplicationTupleFields.DefaultScript, value);
101
}
102
103
- public int ScriptTimeout
103
+ public int? ScriptTimeout
104
{
105
- get => this.Fields[(int)IIsWebApplicationTupleFields.ScriptTimeout].AsNumber();
105
+ get => this.Fields[(int)IIsWebApplicationTupleFields.ScriptTimeout].AsNullableNumber();
106
set => this.Set((int)IIsWebApplicationTupleFields.ScriptTimeout, value);
107
}
108
109
- public int ServerDebugging
109
+ public int? ServerDebugging
110
{
111
- get => this.Fields[(int)IIsWebApplicationTupleFields.ServerDebugging].AsNumber();
111
+ get => this.Fields[(int)IIsWebApplicationTupleFields.ServerDebugging].AsNullableNumber();
112
set => this.Set((int)IIsWebApplicationTupleFields.ServerDebugging, value);
113
}
114
115
- public int ClientDebugging
115
+ public int? ClientDebugging
116
{
117
- get => this.Fields[(int)IIsWebApplicationTupleFields.ClientDebugging].AsNumber();
117
+ get => this.Fields[(int)IIsWebApplicationTupleFields.ClientDebugging].AsNullableNumber();
118
set => this.Set((int)IIsWebApplicationTupleFields.ClientDebugging, value);
119
}
120
src/wixext/Tuples/IIsWebDirPropertiesTuple.cs
+18
-18
@@ -64,15 +64,15 @@ namespace WixToolset.Iis.Tuples
64
65
public IntermediateField this[IIsWebDirPropertiesTupleFields index] => this.Fields[(int)index];
66
67
- public int Access
67
+ public int? Access
68
{
69
- get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Access].AsNumber();
69
+ get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Access].AsNullableNumber();
70
set => this.Set((int)IIsWebDirPropertiesTupleFields.Access, value);
71
}
72
73
- public int Authorization
73
+ public int? Authorization
74
{
75
- get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Authorization].AsNumber();
75
+ get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Authorization].AsNullableNumber();
76
set => this.Set((int)IIsWebDirPropertiesTupleFields.Authorization, value);
77
}
78
@@ -82,21 +82,21 @@ namespace WixToolset.Iis.Tuples
82
set => this.Set((int)IIsWebDirPropertiesTupleFields.AnonymousUserRef, value);
83
}
84
85
- public int IIsControlledPassword
85
+ public int? IIsControlledPassword
86
{
87
- get => this.Fields[(int)IIsWebDirPropertiesTupleFields.IIsControlledPassword].AsNumber();
87
+ get => this.Fields[(int)IIsWebDirPropertiesTupleFields.IIsControlledPassword].AsNullableNumber();
88
set => this.Set((int)IIsWebDirPropertiesTupleFields.IIsControlledPassword, value);
89
}
90
91
- public int LogVisits
91
+ public int? LogVisits
92
{
93
- get => this.Fields[(int)IIsWebDirPropertiesTupleFields.LogVisits].AsNumber();
93
+ get => this.Fields[(int)IIsWebDirPropertiesTupleFields.LogVisits].AsNullableNumber();
94
set => this.Set((int)IIsWebDirPropertiesTupleFields.LogVisits, value);
95
}
96
97
- public int Index
97
+ public int? Index
98
{
99
- get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Index].AsNumber();
99
+ get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Index].AsNullableNumber();
100
set => this.Set((int)IIsWebDirPropertiesTupleFields.Index, value);
101
}
102
@@ -106,9 +106,9 @@ namespace WixToolset.Iis.Tuples
106
set => this.Set((int)IIsWebDirPropertiesTupleFields.DefaultDoc, value);
107
}
108
109
- public int AspDetailedError
109
+ public int? AspDetailedError
110
{
111
- get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AspDetailedError].AsNumber();
111
+ get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AspDetailedError].AsNullableNumber();
112
set => this.Set((int)IIsWebDirPropertiesTupleFields.AspDetailedError, value);
113
}
114
@@ -118,9 +118,9 @@ namespace WixToolset.Iis.Tuples
118
set => this.Set((int)IIsWebDirPropertiesTupleFields.HttpExpires, value);
119
}
120
121
- public int CacheControlMaxAge
121
+ public int? CacheControlMaxAge
122
{
123
- get => this.Fields[(int)IIsWebDirPropertiesTupleFields.CacheControlMaxAge].AsNumber();
123
+ get => this.Fields[(int)IIsWebDirPropertiesTupleFields.CacheControlMaxAge].AsNullableNumber();
124
set => this.Set((int)IIsWebDirPropertiesTupleFields.CacheControlMaxAge, value);
125
}
126
@@ -130,15 +130,15 @@ namespace WixToolset.Iis.Tuples
130
set => this.Set((int)IIsWebDirPropertiesTupleFields.CacheControlCustom, value);
131
}
132
133
- public int NoCustomError
133
+ public int? NoCustomError
134
{
135
- get => this.Fields[(int)IIsWebDirPropertiesTupleFields.NoCustomError].AsNumber();
135
+ get => this.Fields[(int)IIsWebDirPropertiesTupleFields.NoCustomError].AsNullableNumber();
136
set => this.Set((int)IIsWebDirPropertiesTupleFields.NoCustomError, value);
137
}
138
139
- public int AccessSSLFlags
139
+ public int? AccessSSLFlags
140
{
141
- get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AccessSSLFlags].AsNumber();
141
+ get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AccessSSLFlags].AsNullableNumber();
142
set => this.Set((int)IIsWebDirPropertiesTupleFields.AccessSSLFlags, value);
143
}
144
src/wixext/Tuples/IIsWebSiteTuple.cs
+6
-6
@@ -72,9 +72,9 @@ namespace WixToolset.Iis.Tuples
72
set => this.Set((int)IIsWebSiteTupleFields.Description, value);
73
}
74
75
- public int ConnectionTimeout
75
+ public int? ConnectionTimeout
76
{
77
- get => this.Fields[(int)IIsWebSiteTupleFields.ConnectionTimeout].AsNumber();
77
+ get => this.Fields[(int)IIsWebSiteTupleFields.ConnectionTimeout].AsNullableNumber();
78
set => this.Set((int)IIsWebSiteTupleFields.ConnectionTimeout, value);
79
}
80
@@ -84,9 +84,9 @@ namespace WixToolset.Iis.Tuples
84
set => this.Set((int)IIsWebSiteTupleFields.DirectoryRef, value);
85
}
86
87
- public int State
87
+ public int? State
88
{
89
- get => this.Fields[(int)IIsWebSiteTupleFields.State].AsNumber();
89
+ get => this.Fields[(int)IIsWebSiteTupleFields.State].AsNullableNumber();
90
set => this.Set((int)IIsWebSiteTupleFields.State, value);
91
}
92
@@ -114,9 +114,9 @@ namespace WixToolset.Iis.Tuples
114
set => this.Set((int)IIsWebSiteTupleFields.ApplicationRef, value);
115
}
116
117
- public int Sequence
117
+ public int? Sequence
118
{
119
- get => this.Fields[(int)IIsWebSiteTupleFields.Sequence].AsNumber();
119
+ get => this.Fields[(int)IIsWebSiteTupleFields.Sequence].AsNullableNumber();
120
set => this.Set((int)IIsWebSiteTupleFields.Sequence, value);
121
}
122
src/wixlib/iis.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-0083\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\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>{92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}</ProjectGuid>
@@ -38,7 +38,7 @@
38
<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>
39
</PropertyGroup>
40
<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'))" />
41
- <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\build\WixToolset.MSBuild.props'))" />
41
+ <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'))" />
42
</Target>
43
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
44
</Project>
\ No newline at end of file
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-0083" 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