Merge pull request #5808 from dotnet/prerelease

Merge changes from prerelease into main

Author: jasonmalinowski

README.md

@@ -1,12 +1,12 @@
 ## C# for Visual Studio Code
-C# is the feature-rich, language support for C# and is shipped as part of [C# Dev Kit](csdevkitextension). This version of the extension is currently in pre-release and available for you to use today.
+C# is the feature-rich, language support for C# and is shipped as part of [C# Dev Kit][csdevkitextension]. This version of the extension is currently in pre-release and available for you to use today.
 
-C# is an extension that contributes to the [C# Dev Kit extension](csdevkitextension) for Visual Studio Code to provide performant and reliable language support. Under the hood, this extension is powered by a Language Server Protocol (LSP) Tools Host which integrates with open source components like [Roslyn](https://github.com/dotnet/roslyn)  and [Razor](https://github.com/dotnet/razor) to provide rich type information and a faster, more reliable C# experience.
+C# is an extension that contributes to the [C# Dev Kit extension][csdevkitextension] for Visual Studio Code to provide performant and reliable language support. Under the hood, this extension is powered by a Language Server Protocol (LSP) Tools Host which integrates with open source components like [Roslyn](https://github.com/dotnet/roslyn)  and [Razor](https://github.com/dotnet/razor) to provide rich type information and a faster, more reliable C# experience.
 
 ## Recommended Install
-While it is possible to use the C# extension as a standalone extension, we highly recommend using [C# Dev Kit](csdevkitextension).
+While it is possible to use the C# extension as a standalone extension, we highly recommend using [C# Dev Kit][csdevkitextension].
 
-1. Installing [C# Dev Kit](csdevkitextension) will automatically install this extension as a required dependency
+1. Installing [C# Dev Kit][csdevkitextension] will automatically install this extension as a required dependency
 2. Open a folder/workspace that contains a C# project (.csproj) and a C# solution (.sln) and the extension will activate.
 
 Note: If working on a solution that requires versions prior to .NET 6, install a Full Framework runtime and MSBuild tooling.

src/lsptoolshost/roslynLanguageServer.ts

@@ -151,9 +151,10 @@ export class RoslynLanguageServer {
     }
 
     /**
-     * Resolves server options and starts the dotnet language server process.
+     * Resolves server options and starts the dotnet language server process. The process is started asynchronously and this method will not wait until
+     * the process is launched.
      */
-    public async start(): Promise<void> {
+    public start(): void {
         let options = this.optionProvider.GetLatestOptions();
         let logLevel = options.languageServerOptions.logLevel;
         const languageClientTraceLevel = this.GetTraceLevel(logLevel);
@@ -208,7 +209,11 @@ export class RoslynLanguageServer {
         this._languageClient.onDidChangeState(async (state) => {
             if (state.newState === State.Running) {
                 await this._languageClient!.setTrace(languageClientTraceLevel);
-                await this.sendOpenSolutionNotification();
+                if (this._solutionFile) {
+                    await this.sendOpenSolutionNotification();
+                } else {
+                    await this.openDefaultSolution();
+                }
                 await this.sendOrSubscribeForServiceBrokerConnection();
                 this._eventBus.emit(RoslynLanguageServer.serverStateChangeEvent, ServerStateChange.Started);
             }
@@ -223,20 +228,6 @@ export class RoslynLanguageServer {
 
         // Register Razor dynamic file info handling
         this.registerRazor(this._languageClient);
-
-        // If Dev Kit isn't installed, then we are responsible for picking the solution to open, assuming the user hasn't explicitly
-        // disabled it.
-        if (!this._wasActivatedWithCSharpDevkit && options.commonOptions.defaultSolution !== 'disable' && this._solutionFile === undefined) {
-            if (options.commonOptions.defaultSolution !== '') {
-                this.openSolution(vscode.Uri.file(options.commonOptions.defaultSolution));
-            } else {
-                // Auto open if there is just one solution target; if there's more the one we'll just let the user pick with the picker.
-                const solutionUris = await vscode.workspace.findFiles('**/*.sln', '**/node_modules/**', 2);
-                if (solutionUris && solutionUris.length === 1) {
-                    this.openSolution(solutionUris[0]);
-                }
-            }
-        }
     }
 
     public async stop(): Promise<void> {
@@ -246,13 +237,13 @@ export class RoslynLanguageServer {
     }
 
     /**
-     * Restarts the language server.
+     * Restarts the language server. This does not wait until the server has been restarted.
      * Note that since some options affect how the language server is initialized, we must
-     * re-create the LanguageClient instance instead of just stopping/starting it.
+     * re-create the LanguageClient instance instead of just stopping/starting it. 
      */
     public async restart(): Promise<void> {
         await this.stop();
-        await this.start();
+        this.start();
     }
 
     /**
@@ -310,14 +301,32 @@ export class RoslynLanguageServer {
         await this.sendOpenSolutionNotification();
     }
 
-    private async sendOpenSolutionNotification() {
+    private async sendOpenSolutionNotification(): Promise<void>  {
         if (this._solutionFile !== undefined && this._languageClient !== undefined && this._languageClient.isRunning()) {
             let protocolUri = this._languageClient.clientOptions.uriConverters!.code2Protocol(this._solutionFile);
             await this._languageClient.sendNotification("solution/open", new OpenSolutionParams(protocolUri));
         }
     }
 
-    private async sendOrSubscribeForServiceBrokerConnection() {
+    private async openDefaultSolution(): Promise<void> {
+        const options = this.optionProvider.GetLatestOptions();
+
+        // If Dev Kit isn't installed, then we are responsible for picking the solution to open, assuming the user hasn't explicitly
+        // disabled it.
+        if (!this._wasActivatedWithCSharpDevkit && options.commonOptions.defaultSolution !== 'disable' && this._solutionFile === undefined) {
+            if (options.commonOptions.defaultSolution !== '') {
+                this.openSolution(vscode.Uri.file(options.commonOptions.defaultSolution));
+            } else {
+                // Auto open if there is just one solution target; if there's more the one we'll just let the user pick with the picker.
+                const solutionUris = await vscode.workspace.findFiles('**/*.sln', '**/node_modules/**', 2);
+                if (solutionUris && solutionUris.length === 1) {
+                    this.openSolution(solutionUris[0]);
+                }
+            }
+        }
+    }
+
+    private async sendOrSubscribeForServiceBrokerConnection(): Promise<void>  {
         const csharpDevKitExtension = vscode.extensions.getExtension<CSharpDevKitExports>(csharpDevkitExtensionId);
         if (csharpDevKitExtension) {
             const exports = await csharpDevKitExtension.activate();
@@ -429,6 +438,7 @@ export class RoslynLanguageServer {
             _channel.appendLine(`Starting server at ${serverPath}`);
         }
 
+        // shouldn't this arg only be set if it's running with CSDevKit?
         args.push("--telemetryLevel", this.telemetryReporter.telemetryLevel);
 
         let childProcess: cp.ChildProcessWithoutNullStreams;
@@ -520,9 +530,6 @@ export class RoslynLanguageServer {
 
         const extensionPaths = options.languageServerOptions.extensionsPaths || [this.getLanguageServicesDevKitComponentPath(exports)];
 
-        // required for the telemetry service to work
-        await exports.writeCommonPropsAsync(this.context);
-
         let args: string[] = [];
 
         args.push("--sharedDependencies");
@@ -631,7 +638,7 @@ export async function activateRoslynLanguageServer(context: vscode.ExtensionCont
     });
 
     // Start the language server.
-    await _languageServer.start();
+    _languageServer.start();
 }
 
 async function applyAutoInsertEdit(e: vscode.TextDocumentChangeEvent, token: vscode.CancellationToken) {

version.json

@@ -1,8 +1,9 @@
 {
 	"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-	"version": "2.0-beta",
+	"version": "2.0",
 	"publicReleaseRefSpec": [
-		"^refs/heads/release$"
+		"^refs/heads/release$",
+		"^refs/heads/prerelease$"
 	],
 	"cloudBuild": {
 		"buildNumber": {