Merge branch 'create_tags' of https://github.com/ryzngard/vscode-csharp into create_tags

Author: Andrew Hall

.config/branch-merge.json

@@ -3,8 +3,14 @@
 - 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.36008.108 (PR: [#8159](https://github.com/dotnet/vscode-csharp/pull/8159))
+* 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))

.github/workflows/branch-merge.yml

@@ -42,9 +42,9 @@
   "defaults": {
     "roslyn": "5.0.0-1.25204.1",
     "omniSharp": "1.39.12",
-    "razor": "9.0.0-preview.25177.4",
+    "razor": "10.0.0-preview.25210.3",
     "razorOmnisharp": "7.0.0-preview.23363.1",
-    "xamlTools": "17.14.36008.108"
+    "xamlTools": "17.14.36010.33"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",
@@ -1536,6 +1536,11 @@
             "type": "boolean",
             "default": true,
             "description": "%configuration.razor.languageServer.useNewFormattingEngine%"
+          },
+          "razor.languageServer.cohostingEnabled": {
+            "type": "boolean",
+            "default": false,
+            "description": "%configuration.razor.languageServer.cohostingEnabled%"
           }
         }
       },
@@ -5596,4 +5601,4 @@
       }
     }
   }
-}
+}

CHANGELOG.md

@@ -120,6 +120,7 @@
   "configuration.omnisharp.useEditorFormattingSettings": "Určuje, jestli má server OmniSharp používat nastavení editoru VS Code pro formátování kódu C# (použití tabulátorů, velikost odsazení).",
   "configuration.omnisharp.useModernNet.description": "Použijte build serveru OmniSharp pro .NET 6. Tato verze _nepodporuje_ projekty .NET Framework, které nejsou ve stylu sady SDK, včetně Unity. U projektů Framework, .NET Core a .NET 5+, které jsou ve stylu sady SDK, byste měli zaznamenat výrazné zlepšení výkonu.",
   "configuration.omnisharp.useModernNet.title": "Použít build serveru OmniSharp pro .NET 6",
+  "configuration.razor.languageServer.cohostingEnabled": "(EXPERIMENTAL) Enable Razor cohosting.",
   "configuration.razor.languageServer.debug": "Určuje, jestli se má při spouštění jazykového serveru čekat na připojení ladění.",
   "configuration.razor.languageServer.directory": "Přepíše cestu k adresáři jazykového serveru Razor.",
   "configuration.razor.languageServer.forceRuntimeCodeGeneration": "(EXPERIMENTÁLNÍ) Povolit kombinované generování kódu v době návrhu / za běhu pro soubory Razor",

package-lock.json

@@ -120,6 +120,7 @@
   "configuration.omnisharp.useEditorFormattingSettings": "Gibt an, ob OmniSharp VS Code-Editoreinstellungen für C#-Codeformatierung verwenden soll (Verwendung von Registerkarten, Einzugsgröße).",
   "configuration.omnisharp.useModernNet.description": "Verwenden Sie den OmniSharp-Build für .NET 6. Diese Version unterstützt _keine_ .NET Framework-Projekte, die nicht im SDK-Stil vorliegen, einschließlich Unity. Framework-Projekte im SDK-Stil, .NET Core- und .NET 5+-Projekte sollten erhebliche Leistungsverbesserungen aufweisen.",
   "configuration.omnisharp.useModernNet.title": ".NET 6-Build von OmniSharp verwenden",
+  "configuration.razor.languageServer.cohostingEnabled": "(EXPERIMENTAL) Enable Razor cohosting.",
   "configuration.razor.languageServer.debug": "Gibt an, ob beim Starten des Sprachservers auf die Debuganfügung gewartet werden soll.",
   "configuration.razor.languageServer.directory": "Überschreibt den Pfad zum Razor-Sprachserver-Verzeichnis.",
   "configuration.razor.languageServer.forceRuntimeCodeGeneration": "(EXPERIMENTELL) Kombinierte Entwurfszeit-/Runtime-Codegenerierung für Razor-Dateien aktivieren",

package.json

@@ -120,6 +120,7 @@
   "configuration.omnisharp.useEditorFormattingSettings": "Especifica si OmniSharp debe usar la configuración VS Code del editor para el formato de código de C# (uso de tabulaciones, tamaño de sangría).",
   "configuration.omnisharp.useModernNet.description": "Use la compilación de OmniSharp para .NET 6. Esta versión no admite proyectos de .NET Framework que no sean de tipo SDK, incluido Unity. Los proyectos framework de estilo SDK, .NET Core y .NET 5+ deben ver mejoras significativas en el rendimiento.",
   "configuration.omnisharp.useModernNet.title": "Usar la compilación de .NET 6 de OmniSharp",
+  "configuration.razor.languageServer.cohostingEnabled": "(EXPERIMENTAL) Enable Razor cohosting.",
   "configuration.razor.languageServer.debug": "Especifica si se debe esperar a que se adjunte la depuración al iniciar el servidor de lenguaje.",
   "configuration.razor.languageServer.directory": "Invalida la ruta de acceso al directorio del servidor de lenguaje Razor.",
   "configuration.razor.languageServer.forceRuntimeCodeGeneration": "(EXPERIMENTAL) Habilitación de la generación de código en tiempo de ejecución y tiempo de diseño combinado para archivos de Razor",

package.nls.cs.json

@@ -120,6 +120,7 @@
   "configuration.omnisharp.useEditorFormattingSettings": "Spécifie si OmniSharp doit utiliser VS Code paramètres de l’éditeur pour la mise en forme du code C# (utilisation d’onglets, taille de retrait).",
   "configuration.omnisharp.useModernNet.description": "Utilisez la version OmniSharp pour .NET 6. Cette version _ne prend pas_ en charge les projets .NET Framework non de style SDK, y compris Unity. Les projets framework de style SDK, .NET Core et .NET 5+ doivent voir des améliorations significatives des performances.",
   "configuration.omnisharp.useModernNet.title": "Utiliser la version .NET 6 d'OmniSharp",
+  "configuration.razor.languageServer.cohostingEnabled": "(EXPERIMENTAL) Enable Razor cohosting.",
   "configuration.razor.languageServer.debug": "Spécifie s’il faut attendre l’attachement du débogage au lancement du serveur de langage.",
   "configuration.razor.languageServer.directory": "Remplace le chemin d’accès au répertoire du serveur de langage Razor.",
   "configuration.razor.languageServer.forceRuntimeCodeGeneration": "(EXPÉRIMENTAL) Activer la génération combinée de code au moment de la conception/à l’exécution pour les fichiers Razor",

package.nls.de.json

@@ -120,6 +120,7 @@
   "configuration.omnisharp.useEditorFormattingSettings": "Specifica se OmniSharp deve usare le impostazioni dell'editor VS Code per la formattazione del codice C# (uso di tabulazioni, dimensioni rientro).",
   "configuration.omnisharp.useModernNet.description": "Usare la build OmniSharp per .NET 6. Questa versione _non_ supporta i progetti .NET Framework non di tipo SDK, tra cui Unity. I progetti Framework, .NET Core e .NET 5+ di tipo SDK devono vedere miglioramenti significativi delle prestazioni.",
   "configuration.omnisharp.useModernNet.title": "Usare la build .NET 6 di OmniSharp",
+  "configuration.razor.languageServer.cohostingEnabled": "(EXPERIMENTAL) Enable Razor cohosting.",
   "configuration.razor.languageServer.debug": "Specifica se attendere il collegamento di debug all'avvio del server di linguaggio.",
   "configuration.razor.languageServer.directory": "Esegue l'override del percorso della directory del server di linguaggio Razor.",
   "configuration.razor.languageServer.forceRuntimeCodeGeneration": "(SPERIMENTALE) Abilita la generazione combinata di codice in fase di progettazione/runtime per i file Razor",