Skip to content

Commit 4abfac3

Browse files
dibarbetdibarbet
committed
Merge remote-tracking branch 'upstream/prerelease' into merge_prerelease
2 parents ae04c33 + f2508ac commit 4abfac3

File tree

4 files changed

+33
-25
lines changed

4 files changed

+33
-25
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

66
# Latest
7+
* Update Roslyn to 4.11.0-3.24307.2 (PR: [#7211](https://github.com/dotnet/vscode-csharp/pull/7211))
8+
* Avoid writing analyzer shadow copies to /tmp/ on Unix (PR: [#73809](https://github.com/dotnet/roslyn/pull/73809))
9+
* Fix exponential blowup parsing pathological files (PR: [#73788](https://github.com/dotnet/roslyn/pull/73788))
10+
* Fix serialization of capabilities in onautoinsert (PR: [#73867](https://github.com/dotnet/roslyn/pull/73867))
11+
* Update Debugger Packages to v2.33.0 (PR: [#7204](https://github.com/dotnet/vscode-csharp/pull/7204))
12+
13+
# 2.33.16
714
* Update Roslyn to 4.11.0-3.24304.4 (PR: [#7191](https://github.com/dotnet/vscode-csharp/pull/7191))
815
* Fix build host when only the .net 6 SDK is installed (PR: [#73818](https://github.com/dotnet/roslyn/pull/73818))
916
* Bump Razor to 9.0.0-preview.24281.3 (PR: [#73817](https://github.com/dotnet/roslyn/pull/73817))

‎package.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
}
3838
},
3939
"defaults": {
40-
"roslyn": "4.11.0-3.24304.4",
40+
"roslyn": "4.11.0-3.24307.2",
4141
"omniSharp": "1.39.11",
4242
"razor": "7.0.0-preview.24266.1",
4343
"razorOmnisharp": "7.0.0-preview.23363.1",
@@ -421,7 +421,7 @@
421421
{
422422
"id": "Debugger",
423423
"description": ".NET Core Debugger (Windows / x64)",
424-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-win7-x64.zip",
424+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-34-0/coreclr-debug-win7-x64.zip",
425425
"installPath": ".debugger/x86_64",
426426
"platforms": [
427427
"win32"
@@ -431,12 +431,12 @@
431431
"arm64"
432432
],
433433
"installTestPath": "./.debugger/x86_64/vsdbg-ui.exe",
434-
"integrity": "8DD0C7B6936A538220E8A4DB7D9263A151986DE4956E33E86C80465BAD8521C0"
434+
"integrity": "D840546E9A4AD4B6882F80923D213C5C226432936E8124E3EDB903178DD70ED8"
435435
},
436436
{
437437
"id": "Debugger",
438438
"description": ".NET Core Debugger (Windows / ARM64)",
439-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-win10-arm64.zip",
439+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-34-0/coreclr-debug-win10-arm64.zip",
440440
"installPath": ".debugger/arm64",
441441
"platforms": [
442442
"win32"
@@ -445,12 +445,12 @@
445445
"arm64"
446446
],
447447
"installTestPath": "./.debugger/arm64/vsdbg-ui.exe",
448-
"integrity": "7D284CB85CDC1E85EB1BE143A31DC22FECFE3C4B576A507907AC7D32C7610E65"
448+
"integrity": "61CE47D5FA7B7A4051D13B7FE1563F20701F3638832C28AE8F69DF01FBF7315B"
449449
},
450450
{
451451
"id": "Debugger",
452452
"description": ".NET Core Debugger (macOS / x64)",
453-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-osx-x64.zip",
453+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-34-0/coreclr-debug-osx-x64.zip",
454454
"installPath": ".debugger/x86_64",
455455
"platforms": [
456456
"darwin"
@@ -464,12 +464,12 @@
464464
"./vsdbg"
465465
],
466466
"installTestPath": "./.debugger/x86_64/vsdbg-ui",
467-
"integrity": "A61ABA3B6F3A1524E95C7FE07ECF70F156996652E5E3CBB01C50E75CC5A08CEE"
467+
"integrity": "7F390C615486725F68F66725BD9C917D6D492997EC9DF44CC21EC969A48F8A72"
468468
},
469469
{
470470
"id": "Debugger",
471471
"description": ".NET Core Debugger (macOS / arm64)",
472-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-osx-arm64.zip",
472+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-34-0/coreclr-debug-osx-arm64.zip",
473473
"installPath": ".debugger/arm64",
474474
"platforms": [
475475
"darwin"
@@ -482,12 +482,12 @@
482482
"./vsdbg"
483483
],
484484
"installTestPath": "./.debugger/arm64/vsdbg-ui",
485-
"integrity": "9DE76C63EF7D2A2BA8600B381158C57EBD58D8BF235B85D1F1DDE4E7239282B1"
485+
"integrity": "78420B5597BF24A5D9F0DABB7A6B1B393C8986E4107FDF756E6B9FDA04E2830C"
486486
},
487487
{
488488
"id": "Debugger",
489489
"description": ".NET Core Debugger (linux / ARM)",
490-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-linux-arm.zip",
490+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-34-0/coreclr-debug-linux-arm.zip",
491491
"installPath": ".debugger",
492492
"platforms": [
493493
"linux"
@@ -500,12 +500,12 @@
500500
"./vsdbg"
501501
],
502502
"installTestPath": "./.debugger/vsdbg-ui",
503-
"integrity": "2AB179096B5202ED0EAC6BF0C5D17F4506191D24A9A51867B4F4024E036764E2"
503+
"integrity": "22E605917838D5E99A1479242E902902B706A29CF6CA792A189F856C17D2AE8C"
504504
},
505505
{
506506
"id": "Debugger",
507507
"description": ".NET Core Debugger (linux / ARM64)",
508-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-linux-arm64.zip",
508+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-34-0/coreclr-debug-linux-arm64.zip",
509509
"installPath": ".debugger",
510510
"platforms": [
511511
"linux"
@@ -518,12 +518,12 @@
518518
"./vsdbg"
519519
],
520520
"installTestPath": "./.debugger/vsdbg-ui",
521-
"integrity": "25DA86215FD5E0EB091130C9A82443D8B28F3A20A1159127C7F3AE4BE8B9B7AD"
521+
"integrity": "6C02AFEA6506A950F80205ACCFFFE4D3E07CDF9AAC3FA5B6688F90BD59ED7FE4"
522522
},
523523
{
524524
"id": "Debugger",
525525
"description": ".NET Core Debugger (linux musl / x64)",
526-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-linux-musl-x64.zip",
526+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-34-0/coreclr-debug-linux-musl-x64.zip",
527527
"installPath": ".debugger",
528528
"platforms": [
529529
"linux-musl"
@@ -536,12 +536,12 @@
536536
"./vsdbg"
537537
],
538538
"installTestPath": "./.debugger/vsdbg-ui",
539-
"integrity": "7DAB78E1955D95511665A4037E5CEDCF7C39A9FCC269A19A6738672238AE1A52"
539+
"integrity": "A4AF7D113A6F29F6FEFE13A5C774250672CA264A1EF624841B174DCCA48694C0"
540540
},
541541
{
542542
"id": "Debugger",
543543
"description": ".NET Core Debugger (linux musl / ARM64)",
544-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-linux-musl-arm64.zip",
544+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-34-0/coreclr-debug-linux-musl-arm64.zip",
545545
"installPath": ".debugger",
546546
"platforms": [
547547
"linux-musl"
@@ -554,12 +554,12 @@
554554
"./vsdbg"
555555
],
556556
"installTestPath": "./.debugger/vsdbg-ui",
557-
"integrity": "F28A3A76C13A36D94E59C53494D7BAF2A12EB4B005249246972999F064434573"
557+
"integrity": "1097C30E130EB8BE1040A4F1F25424691CE4C5E91CB59E36B7D284B72A3B96BE"
558558
},
559559
{
560560
"id": "Debugger",
561561
"description": ".NET Core Debugger (linux / x64)",
562-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-linux-x64.zip",
562+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-34-0/coreclr-debug-linux-x64.zip",
563563
"installPath": ".debugger",
564564
"platforms": [
565565
"linux"
@@ -572,7 +572,7 @@
572572
"./vsdbg"
573573
],
574574
"installTestPath": "./.debugger/vsdbg-ui",
575-
"integrity": "83EF1FF3BEE1E152550DB53C1EB8625794F0CCDBB94DBBB4B6876CD36A02DBDC"
575+
"integrity": "C409CBBFB4813974EEBA78D301D2F146BC7129B28EA85A1DD378F2789B8F2DD5"
576576
},
577577
{
578578
"id": "Razor",

‎src/shared/dotnetConfigurationProvider.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,13 @@ export class DotnetConfigurationResolver implements vscode.DebugConfigurationPro
110110
throw new UnavaliableLaunchServiceError();
111111
}
112112
} catch (e) {
113-
if (!projectPath) {
114-
throw new LaunchServiceError(
115-
vscode.l10n.t("'{0}' was not provided in the debug configuration.", 'projectPath')
116-
);
117-
}
118113
if (e instanceof UnavaliableLaunchServiceError) {
114+
if (!projectPath) {
115+
throw new LaunchServiceError(
116+
vscode.l10n.t("'{0}' was not provided in the debug configuration.", 'projectPath')
117+
);
118+
}
119+
119120
return await this.resolveDebugConfigurationWithWorkspaceDebugInformationProvider(
120121
folder,
121122
projectPath

‎version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "2.33",
3+
"version": "2.34",
44
"publicReleaseRefSpec": [
55
"^refs/heads/release$",
66
"^refs/heads/prerelease$",

0 commit comments

Comments
 (0)