Merge branch 'main' into merge/prerelease-to-main

Author: JoeRobich

CHANGELOG.md

@@ -3,6 +3,8 @@
 - 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.61.x
+
 # 2.60.x
 * Improve performance of razor/blazor component discovery (PR: [#7826](https://github.com/dotnet/vscode-csharp/pull/7826))
 * Update Razor to 9.0.0-preview.24605.1 (PR: [#7826](https://github.com/dotnet/vscode-csharp/pull/7826))

azure-pipelines/prereqs.yml

@@ -23,7 +23,7 @@ steps:
 - script: dotnet --info
   displayName: Display dotnet info
 
-- script: dotnet tool install --tool-path $(Agent.BuildDirectory) nbgv
+- script: dotnet tool install --version 3.6.146 --tool-path $(Agent.BuildDirectory) nbgv
   displayName: Install nbgv
 
 # If we want to override the version, update the version.json here - vsix packaging will see this value

azure-pipelines/test-matrix.yml

@@ -17,7 +17,7 @@ jobs:
   strategy:
     matrix:
       CSharpTests:
-        npmCommand: 'test:withoutDevKit'
+        npmCommand: 'test:unit' # Restore when integration test are stable: 'test:withoutDevKit'
       DevKitTests:
         npmCommand: test:integration:devkit
   pool: ${{ parameters.pool }}

package.json

@@ -68,6 +68,7 @@
     "compileTest": "tsc -p ./ && webpack --mode development",
     "watch": "tsc -watch -p ./",
     "test": "tsc -p ./ && gulp test",
+    "test:unit": "tsc -p ./ && gulp test:unit",
     "test:withoutDevKit": "tsc -p ./ && gulp test:withoutDevKit",
     "test:integration:devkit": "tsc -p ./ && gulp test:integration:devkit",
     "test:razor": "tsc -p ./ && npm run compile:razorTextMate && gulp test:razor",

src/lsptoolshost/roslynLanguageServer.ts

@@ -792,8 +792,16 @@ export class RoslynLanguageServer {
         );
         vscode.commands.registerCommand(
             DynamicFileInfoHandler.dynamicFileUpdatedCommand,
-            async (notification: RazorDynamicFileChangedParams) =>
-                this.sendNotification<RazorDynamicFileChangedParams>('razor/dynamicFileInfoChanged', notification)
+            async (notification: RazorDynamicFileChangedParams) => {
+                if (this.isRunning()) {
+                    await this.sendNotification<RazorDynamicFileChangedParams>(
+                        'razor/dynamicFileInfoChanged',
+                        notification
+                    );
+                } else {
+                    _channel.warn('Tried to send razor/dynamicFileInfoChanged while server is not running');
+                }
+            }
         );
     }
 

version.json

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