Merge pull request #7061 from dibarbet/merge_main

Merge main into prerelease

Author: dibarbet

CHANGELOG.md

@@ -4,6 +4,11 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # Latest
+* Upgrade Debugger for 2.19.18 Release (PR: [#7060](https://github.com/dotnet/vscode-csharp/pull/7060))
+* Textmate: fix Razor expression classification inside of HTML tags using injection (PR: [#7055](https://github.com/dotnet/vscode-csharp/pull/7055))
+* Textmate: fix Razor expression classification inside of HTML tags (PR: [#7051](https://github.com/dotnet/vscode-csharp/pull/7051))
+
+# 2.26.13
 * Update Roslyn to 4.11.0-1.24209.10 (PR: [#<>](https://github.com/dotnet/vscode-csharp/pull/<>))
   * Fix issue with case sensitivity when finding documentIds for URIs (PR: [#72965](https://github.com/dotnet/roslyn/pull/72965))
   * Bulk add/remove projects to workspace (PR: [#72957](https://github.com/dotnet/roslyn/pull/72957))
@@ -28,7 +33,7 @@
   * Fix hot path string allocations from ProjectKey (PR: [#10138](https://github.com/dotnet/razor/pull/10138))
   * Disable latest runtime patch (PR: [#10133](https://github.com/dotnet/razor/pull/10133))
 
-## 2.23.x
+## 2.23.15
 * Rename RazorComponentAttribute semantic token to razorComponentAttribute (PR: [#6867](https://github.com/dotnet/vscode-csharp/pull/6867))
 * Drop win32-ia32 platform support (PR: [#6983](https://github.com/dotnet/vscode-csharp/pull/6983))
 * Fix some issues with casing when comparing Razor files (PR: [#6974](https://github.com/dotnet/vscode-csharp/pull/6974))

azure-pipelines/loc.yml

@@ -32,10 +32,10 @@ variables:
 - group: OneLocBuildVariables
 
 extends:
-  template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
   parameters:
     pool:
-      name: NetCore1ESPool-Svc-Internal
+      name: netcore1espool-internal
       image: 1es-windows-2022-pt
       os: windows
     stages:

l10n/bundle.l10n.cs.json

@@ -60,13 +60,13 @@
   "For more information about the 'console' field, see {0}": "Další informace o poli „console“ najdete v tématu {0}",
   "Get the SDK": "Získat sadu SDK",
   "Go to GitHub": "Přejít na GitHub",
-  "Go to output": "Go to output",
+  "Go to output": "Přejít na výstup",
   "Help": "Nápověda",
   "Host document file path": "Cesta k souboru dokumentu hostitele",
   "If you have changed target frameworks, make sure to update the program path.": "Pokud jste změnili cílové architektury, nezapomeňte aktualizovat cestu k programu.",
   "Ignore": "Ignorovat",
   "Ignoring non-parseable lines in envFile {0}: {1}.": "Ignorování neanalyzovatelných řádků v souboru envFile {0}: {1}",
-  "IntelliCode features will not be available, {0} failed to activate.": "IntelliCode features will not be available, {0} failed to activate.",
+  "IntelliCode features will not be available, {0} failed to activate.": "Funkce IntelliCode nebudou k dispozici, {0} se nepodařilo aktivovat.",
   "Invalid project index": "Neplatný index projektu",
   "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Návrat k výchozí hodnotě „{0}“",
   "Is this a Bug or Feature request?": "Jde o chybu, nebo žádost o funkci?",
@@ -129,7 +129,7 @@
   "Startup project not set": "Projekt po spuštění není nastavený",
   "Steps to reproduce": "Kroky pro reprodukci",
   "Stop": "Zastavit",
-  "Suppress notification": "Suppress notification",
+  "Suppress notification": "Potlačit oznámení",
   "Synchronization timed out": "Vypršel časový limit synchronizace.",
   "The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": "Nelze nalézt sadu .NET Core SDK: {0}. Ladění .NET Core se nepovolí. Ujistěte se, že je sada .NET Core SDK nainstalovaná a umístěná v dané cestě.",
   "The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "Sada .NET Core SDK umístěná v cestě je příliš stará. Ladění .NET Core se nepovolí. Minimální podporovaná verze je {0}.",

l10n/bundle.l10n.de.json

@@ -60,13 +60,13 @@
   "For more information about the 'console' field, see {0}": "Weitere Informationen zum Feld \"Konsole\" finden Sie unter {0}",
   "Get the SDK": "SDK herunterladen",
   "Go to GitHub": "Zu GitHub wechseln",
-  "Go to output": "Go to output",
+  "Go to output": "Zur Ausgabe wechseln",
   "Help": "Hilfe",
   "Host document file path": "Pfad der Hostdokumentdatei",
   "If you have changed target frameworks, make sure to update the program path.": "Wenn Sie Zielframeworks geändert haben, stellen Sie sicher, dass Sie den Programmpfad aktualisieren.",
   "Ignore": "Ignorieren",
   "Ignoring non-parseable lines in envFile {0}: {1}.": "Nicht parsebare Zeilen in envFile {0} werden ignoriert: {1}.",
-  "IntelliCode features will not be available, {0} failed to activate.": "IntelliCode features will not be available, {0} failed to activate.",
+  "IntelliCode features will not be available, {0} failed to activate.": "IntelliCode-Funktionen sind nicht verfügbar, {0} konnte nicht aktiviert werden.",
   "Invalid project index": "Ungültiger Projektindex",
   "Invalid razor.server.trace setting. Defaulting to '{0}'": "Ungültige razor.server.trace-Einstellung. Standardmäßig wird \"{0}\" verwendet.",
   "Is this a Bug or Feature request?": "Handelt es sich um einen Fehler oder eine Featureanforderung?",
@@ -129,7 +129,7 @@
   "Startup project not set": "Startprojekt nicht festgelegt",
   "Steps to reproduce": "Schritte für Reproduktion",
   "Stop": "Beenden",
-  "Suppress notification": "Suppress notification",
+  "Suppress notification": "Benachrichtigung unterdrücken",
   "Synchronization timed out": "Timeout bei der Synchronisierung",
   "The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": "Das .NET Core SDK kann nicht gefunden werden: {0}. Das .NET Core-Debuggen wird nicht aktiviert. Stellen Sie sicher, dass das .NET Core SDK installiert ist und sich im Pfad befindet.",
   "The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "Das .NET Core SDK auf dem Pfad ist zu alt. Das .NET Core-Debuggen wird nicht aktiviert. Die unterstützte Mindestversion ist {0}.",

l10n/bundle.l10n.es.json

@@ -60,13 +60,13 @@
   "For more information about the 'console' field, see {0}": "Para obtener más información sobre el campo \"consola\", consulte {0}",
   "Get the SDK": "Obtención del SDK",
   "Go to GitHub": "Ir a GitHub",
-  "Go to output": "Go to output",
+  "Go to output": "Ir a la salida",
   "Help": "Ayuda",
   "Host document file path": "Ruta de acceso del archivo de documento de host",
   "If you have changed target frameworks, make sure to update the program path.": "Si ha cambiado las plataformas de destino, asegúrese de actualizar la ruta de acceso del programa.",
   "Ignore": "Ignorar",
   "Ignoring non-parseable lines in envFile {0}: {1}.": "Se omitirán las líneas de envFile {0}: {1} que no se puedan analizar.",
-  "IntelliCode features will not be available, {0} failed to activate.": "IntelliCode features will not be available, {0} failed to activate.",
+  "IntelliCode features will not be available, {0} failed to activate.": "Las características de IntelliCode no estarán disponibles, {0} no se pudieron activar.",
   "Invalid project index": "Índice de proyecto no válido",
   "Invalid razor.server.trace setting. Defaulting to '{0}'": "Configuración razor.server.trace no válida. El valor predeterminado pasa a ser \"{0}\"",
   "Is this a Bug or Feature request?": "¿Se trata de una solicitud de error o característica?",
@@ -129,7 +129,7 @@
   "Startup project not set": "Proyecto de inicio no establecido",
   "Steps to reproduce": "Pasos para reproducir",
   "Stop": "Detener",
-  "Suppress notification": "Suppress notification",
+  "Suppress notification": "Suprimir la notificación",
   "Synchronization timed out": "Tiempo de espera de sincronización agotado.",
   "The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": "No se encuentra el SDK de .NET Core: {0}. No se habilitará la depuración de .NET Core. Asegúrese de que el SDK de .NET Core está instalado y en la ruta de acceso.",
   "The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "El SDK de .NET Core ubicado en la ruta de acceso es muy antiguo. No se habilitará la depuración de .NET Core. La versión mínima admitida es {0}.",

l10n/bundle.l10n.fr.json

@@ -60,13 +60,13 @@
   "For more information about the 'console' field, see {0}": "Pour plus d’informations sur le champ « console », consultez {0}",
   "Get the SDK": "Obtention du Kit de développement logiciel (SDK)",
   "Go to GitHub": "Accéder à GitHub",
-  "Go to output": "Go to output",
+  "Go to output": "Accéder à la sortie",
   "Help": "Aide",
   "Host document file path": "Chemin d’accès au fichier de document hôte",
   "If you have changed target frameworks, make sure to update the program path.": "Si vous avez modifié la version cible de .Net Framework, veillez à mettre à jour le chemin d’accès du programme.",
   "Ignore": "Ignorer",
   "Ignoring non-parseable lines in envFile {0}: {1}.": "Lignes non analysables ignorées dans envFile {0} : {1}.",
-  "IntelliCode features will not be available, {0} failed to activate.": "IntelliCode features will not be available, {0} failed to activate.",
+  "IntelliCode features will not be available, {0} failed to activate.": "Les fonctionnalités IntelliCode ne seront pas disponibles, {0} n’a pas pu être activée.",
   "Invalid project index": "Index de projet non valide",
   "Invalid razor.server.trace setting. Defaulting to '{0}'": "Paramètre razor.server.trace non valide. La valeur par défaut est '{0}'",
   "Is this a Bug or Feature request?": "S’agit-il d’une demande de bogue ou de fonctionnalité ?",
@@ -129,7 +129,7 @@
   "Startup project not set": "Projet de démarrage non défini",
   "Steps to reproduce": "Étapes à suivre pour reproduire",
   "Stop": "Arrêter",
-  "Suppress notification": "Suppress notification",
+  "Suppress notification": "Supprimer la notification",
   "Synchronization timed out": "Délai de synchronisation dépassé",
   "The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": "Le SDK .NET Core est introuvable : {0}. Le débogage .NET Core ne sera pas activé. Assurez-vous que le SDK .NET Core est installé et se trouve sur le chemin.",
   "The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "Le SDK .NET Core situé sur le chemin est trop ancien. Le débogage .NET Core ne sera pas activé. La version minimale prise en charge est {0}.",

l10n/bundle.l10n.it.json

@@ -60,13 +60,13 @@
   "For more information about the 'console' field, see {0}": "Per ulteriori informazioni sul campo 'console', vedere {0}",
   "Get the SDK": "Ottieni l'SDK",
   "Go to GitHub": "Vai a GitHub",
-  "Go to output": "Go to output",
+  "Go to output": "Passa all'output",
   "Help": "Guida",
   "Host document file path": "Percorso del file del documento host",
   "If you have changed target frameworks, make sure to update the program path.": "Se i framework di destinazione sono stati modificati, assicurarsi di aggiornare il percorso del programma.",
   "Ignore": "Ignora",
   "Ignoring non-parseable lines in envFile {0}: {1}.": "Le righe non analizzabili in envFile {0}: {1} verranno ignorate.",
-  "IntelliCode features will not be available, {0} failed to activate.": "IntelliCode features will not be available, {0} failed to activate.",
+  "IntelliCode features will not be available, {0} failed to activate.": "Le funzionalità IntelliCode non saranno disponibili, non è stato possibile eseguire l'attivazione di {0}.",
   "Invalid project index": "Indice di progetto non valido",
   "Invalid razor.server.trace setting. Defaulting to '{0}'": "Impostazione razor.server.trace non valida. Impostazione predefinita su '{0}'",
   "Is this a Bug or Feature request?": "Si tratta di una richiesta di bug o funzionalità?",
@@ -129,7 +129,7 @@
   "Startup project not set": "Progetto di avvio non impostato",
   "Steps to reproduce": "Passaggi per la riproduzione",
   "Stop": "Arresta",
-  "Suppress notification": "Suppress notification",
+  "Suppress notification": "Elimina la notifica",
   "Synchronization timed out": "Timeout sincronizzazione",
   "The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": "L'SDK .NET Core non può essere localizzato: {0}. Il debug di .NET Core non sarà abilitato. Assicurarsi che .NET Core SDK sia installato e si trovi nel percorso.",
   "The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "L'SDK .NET Core situato nel percorso è troppo vecchio. Il debug di .NET Core non sarà abilitato. La versione minima supportata è {0}.",

l10n/bundle.l10n.ja.json

@@ -60,13 +60,13 @@
   "For more information about the 'console' field, see {0}": "'console' フィールドの詳細については、{0} を参照してください",
   "Get the SDK": "SDK の取得",
   "Go to GitHub": "GitHub に移動する",
-  "Go to output": "Go to output",
+  "Go to output": "出力に移動",
   "Help": "ヘルプ",
   "Host document file path": "ホスト ドキュメント ファイルのパス",
   "If you have changed target frameworks, make sure to update the program path.": "ターゲット フレームワークを変更した場合は、プログラム パスを更新するようにしてください。",
   "Ignore": "無視",
   "Ignoring non-parseable lines in envFile {0}: {1}.": "envFile {0} 内の解析できない行を無視します: {1}",
-  "IntelliCode features will not be available, {0} failed to activate.": "IntelliCode features will not be available, {0} failed to activate.",
+  "IntelliCode features will not be available, {0} failed to activate.": "IntelliCode 機能は使用できません。{0} アクティブ化に失敗しました。",
   "Invalid project index": "無効なプロジェクト インデックス",
   "Invalid razor.server.trace setting. Defaulting to '{0}'": "razor.server.trace 設定が無効です。既定値は '{0}' です",
   "Is this a Bug or Feature request?": "これはバグまたは機能の要求ですか?",
@@ -129,7 +129,7 @@
   "Startup project not set": "スタートアップ プロジェクトが設定されていません",
   "Steps to reproduce": "再現手順",
   "Stop": "停止",
-  "Suppress notification": "Suppress notification",
+  "Suppress notification": "通知を非表示",
   "Synchronization timed out": "同期がタイムアウトしました",
   "The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": ".NET Core SDKが見つかりません: {0}.NET Core デバッグは有効になりません。.NET Core SDK がインストールされ、パス上にあることを確認します。",
   "The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "パスにある .NET Core SDK が古すぎます。.NET Core デバッグは有効になりません。サポートされている最小バージョンは {0} です。",

l10n/bundle.l10n.ko.json

@@ -60,13 +60,13 @@
   "For more information about the 'console' field, see {0}": "'콘솔' 필드에 대한 자세한 내용은 {0}을(를) 참조하세요.",
   "Get the SDK": "SDK 받기",
   "Go to GitHub": "GitHub로 이동",
-  "Go to output": "Go to output",
+  "Go to output": "출력으로 이동",
   "Help": "도움말",
   "Host document file path": "호스트 문서 파일 경로",
   "If you have changed target frameworks, make sure to update the program path.": "대상 프레임워크를 변경한 경우 프로그램 경로를 업데이트해야 합니다.",
   "Ignore": "무시",
   "Ignoring non-parseable lines in envFile {0}: {1}.": "envFile {0}: {1}에서 구문 분석할 수 없는 행을 무시합니다.",
-  "IntelliCode features will not be available, {0} failed to activate.": "IntelliCode features will not be available, {0} failed to activate.",
+  "IntelliCode features will not be available, {0} failed to activate.": "IntelliCode 기능을 사용할 수 없으며 {0}을(를) 활성화하지 못했습니다.",
   "Invalid project index": "잘못된 프로젝트 인덱스",
   "Invalid razor.server.trace setting. Defaulting to '{0}'": "razor.server.trace 설정이 잘못되었습니다. 기본값은 '{0}'입니다.",
   "Is this a Bug or Feature request?": "버그인가요, 기능 요청인가요?",
@@ -129,7 +129,7 @@
   "Startup project not set": "시작 프로젝트가 설정되지 않음",
   "Steps to reproduce": "재현 단계",
   "Stop": "중지",
-  "Suppress notification": "Suppress notification",
+  "Suppress notification": "알림 표시 안 함",
   "Synchronization timed out": "동기화가 시간 초과됨",
   "The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": ".NET Core SDK를 찾을 수 없습니다: {0}. .NET Core 디버깅을 사용할 수 없습니다. .NET Core SDK가 설치되어 있고 경로에 있는지 확인합니다.",
   "The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "경로에 있는 .NET Core SDK가 너무 오래되었습니다. .NET Core 디버깅을 사용할 수 없습니다. 지원되는 최소 버전은 {0} 입니다.",

l10n/bundle.l10n.pl.json

@@ -60,13 +60,13 @@
   "For more information about the 'console' field, see {0}": "Aby uzyskać więcej informacji o polu „console”, zobacz {0}",
   "Get the SDK": "Pobierz zestaw SDK",
   "Go to GitHub": "Przejdź do serwisu GitHub",
-  "Go to output": "Go to output",
+  "Go to output": "Przejdź do danych wyjściowych",
   "Help": "Pomoc",
   "Host document file path": "Ścieżka pliku dokumentu hosta",
   "If you have changed target frameworks, make sure to update the program path.": "Jeśli zmieniono platformy docelowe, upewnij się, że zaktualizowano ścieżkę programu.",
   "Ignore": "Ignoruj",
   "Ignoring non-parseable lines in envFile {0}: {1}.": "Ignorowanie wierszy, których nie przeanalizowano w pliku envFile {0}: {1}.",
-  "IntelliCode features will not be available, {0} failed to activate.": "IntelliCode features will not be available, {0} failed to activate.",
+  "IntelliCode features will not be available, {0} failed to activate.": "Funkcje IntelliCode nie będą dostępne, aktywowanie {0} nie powiodło się.",
   "Invalid project index": "Nieprawidłowy indeks projektu",
   "Invalid razor.server.trace setting. Defaulting to '{0}'": "Nieprawidłowe ustawienie razor.server.trace. Wartość domyślna to „{0}”",
   "Is this a Bug or Feature request?": "Czy jest to żądanie dotyczące usterki czy funkcji?",
@@ -129,7 +129,7 @@
   "Startup project not set": "Projekt startowy nie jest ustawiony",
   "Steps to reproduce": "Kroki do odtworzenia",
   "Stop": "Zatrzymaj",
-  "Suppress notification": "Suppress notification",
+  "Suppress notification": "Pomiń powiadomienie",
   "Synchronization timed out": "Przekroczono limit czasu synchronizacji",
   "The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": "Nie można zlokalizować zestawu .NET Core SDK: {0}. Debugowanie platformy .NET Core nie zostanie włączone. Upewnij się, że zestaw .NET Core SDK jest zainstalowany i znajduje się w ścieżce.",
   "The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "Zestaw .NET Core SDK znajdujący się w ścieżce jest za stary. Debugowanie platformy .NET Core nie zostanie włączone. Minimalna obsługiwana wersja to {0}.",