Merge branch 'main' into dev/jorobich/report-all-diagnostics

Author: JoeRobich

CHANGELOG.md

@@ -3,11 +3,23 @@
 - Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
-# 2.66.x
+# 2.67.x
+
 * Update Roslyn to (PR: [#7984](https://github.com/dotnet/vscode-csharp/pull/7984))
   * Return LSP diagnostics with their reported severity. (PR: [#77145](https://github.com/dotnet/roslyn/pull/77145))
   * Fix syntax generation of explict checked operator from symbol (PR: [#77102](https://github.com/dotnet/roslyn/pull/77102))
 * Manage information diagnostic severity on the client-side (PR: [#7984](https://github.com/dotnet/vscode-csharp/pull/7984))
+* Update Razor to 9.0.0-preview.25113.1 (PR: [#7989](https://github.com/dotnet/vscode-csharp/pull/7989))
+  * Update Telemetry package (#11468) (PR: [#11468](https://github.com/dotnet/razor/pull/11468))
+  * Don't hold onto Roslyn projects longer than necessary (#11458) (PR: [#11458](https://github.com/dotnet/razor/pull/11458))
+  * Fix formatting of escaped at signs (#11462) (PR: [#11462](https://github.com/dotnet/razor/pull/11462))
+  * Code action to offer to wrap Html attributes (#11422) (PR: [#11422](https://github.com/dotnet/razor/pull/11422))
+  * Make sure we go through GetAbsolutePosition to handle LSP edge cases (#11441) (PR: [#11441](https://github.com/dotnet/razor/pull/11441))
+  * Make log levels match LogLevel.cs (#11436) (PR: [#11436](https://github.com/dotnet/razor/pull/11436))
+  * Fix on type formatting line delta calculations (#11435) (PR: [#11435](https://github.com/dotnet/razor/pull/11435))
+  * Clean up and rationalize imports in the compiler (#11409) (PR: [#11409](https://github.com/dotnet/razor/pull/11409))
+  * Fix typo in setting description (#11423) (PR: [#11423](https://github.com/dotnet/razor/pull/11423))
+* Bump xamlTools to 17.14.35813.246 (PR: [#7993](https://github.com/dotnet/vscode-csharp/pull/7993))
 
 # 2.65.x
 * Update Roslyn LSP to run on .NET 9 (PR: [#7946](https://github.com/dotnet/vscode-csharp/pull/7946))
@@ -23,7 +35,7 @@
 * Add code snippets for C# expression-bodied properties (PR: [#5683](https://github.com/dotnet/vscode-csharp/pull/5683))
 * Sync whitespace options even when detectIndentation is on (PR: [#7965](https://github.com/dotnet/vscode-csharp/pull/7965))
 * Bump Razor (PR: [#7940](https://github.com/dotnet/vscode-csharp/pull/7940))
-Bump xamltools to 17.14.35807.11(PR: [#7976]( https://github.com/dotnet/vscode-csharp/pull/7976))
+* Bump xamltools to 17.14.35807.11(PR: [#7976]( https://github.com/dotnet/vscode-csharp/pull/7976))
 
 # 2.64.x
 * Bump xamlTools to 17.14.35730.156 (PR: [#7932](https://github.com/dotnet/vscode-csharp/pull/7941))

package.json

@@ -39,9 +39,9 @@
   "defaults": {
     "roslyn": "4.14.0-2.25110.11",
     "omniSharp": "1.39.12",
-    "razor": "9.0.0-preview.25073.1",
+    "razor": "9.0.0-preview.25113.1",
     "razorOmnisharp": "7.0.0-preview.23363.1",
-    "xamlTools": "17.14.35807.11"
+    "xamlTools": "17.14.35813.246"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",
@@ -425,7 +425,7 @@
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (Windows / x64)",
-      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-win7-x64.zip",
+      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-win7-x64.zip",
       "installPath": ".debugger/x86_64",
       "platforms": [
         "win32"
@@ -435,12 +435,12 @@
         "arm64"
       ],
       "installTestPath": "./.debugger/x86_64/vsdbg-ui.exe",
-      "integrity": "BFA8E3298DAFE59213BA2FD9938031B7A41A354415274E8238BB49D9E9381E66"
+      "integrity": "5338B2FE4D94D834EEC9765A0AAB108ED6F4E122993FF08F1050251EF8C08B97"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (Windows / ARM64)",
-      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-win10-arm64.zip",
+      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-win10-arm64.zip",
       "installPath": ".debugger/arm64",
       "platforms": [
         "win32"
@@ -449,12 +449,12 @@
         "arm64"
       ],
       "installTestPath": "./.debugger/arm64/vsdbg-ui.exe",
-      "integrity": "299DA0ABD00CD61AA1A6293A3C103CCF3070844E4B667C2811A3AAC16D7E6E44"
+      "integrity": "10C6BEF03C9EE4BE2DD5BB7D318E36E4008AD09EA72865AB3C539BD8F97E1DD3"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (macOS / x64)",
-      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-osx-x64.zip",
+      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-osx-x64.zip",
       "installPath": ".debugger/x86_64",
       "platforms": [
         "darwin"
@@ -468,12 +468,12 @@
         "./vsdbg"
       ],
       "installTestPath": "./.debugger/x86_64/vsdbg-ui",
-      "integrity": "5DF02935DFFD453E8C947AFC7567F4199D4BD83F582EBB20ECD23C054F8A43E2"
+      "integrity": "38EBE099481ECBACE220A9F775D5E069DAF99B1469F25AC64FFB3CCA4A2537B3"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (macOS / arm64)",
-      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-osx-arm64.zip",
+      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-osx-arm64.zip",
       "installPath": ".debugger/arm64",
       "platforms": [
         "darwin"
@@ -486,12 +486,12 @@
         "./vsdbg"
       ],
       "installTestPath": "./.debugger/arm64/vsdbg-ui",
-      "integrity": "1CBC75E00B7CE32DBD2617AC59EE10A4FE1DBB5AEA6E6A94224F50DEC3C96D3E"
+      "integrity": "2F332163AEE26B4081F362CFF1F543F57FB2923E578952F0DD69CF827E03BE70"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (linux / ARM)",
-      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-linux-arm.zip",
+      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-linux-arm.zip",
       "installPath": ".debugger",
       "platforms": [
         "linux"
@@ -504,12 +504,12 @@
         "./vsdbg"
       ],
       "installTestPath": "./.debugger/vsdbg-ui",
-      "integrity": "AE7B3967783B87448BAC4C78074B1D6F6AD4B70981FBB202CC9150A46405D287"
+      "integrity": "44B74BE4995A5AD31293BB9EC578799268E4409EBBFB7424A1A58FEE7E6A2283"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (linux / ARM64)",
-      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-linux-arm64.zip",
+      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-linux-arm64.zip",
       "installPath": ".debugger",
       "platforms": [
         "linux"
@@ -522,12 +522,12 @@
         "./vsdbg"
       ],
       "installTestPath": "./.debugger/vsdbg-ui",
-      "integrity": "468C4577B8E131E47CE83C7A290DA41580C6D327B43308CA8B206D068057CCD0"
+      "integrity": "0A9A32E2E14BFF90B80EC98BA631D27E8B1847C5BF79E8E9A7206439D68D970B"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (linux musl / x64)",
-      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-linux-musl-x64.zip",
+      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-linux-musl-x64.zip",
       "installPath": ".debugger",
       "platforms": [
         "linux-musl"
@@ -540,12 +540,12 @@
         "./vsdbg"
       ],
       "installTestPath": "./.debugger/vsdbg-ui",
-      "integrity": "B097E8D5C87B445399829DCDC32C387121E81F6F79001715645B620FC8EFD087"
+      "integrity": "423E27BDE8D2DE97261B893CD7B0C78FED94EBF352A672F56BFA2E09D598BEF0"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (linux musl / ARM64)",
-      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-linux-musl-arm64.zip",
+      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-linux-musl-arm64.zip",
       "installPath": ".debugger",
       "platforms": [
         "linux-musl"
@@ -558,12 +558,12 @@
         "./vsdbg"
       ],
       "installTestPath": "./.debugger/vsdbg-ui",
-      "integrity": "02CBCBD53377ECDFD68671D216A7CD2631CF22C60CFA66F5361A919F915D0B19"
+      "integrity": "684B77F7B0A38D2AC7F24DA2682AF53435EC6EA252F694D830D86A47688DE26F"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (linux / x64)",
-      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-60-0/coreclr-debug-linux-x64.zip",
+      "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-66-0/coreclr-debug-linux-x64.zip",
       "installPath": ".debugger",
       "platforms": [
         "linux"
@@ -576,7 +576,7 @@
         "./vsdbg"
       ],
       "installTestPath": "./.debugger/vsdbg-ui",
-      "integrity": "1710E20F9A7BD4F10A126B86D8F3F9F6C2859B7A7EA2E6BACCE7029ACDA57DFB"
+      "integrity": "BFBBB9BCBB7804963C6698B757942C484744CE2DBE5B2610DC7FA69D216B6E98"
     },
     {
       "id": "RazorOmnisharp",
@@ -5592,4 +5592,4 @@
       }
     }
   }
-}
+}

src/lsptoolshost/server/roslynLanguageServer.ts

@@ -181,6 +181,7 @@ export class RoslynLanguageServer {
                     state: ServerState.Started,
                     workspaceLabel: this.workspaceDisplayName(),
                 });
+                this._telemetryReporter.sendTelemetryEvent(TelemetryEventNames.ClientServerReady);
             } else if (state.newState === State.Stopped) {
                 this._languageServerEvents.onServerStateChangeEmitter.fire({
                     state: ServerState.Stopped,
@@ -338,7 +339,7 @@ export class RoslynLanguageServer {
      * Returns whether or not the underlying LSP server is running or not.
      */
     public isRunning(): boolean {
-        return this._languageClient.state === State.Running;
+        return this._languageClient.isRunning();
     }
 
     /**

src/shared/telemetryEventNames.ts

@@ -11,9 +11,17 @@ export enum TelemetryEventNames {
     CSharpActivated = 'CSharpActivated',
 
     // Events related to the roslyn language server.
+
+    // Roslyn client has started initialization process.
     ClientInitialize = 'roslyn/clientInitialize',
+    // Roslyn client has started the server initialization process.
     ClientServerStart = 'roslyn/clientServerInitialize',
+    // Roslyn client has acquired the runtime needed to start the server.
     AcquiredRuntime = 'roslyn/acquiredRuntime',
+    // Roslyn client has successfully started the server process.
     LaunchedServer = 'roslyn/launchedServer',
+    // Roslyn client has connected to the server process named pipe.
     ClientConnected = 'roslyn/clientConnected',
+    // Roslyn client and server have fully initialized via LSP.
+    ClientServerReady = 'roslyn/clientServerReady',
 }

src/shared/utils/getDotnetInfo.ts

@@ -62,7 +62,7 @@ async function parseDotnetInfo(dotnetInfo: string, dotnetExecutablePath: string
             let match: RegExpMatchArray | null;
             if ((match = /^\s*Version:\s*([^\s].*)$/.exec(line))) {
                 version = match[1];
-            } else if ((match = /^ RID:\s*([\w\-.]+)$/.exec(line))) {
+            } else if ((match = /^\s*RID:\s*([\w\-.]+)$/.exec(line))) {
                 runtimeId = match[1];
             } else if ((match = /^\s*Architecture:\s*(.*)/.exec(line))) {
                 architecture = match[1];

version.json

@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "2.66",
+    "version": "2.67",
     "publicReleaseRefSpec": [
         "^refs/heads/release$",
         "^refs/heads/prerelease$",