Merge pull request #7340 from dotnet/merge/main-to-prerelease

[automated] Merge branch 'main' => 'prerelease'

.config/snap-flow.json

@@ -0,0 +1,20 @@
+// ONLY THE VERSION OF THIS FILE IN THE MAIN BRANCH IS USED!
+{
+    "merge-flow-configurations": {
+        // format of this section is
+        // "source-branch-name": {
+        //    "MergeToBranch": "target-branch-name"
+        // },
+        "main": {
+            // The MergeToBranch property should be presented in the object in order the merge flow to work
+            "MergeToBranch": "prerelease",
+            // ExtraSwitches is an optional parameter which is accepted by the script: https://github.com/dotnet/arcade/blob/main/.github/workflows/inter-branch-merge-base.yml. Accepted values are similar to the values from the version file: https://github.com/dotnet/versions/blob/main/Maestro/subscriptions.json
+            "ExtraSwitches": "-QuietComments"
+        },
+        "prerelease": {
+            "MergeToBranch": "release",
+            // ExtraSwitches is an optional parameter which is accepted by the script: https://github.com/dotnet/arcade/blob/main/.github/workflows/inter-branch-merge-base.yml. Accepted values are similar to the values from the version file: https://github.com/dotnet/versions/blob/main/Maestro/subscriptions.json
+            "ExtraSwitches": "-QuietComments"
+        }
+    }
+}

.github/workflows/branch-snap.yml

@@ -0,0 +1,13 @@
+name: Branch snap
+on:
+  workflow_dispatch
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  check-script:
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
+    with:
+      configuration_file_path: '.config/snap-flow.json'

.vscodeignore

@@ -8,6 +8,7 @@
 !.razorDevKit/**
 !.razoromnisharp/**
 .rpt2_cache/**
+.config/**
 .github/**
 .vscode/**
 .vscode-test/**

CHANGELOG.md

@@ -4,6 +4,48 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # Latest
+
+# 2.39.x
+* Add language status bar item displaying project context for open files (PR: [#7321](https://github.com/dotnet/vscode-csharp/pull/7321), PR: [#7333](https://github.com/dotnet/vscode-csharp/pull/7333))
+* Add language status bar item for workspace status (C# standalone) (PR: [#7254](https://github.com/dotnet/vscode-csharp/pull/7254), PR: [#7329])https://github.com/dotnet/vscode-csharp/pull/7329))
+* Update Razor to 9.0.0-preview.24360.1 (PR: [#7327](https://github.com/dotnet/vscode-csharp/pull/7327))
+  * Improve perf in generator cache cases (PR: [#10577](https://github.com/dotnet/razor/pull/10577))
+  * Handle InsertReplaceEdit for completion (PR: [#10563](https://github.com/dotnet/razor/pull/10563))
+  * Use System.Text.Json for serialization (PR: [#10551](https://github.com/dotnet/razor/pull/10551))
+  * Support `DocumentSymbol` results from Roslyn (PR: [#10560](https://github.com/dotnet/razor/pull/10560))
+  * Use a named pipe to communicate projectinfo in vscode (PR: [#10521](https://github.com/dotnet/razor/pull/10521))
+  * Reduce allocations in Razor's DirectiveVisitor (PR: [10521](https://github.com/dotnet/razor/pull/10521))
+* Update Roslyn to 4.12.0-1.24359.11 (PR: [#7326](https://github.com/dotnet/vscode-csharp/pull/7326))
+  * Fix issue causing error toasts to display on diff window views or new C# documents (PR: [#74300](https://github.com/dotnet/roslyn/pull/74300))
+  * Fix issue where loaded projects would be missing references (PR: [#74189](https://github.com/dotnet/roslyn/pull/74189))
+  * Fix UseNullPropagationCodeFixProvider for parenthesized property access (PR: [#74316](https://github.com/dotnet/roslyn/pull/74316))
+  * Rename the record parameter when its property get renamed (PR: [#74168](https://github.com/dotnet/roslyn/pull/74168))
+  * Report a diagnostic on missing body in partial property implementation (PR [#74224](https://github.com/dotnet/roslyn/pull/74224))
+  * Do not offer 'convert' namespace when the ns has sibling types (PR [#74216](https://github.com/dotnet/roslyn/pull/74216))
+  * Consume new Razor EA (PR: [#74134](https://github.com/dotnet/roslyn/pull/74134))
+  * Report diagnostic for field and value in property accessors when used as primary expressions only (PR: [#74164](https://github.com/dotnet/roslyn/pull/74164))
+  * Ensure an empty run result doesn't throw when generators are present (PR: [#74034](https://github.com/dotnet/roslyn/pull/74034))
+  * Support navigating to an interceptor location when on an intercepted method call (PR: [#74006](https://github.com/dotnet/roslyn/pull/74006))
+  * Add type hints for collection expressions (PR: [#74051](https://github.com/dotnet/roslyn/pull/74051))
+  * Ensure source generated documents are up-to-date before analyzing EnC changes (PR: [#73989](https://github.com/dotnet/roslyn/pull/73989))
+  * Support goto-def taking you from an interceptor method to the location being intercepted (PR: [#73992](https://github.com/dotnet/roslyn/pull/73992))
+  * Various performance fixes
+    * Reduce closures allocated during invocation of CapturedSymbolReplacement.Replacement (PR: [#74258](https://github.com/dotnet/roslyn/pull/74258))
+    * Reduce allocations in SymbolDeclaredCompilationEvent (PR: [#74250](https://github.com/dotnet/roslyn/pull/74250))
+    * Reduce allocations in AbstractProjectExtensionProvider.FilterExtensions (PR [#74112](https://github.com/dotnet/roslyn/pull/74112))
+    * Avoid re-running all codeaction requests at low priority (PR: [#74083](https://github.com/dotnet/roslyn/pull/74083))
+    * Reduce time spent in ConflictResolver.Session.GetNodesOrTokensToCheckForConflicts (PR: [#74101](https://github.com/dotnet/roslyn/pull/74101))
+    * Avoid allocations in AbstractSyntaxIndex<>.GetIndexAsync( PR: [#74075](https://github.com/dotnet/roslyn/pull/74075))
+* Bump xamltools to 17.12.35112.24 (PR: [#7309](https://github.com/dotnet/vscode-csharp/pull/7334))
+  * Fixed issue with Exception type related to https://github.com/microsoft/vscode-dotnettools/issues/1247
+  * Fixed Hot Reload not working on some Android device models: https://github.com/microsoft/vscode-dotnettools/issues/1241
+
+
+# 2.38.16
+* Start localizing additional strings (PR: [#7305](https://github.com/dotnet/vscode-csharp/pull/7305))
+* Fix issue launching Razor server on macOS (PR: [#7300](https://github.com/dotnet/vscode-csharp/pull/7300))
+
+# 2.37.26
 * Bump xamltools to 17.11.35027.17 (PR: [#7288](https://github.com/dotnet/vscode-csharp/pull/7288))
   * Fix impossible to enter multiple spaces in attribute area
   * Fix cannot accept Copilot suggestion with Tab when IntelliSense is open

l10n/bundle.l10n.cs.json

@@ -5,10 +5,13 @@
   "'{0}' was not set in the debug configuration.": "Nenastaveno v konfiguraci ladění: {0}",
   "1 reference": "1 odkaz",
   "A valid dotnet installation could not be found: {0}": "Nepovedlo se najít platnou instalaci rozhraní dotnet: {0}",
+  "Active File Context": "Active File Context",
   "Actual behavior": "Skutečné chování",
   "An error occurred during installation of the .NET Debugger. The C# extension may need to be reinstalled.": "Při instalaci ladicího programu .NET došlo k chybě. Rozšíření C# může být nutné přeinstalovat.",
   "Author": "Autor",
   "Bug": "Chyba",
+  "C# Project Context Status": "C# Project Context Status",
+  "C# Workspace Status": "Stav pracovního prostoru C#",
   "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "Konfigurace jazyka C# se změnila. Chcete znovu spustit jazykový server se změnami?",
   "C# configuration has changed. Would you like to reload the window to apply your changes?": "Konfigurace jazyka C# se změnila. Chcete znovu načíst okno, aby se změny použily?",
   "Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "Nelze najít otevřenou složku pracovního prostoru. Než začnete ladit s konfigurací {0}, otevřete prosím složku.",
@@ -91,6 +94,7 @@
   "OmniSharp requires a complete install of Mono (including MSBuild) to provide language services when `omnisharp.useModernNet` is disabled in Settings. Please install the latest Mono and restart.": "OmniSharp requires a complete install of Mono (including MSBuild) to provide language services when `omnisharp.useModernNet` is disabled in Settings. Please install the latest Mono and restart.",
   "Open envFile": "Otevřít soubor envFile",
   "Open settings": "Open settings",
+  "Open solution": "Otevřít řešení",
   "Operating system \"{0}\" not supported.": "Operační systém {0} se nepodporuje.",
   "Package {0} download from {1} failed integrity check. Some features may not work as expected. Please restart Visual Studio Code to retrigger the download": "Package {0} download from {1} failed integrity check. Some features may not work as expected. Please restart Visual Studio Code to retrigger the download",
   "Perform the actions (or no action) that resulted in your Razor issue": "Proveďte činnost (nebo zopakujte nečinnost), která vedla k problémům s Razorem.",
@@ -179,6 +183,7 @@
   "Virtual document file path": "Cesta k souboru virtuálního dokumentu",
   "WARNING": "UPOZORNĚNÍ",
   "Workspace information": "Informace o pracovním prostoru",
+  "Workspace projects": "Projekty pracovních prostorů",
   "Would you like to restart the Razor Language Server to enable the Razor trace configuration change?": "Chcete restartovat jazykový server Razor, aby se projevila změna konfigurace trasování Razor?",
   "Yes": "Ano",
   "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.",