Merge pull request #7311 from dotnet/merge_prerelease_to_release

Merge prerelease to release

.config/1espt/PipelineAutobaseliningConfig.yml

@@ -30,6 +30,8 @@ pipelines:
           lastModifiedDate: 2024-03-19
         armory:
           lastModifiedDate: 2024-03-19
+        policheck:
+          lastModifiedDate: 2024-06-27
       binary:
         credscan:
           lastModifiedDate: 2024-03-19

.config/guardian/.gdnbaselines

@@ -21,9 +21,9 @@
       ],
       "tool": "credscan",
       "ruleId": "CSCAN-GENERAL0020",
-      "createdDate": "2024-04-19 18:19:20Z",
-      "expirationDate": "2024-10-06 18:25:02Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2024-04-19 18:25:02Z"
+      "createdDate": "2024-06-27 21:30:23Z",
+      "expirationDate": "2024-12-14 21:44:58Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-06-27 21:44:58Z"
     }
   }
 }

.config/guardian/TSAConfig.gdntsa

@@ -0,0 +1,15 @@
+{
+    "codebaseName": "VSCode-CSharp-GitHub",
+    "notificationAliases": [
+        "[email protected]"
+    ],
+    "codebaseAdmins": [
+        "REDMOND\\phillipa",
+        "REDMOND\\arkalyan"
+    ],
+    "instanceUrl": "https://devdiv.visualstudio.com",
+    "projectName": "DevDiv",
+    "areaPath": "DevDiv\\NET Developer Experience\\CSharp and VB IDE\\VSCode",
+    "iterationPath": "DevDiv",
+    "allTools": true
+}

CHANGELOG.md

@@ -4,6 +4,15 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # Latest
+* 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
+* Fixing snippets in Razor LSP completion (PR: [#7274](https://github.com/dotnet/vscode-csharp/pull/7274))
+* Fix NRE in Razor completion. (PR: [#7272](https://github.com/dotnet/vscode-csharp/pull/7272))
+* Update debugger to indicate Monterey as the lowest supported MacOS version (PR: [#7256](https://github.com/dotnet/vscode-csharp/pull/7256))
+* Improve Razor completion experience (tag helpers, icons) (PR: [#7205](https://github.com/dotnet/vscode-csharp/pull/7205))
+
+# 2.36.19
 * Update Razor to 9.0.0-preview.24325.5 (PR: [#7277](https://github.com/dotnet/vscode-csharp/pull/7277))
   * Fix completion commit characters (PR: [#10533](https://github.com/dotnet/razor/pull/10533))
   * Add back roll foward to rzls (PR: [#10530](https://github.com/dotnet/razor/pull/10530))

azure-pipelines-official.yml

@@ -33,11 +33,21 @@ extends:
       name: netcore1espool-internal
       image: 1es-windows-2022
       os: windows
+    sdl:
+      sourceAnalysisPool:
+        name: netcore1espool-internal
+        image: 1es-windows-2022
+        os: windows
+      policheck:
+        enabled: true
+      tsa:
+        enabled: true
+        configFile: '$(Build.SourcesDirectory)/.config/guardian/TSAConfig.gdntsa'
     customBuildTags:
     - ES365AIMigrationTooling
     stages:
     - template: /azure-pipelines/build-all.yml@self
       parameters:
         versionNumberOverride: ${{ parameters.versionNumberOverride }}
         isOfficial: true
-        channel: ${{ parameters.channel }}
+        channel: ${{ parameters.channel }}

l10n/bundle.l10n.cs.json

@@ -150,7 +150,6 @@
   "Unable to resolve VSCode's version of CSharp": "Nepovedlo se rozpoznat verzi jazyka CSharp v nástroji VSCode.",
   "Unable to resolve VSCode's version of Html": "Nepovedlo se přeložit verzi HTML nástroje VSCode.",
   "Unexpected RuntimeId '{0}'.": "Neočekávané RuntimeId „{0}“",
-  "Unexpected completion trigger kind: {0}": "Neočekávaný druh triggeru dokončení: {0}",
   "Unexpected error when attaching to C# preview window.": "Při připojování k oknu náhledu jazyka C# došlo k neočekávané chybě.",
   "Unexpected error when attaching to HTML preview window.": "Při připojování k oknu náhledu HTML došlo k neočekávané chybě.",
   "Unexpected error when attaching to report Razor issue window.": "Při připojování k oknu pro nahlášení problémů s Razorem došlo k neočekávané chybě.",
@@ -168,7 +167,8 @@
   "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.",
   "You must first start the data collection before stopping.": "Před zastavením je zapotřebí nejdříve spustit shromažďování dat.",
   "Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.": "Váš pracovní prostor má více souborů řešení Visual Studio. Vyberte prosím jednu, abyste získali úplnou technologii IntelliSense.",
-  "[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[CHYBA] Ladicí program nelze nainstalovat. Ladicí program vyžaduje macOS 10.12 (Sierra) nebo novější.",
+  "[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'": "[CHYBA] Ladicí program nelze nainstalovat. Ladicí program není pro {0} podporován.",
+  "[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.": "[CHYBA] Ladicí program nelze nainstalovat. Ladicí program vyžaduje macOS 12 (Monterey) nebo novější.",
   "[ERROR] The debugger cannot be installed. Unknown platform.": "[CHYBA] Ladicí program nelze nainstalovat. Neznámá platforma.",
   "[ERROR]: C# Extension failed to install the debugger package.": "[CHYBA]: Rozšíření jazyka C# se nepodařilo nainstalovat balíček ladicího programu.",
   "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[UPOZORNĚNÍ]: Ladicí program .NET nepodporuje systém Windows pro platformu x86. Ladění nebude k dispozici.",

l10n/bundle.l10n.de.json

@@ -150,7 +150,6 @@
   "Unable to resolve VSCode's version of CSharp": "VSCode-Version von CSharp kann nicht aufgelöst werden.",
   "Unable to resolve VSCode's version of Html": "VSCode-Version von HTML kann nicht aufgelöst werden",
   "Unexpected RuntimeId '{0}'.": "Unerwartete RuntimeId \"{0}\".",
-  "Unexpected completion trigger kind: {0}": "Unerwartete Vervollständigungstriggerart: {0}",
   "Unexpected error when attaching to C# preview window.": "Unerwarteter Fehler beim Anfügen an das C#-Vorschaufenster.",
   "Unexpected error when attaching to HTML preview window.": "Unerwarteter Fehler beim Anfügen an das HTML-Vorschaufenster.",
   "Unexpected error when attaching to report Razor issue window.": "Unerwarteter Fehler beim Anfügen an das Fenster \"Razor-Problem melden\"",
@@ -168,7 +167,8 @@
   "You must first start the data collection before copying.": "Sie müssen die Datensammlung vor dem Kopieren starten.",
   "You must first start the data collection before stopping.": "Sie müssen zuerst die Datensammlung starten, bevor Sie sie beenden.",
   "Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.": "Ihr Arbeitsbereich umfasst mehrere Visual Studio-Projektmappendateien. Wählen Sie eine aus, um vollständiges IntelliSense zu erhalten.",
-  "[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[FEHLER] Der Debugger kann nicht installiert werden. Der Debugger erfordert macOS 10.12 (Sierra) oder höher.",
+  "[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'": "[FEHLER] Der Debugger kann nicht installiert werden. Der Debugger wird für „{0}“ nicht unterstützt.",
+  "[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.": "[FEHLER] Der Debugger kann nicht installiert werden. Der Debugger erfordert macOS 12 (Monterey) oder höher.",
   "[ERROR] The debugger cannot be installed. Unknown platform.": "[FEHLER] Der Debugger kann nicht installiert werden. Unbekannte Plattform.",
   "[ERROR]: C# Extension failed to install the debugger package.": "[FEHLER]: Fehler beim Installieren des Debuggerpakets durch die C#-Erweiterung.",
   "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[WARNUNG]: x86 Windows wird vom .NET-Debugger nicht unterstützt. Debuggen ist nicht verfügbar.",

l10n/bundle.l10n.es.json

@@ -150,7 +150,6 @@
   "Unable to resolve VSCode's version of CSharp": "No se puede resolver la versión de CSharp de VSCode",
   "Unable to resolve VSCode's version of Html": "No se puede resolver la versión de HTML de VSCode",
   "Unexpected RuntimeId '{0}'.": "RuntimeId '{0}' inesperado.",
-  "Unexpected completion trigger kind: {0}": "Tipo de desencadenador de finalización inesperado: {0}",
   "Unexpected error when attaching to C# preview window.": "Error inesperado al adjuntar a la ventana de vista previa de C#.",
   "Unexpected error when attaching to HTML preview window.": "Error inesperado al adjuntar a la ventana de vista previa HTML.",
   "Unexpected error when attaching to report Razor issue window.": "Error inesperado al adjuntar a la ventana de problemas de Razor de informe.",
@@ -168,7 +167,8 @@
   "You must first start the data collection before copying.": "Primero debe iniciar la recopilación de datos antes de copiar.",
   "You must first start the data collection before stopping.": "Primero debe iniciar la recopilación de datos antes de detenerse.",
   "Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.": "El área de trabajo tiene varios archivos de solución de Visual Studio; seleccione uno para obtener IntelliSense completo.",
-  "[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[ERROR] No se puede instalar el depurador. El depurador requiere macOS 10.12 (Sierra) o posterior.",
+  "[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'": "[ERROR] No se puede instalar el depurador. El depurador no se admite en '{0}'",
+  "[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.": "[ERROR] No se puede instalar el depurador. El depurador requiere macOS 12 (Monterey) o una versión más reciente.",
   "[ERROR] The debugger cannot be installed. Unknown platform.": "[ERROR] No se puede instalar el depurador. Plataforma desconocida.",
   "[ERROR]: C# Extension failed to install the debugger package.": "[ERROR]: la extensión de C# no pudo instalar el paquete del depurador.",
   "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[ADVERTENCIA]: El depurador de .NET no admite Windows x86. La depuración no estará disponible.",

l10n/bundle.l10n.fr.json

@@ -150,7 +150,6 @@
   "Unable to resolve VSCode's version of CSharp": "Impossible de résoudre la version de CSharp de VSCode",
   "Unable to resolve VSCode's version of Html": "Impossible de résoudre la version HTML de VSCode",
   "Unexpected RuntimeId '{0}'.": "RuntimeId « {0} » inattendu.",
-  "Unexpected completion trigger kind: {0}": "Genre de déclencheur d’achèvement inattendu : {0}",
   "Unexpected error when attaching to C# preview window.": "Erreur inattendue lors de l’attachement à la fenêtre d’aperçu C#.",
   "Unexpected error when attaching to HTML preview window.": "Erreur inattendue lors de l’attachement à la fenêtre d’aperçu HTML.",
   "Unexpected error when attaching to report Razor issue window.": "Erreur inattendue lors de l’attachement à la fenêtre de rapport du problème Razor.",
@@ -168,7 +167,8 @@
   "You must first start the data collection before copying.": "Vous devez d’abord démarrer la collecte de données avant de la copier.",
   "You must first start the data collection before stopping.": "Vous devez commencer par démarrer la collecte de données avant de l’arrêter.",
   "Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.": "Votre espace de travail comporte plusieurs fichiers solution Visual Studio ; sélectionnez-en un pour obtenir intelliSense complet.",
-  "[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[ERREUR] Impossible d’installer le débogueur. Le débogueur nécessite macOS 10.12 (Sierra) ou version ultérieure.",
+  "[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'": "[ERREUR] Impossible d’installer le débogueur. Le débogueur n’est pas pris en charge sur « {0} »",
+  "[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.": "[ERREUR] Impossible d’installer le débogueur. Le débogueur nécessite macOS 12 (Monterey) ou une version plus récente.",
   "[ERROR] The debugger cannot be installed. Unknown platform.": "[ERREUR] Impossible d’installer le débogueur. Plateforme inconnue.",
   "[ERROR]: C# Extension failed to install the debugger package.": "[ERREUR] : l’extension C# n’a pas pu installer le package du débogueur.",
   "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[AVERTISSEMENT] : Windows x86 n'est pas pris en charge par le débogueur .NET. Le débogage ne sera pas disponible.",

l10n/bundle.l10n.it.json

@@ -150,7 +150,6 @@
   "Unable to resolve VSCode's version of CSharp": "Non è possibile risolvere la versione VSCode di CSharp",
   "Unable to resolve VSCode's version of Html": "Non è possibile risolvere la versione HTML di VSCode",
   "Unexpected RuntimeId '{0}'.": "RuntimeId imprevisto '{0}'.",
-  "Unexpected completion trigger kind: {0}": "Tipo di trigger di completamento imprevisto: {0}",
   "Unexpected error when attaching to C# preview window.": "Errore imprevisto durante il collegamento alla finestra di anteprima di C#.",
   "Unexpected error when attaching to HTML preview window.": "Errore imprevisto durante il collegamento alla finestra di anteprima HTML.",
   "Unexpected error when attaching to report Razor issue window.": "Errore imprevisto durante il collegamento alla finestra di segnalazione del problema Razor.",
@@ -168,7 +167,8 @@
   "You must first start the data collection before copying.": "Prima di eseguire la copia, è necessario avviare la raccolta dati.",
   "You must first start the data collection before stopping.": "Prima di arrestare è necessario avviare la raccolta dati prima.",
   "Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.": "L'area di lavoro contiene più file di soluzione Visual Studio; selezionarne uno per ottenere IntelliSense completo.",
-  "[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[ERROR] Impossibile installare il debugger. Il debugger richiede macOS 10.12 (Sierra) o versione successiva.",
+  "[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'": "[ERROR] Impossibile installare il debugger. Il debugger non è supportato in '{0}'",
+  "[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.": "[ERROR] Impossibile installare il debugger. Il debugger richiede macOS 12 (Monterey) o una versione successiva.",
   "[ERROR] The debugger cannot be installed. Unknown platform.": "[ERROR] Impossibile installare il debugger. Piattaforma sconosciuta.",
   "[ERROR]: C# Extension failed to install the debugger package.": "[ERROR]: l'estensione C# non è riuscita a installare il pacchetto del debugger.",
   "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[AVVISO]: x86 Windows non è supportato dal debugger .NET. Il debug non sarà disponibile.",

l10n/bundle.l10n.ja.json

@@ -150,7 +150,6 @@
   "Unable to resolve VSCode's version of CSharp": "VSCode の CSharp のバージョンを解決できません",
   "Unable to resolve VSCode's version of Html": "VSCode の HTML のバージョンを解決できません",
   "Unexpected RuntimeId '{0}'.": "予期しない RuntimeId '{0}' です。",
-  "Unexpected completion trigger kind: {0}": "予期しない完了トリガーの種類: {0}",
   "Unexpected error when attaching to C# preview window.": "C# プレビュー ウィンドウにアタッチするときに予期しないエラーが発生しました。",
   "Unexpected error when attaching to HTML preview window.": "HTML プレビュー ウィンドウにアタッチするときに予期しないエラーが発生しました。",
   "Unexpected error when attaching to report Razor issue window.": "Razor の問題ウィンドウを報告するために添付するときに予期しないエラーが発生しました。",
@@ -168,7 +167,8 @@
   "You must first start the data collection before copying.": "コピーする前に、まずデータ収集を開始する必要があります。",
   "You must first start the data collection before stopping.": "停止する前に、まずデータ収集を開始する必要があります。",
   "Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.": "ワークスペースに複数の Visual Studio ソリューション ファイルがあります。完全な IntelliSense を入手するには、ファイルを 1 つ選択してください。",
-  "[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[エラー] デバッガーをインストールできません。デバッガーには macOS 10.12 (Sierra) 以降が必要です。",
+  "[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'": "[エラー] デバッガーをインストールできません。デバッガーは '{0}' でサポートされていません",
+  "[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.": "[エラー] デバッガーをインストールできません。デバッガーには macOS 12 (Monterey) 以降が必要です。",
   "[ERROR] The debugger cannot be installed. Unknown platform.": "[エラー] デバッガーをインストールできません。不明なプラットフォームです。",
   "[ERROR]: C# Extension failed to install the debugger package.": "[エラー]: C# 拡張機能でデバッガー パッケージをインストールできませんでした。",
   "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[警告]: x86 Windows は .NET デバッガーではサポートされていません。デバッグは使用できません。",

l10n/bundle.l10n.json

@@ -118,7 +118,6 @@
   "Unexpected error when attaching to C# preview window.": "Unexpected error when attaching to C# preview window.",
   "Razor C# copied to clipboard": "Razor C# copied to clipboard",
   "Copy C#": "Copy C#",
-  "Unexpected completion trigger kind: {0}": "Unexpected completion trigger kind: {0}",
   "1 reference": "1 reference",
   "{0} references": "{0} references",
   "Run and Debug: auto-detection found {0} for a launch browser": "Run and Debug: auto-detection found {0} for a launch browser",
@@ -167,7 +166,8 @@
   "Unexpected message received from debugger.": "Unexpected message received from debugger.",
   "[ERROR]: C# Extension failed to install the debugger package.": "[ERROR]: C# Extension failed to install the debugger package.",
   "Could not find a process id to attach.": "Could not find a process id to attach.",
-  "[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.",
+  "[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'": "[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'",
+  "[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.": "[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.",
   "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.",
   "[ERROR] The debugger cannot be installed. Unknown platform.": "[ERROR] The debugger cannot be installed. Unknown platform.",
   "Failed to complete the installation of the C# extension. Please see the error in the output window below.": "Failed to complete the installation of the C# extension. Please see the error in the output window below.",