Merge pull request #6738 from dibarbet/merge_main

Merge main into release

Author: dibarbet

.gitattributes

@@ -1,2 +1,5 @@
 # This is a generated file from vscode-l10n tool, and it always uses 'lf' and line ending. Set it to 'lf' so we don't get warning every time when localization file get changed.
 l10n/bundle.l10n.json text eol=lf
+
+# This is a Unix shell script, so it always use the 'lf' line ends
+scripts/remoteProcessPickerScript text eol=lf

package.nls.json

@@ -188,16 +188,16 @@
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
-  "generateOptionsSchema.console.markdownDescription": "When launching console projects, indicates which console the target program should be launched into.",
+  "generateOptionsSchema.console.markdownDescription": "Indicates which console the target program should be launched into. See https://aka.ms/VSCode-CS-LaunchJson-Console for more information.",
   "generateOptionsSchema.console.settingsDescription": {
-    "message": "**Note:** _This option is only used for the `dotnet` debug configuration type_.\n\nWhen launching console projects, indicates which console the target program should be launched into.",
+    "message": "**Note:** _This option is only used for console projects launched with the `dotnet` debug configuration type_.\n\nIndicates which console the target program should be launched into. See https://aka.ms/VSCode-CS-LaunchJson-Console for more information.",
     "comment": [
       "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
     ]
   },
-  "generateOptionsSchema.console.internalConsole.enumDescription": "Output to the VS Code Debug Console. This doesn't support reading console input (ex:Console.ReadLine).",
-  "generateOptionsSchema.console.integratedTerminal.enumDescription": "VS Code's integrated terminal.",
-  "generateOptionsSchema.console.externalTerminal.enumDescription": "External terminal that can be configured via user settings.",
+  "generateOptionsSchema.console.internalConsole.enumDescription": "The target process's console input (stdin) and output (stdout/stderr) are routed through the VS Code Debug Console.",
+  "generateOptionsSchema.console.integratedTerminal.enumDescription": "The target process will run inside VS Code's integrated terminal.",
+  "generateOptionsSchema.console.externalTerminal.enumDescription": "The target process will run inside its own external terminal. When using this mode, you will need to switch focus between Visual Studio Code and the external terminal window.",
   "generateOptionsSchema.externalConsole.markdownDescription": {
     "message": "Attribute `externalConsole` is deprecated, use `console` instead. This option defaults to `false`.",
     "comment": [

src/lsptoolshost/roslynLanguageServer.ts

@@ -902,7 +902,7 @@ export async function activateRoslynLanguageServer(
     return languageServer;
 
     function scanExtensionPlugins(): string[] {
-        return vscode.extensions.all.flatMap((extension) => {
+        const extensionsFromPackageJson = vscode.extensions.all.flatMap((extension) => {
             let loadPaths = extension.packageJSON.contributes?.['csharpExtensionLoadPaths'];
             if (loadPaths === undefined || loadPaths === null) {
                 _traceChannel.appendLine(`Extension ${extension.id} does not contribute csharpExtensionLoadPaths`);
@@ -920,6 +920,8 @@ export async function activateRoslynLanguageServer(
             _traceChannel.appendLine(`Extension ${extension.id} contributes csharpExtensionLoadPaths: ${loadPaths}`);
             return loadPaths;
         });
+        const extensionsFromOptions = languageServerOptions.extensionsPaths ?? [];
+        return extensionsFromPackageJson.concat(extensionsFromOptions);
     }
 }
 

src/tools/OptionsSchema.json

@@ -371,12 +371,12 @@
           "type": "string",
           "enum": [ "internalConsole", "integratedTerminal", "externalTerminal" ],
           "enumDescriptions": [
-            "Output to the VS Code Debug Console. This doesn't support reading console input (ex:Console.ReadLine).",
-            "VS Code's integrated terminal.",
-            "External terminal that can be configured via user settings."
+            "The target process's console input (stdin) and output (stdout/stderr) are routed through the VS Code Debug Console.",
+            "The target process will run inside VS Code's integrated terminal.",
+            "The target process will run inside its own external terminal. When using this mode, you will need to switch focus between Visual Studio Code and the external terminal window."
           ],
-          "markdownDescription": "When launching console projects, indicates which console the target program should be launched into.",
-          "settingsDescription": "**Note:** _This option is only used for the `dotnet` debug configuration type_.\n\nWhen launching console projects, indicates which console the target program should be launched into.",
+          "markdownDescription": "Indicates which console the target program should be launched into. See https://aka.ms/VSCode-CS-LaunchJson-Console for more information.",
+          "settingsDescription": "**Note:** _This option is only used for console projects launched with the `dotnet` debug configuration type_.\n\nIndicates which console the target program should be launched into. See https://aka.ms/VSCode-CS-LaunchJson-Console for more information.",
           "default": "internalConsole"
         },
         "externalConsole": {

test/artifactTests/vsix.test.ts

@@ -18,7 +18,7 @@ describe('Vscode VSIX', () => {
     vsixFiles.forEach((element) => {
         // We're packaging the platform specific Roslyn server with ready to run in the vsix, so the size should be roughly ~50MB
         // We also publish the Razor server, which is roughly ~75MB
-        const sizeInMB = 220;
+        const sizeInMB = 230;
         const maximumVsixSizeInBytes = sizeInMB * 1024 * 1024;
 
         describe(`Given ${element}`, () => {

version.json

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