[automated] Merge branch 'main' => 'prerelease' (#8498)

Author: dotnet-policy-service[bot]

.vscode/launch.json

@@ -11,6 +11,38 @@
             "outFiles": ["${workspaceRoot}/dist/*.js"],
             "preLaunchTask": "packageDev"
         },
+        {
+          "name": "[Untrusted] Run Integration Test",
+          "type": "extensionHost",
+          "request": "launch",
+          "runtimeExecutable": "${execPath}",
+          "args": [
+            // Launch VSCode using a specific profile to ensure that user settings are not used.
+            // This profile must be imported into vscode before running this launch configuration.
+            // The profile can be found under /test/csharp-test-profile.
+            "--profile",
+            "csharp-test-profile",
+            "${workspaceRoot}/test/untrustedWorkspace/integrationTests/testAssets/empty/.vscode/empty.code-workspace",
+            "--extensionDevelopmentPath=${workspaceRoot}",
+            "--extensionTestsPath=${workspaceRoot}/out/test/untrustedWorkspace/integrationTests",
+            "--log",
+            "ms-dotnettools.csharp:trace"
+          ],
+          "env": {
+            "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
+          },
+          "sourceMaps": true,
+          "outFiles": [
+            "${workspaceRoot}/dist/*.js",
+            "${workspaceRoot}/out/test/**/*.js"
+          ],
+          "resolveSourceMapLocations": [
+            "${workspaceFolder}/**",
+            "!**/node_modules/**"
+          ],
+          "preLaunchTask": "packageDev",
+          "internalConsoleOptions": "openOnSessionStart"
+        },
         {
             "name": "[Roslyn] Run Current File Integration Tests",
             "type": "extensionHost",
@@ -187,9 +219,9 @@
             "args": ["updatePackageDependencies"],
             "env": {
                 "NEW_DEPS_ID": "OmniSharp",
-                "NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-x64-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-x86-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-arm64-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-osx-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-x64-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-arm64-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-musl-x64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-musl-arm64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-x64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-arm64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-osx-x64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-osx-arm64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-x64-net6.0-1.39.12.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-win-arm64-net6.0-1.39.12.zip",
-                "OLD_DEPS_VERSION": "1.39.11",
-                "NEW_DEPS_VERSION": "1.39.12"
+                "NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-x64.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-x86.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-arm64.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-osx.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-x64.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-arm64.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-musl-x64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-musl-arm64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-x64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-linux-arm64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-osx-x64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-osx-arm64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-x64-net6.0.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.14/omnisharp-win-arm64-net6.0.zip",
+                "OLD_DEPS_VERSION": "1.39.12",
+                "NEW_DEPS_VERSION": "1.39.14"
             },
             "cwd": "${workspaceFolder}"
         },

.vscode/tasks.json

@@ -15,7 +15,8 @@
             "group": {
                 "kind": "build",
                 "isDefault": true
-            }
+            },
+            "problemMatcher": "$tsc",
         },
         {
             "label": "buildDev",
@@ -25,7 +26,8 @@
             "group": {
                 "kind": "build",
                 "isDefault": true
-            }
+            },
+            "problemMatcher": "$tsc",
         },
         {
             "label": "package",
@@ -35,7 +37,8 @@
             "group": {
                 "kind": "build",
                 "isDefault": true
-            }
+            },
+            "problemMatcher": "$tsc",
         },
         {
             "label": "packageDev",
@@ -45,7 +48,8 @@
             "group": {
                 "kind": "build",
                 "isDefault": true
-            }
+            },
+            "problemMatcher": "$tsc",
         },
         {
             "label": "test",

CHANGELOG.md

@@ -3,6 +3,48 @@
 - 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.88.x
+* Enable Razor Cohosting "on" by default (PR: [#8469](https://github.com/dotnet/vscode-csharp/pull/8469))
+* Bump Roslyn to 5.0.0-2.25405.5 (PR: [#8493](https://github.com/dotnet/vscode-csharp/pull/8493))
+  * Fix file-based programs getting stuck in the host workspace(PR: [#79730](https://github.com/dotnet/roslyn/pull/79730))
+  * Fixed irregular spacing between list items(PR: [#79388](https://github.com/dotnet/roslyn/pull/79388))
+  * Introduce helper to ensure span mapping is consistent everywhere(PR: [#79729](https://github.com/dotnet/roslyn/pull/79729))
+  * Fix formatting in use-auto-prop when attributes are present(PR: [#79735](https://github.com/dotnet/roslyn/pull/79735))
+  * Razor span mapping in LSP for cohosting(PR: [#79677](https://github.com/dotnet/roslyn/pull/79677))
+  * Handle concurrent requests to update workspace contents and workspace SG info.(PR: [#79628](https://github.com/dotnet/roslyn/pull/79628))
+  * Update debugger.contracts to 18.0.0-beta.25379.1(PR: [#79661](https://github.com/dotnet/roslyn/pull/79661))
+  * Fix logging when item counts change in LoadedProject(PR: [#79640](https://github.com/dotnet/roslyn/pull/79640))
+  * File-based program directive diagnostics in editor(PR: [#79421](https://github.com/dotnet/roslyn/pull/79421))
+  * Fixup quick info for suppressed nullable operations.(PR: [#79636](https://github.com/dotnet/roslyn/pull/79636))
+  * Rename Razor source generated documents in all scenarios, and map edits(PR: [#79604](https://github.com/dotnet/roslyn/pull/79604))
+  * Fix formatting of CDATA sections in quick info(PR: [#79627](https://github.com/dotnet/roslyn/pull/79627))
+  * Add diagnostic provider for clients without dynamic registration(PR: [#77984](https://github.com/dotnet/roslyn/pull/77984))
+  * Fix eol handling on the last token in a file when formatting code actions(PR: [#79602](https://github.com/dotnet/roslyn/pull/79602))
+  * Reduce allocations during CommonCompletionItem.Create(PR: [#79591](https://github.com/dotnet/roslyn/pull/79591))
+  * Add metadata documents to the MAS workspace upfront(PR: [#78886](https://github.com/dotnet/roslyn/pull/78886))
+  * Update debugger contracts to 18.0.0-beta.25353.1(PR: [#79277](https://github.com/dotnet/roslyn/pull/79277))
+  * Include comments written above local variables when getting quick info for them.(PR: [#79580](https://github.com/dotnet/roslyn/pull/79580))
+  * Modify LSP folding ranges to account for AutoCollapse(PR: [#79551](https://github.com/dotnet/roslyn/pull/79551))
+  * Have 'use explicit type' add usings as necessary to minimally qualify the type(PR: [#79574](https://github.com/dotnet/roslyn/pull/79574))
+  * Fix issue where we weren't properly adding elastic trivia to newly generated members(PR: [#79571](https://github.com/dotnet/roslyn/pull/79571))
+  * Properly handle optional arguments when converting a local function to a method.(PR: [#79531](https://github.com/dotnet/roslyn/pull/79531))
+  * Fix issue with 'use explicit type' and nullable tuples(PR: [#79544](https://github.com/dotnet/roslyn/pull/79544))
+  * Fix name qualification when moving a using alias outside of a file scoped namespace(PR: [#79540](https://github.com/dotnet/roslyn/pull/79540))
+  * Allow add using to work on Razor generated documents(PR: [#79530](https://github.com/dotnet/roslyn/pull/79530))
+  * Fix 'this' keyword not being recomended where allowed(PR: [#79514](https://github.com/dotnet/roslyn/pull/79514))
+  * Fix 'switch' keyword recomendations after an expression(PR: [#79515](https://github.com/dotnet/roslyn/pull/79515))
+  * Suggest proper 'Async'-suffixed name for Task-returning symbols(PR: [#79518](https://github.com/dotnet/roslyn/pull/79518))
+  * Locate usable MSBuild when launching .NET Core BuildHost (PR: [#79494](https://github.com/dotnet/roslyn/pull/79494)
+* Bump Razor to 10.0.0-preview.25403.1 (PR: [#8485](https://github.com/dotnet/vscode-csharp/pull/8485))
+  * Cache MEF composition in OOP and VS Code (PR: [#12041](https://github.com/dotnet/razor/pull/12041))
+  * Make cohost formatting honour C# formatting options (PR: [#12042](https://github.com/dotnet/razor/pull/12042))
+  * Correctly set the Html document uri for diagnostics requests (PR: [#12061](https://github.com/dotnet/razor/pull/12061))
+* Fix issue acquiring components when using proxies (PR: [#8457](https://github.com/dotnet/vscode-csharp/pull/8457))
+* Support activating the extension with limited support in untrusted workspaces (PR: [#8435](https://github.com/dotnet/vscode-csharp/pull/8435))
+* Report specific c# settings in issue template (PR: [#8433](https://github.com/dotnet/vscode-csharp/pull/8433))
+* Update OmniSharp to 1.39.14 (PR: [#8492](https://github.com/dotnet/vscode-csharp/pull/8492))
+  * Update Roslyn to 4.14.0-3.25168.13 (PR: [omnisharp-roslyn/#2664](https://github.com/OmniSharp/omnisharp-roslyn/pull/2664))
+
 # 2.87.x
 * Fix acquisition of components with proxies (PR: [#8462](https://github.com/dotnet/vscode-csharp/pull/8462))
 * Bump Roslyn to 5.0.0-2.25404.10 (PR: [#8490](https://github.com/dotnet/vscode-csharp/pull/8490))

CODE-OF-CONDUCT.md

@@ -0,0 +1,6 @@
+# Code of Conduct
+
+This project has adopted the code of conduct defined by the Contributor Covenant
+to clarify expected behavior in our community.
+
+For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

CONTRIBUTING.md

@@ -118,22 +118,24 @@ This section provides instructions on how to debug locally built Roslyn and Razo
 
 #### Configuring Roslyn Language Server
 
-In your `settings.json` file, add the following lines:
+Add the following lines to your `settings.json`. Replace `<roslynRepoRoot>` with the actual path to your Roslyn repository.
 
 ```json
 "dotnet.server.waitForDebugger": true,
 "dotnet.server.path": "<roslynRepoRoot>/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net9.0/Microsoft.CodeAnalysis.LanguageServer.dll"
 ```
 
-Replace <roslynRepoRoot> with the actual path to your Roslyn repository.
+---
 
-If using C# Dev Kit, you can also override the Roslyn DevKit component in your `settings.json`:
+**If using C# Dev Kit**, you also need to override the Roslyn DevKit component in your `settings.json`. This step is not necessary if you are not loading the Dev Kit extension.
 ```json
 "dotnet.server.componentPaths": {
     "roslynDevKit": "<roslynRepoRoot>/artifacts/bin/Microsoft.VisualStudio.LanguageServices.DevKit/Debug/net9.0"
 },
 ```
 
+---
+
 Or, in VSCode settings (`Ctrl+,`):
 
 1. Search for `dotnet server`.
@@ -143,15 +145,15 @@ Or, in VSCode settings (`Ctrl+,`):
 
 #### Configuring Razor Language Server
 
-In your workspace settings.json file, add the following lines:
+Add the following lines to your `settings.json`. Replace `<razorRepoRoot>` with the actual path to your Razor repository.
 
 ```json
 "razor.languageServer.debug": true,
 "razor.languageServer.directory": "<razorRepoRoot>/artifacts/bin/rzls/Debug/net9.0",
 "razor.server.trace": "Debug"
 ```
 
-Replace `$razorRepoRoot` with your actual values.
+---
 
 Or, in VSCode settings (`Ctrl+,`):
 

README.md

@@ -41,12 +41,6 @@ Copyright © .NET Foundation, and contributors.
 The Microsoft C# extension is subject to [these license terms](https://github.com/dotnet/vscode-csharp/blob/main/RuntimeLicenses/license.txt).
 The source code to this extension is available on [https://github.com/dotnet/vscode-csharp](https://github.com/dotnet/vscode-csharp) and licensed under the [MIT license](LICENSE.txt).
 
-### Code of Conduct
-
-This project has adopted the code of conduct defined by the [Contributor Covenant](http://contributor-covenant.org/)
-to clarify expected behavior in our community.
-For more information see the [.NET Foundation Code of Conduct](http://www.dotnetfoundation.org/code-of-conduct).
-
 ### Contribution License Agreement
 
 By signing the [CLA](https://cla.dotnetfoundation.org/), the community is free to use your contribution to [.NET Foundation](http://www.dotnetfoundation.org) projects.

azure-pipelines/test-matrix.yml

@@ -31,6 +31,9 @@ jobs:
       RazorCohostTests:
         npmCommand: test:integration:razor:cohost
         isIntegration: true
+      UntrustedWorkspaceTest:
+        npmCommand: test:integration:untrusted
+        isIntegration: true
   pool: ${{ parameters.pool }}
   ${{ if parameters.containerName }}:
     container: ${{ parameters.containerName }}
@@ -41,4 +44,4 @@ jobs:
       installAdditionalLinuxDependencies: ${{ parameters.installAdditionalLinuxDependencies }}
       npmCommand: $(npmCommand)
       testVSCodeVersion: ${{ parameters.testVSCodeVersion }}
-      isIntegration: $(isIntegration)
+      isIntegration: $(isIntegration)

jest.config.ts

@@ -13,6 +13,7 @@ const config: Config = {
         '<rootDir>/test/omnisharp/omnisharpUnitTests/jest.config.ts',
         '<rootDir>/test/razor/razorIntegrationTests/jest.config.ts',
         '<rootDir>/test/razor/razorTests/jest.config.ts',
+        '<rootDir>/test/untrustedWorkspace/integrationTests/jest.config.ts',
     ],
     // Reporters are a global jest configuration property and cannot be set in the project jest config.
     // This configuration will create a 'junit.xml' file in the output directory, no matter which test project is running.

l10n/bundle.l10n.cs.json

@@ -138,6 +138,7 @@
   "Razor issue data collection stopped. Copying issue content...": "Shromažďování dat o problému s Razorem se zastavilo. Kopíruje se obsah problému…",
   "Razor.VSCode version": "Verze Razor.VSCode",
   "Recording trace...": "Zaznamenává se trasování...",
+  "Reload C# Extension": "Znovu načíst rozšíření C#",
   "Reload Window": "Znovu načíst okno",
   "Replace existing build and debug assets?": "Nahradit existující prostředky sestavení a ladění?",
   "Report Razor Issue": "Nahlásit problém s Razorem",
@@ -214,6 +215,7 @@
   "WARNING": "UPOZORNĚNÍ",
   "Workspace information": "Informace o pracovním prostoru",
   "Workspace projects": "Projekty pracovních prostorů",
+  "Workspace trust has changed. Would you like to reload the C# extension?": "Vztah důvěryhodnosti pracovního prostoru se změnil. Chcete znovu načíst rozšíření C#?",
   "Yes": "Ano",
   "You can modify the default arguments if needed": "V případě potřeby můžete změnit výchozí argumenty.",
   "You must first start the data collection before copying.": "Před kopírováním je zapotřebí nejdříve spustit shromažďování dat.",

l10n/bundle.l10n.de.json

@@ -138,6 +138,7 @@
   "Razor issue data collection stopped. Copying issue content...": "Die Sammlung von Razor-Problemdaten wurde beendet. Probleminhalt wird kopiert...",
   "Razor.VSCode version": "Razor.VSCode-Version",
   "Recording trace...": "Ablaufverfolgung wird aufgezeichnet...",
+  "Reload C# Extension": "C#-Erweiterung neu laden",
   "Reload Window": "Fenster neu laden",
   "Replace existing build and debug assets?": "Vorhandene Build- und Debugressourcen ersetzen?",
   "Report Razor Issue": "Razor-Problem melden",
@@ -214,6 +215,7 @@
   "WARNING": "WARNUNG",
   "Workspace information": "Arbeitsbereichsinformationen",
   "Workspace projects": "Arbeitsbereichsprojekte",
+  "Workspace trust has changed. Would you like to reload the C# extension?": "Die Vertrauensstellung des Arbeitsbereichs wurde geändert. Möchten Sie die C#-Erweiterung neu laden?",
   "Yes": "Ja",
   "You can modify the default arguments if needed": "Sie können die Standardargumente bei Bedarf ändern.",
   "You must first start the data collection before copying.": "Sie müssen die Datensammlung vor dem Kopieren starten.",