Merge remote-tracking branch 'dotnet/main' into activeExps

Author: genlu

.config/branch-merge.json

@@ -3,7 +3,25 @@
 - 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.75.x
+
+# 2.74.x
+* Bump xamlTools to 17.14.36010.33 (PR: [#8178](https://github.com/dotnet/vscode-csharp/pull/8178))
+* Bump razor to 10.0.0-preview.25210.3 (PR: [#8171](https://github.com/dotnet/vscode-csharp/pull/8171))
+  * Allow graceful handling of ArgumentException when trying to apply changes to SourceText in LspTextChangesLoader (PR: [#11727](https://github.com/dotnet/razor/pull/11727))
+  * Tweak a log message (PR: [#11705](https://github.com/dotnet/razor/pull/11705))
+  * Improve performance and memory usage of TagHelperBinder (PR: [#11671](https://github.com/dotnet/razor/pull/11671))
+
 # 2.73.x
+* Bump Roslyn to 5.0.0-1.25204.1 (PR: [#8138](https://github.com/dotnet/vscode-csharp/pull/8138))
+  * Ensure that newline is inserted after file scoped namespace declarations (PR: [#77821](https://github.com/dotnet/roslyn/pull/77821))
+  * Allow modification of source generated documents (PR: [#77587](https://github.com/dotnet/roslyn/pull/77587))
+  * Simplify the code for getting source generator diagnostics into the diagnostics service. (PR: [#77898](https://github.com/dotnet/roslyn/pull/77898))
+  * Make GlobalOptionService initialization synchronous. (PR: [#77823](https://github.com/dotnet/roslyn/pull/77823))
+  * Change keys for import caching (PR: [#77627](https://github.com/dotnet/roslyn/pull/77627))
+* Don't show duplicate toast if C# Dev Kit fails to activate (PR: [#8135](https://github.com/dotnet/vscode-csharp/pull/8135))
+* Bump xamlTools to 17.14.36004.3 (PR: [#8134](https://github.com/dotnet/vscode-csharp/pull/8134))
+* Acquire aspnetcore runtime when using Dev Kit to avoid double acquisition (PR: [#8132](https://github.com/dotnet/vscode-csharp/pull/8132))
 
 # 2.72.x
 * Revert xamlTools to 17.14.35913.250 (PR: [#8121](https://github.com/dotnet/vscode-csharp/pull/8121))
@@ -18,18 +36,18 @@
   * Cleanup and make semantic token processing and testing code more consistent (PR: [#77684](https://github.com/dotnet/roslyn/pull/77684))
   * Fix generation of attribute with array constant (PR: [#77661](https://github.com/dotnet/roslyn/pull/77661))
 * Bump Razor to (PR: [#8096](https://github.com/dotnet/vscode-csharp/pull/8096))
-  * Some code actions ordering and cleanup (#11659) (PR: [#11659](https://github.com/dotnet/razor/pull/11659))
-  * Emit pragmas for empty @ expressions in MVC (#11653) (PR: [#11653](https://github.com/dotnet/razor/pull/11653))
-  * Couple of small code actions tweaks (#11630) (PR: [#11630](https://github.com/dotnet/razor/pull/11630))
-  * Fix text area formatting in the new formatting engine (#11624) (PR: [#11624](https://github.com/dotnet/razor/pull/11624))
+  * Some code actions ordering and cleanup (PR: [#11659](https://github.com/dotnet/razor/pull/11659))
+  * Emit pragmas for empty @ expressions in MVC (PR: [#11653](https://github.com/dotnet/razor/pull/11653))
+  * Couple of small code actions tweaks (PR: [#11630](https://github.com/dotnet/razor/pull/11630))
+  * Fix text area formatting in the new formatting engine (PR: [#11624](https://github.com/dotnet/razor/pull/11624))
 
 # 2.71.x
 * Bump xamlTools to 17.14.35920.284 (PR: [#8083](https://github.com/dotnet/vscode-csharp/pull/8083))
 * Localization (PR: [#8084](https://github.com/dotnet/vscode-csharp/pull/8084))
-* Update wording on Razor Report Issue(PR: [#8081](https://github.com/dotnet/vscode-csharp/pull/8081))
-* Use the new SDK install experience when available.(PR: [#8080](https://github.com/dotnet/vscode-csharp/pull/8080))
-* Only enable Generate Assets command when the extension is activated.(PR: [#8079](https://github.com/dotnet/vscode-csharp/pull/8079))
-* Expose `sendRequestWithProgress` as experimental API(PR: [#8074](https://github.com/dotnet/vscode-csharp/pull/8074))
+* Update wording on Razor Report Issue (PR: [#8081](https://github.com/dotnet/vscode-csharp/pull/8081))
+* Use the new SDK install experience when available. (PR: [#8080](https://github.com/dotnet/vscode-csharp/pull/8080))
+* Only enable Generate Assets command when the extension is activated. (PR: [#8079](https://github.com/dotnet/vscode-csharp/pull/8079))
+* Expose `sendRequestWithProgress` as experimental API (PR: [#8074](https://github.com/dotnet/vscode-csharp/pull/8074))
 
 # 2.70.x
 * Bump razor to 9.0.0-preview.25161.2 (PR: [#8058](https://github.com/dotnet/vscode-csharp/pull/8058))

.github/workflows/branch-merge.yml

@@ -15,47 +15,91 @@ For help and questions about using this project, please see the [README](https:/
 We highly recommend using the C# extension's built-in command, `CSharp: Report an issue` (`csharp.reportIssue`) to create a pre-filled issue template.  This will include helpful details such as local dotnet installations, installed extensions, and other information.
 ![csharp.reportIssue command](./docs/report_issue.png)
 
-#### Collecting general logs
+#### Collecting General Logs
 
-The template has a section to include the `C#` output window logs.  These logs are not automatically included as they may contain personal information (such as full file paths and project names), but they are key to resolving problems.  
+The template has a section to include the `C#` output window logs. These logs are not automatically included as they may contain personal information (such as full file paths and project names), but they are key to resolving problems.
 
-1.  Find the `C#` output window (`View` -> `Output`) and set the log level to `Trace`
-    ![c# output window showing trace option](./docs/csharp_trace.png)
-2.  Reproduce the issue
-3.  In the `C#` output window, select all (e.g. `cntrl+a`) and copy paste into the issue template under the 'C# Log' section.  If you need to redact file paths and other information, please do so at this time.
-4.  Once the logs are collected, reset the window log level to `Info`
+1. **Set the Log Level to Trace**:
+   - Open the `C#` output window (`View` -> `Output`).
+   - Set the log level to `Trace`.
+     
+     ![c# output window showing trace option](./docs/csharp_trace.png)
 
-If the issue only reproduces on extension startup, you can set `Trace` as the default (see screenshot above), reload the window, and trace logs will be captured on startup.
+2. **Reproduce the Issue**:
+   - Perform the actions that reproduce the issue.
+
+3. **Copy the Logs**:
+   - In the `C#` output window, select all the logs (e.g., `Ctrl+A`) and copy them.
+   - Paste the logs into the issue template under the "C# Log" section.
+   - If necessary, redact sensitive information (e.g., file paths, project names).
+
+4. **Reset the Log Level**:
+   - After collecting the logs, reset the log level to `Info`.
+
+**Note**: If the issue occurs during extension startup, you can set `Trace` as the default log level, restart VSCode, and the trace logs will be captured automatically.
 
 ##### C# LSP Trace Logs
-Sometimes we need to know exactly what requests were sent to the Roslyn language server.  To capture these logs:
+- To capture detailed requests sent to the Roslyn language server:
+  1. Set the `C#` output window log level to `Trace` (as described above).
+  2. Open the `C# LSP Trace Logs` output window.
+  3. Reproduce the issue.
+  4. Copy the contents of the `C# LSP Trace Logs` output window.
+
+
+##### Other Ways to Set the Log Level
+1. When launching VSCode from the CLI, pass the `--log ms-dotnettools.csharp:trace` parameter.
+2. Invoke the `Developer: Set Log Level` command from the VSCode command palette, find the `C#` entry, and set the level.
+
+#### Collecting Razor Logs
+For issues with Razor, the Razor Log output window can contain useful information.
+
+1. **Set the Log Level to Trace**:
+   - Open the `Razor Logs` output window (`View` -> `Output`).
+   - Set the log level to `Trace`.
+     
+     ![razor log output window showing trace option](./docs/razor_logs.png)
 
-1.  Set the log level to `Trace` for the `C#` output window as described above.
-2.  Find the `C# LSP Trace Logs` output window
-3.  Reproduce the issue
-4.  Copy the contents of the `C# LSP Trace Logs` output window.
+2. **Reproduce the Issue**:
+   - Perform the actions that reproduce the issue.
 
-##### Other ways to set the log level
-1.  When launching VSCode from the CLI, pass the `--log ms-dotnettools.csharp:trace` parameter.
-2.  Invoke the `Developer: Set Log Level` command from the VSCode command palette, find the `C#` entry and set the level.
+3. **Copy the Logs**:
+   - Select all contents of the window (e.g., `Ctrl+A`) and paste them into the GitHub issue when requested.
 
-#### Project loading problems
+4. **Reset the Log Level**:
+   - Once the logs are collected, reset the log level to `Info`.
 
-A common cause of missing language features is a failure to load the project(s) or solution.  There can be a number of reasons why this happens, and some additional information is generally necessary to figure out what is going wrong.
+#### Project Loading Problems
 
-First, providing the information from the issue template and the general logs (see above section) is almost always necessary.  After that there are a couple things to check:
+Missing language features are often caused by a failure to load the project(s) or solution. To diagnose and resolve these issues, follow these steps:
 
-1.  Is the file found in the correct project by the language server?  This information is displayed in the bottom right corner of the VSCode window in the language status section.  This item can be pinned using the pin icon so that it is always displayed.
+1. **Provide General Logs**:
+   - Include the information from the issue template and the general logs (see the "Collecting General Logs" section above). These logs are essential for troubleshooting.
 
-    ![language status bar opened showing file active project context](./docs/language_status.png)
-2.  If using C# Dev Kit, check that the Solution Explorer displays the project with the expected references.  If not as expected, please also provide the contents of the `Projects` output window in the issue.
+2. **Check the Active Project Context**:
+   - Verify that the file is associated with the correct project in the language server.
+   - This information is displayed in the bottom-right corner of the VSCode window in the language status section.
+   - You can pin this item using the pin icon to keep it visible at all times.
+
+     ![language status bar showing file active project context](./docs/language_status.png)
+
+3. **Verify the Solution Explorer (C# Dev Kit)**:
+   - If you are using C# Dev Kit, check the Solution Explorer to ensure the project is displayed with the expected references.
+   - If the references or structure are not as expected, include the contents of the `Projects` output window in your issue report.
 
 #### Colorization problems
+If you encounter issues with document classification (e.g., incorrect syntax highlighting or colorization), please provide the following information to help us diagnose the problem:
+
+1. **Theme in Use**:
+   - Specify the name of the theme you are currently using in VSCode (e.g., "Dark+", "Light+", or a custom theme).
+
+2. **Tokens and Scope Information**:
+   - The `Developer: Inspect Editor Tokens and Scopes` command shows information about the problematic word or section:
+     1. Open the Command Palette (`Ctrl+Shift+P` or `Cmd+Shift+P` on macOS).
+     2. Search for and select `Developer: Inspect Editor Tokens and Scopes` (`editor.action.inspectTMScopes`).
+     3. Click on the word or section with incorrect colorization to display the token and scope information.
+   - Take a screenshot of the output and include it in your issue report.
 
-For issues related to classification (colorizing the document), please provide the following
-1.  Which theme is currently being used
-2.  A screenshot of the `Developer: Inspect Editor Tokens and Scopes` (`editor.action.inspectTMScopes`) command output on the incorrect word
-![inspect tokens and scopes output](./docs/inspect_tokens.png)
+     ![Inspect Tokens and Scopes Output](./docs/inspect_tokens.png)
 
 #### Diagnostics problems
 
@@ -64,16 +108,14 @@ For issues with diagnostics, please provide values of the background analysis sc
 
 #### Language server crashing
 
-As before, the general log collection is usually useful.  However we're not always able to diagnose just from the logs.  In that case a crash dump is useful.  This can be collected by setting the `dotnet.server.crashDumpPath` VSCode setting to a user-writeable folder.
-![vscode setting for crash dump path](./docs/crash_dump.png)
-
-When the server crashes, this should create a crash dump for it.
+If the language server crashes, general logs are often helpful for diagnosing the issue. However, in some cases, logs alone may not provide enough information and we may need a crash dump. Follow these steps to collect a crash dump:
+- Set the `dotnet.server.crashDumpPath` setting in VSCode to a user-writable folder where crash dumps can be saved.
+- Reproduce the issue
+- When the server crashes, a dump in the specified folder will be created.
 
 > [!WARNING]
 > The dump can contain detailed information on the project - generally we will provide an email so that it can be shared privately
 
-
-
 ## Microsoft Support Policy
 
 Support for this project is limited to the resources listed above.