Skip to content

Commit ff40d64

Browse files
ctaggartAArnott
ctaggart
authored and
AArnott
committed
add latest runtime identifiers (#316)
1 parent 01ebb81 commit ff40d64

File tree

1 file changed

+20
-156
lines changed

1 file changed

+20
-156
lines changed

‎src/Nerdbank.GitVersioning.Tasks/RuntimeIdMap.cs‎

Lines changed: 20 additions & 156 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ void FindBestCandidate(int startIndex, int increment)
5050

5151
// Find the highest available version that is lower than or equal to the runtime version
5252
// among candidates that have the same qualifiers.
53-
if (candidateQualifiers == runtimeQualifiers &&
54-
CompareVersions(candidateVersion, runtimeVersion) <= 0 &&
53+
if (candidateQualifiers == runtimeQualifiers &&
54+
CompareVersions(candidateVersion, runtimeVersion) <= 0 &&
5555
(bestVersion == null || CompareVersions(candidateVersion, bestVersion) > 0))
5656
{
5757
bestMatchIndex = i;
5858
bestVersion = candidateVersion;
5959
}
60-
60+
6161
i += increment;
6262
}
6363
}
@@ -107,7 +107,7 @@ internal static int CompareVersions(string[] left, string[] right)
107107

108108
internal static void ParseRuntimeId(string runtimeId, out string osName, out string[] version, out string qualifiers)
109109
{
110-
// We use the following convention in all newly-defined RIDs. Some RIDs (win7-x64, win8-x64) predate this convention and don't follow it, but all new RIDs should follow it.
110+
// We use the following convention in all newly-defined RIDs. Some RIDs (win7-x64, win8-x64) predate this convention and don't follow it, but all new RIDs should follow it.
111111
// [os name].[version]-[architecture]-[additional qualifiers]
112112
// See https://github.com/dotnet/corefx/blob/master/pkg/Microsoft.NETCore.Platforms/readme.md#naming-convention
113113

@@ -158,179 +158,111 @@ internal static void ParseRuntimeId(string runtimeId, out string osName, out str
158158
private static readonly string[] s_rids = new[]
159159
{
160160
"alpine-x64",
161-
"alpine-x64-corert",
162161
"alpine.3.6-x64",
163-
"alpine.3.6-x64-corert",
164162
"alpine.3.7-x64",
165-
"alpine.3.7-x64-corert",
163+
"alpine.3.8-x64",
164+
"alpine.3.9-x64",
166165
"centos-x64",
167-
"centos-x64-corert",
168166
"centos.7-x64",
169-
"centos.7-x64-corert",
170167
"debian-x64",
171-
"debian-x64-corert",
172168
"debian.8-x64",
173-
"debian.8-x64-corert",
174169
"debian.9-x64",
175-
"debian.9-x64-corert",
176170
"fedora-x64",
177-
"fedora-x64-corert",
178171
"fedora.23-x64",
179-
"fedora.23-x64-corert",
180172
"fedora.24-x64",
181-
"fedora.24-x64-corert",
182173
"fedora.25-x64",
183-
"fedora.25-x64-corert",
184174
"fedora.26-x64",
185-
"fedora.26-x64-corert",
186175
"fedora.27-x64",
187-
"fedora.27-x64-corert",
188176
"fedora.28-x64",
189-
"fedora.28-x64-corert",
177+
"fedora.29-x64",
190178
"gentoo-x64",
191-
"gentoo-x64-corert",
192179
"linux-musl-x64",
193-
"linux-musl-x64-corert",
194180
"linux-x64",
195-
"linux-x64-corert",
196181
"linuxmint.17-x64",
197-
"linuxmint.17-x64-corert",
198182
"linuxmint.17.1-x64",
199-
"linuxmint.17.1-x64-corert",
200183
"linuxmint.17.2-x64",
201-
"linuxmint.17.2-x64-corert",
202184
"linuxmint.17.3-x64",
203-
"linuxmint.17.3-x64-corert",
204185
"linuxmint.18-x64",
205-
"linuxmint.18-x64-corert",
206186
"linuxmint.18.1-x64",
207-
"linuxmint.18.1-x64-corert",
208187
"linuxmint.18.2-x64",
209-
"linuxmint.18.2-x64-corert",
210188
"linuxmint.18.3-x64",
211-
"linuxmint.18.3-x64-corert",
212189
"linuxmint.19-x64",
213-
"linuxmint.19-x64-corert",
214190
"ol-x64",
215-
"ol-x64-corert",
216191
"ol.7-x64",
217-
"ol.7-x64-corert",
218192
"ol.7.0-x64",
219-
"ol.7.0-x64-corert",
220193
"ol.7.1-x64",
221-
"ol.7.1-x64-corert",
222194
"ol.7.2-x64",
223-
"ol.7.2-x64-corert",
224195
"ol.7.3-x64",
225-
"ol.7.3-x64-corert",
226196
"ol.7.4-x64",
227-
"ol.7.4-x64-corert",
197+
"ol.7.5-x64",
198+
"ol.7.6-x64",
228199
"opensuse-x64",
229-
"opensuse-x64-corert",
230200
"opensuse.13.2-x64",
231-
"opensuse.13.2-x64-corert",
201+
"opensuse.15.0-x64",
232202
"opensuse.42.1-x64",
233-
"opensuse.42.1-x64-corert",
234203
"opensuse.42.2-x64",
235-
"opensuse.42.2-x64-corert",
236204
"opensuse.42.3-x64",
237-
"opensuse.42.3-x64-corert",
238205
"osx",
239-
"osx-corert",
240206
"osx-x64",
241-
"osx-x64-corert",
242207
"osx.10.10",
243-
"osx.10.10-corert",
244208
"osx.10.10-x64",
245-
"osx.10.10-x64-corert",
246209
"osx.10.11",
247-
"osx.10.11-corert",
248210
"osx.10.11-x64",
249-
"osx.10.11-x64-corert",
250211
"osx.10.12",
251-
"osx.10.12-corert",
252212
"osx.10.12-x64",
253-
"osx.10.12-x64-corert",
254213
"osx.10.13",
255-
"osx.10.13-corert",
256214
"osx.10.13-x64",
257-
"osx.10.13-x64-corert",
215+
"osx.10.14",
216+
"osx.10.14-x64",
258217
"rhel-x64",
259-
"rhel-x64-corert",
260218
"rhel.6-x64",
261-
"rhel.6-x64-corert",
262219
"rhel.7-x64",
263-
"rhel.7-x64-corert",
264220
"rhel.7.0-x64",
265-
"rhel.7.0-x64-corert",
266221
"rhel.7.1-x64",
267-
"rhel.7.1-x64-corert",
268222
"rhel.7.2-x64",
269-
"rhel.7.2-x64-corert",
270223
"rhel.7.3-x64",
271-
"rhel.7.3-x64-corert",
272224
"rhel.7.4-x64",
273-
"rhel.7.4-x64-corert",
225+
"rhel.7.5-x64",
226+
"rhel.7.6-x64",
227+
"rhel.8-x64",
228+
"rhel.8.0-x64",
274229
"sles-x64",
275-
"sles-x64-corert",
276230
"sles.12-x64",
277-
"sles.12-x64-corert",
278231
"sles.12.1-x64",
279-
"sles.12.1-x64-corert",
280232
"sles.12.2-x64",
281-
"sles.12.2-x64-corert",
282233
"sles.12.3-x64",
283-
"sles.12.3-x64-corert",
234+
"sles.15-x64",
284235
"ubuntu-x64",
285-
"ubuntu-x64-corert",
286236
"ubuntu.14.04-x64",
287-
"ubuntu.14.04-x64-corert",
288237
"ubuntu.14.10-x64",
289-
"ubuntu.14.10-x64-corert",
290238
"ubuntu.15.04-x64",
291-
"ubuntu.15.04-x64-corert",
292239
"ubuntu.15.10-x64",
293-
"ubuntu.15.10-x64-corert",
294240
"ubuntu.16.04-x64",
295-
"ubuntu.16.04-x64-corert",
296241
"ubuntu.16.10-x64",
297-
"ubuntu.16.10-x64-corert",
298242
"ubuntu.17.04-x64",
299-
"ubuntu.17.04-x64-corert",
300243
"ubuntu.17.10-x64",
301-
"ubuntu.17.10-x64-corert",
302244
"ubuntu.18.04-x64",
303-
"ubuntu.18.04-x64-corert",
245+
"ubuntu.18.10-x64",
304246
"win-x64",
305247
"win-x64-aot",
306-
"win-x64-corert",
307248
"win-x86",
308249
"win-x86-aot",
309-
"win-x86-corert",
310250
"win10-x64",
311251
"win10-x64-aot",
312-
"win10-x64-corert",
313252
"win10-x86",
314253
"win10-x86-aot",
315-
"win10-x86-corert",
316254
"win7-x64",
317255
"win7-x64-aot",
318-
"win7-x64-corert",
319256
"win7-x86",
320257
"win7-x86-aot",
321-
"win7-x86-corert",
322258
"win8-x64",
323259
"win8-x64-aot",
324-
"win8-x64-corert",
325260
"win8-x86",
326261
"win8-x86-aot",
327-
"win8-x86-corert",
328262
"win81-x64",
329263
"win81-x64-aot",
330-
"win81-x64-corert",
331264
"win81-x86",
332265
"win81-x86-aot",
333-
"win81-x86-corert",
334266
};
335267

336268
private static readonly string[] s_directories = new[]
@@ -340,16 +272,10 @@ internal static void ParseRuntimeId(string runtimeId, out string osName, out str
340272
"alpine-x64",
341273
"alpine-x64",
342274
"alpine-x64",
343-
"alpine-x64",
344-
"rhel-x64",
345275
"rhel-x64",
346276
"rhel-x64",
347-
"rhel-x64",
348-
"linux-x64",
349277
"linux-x64",
350278
"linux-x64",
351-
"linux-x64",
352-
"debian.9-x64",
353279
"debian.9-x64",
354280
"fedora-x64",
355281
"fedora-x64",
@@ -359,18 +285,6 @@ internal static void ParseRuntimeId(string runtimeId, out string osName, out str
359285
"fedora-x64",
360286
"fedora-x64",
361287
"fedora-x64",
362-
"fedora-x64",
363-
"fedora-x64",
364-
"fedora-x64",
365-
"fedora-x64",
366-
"fedora-x64",
367-
"fedora-x64",
368-
"linux-x64",
369-
"linux-x64",
370-
"linux-x64",
371-
"linux-x64",
372-
"linux-x64",
373-
"linux-x64",
374288
"linux-x64",
375289
"linux-x64",
376290
"linux-x64",
@@ -382,18 +296,7 @@ internal static void ParseRuntimeId(string runtimeId, out string osName, out str
382296
"linux-x64",
383297
"linux-x64",
384298
"linux-x64",
385-
"linux-x64",
386-
"linux-x64",
387-
"linux-x64",
388-
"linux-x64",
389-
"linux-x64",
390-
"linux-x64",
391-
"linux-x64",
392-
"rhel-x64",
393-
"rhel-x64",
394-
"rhel-x64",
395-
"rhel-x64",
396-
"rhel-x64",
299+
"ubuntu.18.04-x64",
397300
"rhel-x64",
398301
"rhel-x64",
399302
"rhel-x64",
@@ -409,11 +312,6 @@ internal static void ParseRuntimeId(string runtimeId, out string osName, out str
409312
"linux-x64",
410313
"linux-x64",
411314
"linux-x64",
412-
"linux-x64",
413-
"linux-x64",
414-
"linux-x64",
415-
"linux-x64",
416-
"osx",
417315
"osx",
418316
"osx",
419317
"osx",
@@ -426,15 +324,6 @@ internal static void ParseRuntimeId(string runtimeId, out string osName, out str
426324
"osx",
427325
"osx",
428326
"osx",
429-
"osx",
430-
"osx",
431-
"osx",
432-
"osx",
433-
"osx",
434-
"osx",
435-
"osx",
436-
"rhel-x64",
437-
"rhel-x64",
438327
"rhel-x64",
439328
"rhel-x64",
440329
"rhel-x64",
@@ -447,22 +336,6 @@ internal static void ParseRuntimeId(string runtimeId, out string osName, out str
447336
"rhel-x64",
448337
"rhel-x64",
449338
"rhel-x64",
450-
"rhel-x64",
451-
"rhel-x64",
452-
"linux-x64",
453-
"linux-x64",
454-
"linux-x64",
455-
"linux-x64",
456-
"linux-x64",
457-
"linux-x64",
458-
"linux-x64",
459-
"linux-x64",
460-
"linux-x64",
461-
"linux-x64",
462-
"linux-x64",
463-
"linux-x64",
464-
"linux-x64",
465-
"linux-x64",
466339
"linux-x64",
467340
"linux-x64",
468341
"linux-x64",
@@ -478,35 +351,26 @@ internal static void ParseRuntimeId(string runtimeId, out string osName, out str
478351
"linux-x64",
479352
"linux-x64",
480353
"linux-x64",
354+
"ubuntu.18.04-x64",
481355
"linux-x64",
482356
"win-x64",
483357
"win-x64",
484-
"win-x64",
485358
"win-x86",
486359
"win-x86",
487-
"win-x86",
488-
"win-x64",
489360
"win-x64",
490361
"win-x64",
491362
"win-x86",
492363
"win-x86",
493-
"win-x86",
494364
"win-x64",
495365
"win-x64",
496-
"win-x64",
497-
"win-x86",
498366
"win-x86",
499367
"win-x86",
500368
"win-x64",
501369
"win-x64",
502-
"win-x64",
503-
"win-x86",
504370
"win-x86",
505371
"win-x86",
506372
"win-x64",
507373
"win-x64",
508-
"win-x64",
509-
"win-x86",
510374
"win-x86",
511375
"win-x86",
512376
};

0 commit comments

Comments
 (0)