Skip to content

Commit 9d0a155

Browse files
JoeRobichJoeRobich
authored
Merge branch 'main' into dev/jorobich/update-roslyn
2 parents cf75b57 + d3395d7 commit 9d0a155

File tree

5 files changed

+65
-66
lines changed

5 files changed

+65
-66
lines changed

‎.vscode/launch.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@
219219
"args": ["updatePackageDependencies"],
220220
"env": {
221221
"NEW_DEPS_ID": "OmniSharp",
222-
"NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-x64-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-x86-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-arm64-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-osx-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-x64-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-arm64-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-musl-x64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-musl-arm64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-x64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-arm64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-osx-x64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-osx-arm64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-x64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-arm64-net6.0-1.39.12.zip",
223-
"OLD_DEPS_VERSION": "1.39.11",
224-
"NEW_DEPS_VERSION": "1.39.12"
222+
"NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-x64.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-x86.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-arm64.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-osx.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-x64.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-arm64.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-musl-x64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-musl-arm64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-x64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-arm64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-osx-x64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-osx-arm64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-x64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-arm64-net6.0.zip",
223+
"OLD_DEPS_VERSION": "1.39.12",
224+
"NEW_DEPS_VERSION": "1.39.14"
225225
},
226226
"cwd": "${workspaceFolder}"
227227
},

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
* Fix issue acquiring components when using proxies (PR: [#8457](https://github.com/dotnet/vscode-csharp/pull/8457))
4343
* Support activating the extension with limited support in untrusted workspaces (PR: [#8435](https://github.com/dotnet/vscode-csharp/pull/8435))
4444
* Report specific c# settings in issue template (PR: [#8433](https://github.com/dotnet/vscode-csharp/pull/8433))
45+
* Update OmniSharp to 1.39.14 (PR: [#8492](https://github.com/dotnet/vscode-csharp/pull/8492))
46+
* Update Roslyn to 4.14.0-3.25168.13 (PR: [omnisharp-roslyn/#2664](https://github.com/OmniSharp/omnisharp-roslyn/pull/2664))
4547

4648
# 2.87.x
4749
* Bump Roslyn to 5.0.0-2.25371.17 (PR: [#8436](https://github.com/dotnet/vscode-csharp/pull/8436))

‎package.json

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
],
4242
"defaults": {
4343
"roslyn": "5.0.0-2.25405.5",
44-
"omniSharp": "1.39.12",
44+
"omniSharp": "1.39.14",
4545
"razor": "10.0.0-preview.25403.1",
4646
"razorOmnisharp": "7.0.0-preview.23363.1",
4747
"xamlTools": "17.14.36106.43"
@@ -185,72 +185,72 @@
185185
{
186186
"id": "OmniSharp",
187187
"description": "OmniSharp for Windows (.NET 4.7.2 / x64)",
188-
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-x64-1.39.12.zip",
189-
"installPath": ".omnisharp/1.39.12",
188+
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-x64.zip",
189+
"installPath": ".omnisharp/1.39.14",
190190
"platforms": [
191191
"win32"
192192
],
193193
"architectures": [
194194
"x86_64"
195195
],
196-
"installTestPath": "./.omnisharp/1.39.12/OmniSharp.exe",
196+
"installTestPath": "./.omnisharp/1.39.14/OmniSharp.exe",
197197
"platformId": "win-x64",
198198
"isFramework": true,
199-
"integrity": "A52562B44C9BAA2811F0A617F182A5886BB79BB1532850827D89F173D8C962B6"
199+
"integrity": "64B040ECD9390C1A595D764561653E80EE857298E1B079661081A234326B9B97"
200200
},
201201
{
202202
"id": "OmniSharp",
203203
"description": "OmniSharp for Windows (.NET 6 / x64)",
204-
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-x64-net6.0-1.39.12.zip",
205-
"installPath": ".omnisharp/1.39.12-net6.0",
204+
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-x64-net6.0.zip",
205+
"installPath": ".omnisharp/1.39.14-net6.0",
206206
"platforms": [
207207
"win32"
208208
],
209209
"architectures": [
210210
"x86_64"
211211
],
212-
"installTestPath": "./.omnisharp/1.39.12-net6.0/OmniSharp.dll",
212+
"installTestPath": "./.omnisharp/1.39.14-net6.0/OmniSharp.dll",
213213
"platformId": "win-x64",
214214
"isFramework": false,
215-
"integrity": "21BB3F7D990B6D464A748E9C11731582CAEEAAB87D7F749EDEACFE136A09C13E"
215+
"integrity": "DA298BCBD471E9A8D2B5A007132B5F5CD567FE6A9C84BC97A7ABD4005AAD6A96"
216216
},
217217
{
218218
"id": "OmniSharp",
219219
"description": "OmniSharp for Windows (.NET 4.7.2 / arm64)",
220-
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-arm64-1.39.12.zip",
221-
"installPath": ".omnisharp/1.39.12",
220+
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-arm64.zip",
221+
"installPath": ".omnisharp/1.39.14",
222222
"platforms": [
223223
"win32"
224224
],
225225
"architectures": [
226226
"arm64"
227227
],
228-
"installTestPath": "./.omnisharp/1.39.12/OmniSharp.exe",
228+
"installTestPath": "./.omnisharp/1.39.14/OmniSharp.exe",
229229
"platformId": "win-arm64",
230230
"isFramework": true,
231-
"integrity": "E61CFBD416C9099D5710748281A0E07763ABE6D6EC930F31335B008DB6907780"
231+
"integrity": "D171EFE3D50D2C5E6F05AF124144E6DA3083866A867DE8E10C115E44F32A03F3"
232232
},
233233
{
234234
"id": "OmniSharp",
235235
"description": "OmniSharp for Windows (.NET 6 / arm64)",
236-
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-arm64-net6.0-1.39.12.zip",
237-
"installPath": ".omnisharp/1.39.12-net6.0",
236+
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-arm64-net6.0.zip",
237+
"installPath": ".omnisharp/1.39.14-net6.0",
238238
"platforms": [
239239
"win32"
240240
],
241241
"architectures": [
242242
"arm64"
243243
],
244-
"installTestPath": "./.omnisharp/1.39.12-net6.0/OmniSharp.dll",
244+
"installTestPath": "./.omnisharp/1.39.14-net6.0/OmniSharp.dll",
245245
"platformId": "win-arm64",
246246
"isFramework": false,
247-
"integrity": "ECA34E2AEEB1775AAB664C5C06232EFBB57BB2CA6020A63FB92D24A0EE3A6906"
247+
"integrity": "60324F7482472E081AA560F5FB46BC8A286A38D327C76F7ECE2595994154D7F6"
248248
},
249249
{
250250
"id": "OmniSharp",
251251
"description": "OmniSharp for OSX (Mono / x64)",
252-
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-osx-1.39.12.zip",
253-
"installPath": ".omnisharp/1.39.12",
252+
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-osx.zip",
253+
"installPath": ".omnisharp/1.39.14",
254254
"platforms": [
255255
"darwin"
256256
],
@@ -262,48 +262,48 @@
262262
"./mono.osx",
263263
"./run"
264264
],
265-
"installTestPath": "./.omnisharp/1.39.12/run",
265+
"installTestPath": "./.omnisharp/1.39.14/run",
266266
"platformId": "osx",
267267
"isFramework": true,
268-
"integrity": "645BD54508011CEF386FC765FA9E2DD6F6615120A6F611EF78DB2C41A3634C71"
268+
"integrity": "D1CD0A8A55E99BD8636D329946D69CDE3E0FEA518A3AB9F1A300C8C62FFD9980"
269269
},
270270
{
271271
"id": "OmniSharp",
272272
"description": "OmniSharp for OSX (.NET 6 / x64)",
273-
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-osx-x64-net6.0-1.39.12.zip",
274-
"installPath": ".omnisharp/1.39.12-net6.0",
273+
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-osx-x64-net6.0.zip",
274+
"installPath": ".omnisharp/1.39.14-net6.0",
275275
"platforms": [
276276
"darwin"
277277
],
278278
"architectures": [
279279
"x86_64"
280280
],
281-
"installTestPath": "./.omnisharp/1.39.12-net6.0/OmniSharp.dll",
281+
"installTestPath": "./.omnisharp/1.39.14-net6.0/OmniSharp.dll",
282282
"platformId": "osx-x64",
283283
"isFramework": false,
284-
"integrity": "04A286EA36CE60AD1EBC83E16B114FD6663BDE840C43FD695067268A39B81CB1"
284+
"integrity": "C1DD5FB6A45420B55B1698F1A49DA056B643C834D57004BC65ED32EE9335F308"
285285
},
286286
{
287287
"id": "OmniSharp",
288288
"description": "OmniSharp for OSX (.NET 6 / arm64)",
289-
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-osx-arm64-net6.0-1.39.12.zip",
290-
"installPath": ".omnisharp/1.39.12-net6.0",
289+
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-osx-arm64-net6.0.zip",
290+
"installPath": ".omnisharp/1.39.14-net6.0",
291291
"platforms": [
292292
"darwin"
293293
],
294294
"architectures": [
295295
"arm64"
296296
],
297-
"installTestPath": "./.omnisharp/1.39.12-net6.0/OmniSharp.dll",
297+
"installTestPath": "./.omnisharp/1.39.14-net6.0/OmniSharp.dll",
298298
"platformId": "osx-arm64",
299299
"isFramework": false,
300-
"integrity": "44A197EBB3FC1AE55209FD3A125F2EDF6327F91A0E1EFC76025B5F7787CC4F94"
300+
"integrity": "C3A345E07E6EDA5C6ADF9D4FC067640DABE0C1A75C2CAC49340AEC21F1687799"
301301
},
302302
{
303303
"id": "OmniSharp",
304304
"description": "OmniSharp for Linux (Mono / x86)",
305-
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-x86-1.39.12.zip",
306-
"installPath": ".omnisharp/1.39.12",
305+
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-x86.zip",
306+
"installPath": ".omnisharp/1.39.14",
307307
"platforms": [
308308
"linux"
309309
],
@@ -315,16 +315,16 @@
315315
"./mono.linux-x86",
316316
"./run"
317317
],
318-
"installTestPath": "./.omnisharp/1.39.12/run",
318+
"installTestPath": "./.omnisharp/1.39.14/run",
319319
"platformId": "linux-x86",
320320
"isFramework": true,
321-
"integrity": "7C5691CCA9F617FBCCAA687F3624913428F31FF3213F689E25D62E17CBC0C2DE"
321+
"integrity": "8A35A36FAE073E975F9D8C7F1DE58AFB07F504E12D7DBFFA95E4A52E2D0E6610"
322322
},
323323
{
324324
"id": "OmniSharp",
325325
"description": "OmniSharp for Linux (Mono / x64)",
326-
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-x64-1.39.12.zip",
327-
"installPath": ".omnisharp/1.39.12",
326+
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-x64.zip",
327+
"installPath": ".omnisharp/1.39.14",
328328
"platforms": [
329329
"linux"
330330
],
@@ -335,32 +335,32 @@
335335
"./mono.linux-x86_64",
336336
"./run"
337337
],
338-
"installTestPath": "./.omnisharp/1.39.12/run",
338+
"installTestPath": "./.omnisharp/1.39.14/run",
339339
"platformId": "linux-x64",
340340
"isFramework": true,
341-
"integrity": "82997A2EC98CDC213712EE0F96FB5A0A6C0858889D26C6BD7DB2FA1269FD6CBA"
341+
"integrity": "4F146EB94A195A437361C0FEC527309F0AA31474C6D9B7B9E0BC9A1804BD8EAF"
342342
},
343343
{
344344
"id": "OmniSharp",
345345
"description": "OmniSharp for Linux (.NET 6 / x64)",
346-
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-x64-net6.0-1.39.12.zip",
347-
"installPath": ".omnisharp/1.39.12-net6.0",
346+
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-x64-net6.0.zip",
347+
"installPath": ".omnisharp/1.39.14-net6.0",
348348
"platforms": [
349349
"linux"
350350
],
351351
"architectures": [
352352
"x86_64"
353353
],
354-
"installTestPath": "./.omnisharp/1.39.12-net6.0/OmniSharp.dll",
354+
"installTestPath": "./.omnisharp/1.39.14-net6.0/OmniSharp.dll",
355355
"platformId": "linux-x64",
356356
"isFramework": false,
357-
"integrity": "7D65424EEEC4D0C06BAEE22D37465AD9718B626D4E9E9CA0E5FB95862630C049"
357+
"integrity": "EBA3F00A807517789BE0188F86F8B685D74359D6BD684D7A0B0125E33AD59D89"
358358
},
359359
{
360360
"id": "OmniSharp",
361361
"description": "OmniSharp for Linux (Mono / arm64)",
362-
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-arm64-1.39.12.zip",
363-
"installPath": ".omnisharp/1.39.12",
362+
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-arm64.zip",
363+
"installPath": ".omnisharp/1.39.14",
364364
"platforms": [
365365
"linux"
366366
],
@@ -371,58 +371,58 @@
371371
"./mono.linux-arm64",
372372
"./run"
373373
],
374-
"installTestPath": "./.omnisharp/1.39.12/run",
374+
"installTestPath": "./.omnisharp/1.39.14/run",
375375
"platformId": "linux-arm64",
376376
"isFramework": true,
377-
"integrity": "39478AE2072874258CC493055F7332FD9BEC7B3ED1FFF57280EB2D07CAFAE4BD"
377+
"integrity": "B33419B089119D5327A228636BBA5713715D4D76B4B0FB4EFEFCBECE2F8F2D22"
378378
},
379379
{
380380
"id": "OmniSharp",
381381
"description": "OmniSharp for Linux (.NET 6 / arm64)",
382-
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-arm64-net6.0-1.39.12.zip",
383-
"installPath": ".omnisharp/1.39.12-net6.0",
382+
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-arm64-net6.0.zip",
383+
"installPath": ".omnisharp/1.39.14-net6.0",
384384
"platforms": [
385385
"linux"
386386
],
387387
"architectures": [
388388
"arm64"
389389
],
390-
"installTestPath": "./.omnisharp/1.39.12-net6.0/OmniSharp.dll",
390+
"installTestPath": "./.omnisharp/1.39.14-net6.0/OmniSharp.dll",
391391
"platformId": "linux-arm64",
392392
"isFramework": false,
393-
"integrity": "1A009CF2D62D1A6FE1646FFF03FED52633B019B49A71FB3D8CE74406224EA0C5"
393+
"integrity": "0E2C69F191268959D68A35E1CC8FD832A688AF516A9945EF25DC8C6EA014A7C2"
394394
},
395395
{
396396
"id": "OmniSharp",
397397
"description": "OmniSharp for Linux musl (.NET 6 / x64)",
398-
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-musl-x64-net6.0-1.39.12.zip",
399-
"installPath": ".omnisharp/1.39.12-net6.0",
398+
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-musl-x64-net6.0.zip",
399+
"installPath": ".omnisharp/1.39.14-net6.0",
400400
"platforms": [
401401
"linux-musl"
402402
],
403403
"architectures": [
404404
"x86_64"
405405
],
406-
"installTestPath": "./.omnisharp/1.39.12-net6.0/OmniSharp.dll",
406+
"installTestPath": "./.omnisharp/1.39.14-net6.0/OmniSharp.dll",
407407
"platformId": "linux-musl-x64",
408408
"isFramework": false,
409-
"integrity": "FB97F4B0AB76823272B55CA3134FD5877C5651366CB88C678ED0445E86A8CD35"
409+
"integrity": "098106AA7AA22FB427A5333B120916BD0C2FA8A303DA9653992E45F20BFD6AAF"
410410
},
411411
{
412412
"id": "OmniSharp",
413413
"description": "OmniSharp for Linux musl (.NET 6 / arm64)",
414-
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-musl-arm64-net6.0-1.39.12.zip",
415-
"installPath": ".omnisharp/1.39.12-net6.0",
414+
"url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-musl-arm64-net6.0.zip",
415+
"installPath": ".omnisharp/1.39.14-net6.0",
416416
"platforms": [
417417
"linux-musl"
418418
],
419419
"architectures": [
420420
"arm64"
421421
],
422-
"installTestPath": "./.omnisharp/1.39.12-net6.0/OmniSharp.dll",
422+
"installTestPath": "./.omnisharp/1.39.14-net6.0/OmniSharp.dll",
423423
"platformId": "linux-musl-arm64",
424424
"isFramework": false,
425-
"integrity": "9944EBD6EE06BD595BCADD3057CD9BEF4105C3A3952DAE03E54F3114E2E6661F"
425+
"integrity": "7CF8465D490D6D5362C0FBB5F9550C95FBCB8D306079185CC533D37A7A40F666"
426426
},
427427
{
428428
"id": "RoslynCopilot",
@@ -5653,4 +5653,4 @@
56535653
}
56545654
}
56555655
}
5656-
}
5656+
}

‎src/tools/updatePackageDependencies.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,7 @@ function getLowercaseFileNameFromUrl(url: string): string {
259259
let fileName = url.substr(index + 1).toLowerCase();
260260

261261
if (fileName.startsWith('omnisharp')) {
262-
// Omnisharp versions are always after the last '-'.
263-
// e.g. we want omnisharp-win-x86 from omnisharp-win-x86-1.39.3.zip
264-
const lastDash = fileName.lastIndexOf('-');
265-
fileName = fileName.substr(0, lastDash);
262+
// Omnisharp versions are not contained in the file name.
266263
return fileName;
267264
} else if (fileName.startsWith('coreclr-debug')) {
268265
// Debugger versions are not contained in the file name.

‎test/omnisharp/omnisharpIntegrationTests/completionProvider.integration.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ describeIfNotRazorOrGenerator(`${OmniSharpCompletionProvider.name}: Returns the
6262
expect(documentation.length).toBeGreaterThan(0);
6363
});
6464

65-
test('Override completion has additional edits sync', async () => {
65+
test.skip('Override completion has additional edits sync', async () => {
6666
const completionList = <vscode.CompletionList>(
6767
await vscode.commands.executeCommand(
6868
'vscode.executeCompletionItemProvider',

0 commit comments

Comments
 (0)