Skip to content

Commit f092266

Browse files
JoeRobichJoeRobich
authored
Merge branch 'main' into dev/jorobich/report-all-diagnostics
2 parents 80187d6 + afccef9 commit f092266

File tree

6 files changed

+47
-26
lines changed

6 files changed

+47
-26
lines changed

‎CHANGELOG.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,23 @@
33
- Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

6-
# 2.66.x
6+
# 2.67.x
7+
78
* Update Roslyn to (PR: [#7984](https://github.com/dotnet/vscode-csharp/pull/7984))
89
* Return LSP diagnostics with their reported severity. (PR: [#77145](https://github.com/dotnet/roslyn/pull/77145))
910
* Fix syntax generation of explict checked operator from symbol (PR: [#77102](https://github.com/dotnet/roslyn/pull/77102))
1011
* Manage information diagnostic severity on the client-side (PR: [#7984](https://github.com/dotnet/vscode-csharp/pull/7984))
12+
* Update Razor to 9.0.0-preview.25113.1 (PR: [#7989](https://github.com/dotnet/vscode-csharp/pull/7989))
13+
* Update Telemetry package (#11468) (PR: [#11468](https://github.com/dotnet/razor/pull/11468))
14+
* Don't hold onto Roslyn projects longer than necessary (#11458) (PR: [#11458](https://github.com/dotnet/razor/pull/11458))
15+
* Fix formatting of escaped at signs (#11462) (PR: [#11462](https://github.com/dotnet/razor/pull/11462))
16+
* Code action to offer to wrap Html attributes (#11422) (PR: [#11422](https://github.com/dotnet/razor/pull/11422))
17+
* Make sure we go through GetAbsolutePosition to handle LSP edge cases (#11441) (PR: [#11441](https://github.com/dotnet/razor/pull/11441))
18+
* Make log levels match LogLevel.cs (#11436) (PR: [#11436](https://github.com/dotnet/razor/pull/11436))
19+
* Fix on type formatting line delta calculations (#11435) (PR: [#11435](https://github.com/dotnet/razor/pull/11435))
20+
* Clean up and rationalize imports in the compiler (#11409) (PR: [#11409](https://github.com/dotnet/razor/pull/11409))
21+
* Fix typo in setting description (#11423) (PR: [#11423](https://github.com/dotnet/razor/pull/11423))
22+
* Bump xamlTools to 17.14.35813.246 (PR: [#7993](https://github.com/dotnet/vscode-csharp/pull/7993))
1123

1224
# 2.65.x
1325
* Update Roslyn LSP to run on .NET 9 (PR: [#7946](https://github.com/dotnet/vscode-csharp/pull/7946))
@@ -23,7 +35,7 @@
2335
* Add code snippets for C# expression-bodied properties (PR: [#5683](https://github.com/dotnet/vscode-csharp/pull/5683))
2436
* Sync whitespace options even when detectIndentation is on (PR: [#7965](https://github.com/dotnet/vscode-csharp/pull/7965))
2537
* Bump Razor (PR: [#7940](https://github.com/dotnet/vscode-csharp/pull/7940))
26-
Bump xamltools to 17.14.35807.11(PR: [#7976]( https://github.com/dotnet/vscode-csharp/pull/7976))
38+
* Bump xamltools to 17.14.35807.11(PR: [#7976]( https://github.com/dotnet/vscode-csharp/pull/7976))
2739

2840
# 2.64.x
2941
* Bump xamlTools to 17.14.35730.156 (PR: [#7932](https://github.com/dotnet/vscode-csharp/pull/7941))

‎package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
"defaults": {
4040
"roslyn": "4.14.0-2.25110.11",
4141
"omniSharp": "1.39.12",
42-
"razor": "9.0.0-preview.25073.1",
42+
"razor": "9.0.0-preview.25113.1",
4343
"razorOmnisharp": "7.0.0-preview.23363.1",
44-
"xamlTools": "17.14.35807.11"
44+
"xamlTools": "17.14.35813.246"
4545
},
4646
"main": "./dist/extension",
4747
"l10n": "./l10n",
@@ -425,7 +425,7 @@
425425
{
426426
"id": "Debugger",
427427
"description": ".NET Core Debugger (Windows / x64)",
428-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-win7-x64.zip",
428+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-win7-x64.zip",
429429
"installPath": ".debugger/x86_64",
430430
"platforms": [
431431
"win32"
@@ -435,12 +435,12 @@
435435
"arm64"
436436
],
437437
"installTestPath": "./.debugger/x86_64/vsdbg-ui.exe",
438-
"integrity": "BFA8E3298DAFE59213BA2FD9938031B7A41A354415274E8238BB49D9E9381E66"
438+
"integrity": "5338B2FE4D94D834EEC9765A0AAB108ED6F4E122993FF08F1050251EF8C08B97"
439439
},
440440
{
441441
"id": "Debugger",
442442
"description": ".NET Core Debugger (Windows / ARM64)",
443-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-win10-arm64.zip",
443+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-win10-arm64.zip",
444444
"installPath": ".debugger/arm64",
445445
"platforms": [
446446
"win32"
@@ -449,12 +449,12 @@
449449
"arm64"
450450
],
451451
"installTestPath": "./.debugger/arm64/vsdbg-ui.exe",
452-
"integrity": "299DA0ABD00CD61AA1A6293A3C103CCF3070844E4B667C2811A3AAC16D7E6E44"
452+
"integrity": "10C6BEF03C9EE4BE2DD5BB7D318E36E4008AD09EA72865AB3C539BD8F97E1DD3"
453453
},
454454
{
455455
"id": "Debugger",
456456
"description": ".NET Core Debugger (macOS / x64)",
457-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-osx-x64.zip",
457+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-osx-x64.zip",
458458
"installPath": ".debugger/x86_64",
459459
"platforms": [
460460
"darwin"
@@ -468,12 +468,12 @@
468468
"./vsdbg"
469469
],
470470
"installTestPath": "./.debugger/x86_64/vsdbg-ui",
471-
"integrity": "5DF02935DFFD453E8C947AFC7567F4199D4BD83F582EBB20ECD23C054F8A43E2"
471+
"integrity": "38EBE099481ECBACE220A9F775D5E069DAF99B1469F25AC64FFB3CCA4A2537B3"
472472
},
473473
{
474474
"id": "Debugger",
475475
"description": ".NET Core Debugger (macOS / arm64)",
476-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-osx-arm64.zip",
476+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-osx-arm64.zip",
477477
"installPath": ".debugger/arm64",
478478
"platforms": [
479479
"darwin"
@@ -486,12 +486,12 @@
486486
"./vsdbg"
487487
],
488488
"installTestPath": "./.debugger/arm64/vsdbg-ui",
489-
"integrity": "1CBC75E00B7CE32DBD2617AC59EE10A4FE1DBB5AEA6E6A94224F50DEC3C96D3E"
489+
"integrity": "2F332163AEE26B4081F362CFF1F543F57FB2923E578952F0DD69CF827E03BE70"
490490
},
491491
{
492492
"id": "Debugger",
493493
"description": ".NET Core Debugger (linux / ARM)",
494-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-linux-arm.zip",
494+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-linux-arm.zip",
495495
"installPath": ".debugger",
496496
"platforms": [
497497
"linux"
@@ -504,12 +504,12 @@
504504
"./vsdbg"
505505
],
506506
"installTestPath": "./.debugger/vsdbg-ui",
507-
"integrity": "AE7B3967783B87448BAC4C78074B1D6F6AD4B70981FBB202CC9150A46405D287"
507+
"integrity": "44B74BE4995A5AD31293BB9EC578799268E4409EBBFB7424A1A58FEE7E6A2283"
508508
},
509509
{
510510
"id": "Debugger",
511511
"description": ".NET Core Debugger (linux / ARM64)",
512-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-linux-arm64.zip",
512+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-linux-arm64.zip",
513513
"installPath": ".debugger",
514514
"platforms": [
515515
"linux"
@@ -522,12 +522,12 @@
522522
"./vsdbg"
523523
],
524524
"installTestPath": "./.debugger/vsdbg-ui",
525-
"integrity": "468C4577B8E131E47CE83C7A290DA41580C6D327B43308CA8B206D068057CCD0"
525+
"integrity": "0A9A32E2E14BFF90B80EC98BA631D27E8B1847C5BF79E8E9A7206439D68D970B"
526526
},
527527
{
528528
"id": "Debugger",
529529
"description": ".NET Core Debugger (linux musl / x64)",
530-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-linux-musl-x64.zip",
530+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-linux-musl-x64.zip",
531531
"installPath": ".debugger",
532532
"platforms": [
533533
"linux-musl"
@@ -540,12 +540,12 @@
540540
"./vsdbg"
541541
],
542542
"installTestPath": "./.debugger/vsdbg-ui",
543-
"integrity": "B097E8D5C87B445399829DCDC32C387121E81F6F79001715645B620FC8EFD087"
543+
"integrity": "423E27BDE8D2DE97261B893CD7B0C78FED94EBF352A672F56BFA2E09D598BEF0"
544544
},
545545
{
546546
"id": "Debugger",
547547
"description": ".NET Core Debugger (linux musl / ARM64)",
548-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-linux-musl-arm64.zip",
548+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-linux-musl-arm64.zip",
549549
"installPath": ".debugger",
550550
"platforms": [
551551
"linux-musl"
@@ -558,12 +558,12 @@
558558
"./vsdbg"
559559
],
560560
"installTestPath": "./.debugger/vsdbg-ui",
561-
"integrity": "02CBCBD53377ECDFD68671D216A7CD2631CF22C60CFA66F5361A919F915D0B19"
561+
"integrity": "684B77F7B0A38D2AC7F24DA2682AF53435EC6EA252F694D830D86A47688DE26F"
562562
},
563563
{
564564
"id": "Debugger",
565565
"description": ".NET Core Debugger (linux / x64)",
566-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-linux-x64.zip",
566+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-linux-x64.zip",
567567
"installPath": ".debugger",
568568
"platforms": [
569569
"linux"
@@ -576,7 +576,7 @@
576576
"./vsdbg"
577577
],
578578
"installTestPath": "./.debugger/vsdbg-ui",
579-
"integrity": "1710E20F9A7BD4F10A126B86D8F3F9F6C2859B7A7EA2E6BACCE7029ACDA57DFB"
579+
"integrity": "BFBBB9BCBB7804963C6698B757942C484744CE2DBE5B2610DC7FA69D216B6E98"
580580
},
581581
{
582582
"id": "RazorOmnisharp",
@@ -5592,4 +5592,4 @@
55925592
}
55935593
}
55945594
}
5595-
}
5595+
}

‎src/lsptoolshost/server/roslynLanguageServer.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ export class RoslynLanguageServer {
181181
state: ServerState.Started,
182182
workspaceLabel: this.workspaceDisplayName(),
183183
});
184+
this._telemetryReporter.sendTelemetryEvent(TelemetryEventNames.ClientServerReady);
184185
} else if (state.newState === State.Stopped) {
185186
this._languageServerEvents.onServerStateChangeEmitter.fire({
186187
state: ServerState.Stopped,
@@ -338,7 +339,7 @@ export class RoslynLanguageServer {
338339
* Returns whether or not the underlying LSP server is running or not.
339340
*/
340341
public isRunning(): boolean {
341-
return this._languageClient.state === State.Running;
342+
return this._languageClient.isRunning();
342343
}
343344

344345
/**

‎src/shared/telemetryEventNames.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,17 @@ export enum TelemetryEventNames {
1111
CSharpActivated = 'CSharpActivated',
1212

1313
// Events related to the roslyn language server.
14+
15+
// Roslyn client has started initialization process.
1416
ClientInitialize = 'roslyn/clientInitialize',
17+
// Roslyn client has started the server initialization process.
1518
ClientServerStart = 'roslyn/clientServerInitialize',
19+
// Roslyn client has acquired the runtime needed to start the server.
1620
AcquiredRuntime = 'roslyn/acquiredRuntime',
21+
// Roslyn client has successfully started the server process.
1722
LaunchedServer = 'roslyn/launchedServer',
23+
// Roslyn client has connected to the server process named pipe.
1824
ClientConnected = 'roslyn/clientConnected',
25+
// Roslyn client and server have fully initialized via LSP.
26+
ClientServerReady = 'roslyn/clientServerReady',
1927
}

‎src/shared/utils/getDotnetInfo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ async function parseDotnetInfo(dotnetInfo: string, dotnetExecutablePath: string
6262
let match: RegExpMatchArray | null;
6363
if ((match = /^\s*Version:\s*([^\s].*)$/.exec(line))) {
6464
version = match[1];
65-
} else if ((match = /^ RID:\s*([\w\-.]+)$/.exec(line))) {
65+
} else if ((match = /^\s*RID:\s*([\w\-.]+)$/.exec(line))) {
6666
runtimeId = match[1];
6767
} else if ((match = /^\s*Architecture:\s*(.*)/.exec(line))) {
6868
architecture = match[1];

‎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.66",
3+
"version": "2.67",
44
"publicReleaseRefSpec": [
55
"^refs/heads/release$",
66
"^refs/heads/prerelease$",

0 commit comments

Comments
 (0)