Merge remote-tracking branch 'upstream/main' into merge_main_feature

Author: dibarbet

.vscode/launch.json

@@ -169,8 +169,8 @@
               "updatePackageDependencies"
           ],
           "env": {
-              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/57a8b1dc12af90bdc1b8e0036d4b5cf8/razorlanguageserver-linux-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/b59d0eb28baf935dcb81dc1aa91b8b37/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/b6de6303a02473ba8fbe4d127d3d0827/razorlanguageserver-linux-musl-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/a9c955bc5b09ee22f82309ec821ea630/razorlanguageserver-linux-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/0ad87856a78cf034b5e30423f51f42ca/razorlanguageserver-osx-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/d7dbdd01e9d1fc74e44de8bf5c2c3cf4/razorlanguageserver-osx-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/2d81ded18f0c7efa1c7e37489093a613/razorlanguageserver-platformagnostic-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/3f8fd08587afa3b615886dd745723497/razorlanguageserver-win-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/5d025f318cb834236a06439eb37ce889/razorlanguageserver-win-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/adb8c2855e48de8cdd7e39eb669583fd/razorlanguageserver-win-x86-7.0.0-preview.23627.2.zip",
-              "NEW_DEPS_VERSION": "7.0.0-preview.23627.2",
+              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/420a6ec206eb7453acee219ddfe97a14/razorlanguageserver-linux-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/8579bdea0d4232379986316e1f72572f/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/5b08fc7913366c8768377a2dcfa055db/razorlanguageserver-linux-musl-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/83d96cafc10aa3c3fc12d5bbacad6c89/razorlanguageserver-linux-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/e28e9c3759d96a1245e1bd1cc5c5a4d2/razorlanguageserver-osx-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/2726c9e015da3df40d96785def167b38/razorlanguageserver-osx-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/f0497330cb14752e01106d27040b4354/razorlanguageserver-platformagnostic-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/a38740e0591c3332438c589fc8785e3f/razorlanguageserver-win-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/dc56cfd34f209d91021fcd8ca5d40154/razorlanguageserver-win-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/b7731470e03e47b60da3c7fdb5d5a3a8/razorlanguageserver-win-x86-7.0.0-preview.24079.3.zip",
+              "NEW_DEPS_VERSION": "7.0.0-preview.24079.3",
               "NEW_DEPS_ID": "Razor"
           },
           "cwd": "${workspaceFolder}"
@@ -185,8 +185,8 @@
             "updatePackageDependencies"
         ],
         "env": {
-            "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/43f1ef568ef88acabea9c481f26fcf7b/devkittelemetry-linux-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/c4ff4d3e1476e78f2d73b48e26c69ef6/devkittelemetry-linux-musl-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/310f2c0528251ca3b879b62f7a434446/devkittelemetry-linux-musl-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/fa99bc6fb3d16f8c44f0ad61023e0589/devkittelemetry-linux-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/6d1472e8f350ab8f388c343db7760c9f/devkittelemetry-osx-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/5576ccdc7e3157c034a89ba13a63c915/devkittelemetry-osx-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/e1a9519ed126c32b21eb79758a09d7a6/devkittelemetry-platformagnostic-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/c3b220e7bcc471a816c6d6ba0dc351b0/devkittelemetry-win-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/7933e8f488ff35ed9204db2aaabe6e3b/devkittelemetry-win-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/e2017d3c8ae1a52ced7b31936b2a9d19/devkittelemetry-win-x86-7.0.0-preview.23627.2.zip",
-            "NEW_DEPS_VERSION": "7.0.0-preview.23627.2",
+            "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/84815a04739f5b763e2153c360e12cf6/devkittelemetry-linux-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/b4f50214c6aa2ce8b5262573d4b6b5df/devkittelemetry-linux-musl-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/adf4a7897daa09a568223ad7de3c72cf/devkittelemetry-linux-musl-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/c0449814753c26a2795808672c3b77e1/devkittelemetry-linux-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/c00d50f4ad20c4cce5aa200d3eeff9fd/devkittelemetry-osx-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/4e918b14388b718713c24f833e9a4a4e/devkittelemetry-osx-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/f983493b8869761430a81c661452fc1d/devkittelemetry-platformagnostic-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/ed3b467402a10d0a96f997a9c57b927b/devkittelemetry-win-arm64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/32f8cf11ce10df3e6c2af81a088b069f/devkittelemetry-win-x64-7.0.0-preview.24079.3.zip,https://download.visualstudio.microsoft.com/download/pr/6c4b89c1-7c4f-4db9-8751-073d652367ad/5a469c04cd09bbe907dc144dc42a5710/devkittelemetry-win-x86-7.0.0-preview.24079.3.zip",
+            "NEW_DEPS_VERSION": "7.0.0-preview.24079.3",
             "NEW_DEPS_ID": "RazorTelemetry"
         },
         "cwd": "${workspaceFolder}"

CHANGELOG.md

@@ -5,6 +5,10 @@
 
 ## Latest
 * Update Roslyn to run on .NET 8 (PR: [#6840](https://github.com/dotnet/vscode-csharp/pull/6840))
+* Update Razor to 7.0.0-preview.24079.3 (PR: [#6841](https://github.com/dotnet/vscode-csharp/pull/6841))
+  * Fix an issue with component hover not showing enough information (PR: [dotnet/razor#9862](https://github.com/dotnet/razor/pull/9862))
+* Fix regression in override completion (PR: [#6869](https://github.com/dotnet/vscode-csharp/pull/6869))
+* Update debugger to 2.18.0 release (PR: [#6853](https://github.com/dotnet/vscode-csharp/pull/6853))
 
 ## 2.17.7
 * Update Roslyn to 4.10.0-2.24102.11 (PR: [#6847](https://github.com/dotnet/vscode-csharp/pull/6847))

azure-pipelines-official.yml

@@ -3,6 +3,7 @@ trigger:
     include:
     - main
     - release
+    - prerelease
 pr: none
 
 parameters:

azure-pipelines.yml

@@ -4,11 +4,13 @@ trigger:
     include:
     - feature/*
     - release
+    - prerelease
     - main
 
 pr:
 - feature/*
 - release
+- prerelease
 - main
 
 stages:

l10n/bundle.l10n.cs.json

@@ -31,7 +31,7 @@
   "Could not determine CSharp content": "Nepovedlo se určit obsah CSharp.",
   "Could not determine Html content": "Nepovedlo se určit obsah HTML.",
   "Could not find '{0}' in or above '{1}'.": "Nepovedlo se najít {0} v {1} ani výše.",
-  "Could not find Razor Language Server executable within directory '{0}'": "V adresáři {0} se nepovedlo najít spustitelný soubor jazykového serveru Razor.",
+  "Could not find Razor Language Server executable '{0}' within directory": "V adresáři se nepovedlo najít spustitelný soubor jazykového serveru Razor {0}.",
   "Could not find a process id to attach.": "Nepovedlo se najít ID procesu, který se má připojit.",
   "Could not locate .NET Core project in '{0}'. Assets were not generated.": "V umístění {0} se nepovedlo najít projekt .NET Core. Prostředky se nevygenerovaly.",
   "Couldn't create self-signed certificate. See output for more information.": "Certifikát podepsaný svým držitelem (self-signed certificate) se nepovedlo vytvořit. Další informace najdete ve výstupu.",

l10n/bundle.l10n.de.json

@@ -31,7 +31,7 @@
   "Could not determine CSharp content": "Der CSharp-Inhalt konnte nicht bestimmt werden.",
   "Could not determine Html content": "Der HTML-Inhalt konnte nicht bestimmt werden.",
   "Could not find '{0}' in or above '{1}'.": "\"{0}\" wurde in oder über \"{1}\" nicht gefunden.",
-  "Could not find Razor Language Server executable within directory '{0}'": "Die ausführbare Datei des Razor-Sprachservers wurde im Verzeichnis \"{0}\" nicht gefunden.",
+  "Could not find Razor Language Server executable '{0}' within directory": "Die ausführbare Razor Language Server-Datei „{0}“ wurde im Verzeichnis nicht gefunden.",
   "Could not find a process id to attach.": "Es wurde keine anzufügende Prozess-ID gefunden.",
   "Could not locate .NET Core project in '{0}'. Assets were not generated.": "Das .NET Core-Projekt wurde in \"{0}\" nicht gefunden. Ressourcen wurden nicht generiert.",
   "Couldn't create self-signed certificate. See output for more information.": "Das selbstsignierte Zertifikat konnte nicht erstellt werden. Weitere Informationen finden Sie in der Ausgabe.",

l10n/bundle.l10n.es.json

@@ -31,7 +31,7 @@
   "Could not determine CSharp content": "No se pudo determinar el contenido de CSharp",
   "Could not determine Html content": "No se pudo determinar el contenido HTML",
   "Could not find '{0}' in or above '{1}'.": "No se pudo encontrar '{0}' en '' o encima de '{1}'.",
-  "Could not find Razor Language Server executable within directory '{0}'": "No se encontró el ejecutable del servidor de lenguaje Razor en el directorio '{0}'",
+  "Could not find Razor Language Server executable '{0}' within directory": "No se encontró el ejecutable del servidor de lenguaje Razor en el directorio ''{0}''",
   "Could not find a process id to attach.": "No se pudo encontrar un id. de proceso para adjuntar.",
   "Could not locate .NET Core project in '{0}'. Assets were not generated.": "No se pudo encontrar el proyecto de .NET Core en “{0}”. No se generaron recursos.",
   "Couldn't create self-signed certificate. See output for more information.": "No se pudo crear el certificado autofirmado. Vea la salida para obtener más información.",

l10n/bundle.l10n.fr.json

@@ -31,7 +31,7 @@
   "Could not determine CSharp content": "Impossible de déterminer le contenu CSharp",
   "Could not determine Html content": "Impossible de déterminer le contenu HTML",
   "Could not find '{0}' in or above '{1}'.": "Impossible de trouver '{0}' dans ou au-dessus '{1}'.",
-  "Could not find Razor Language Server executable within directory '{0}'": "Impossible de trouver l’exécutable du serveur de langage Razor dans le répertoire '{0}'",
+  "Could not find Razor Language Server executable '{0}' within directory": "Impossible de trouver l’exécutable du serveur de langage Razor dans le répertoire « {0} »",
   "Could not find a process id to attach.": "Impossible de trouver un ID de processus à joindre.",
   "Could not locate .NET Core project in '{0}'. Assets were not generated.": "Impossible de localiser le projet .NET Core dans '{0}'. Les actifs n'ont pas été générés.",
   "Couldn't create self-signed certificate. See output for more information.": "Impossible de créer un certificat auto-signé. Pour plus d’informations, consultez la sortie.",

l10n/bundle.l10n.it.json

@@ -31,7 +31,7 @@
   "Could not determine CSharp content": "Non è stato possibile determinare il contenuto CSharp",
   "Could not determine Html content": "Non è stato possibile determinare il contenuto HTML",
   "Could not find '{0}' in or above '{1}'.": "Non è stato possibile trovare '{0}{0}' in o sopra '{1}'.",
-  "Could not find Razor Language Server executable within directory '{0}'": "Non è stato possibile trovare l'eseguibile del server di linguaggio Razor nella directory '{0}'",
+  "Could not find Razor Language Server executable '{0}' within directory": "Non è possibile trovare l'eseguibile del server di linguaggio Razor '{0}' nella directory",
   "Could not find a process id to attach.": "Non è stato possibile trovare un ID processo da collegare.",
   "Could not locate .NET Core project in '{0}'. Assets were not generated.": "Non è stato possibile individuare il progetto .NET Core in \"{0}\". Gli asset non sono stati generati.",
   "Couldn't create self-signed certificate. See output for more information.": "Impossibile creare il certificato autofirmato. Per altre informazioni, vedere l'output.",

l10n/bundle.l10n.ja.json

@@ -31,7 +31,7 @@
   "Could not determine CSharp content": "CSharp コンテンツを特定できませんでした",
   "Could not determine Html content": "HTML コンテンツを特定できませんでした",
   "Could not find '{0}' in or above '{1}'.": "'{1}' 以上に '{0}' が見つかりませんでした。",
-  "Could not find Razor Language Server executable within directory '{0}'": "ディレクトリ '{0}' 内に Razor 言語サーバーの実行可能ファイルが見つかりませんでした",
+  "Could not find Razor Language Server executable '{0}' within directory": "ディレクトリ内に Razor 言語サーバーの実行可能ファイル '{0}' が見つかりませんでした",
   "Could not find a process id to attach.": "アタッチするプロセス ID が見つかりませんでした。",
   "Could not locate .NET Core project in '{0}'. Assets were not generated.": "'{0}' で .NET Core プロジェクトが見つかりませんでした。アセットは生成されませんでした。",
   "Couldn't create self-signed certificate. See output for more information.": "自己署名証明書を作成できませんでした。詳細については、出力を参照してください。",