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

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

.config/branch-merge.json

@@ -7,7 +7,7 @@
         },
         // Merge any release only changes to main.
         "release": {
-            "MergeToBranch": "release",
+            "MergeToBranch": "main",
             "ExtraSwitches": "-QuietComments"
         }
     }

.github/workflows/branch-merge.yml

@@ -2,9 +2,10 @@
 
 name: Flow release/prerelease changes to main
 on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 */3 * * *'
+  push:
+   branches:
+     - 'release'
+     - 'prerelease'
 
 permissions:
   contents: write

CHANGELOG.md

@@ -3,7 +3,21 @@
 - 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)
 
-# Latest
+# 2.41.x
+* Bump Roslyn to 4.12.0-1.24376.3 (PR: [#7393](https://github.com/dotnet/vscode-csharp/pull/7393))
+  * Fix race condition in LSP FindAllReferences when linked files were involved.(PR: [#74566](https://github.com/dotnet/roslyn/pull/74566))
+  * Fix dll load issue when loading Razor projects in VSCode (PR: [#74570](https://github.com/dotnet/roslyn/pull/74570))
+  * Don't bring up completion when deleting in an xml doc comment's text (PR: [#74558](https://github.com/dotnet/roslyn/pull/74558))
+  * Merge changes from a single DidChange notification (PR: [#74268](https://github.com/dotnet/roslyn/pull/74268))
+  * Support language features in metadata / decompiled source (PR: [#74488](https://github.com/dotnet/roslyn/pull/74488))
+  * Fix crash in sighelp (PR: [#74510](https://github.com/dotnet/roslyn/pull/74510))
+* Update Debugger Packages to v2.40.0 (PR: [#7390](https://github.com/dotnet/vscode-csharp/pull/7390))
+* Update Razor to 9.0.0-preview.24366.2 (PR: [#7384](https://github.com/dotnet/vscode-csharp/pull/7384))
+  * [FUSE] Component attribute nameof() (#10581) (PR: [#10581](https://github.com/dotnet/razor/pull/10581))
+  * Pool CodeWriter ReadOnlyMemory<char> pages (#10585) (PR: [#10585](https://github.com/dotnet/razor/pull/10585))
+  * Improve performance of `DefaultRazorTagHelperContextDiscoveryPhase` (#10602) (PR: [#10602](https://github.com/dotnet/razor/pull/10602))
+  * Flesh out `PooledArrayBuilder<T>` a bit (#10606) (PR: [#10606](https://github.com/dotnet/razor/pull/10606))
+* Bump xamltools to 17.12.35126.17 (PR: [#7392](https://github.com/dotnet/vscode-csharp/pull/7392))
 * Add option to disable server gc (PR: [#7155](https://github.com/dotnet/vscode-csharp/pull/7155))
 * Update the workspace status bar when the server is stopped. (PR: [#7352](https://github.com/dotnet/vscode-csharp/pull/7352))
 * Update Debugger to v2.39.0 (PR: [#7342](https://github.com/dotnet/vscode-csharp/pull/7342))

package.json

@@ -37,11 +37,11 @@
     }
   },
   "defaults": {
-    "roslyn": "4.12.0-1.24366.6",
+    "roslyn": "4.12.0-1.24376.3",
     "omniSharp": "1.39.11",
-    "razor": "9.0.0-preview.24365.1",
+    "razor": "9.0.0-preview.24366.2",
     "razorOmnisharp": "7.0.0-preview.23363.1",
-    "xamlTools": "17.12.35119.17"
+    "xamlTools": "17.12.35126.17"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",
@@ -420,7 +420,7 @@
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (Windows / x64)",
-      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-39-0/coreclr-debug-win7-x64.zip",
+      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-win7-x64.zip",
       "installPath": ".debugger/x86_64",
       "platforms": [
         "win32"
@@ -430,12 +430,12 @@
         "arm64"
       ],
       "installTestPath": "./.debugger/x86_64/vsdbg-ui.exe",
-      "integrity": "2E1B070445463960CF431E520CC2F8C17606A0ADC8FC0AD980F8C228FDE4C20F"
+      "integrity": "44FC0222F5AB8C70EFA2EC0039D8589A9F441BEBB686779AD0DEEAA2585D32BF"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (Windows / ARM64)",
-      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-39-0/coreclr-debug-win10-arm64.zip",
+      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-win10-arm64.zip",
       "installPath": ".debugger/arm64",
       "platforms": [
         "win32"
@@ -444,12 +444,12 @@
         "arm64"
       ],
       "installTestPath": "./.debugger/arm64/vsdbg-ui.exe",
-      "integrity": "813140680EDCDF32280314A6C69A3AB3699016FF2ABC977905E7E8EC51665317"
+      "integrity": "05CADC2AEAAF7B178545390304D7156D48C9AE3F1FACC36F08EA1D679B999488"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (macOS / x64)",
-      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-39-0/coreclr-debug-osx-x64.zip",
+      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-osx-x64.zip",
       "installPath": ".debugger/x86_64",
       "platforms": [
         "darwin"
@@ -463,12 +463,12 @@
         "./vsdbg"
       ],
       "installTestPath": "./.debugger/x86_64/vsdbg-ui",
-      "integrity": "2A05B2FADA307DA2E3E1A11BE3765CB1D4FDE1966B36C573C8B3A35D2AC3705A"
+      "integrity": "6DFB48E8FDBA688B406D8EC9B9561355C035126062C33EAC945D6D93CA444BF3"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (macOS / arm64)",
-      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-39-0/coreclr-debug-osx-arm64.zip",
+      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-osx-arm64.zip",
       "installPath": ".debugger/arm64",
       "platforms": [
         "darwin"
@@ -481,12 +481,12 @@
         "./vsdbg"
       ],
       "installTestPath": "./.debugger/arm64/vsdbg-ui",
-      "integrity": "696E8087F419FFF82159F0959909A627FAA12AFA5D7FBD620482E74CD475172B"
+      "integrity": "82DD26E2A4D34B4E68BB939182C55D13CDC5F9576010C807B476C7ADB236407C"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (linux / ARM)",
-      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-39-0/coreclr-debug-linux-arm.zip",
+      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-linux-arm.zip",
       "installPath": ".debugger",
       "platforms": [
         "linux"
@@ -499,12 +499,12 @@
         "./vsdbg"
       ],
       "installTestPath": "./.debugger/vsdbg-ui",
-      "integrity": "9B3009AC00E221DD0480340983522E944E4F61E1DBA6AC2D1E35F629EA436D8B"
+      "integrity": "7A4E2973607CE1B09902E9512D21953CAE9D4884560B9F0D752FDB0008D8A4B3"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (linux / ARM64)",
-      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-39-0/coreclr-debug-linux-arm64.zip",
+      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-linux-arm64.zip",
       "installPath": ".debugger",
       "platforms": [
         "linux"
@@ -517,12 +517,12 @@
         "./vsdbg"
       ],
       "installTestPath": "./.debugger/vsdbg-ui",
-      "integrity": "76257B3F4F2DFFD2DC7CFCB4A230C973191BEAE8BC16E347444D19451107BFAE"
+      "integrity": "43EE8F9FEF81FC255CB4B598083BCB45AF42DF8C7AEAFFF61785425EE1376EA8"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (linux musl / x64)",
-      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-39-0/coreclr-debug-linux-musl-x64.zip",
+      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-linux-musl-x64.zip",
       "installPath": ".debugger",
       "platforms": [
         "linux-musl"
@@ -535,12 +535,12 @@
         "./vsdbg"
       ],
       "installTestPath": "./.debugger/vsdbg-ui",
-      "integrity": "C518061780B9286C5128CD3DA556214EDD6076324869A5459A998FBED032351F"
+      "integrity": "B5FD9381FD2B79CA97BD2BA7DC1B572F8E318F3BCBC3D40C9190DA41C0A897BC"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (linux musl / ARM64)",
-      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-39-0/coreclr-debug-linux-musl-arm64.zip",
+      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-linux-musl-arm64.zip",
       "installPath": ".debugger",
       "platforms": [
         "linux-musl"
@@ -553,12 +553,12 @@
         "./vsdbg"
       ],
       "installTestPath": "./.debugger/vsdbg-ui",
-      "integrity": "805D76CCA280E165C5CE02EAD14241A94CC3E1D7E5EBB658FBE82E730EB5F1C3"
+      "integrity": "23C13F9294CC08977BF46591E4020E3CB49126C8D03F57D1A97C18489CF27FDC"
     },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (linux / x64)",
-      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-39-0/coreclr-debug-linux-x64.zip",
+      "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-linux-x64.zip",
       "installPath": ".debugger",
       "platforms": [
         "linux"
@@ -571,7 +571,7 @@
         "./vsdbg"
       ],
       "installTestPath": "./.debugger/vsdbg-ui",
-      "integrity": "598B632A366CCECE147553C4A0E9A7F9B26B63B61AE33F2CA4950E6BFAF97F34"
+      "integrity": "14E2A59A049EE150C85A9C1D711CED928FF993C81C1C635CE83B4A890CC3F486"
     },
     {
       "id": "RazorOmnisharp",

package.nls.cs.json

@@ -67,15 +67,15 @@
   "configuration.dotnet.server.startTimeout": "Určuje časový limit (v ms), aby se klient úspěšně spustil a připojil k jazykovému serveru.",
   "configuration.dotnet.server.suppressLspErrorToasts": "Potlačí zobrazování informačních zpráv o chybách, pokud na serveru dojde k chybě, ze které se dá zotavit.",
   "configuration.dotnet.server.trace": "Nastaví úroveň protokolování pro jazykový server",
-  "configuration.dotnet.server.useServerGC": "Configure the language server to use .NET server garbage collection.  Server garbage collection generally provides better performance at the expensive of higher memory consumption.",
+  "configuration.dotnet.server.useServerGC": "Nakonfigurujte jazykový server tak, aby používal uvolňování paměti serveru .NET.  Uvolňování paměti serveru obecně přináší vyšší výkon za cenu vyšší spotřeby paměti.",
   "configuration.dotnet.server.waitForDebugger": "Při spuštění serveru předá příznak --debug, aby bylo možné připojit ladicí program. (Dříve omnisharp.waitForDebugger)",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "Hledat symboly v referenčních sestaveních Ovlivňuje funkce, které vyžadují vyhledávání symbolů, například přidání importů.",
-  "configuration.dotnet.typeMembers.memberInsertionLocation": "The insertion location of properties, events, and methods When implement interface or abstract class.",
-  "configuration.dotnet.typeMembers.memberInsertionLocation.atTheEnd": "Place them at the end.",
-  "configuration.dotnet.typeMembers.memberInsertionLocation.withOtherMembersOfTheSameKind": "Place them with other members of the same kind.",
-  "configuration.dotnet.typeMembers.propertyGenerationBehavior": "Generation behavior of properties when implement interface or abstract class.",
-  "configuration.dotnet.typeMembers.propertyGenerationBehavior.preferAutoProperties": "Prefer auto properties.",
-  "configuration.dotnet.typeMembers.propertyGenerationBehavior.preferThrowingProperties": "Prefer throwing properties.",
+  "configuration.dotnet.typeMembers.memberInsertionLocation": "Umístění vložení vlastností, událostí a metod při implementaci rozhraní nebo abstraktní třídy.",
+  "configuration.dotnet.typeMembers.memberInsertionLocation.atTheEnd": "Umístit je na konec.",
+  "configuration.dotnet.typeMembers.memberInsertionLocation.withOtherMembersOfTheSameKind": "Umístěte je s ostatními členy stejného druhu.",
+  "configuration.dotnet.typeMembers.propertyGenerationBehavior": "Chování generování vlastností při implementaci rozhraní nebo abstraktní třídy.",
+  "configuration.dotnet.typeMembers.propertyGenerationBehavior.preferAutoProperties": "Upřednostňovat automatické vlastnosti.",
+  "configuration.dotnet.typeMembers.propertyGenerationBehavior.preferThrowingProperties": "Upřednostňovat vyvolávání vlastností.",
   "configuration.dotnet.unitTestDebuggingOptions": "Možnosti, které se mají použít s ladicím programem při spouštění pro ladění testů jednotek. (Dříve csharp.unitTestDebuggingOptions)",
   "configuration.dotnet.unitTests.runSettingsPath": "Cesta k souboru .runsettings, který by se měl použít při spouštění testů jednotek (dříve omnisharp.testRunSettings)",
   "configuration.omnisharp.autoStart": "Určuje, jestli se server OmniSharp automaticky spustí, nebo ne. Pokud je false, lze server OmniSharp spustit pomocí příkazu Restartovat OmniSharp.",

package.nls.de.json

@@ -67,15 +67,15 @@
   "configuration.dotnet.server.startTimeout": "Gibt ein Timeout (in ms) an, mit dem der Client erfolgreich gestartet und eine Verbindung mit dem Sprachserver hergestellt werden kann.",
   "configuration.dotnet.server.suppressLspErrorToasts": "Unterdrückt, dass Fehler-Popups angezeigt werden, wenn auf dem Server ein wiederherstellbarer Fehler auftritt.",
   "configuration.dotnet.server.trace": "Legt den Protokolliergrad für den Sprachserver fest.",
-  "configuration.dotnet.server.useServerGC": "Configure the language server to use .NET server garbage collection.  Server garbage collection generally provides better performance at the expensive of higher memory consumption.",
+  "configuration.dotnet.server.useServerGC": "Konfigurieren Sie den Sprachserver für die Verwendung der GC des .NET-Servers.  Die GC auf dem Server bietet im Allgemeinen eine bessere Leistung bei einem höheren Arbeitsspeicherverbrauch.",
   "configuration.dotnet.server.waitForDebugger": "Übergibt das Flag \"--debug\" beim Starten des Servers, damit ein Debugger angefügt werden kann. (Zuvor \"omnisharp.waitForDebugger\")",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "Symbole in Verweisassemblys suchen. Dies wirkt sich auf Features aus, die eine Symbolsuche erfordern, z. B. Importe hinzufügen.",
-  "configuration.dotnet.typeMembers.memberInsertionLocation": "The insertion location of properties, events, and methods When implement interface or abstract class.",
-  "configuration.dotnet.typeMembers.memberInsertionLocation.atTheEnd": "Place them at the end.",
-  "configuration.dotnet.typeMembers.memberInsertionLocation.withOtherMembersOfTheSameKind": "Place them with other members of the same kind.",
-  "configuration.dotnet.typeMembers.propertyGenerationBehavior": "Generation behavior of properties when implement interface or abstract class.",
-  "configuration.dotnet.typeMembers.propertyGenerationBehavior.preferAutoProperties": "Prefer auto properties.",
-  "configuration.dotnet.typeMembers.propertyGenerationBehavior.preferThrowingProperties": "Prefer throwing properties.",
+  "configuration.dotnet.typeMembers.memberInsertionLocation": "Die Einfügeposition von Eigenschaften, Ereignissen und Methoden beim Implementieren der Schnittstelle oder abstrakten Klasse.",
+  "configuration.dotnet.typeMembers.memberInsertionLocation.atTheEnd": "Platzieren Sie sie am Ende.",
+  "configuration.dotnet.typeMembers.memberInsertionLocation.withOtherMembersOfTheSameKind": "Platzieren Sie sie mit anderen Mitgliedern derselben Art.",
+  "configuration.dotnet.typeMembers.propertyGenerationBehavior": "Generierungsverhalten von Eigenschaften beim Implementieren einer Schnittstelle oder einer abstrakten Klasse.",
+  "configuration.dotnet.typeMembers.propertyGenerationBehavior.preferAutoProperties": "Automatische Eigenschaften bevorzugen.",
+  "configuration.dotnet.typeMembers.propertyGenerationBehavior.preferThrowingProperties": "Ausgelöste Eigenschaften bevorzugen.",
   "configuration.dotnet.unitTestDebuggingOptions": "Optionen, die mit dem Debugger beim Starten des Komponententestdebuggings verwendet werden können. (Zuvor \"csharp.unitTestDebuggingOptions\")",
   "configuration.dotnet.unitTests.runSettingsPath": "Pfad zur „.runsettings“-Datei, die beim Ausführen von Komponententests verwendet werden soll. (Vorher `omnisharp.testRunSettings`)",
   "configuration.omnisharp.autoStart": "Gibt an, ob der OmniSharp-Server automatisch gestartet wird. Bei „false“ kann OmniSharp mit dem Befehl „OmniSharp neu starten“ gestartet werden.",

package.nls.es.json

@@ -67,15 +67,15 @@
   "configuration.dotnet.server.startTimeout": "Especifica un tiempo de espera (en ms) para que el cliente se inicie correctamente y se conecte al servidor de lenguaje.",
   "configuration.dotnet.server.suppressLspErrorToasts": "Suprime la visualización de notificaciones del sistema de error si el servidor encuentra un error recuperable.",
   "configuration.dotnet.server.trace": "Establece el nivel de registro para el servidor de lenguaje",
-  "configuration.dotnet.server.useServerGC": "Configure the language server to use .NET server garbage collection.  Server garbage collection generally provides better performance at the expensive of higher memory consumption.",
+  "configuration.dotnet.server.useServerGC": "Configure el servidor de idiomas para usar la recolección de elementos no utilizados del servidor de .NET.  La recolección de elementos no utilizados del servidor suele proporcionar un mejor rendimiento a costa de un mayor consumo de memoria.",
   "configuration.dotnet.server.waitForDebugger": "Pasa la marca --debug al iniciar el servidor para permitir que se adjunte un depurador. (Anteriormente \"omnisharp.waitForDebugger\")",
   "configuration.dotnet.symbolSearch.searchReferenceAssemblies": "Buscar símbolos en ensamblados de referencia. Afecta a las características y requiere la búsqueda de símbolos, como agregar importaciones.",
-  "configuration.dotnet.typeMembers.memberInsertionLocation": "The insertion location of properties, events, and methods When implement interface or abstract class.",
-  "configuration.dotnet.typeMembers.memberInsertionLocation.atTheEnd": "Place them at the end.",
-  "configuration.dotnet.typeMembers.memberInsertionLocation.withOtherMembersOfTheSameKind": "Place them with other members of the same kind.",
-  "configuration.dotnet.typeMembers.propertyGenerationBehavior": "Generation behavior of properties when implement interface or abstract class.",
-  "configuration.dotnet.typeMembers.propertyGenerationBehavior.preferAutoProperties": "Prefer auto properties.",
-  "configuration.dotnet.typeMembers.propertyGenerationBehavior.preferThrowingProperties": "Prefer throwing properties.",
+  "configuration.dotnet.typeMembers.memberInsertionLocation": "Ubicación de inserción de propiedades, eventos y métodos cuando se implementa una interfaz o una clase abstracta.",
+  "configuration.dotnet.typeMembers.memberInsertionLocation.atTheEnd": "Colóquelos al final.",
+  "configuration.dotnet.typeMembers.memberInsertionLocation.withOtherMembersOfTheSameKind": "Colóquelos con otros miembros del mismo tipo.",
+  "configuration.dotnet.typeMembers.propertyGenerationBehavior": "Comportamiento de generación de propiedades al implementar una interfaz o una clase abstracta.",
+  "configuration.dotnet.typeMembers.propertyGenerationBehavior.preferAutoProperties": "Preferir propiedades automáticas.",
+  "configuration.dotnet.typeMembers.propertyGenerationBehavior.preferThrowingProperties": "Preferir propiedades de lanzamiento.",
   "configuration.dotnet.unitTestDebuggingOptions": "Opciones que se van a usar con el depurador al iniciar para la depuración de pruebas unitarias. (Anteriormente \"csharp.unitTestDebuggingOptions\")",
   "configuration.dotnet.unitTests.runSettingsPath": "Ruta de acceso al archivo .runsettings que debe usarse al ejecutar pruebas unitarias. (Previously `omnisharp.testRunSettings`)",
   "configuration.omnisharp.autoStart": "Especifica si el servidor OmniSharp se iniciará automáticamente o no. Si es false, OmniSharp se puede iniciar con el comando \"Restart OmniSharp\".",