Merge pull request #6695 from dibarbet/merge_main

Merge main to release

.gitignore

@@ -3,6 +3,7 @@ obj
 node_modules
 out
 .roslyn/
+.roslynDevKit/
 .omnisharp/
 .omnisharp-*/
 .vs/

.vscodeignore

@@ -2,6 +2,7 @@
 .logs/**
 .nyc_output/**
 !.roslyn/**
+!.roslynDevKit/**
 !.omnisharp/**
 !.razor/**
 !.razoromnisharp/**

CHANGELOG.md

@@ -6,9 +6,13 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 ## Latest
-* Update Roslyn to 4.9.0-2.23563.2 (PR: [#6664](https://github.com/dotnet/vscode-csharp/pull/6664))
+* Update Roslyn to 4.9.0-2.23571.2 (PR: [#6681](https://github.com/dotnet/vscode-csharp/pull/6681))
+  * Workaround vscode bug with returning defaultBehavior from prepareRename (PR: [#70840](https://github.com/dotnet/roslyn/pull/70840))
   * Implement textDocument/prepareRename to show error in invalid rename locations (PR: [#70724](https://github.com/dotnet/roslyn/pull/70724))
   * Improve Hover markdown on 'await' keyword (PR: [#70629](https://github.com/dotnet/roslyn/pull/70629))
+* Remove blazor debugging extension (PR: [#5579](https://github.com/dotnet/vscode-csharp/pull/5579))
+* Fix issue with mismatch in casing in solution file (PR: [#6683](https://github.com/dotnet/vscode-csharp/pull/6683))
+* Add nested code actions to csharp extension (PR: [#6572](https://github.com/dotnet/vscode-csharp/pull/6572))
 * Direct debugger setting documentation to code.visualstudio.com (PR: [#6659](https://github.com/dotnet/vscode-csharp/pull/6659))
 * Add a timeout for downloading razor telemetry (PR: [#6622](https://github.com/dotnet/vscode-csharp/pull/6622))
 * Rearrange settings sections into actual categories (PR: [#6652](https://github.com/dotnet/vscode-csharp/pull/6652))

l10n/bundle.l10n.cs.json

@@ -50,6 +50,7 @@
   "Failed to set extension directory": "Nepovedlo se nastavit adresář rozšíření.",
   "Failed to set install complete file path": "Nepovedlo se nastavit úplnou cestu k souboru instalace",
   "Fix All Code Action": "Opravit všechny akce kódu",
+  "Fix All: ": "Opravit vše: ",
   "For further information visit {0}": "Další informace najdete na {0}",
   "For further information visit {0}.": "Další informace najdete na {0}.",
   "For more information about the 'console' field, see {0}": "Další informace o poli „console“ najdete v tématu {0}",
@@ -67,6 +68,7 @@
   "Machine information": "Informace o počítači",
   "More Information": "Další informace",
   "Name not defined in current configuration.": "Název není v aktuální konfiguraci definován.",
+  "Nested Code Action": "Akce vnořeného kódu",
   "No executable projects": "Žádné spustitelné projekty",
   "No launchable target found for '{0}'": "Pro „{0}“ se nenašel žádný spustitelný cíl",
   "No process was selected.": "Nebyl vybrán žádný proces.",

l10n/bundle.l10n.de.json

@@ -50,6 +50,7 @@
   "Failed to set extension directory": "Fehler beim Festlegen des Erweiterungsverzeichnisses",
   "Failed to set install complete file path": "Fehler beim Festlegen des Vollständigen Installationsdateipfads.",
   "Fix All Code Action": "Korrigieren der gesamten Codeaktion",
+  "Fix All: ": "Alle korrigieren: ",
   "For further information visit {0}": "Weitere Informationen finden Sie unter {0}",
   "For further information visit {0}.": "Weitere Informationen finden Sie unter {0}.",
   "For more information about the 'console' field, see {0}": "Weitere Informationen zum Feld \"Konsole\" finden Sie unter {0}",
@@ -67,6 +68,7 @@
   "Machine information": "Computerinformationen",
   "More Information": "Weitere Informationen",
   "Name not defined in current configuration.": "Der Name ist in der aktuellen Konfiguration nicht definiert.",
+  "Nested Code Action": "Geschachtelte Codeaktion",
   "No executable projects": "Keine ausführbaren Projekte",
   "No launchable target found for '{0}'": "Für \"{0}\" wurde kein startbares Ziel gefunden.",
   "No process was selected.": "Es wurde kein Prozess ausgewählt.",

l10n/bundle.l10n.es.json

@@ -50,6 +50,7 @@
   "Failed to set extension directory": "No se pudo establecer el directorio de la extensión",
   "Failed to set install complete file path": "No se pudo establecer la ruta de acceso completa del archivo de instalación",
   "Fix All Code Action": "Corregir toda la acción de código",
+  "Fix All: ": "Corregir todo: ",
   "For further information visit {0}": "Para obtener más información, visite {0}",
   "For further information visit {0}.": "Para obtener más información, visite {0}.",
   "For more information about the 'console' field, see {0}": "Para obtener más información sobre el campo \"consola\", consulte {0}",
@@ -67,6 +68,7 @@
   "Machine information": "Información del equipo",
   "More Information": "Más información",
   "Name not defined in current configuration.": "Nombre no definido en la configuración actual.",
+  "Nested Code Action": "Acción de código anidado",
   "No executable projects": "No hay proyectos ejecutables",
   "No launchable target found for '{0}'": "No se encontró ningún destino para '{0}' que se pueda iniciar.",
   "No process was selected.": "No se seleccionó ningún proceso.",

l10n/bundle.l10n.fr.json

@@ -37,7 +37,7 @@
   "Do not load any": "Ne charger aucun",
   "Does not contain .NET Core projects.": "Ne contient pas de projets .NET Core.",
   "Don't Ask Again": "Ne plus me poser la question",
-  "Downloading Razor Telemetry Package": "Downloading Razor Telemetry Package",
+  "Downloading Razor Telemetry Package": "Téléchargement du package de télémétrie Razor",
   "Enable launching a web browser when ASP.NET Core starts. For more information: {0}": "Activez le lancement d’un navigateur web au démarrage de ASP.NET Core. Pour plus d’informations : {0}",
   "Error Message: ": "Message d'erreur : ",
   "Expand": "Développer",
@@ -50,6 +50,7 @@
   "Failed to set extension directory": "Échec de la définition du répertoire d’extensions",
   "Failed to set install complete file path": "Échec de la définition du chemin d’accès complet à l’installation",
   "Fix All Code Action": "Corriger toutes les actions de code",
+  "Fix All: ": "Corriger tout : ",
   "For further information visit {0}": "Pour plus d’informations, consultez {0}",
   "For further information visit {0}.": "Pour plus d’informations, consultez {0}.",
   "For more information about the 'console' field, see {0}": "Pour plus d’informations sur le champ « console », consultez {0}",
@@ -67,6 +68,7 @@
   "Machine information": "Informations sur l'ordinateur",
   "More Information": "Plus d'informations",
   "Name not defined in current configuration.": "Nom non défini dans la configuration actuelle.",
+  "Nested Code Action": "Action de code imbriqué",
   "No executable projects": "Aucun projet exécutable",
   "No launchable target found for '{0}'": "Aucune cible pouvant être lancée n’a été trouvée pour « {0} »",
   "No process was selected.": "Aucun processus n’a été sélectionné.",

l10n/bundle.l10n.it.json

@@ -37,7 +37,7 @@
   "Do not load any": "Non caricare",
   "Does not contain .NET Core projects.": "Non contiene progetti .NET Core.",
   "Don't Ask Again": "Non chiedere più",
-  "Downloading Razor Telemetry Package": "Downloading Razor Telemetry Package",
+  "Downloading Razor Telemetry Package": "Download del pacchetto di telemetria Razor",
   "Enable launching a web browser when ASP.NET Core starts. For more information: {0}": "Abilita l'avvio di un Web browser all'avvio di ASP.NET Core. Per ulteriori informazioni: {0}",
   "Error Message: ": "Messaggio di errore: ",
   "Expand": "Espandi",
@@ -50,6 +50,7 @@
   "Failed to set extension directory": "Non è stato possibile impostare la directory delle estensioni",
   "Failed to set install complete file path": "Non è stato possibile impostare il percorso completo del file di installazione",
   "Fix All Code Action": "Correzione di tutte le azioni del codice",
+  "Fix All: ": "Correggi tutto: ",
   "For further information visit {0}": "Per ulteriori informazioni, visitare {0}",
   "For further information visit {0}.": "Per ulteriori informazioni, visitare {0}.",
   "For more information about the 'console' field, see {0}": "Per ulteriori informazioni sul campo 'console', vedere {0}",
@@ -67,6 +68,7 @@
   "Machine information": "Informazioni computer",
   "More Information": "Altre informazioni",
   "Name not defined in current configuration.": "Nome non definito nella configurazione corrente.",
+  "Nested Code Action": "Azione codice annidato",
   "No executable projects": "Nessun progetto eseguibile",
   "No launchable target found for '{0}'": "Non è stata trovata alcuna destinazione avviabile per '{0}'",
   "No process was selected.": "Nessun processo selezionato.",

l10n/bundle.l10n.ja.json

@@ -50,6 +50,7 @@
   "Failed to set extension directory": "拡張機能ディレクトリを設定できませんでした",
   "Failed to set install complete file path": "インストール完了ファイル パスを設定できませんでした",
   "Fix All Code Action": "すべてのコードアクションを修正する",
+  "Fix All: ": "すべて修正: ",
   "For further information visit {0}": "詳細については、{0} を参照してください",
   "For further information visit {0}.": "詳細については、{0} を参照してください。",
   "For more information about the 'console' field, see {0}": "'console' フィールドの詳細については、{0} を参照してください",
@@ -67,6 +68,7 @@
   "Machine information": "コンピューター情報",
   "More Information": "詳細",
   "Name not defined in current configuration.": "現在の構成で名前が定義されていません。",
+  "Nested Code Action": "入れ子になったコード アクション",
   "No executable projects": "実行可能なプロジェクトがありません",
   "No launchable target found for '{0}'": "'{0}' 向けに起動可能なターゲットが見つかりません",
   "No process was selected.": "プロセスが選択されていません。",

l10n/bundle.l10n.json

@@ -136,6 +136,8 @@
   "Restore": "Restore",
   "Sending request": "Sending request",
   "C# configuration has changed. Would you like to reload the window to apply your changes?": "C# configuration has changed. Would you like to reload the window to apply your changes?",
+  "Nested Code Action": "Nested Code Action",
+  "Fix All: ": "Fix All: ",
   "Pick a fix all scope": "Pick a fix all scope",
   "Fix All Code Action": "Fix All Code Action",
   "pipeArgs must be a string or a string array type": "pipeArgs must be a string or a string array type",

l10n/bundle.l10n.ko.json

@@ -50,6 +50,7 @@
   "Failed to set extension directory": "확장 디렉터리를 설정하지 못했습니다.",
   "Failed to set install complete file path": "설치 완료 파일 경로를 설정하지 못했습니다.",
   "Fix All Code Action": "모든 코드 동작 수정",
+  "Fix All: ": "모두 수정: ",
   "For further information visit {0}": "자세한 내용은 {0}을(를) 방문하세요.",
   "For further information visit {0}.": "자세한 내용은 {0}을(를) 방문하세요.",
   "For more information about the 'console' field, see {0}": "'콘솔' 필드에 대한 자세한 내용은 {0}을(를) 참조하세요.",
@@ -67,6 +68,7 @@
   "Machine information": "컴퓨터 정보",
   "More Information": "추가 정보",
   "Name not defined in current configuration.": "현재 구성에 정의되지 않은 이름입니다.",
+  "Nested Code Action": "중첩 코드 동작",
   "No executable projects": "실행 가능한 프로젝트 없음",
   "No launchable target found for '{0}'": "'{0}'에 대해 실행 가능한 대상이 없습니다.",
   "No process was selected.": "선택된 프로세스가 없습니다.",

l10n/bundle.l10n.pl.json

@@ -50,6 +50,7 @@
   "Failed to set extension directory": "Nie można ustawić katalogu rozszerzenia",
   "Failed to set install complete file path": "Nie można ustawić pełnej ścieżki pliku instalacji",
   "Fix All Code Action": "Napraw całą akcję kodu",
+  "Fix All: ": "Napraw wszystko: ",
   "For further information visit {0}": "Aby uzyskać więcej informacji, odwiedź witrynę {0}",
   "For further information visit {0}.": "Aby uzyskać więcej informacji, odwiedź witrynę {0}.",
   "For more information about the 'console' field, see {0}": "Aby uzyskać więcej informacji o polu „console”, zobacz {0}",
@@ -67,6 +68,7 @@
   "Machine information": "Informacje o maszynie",
   "More Information": "Więcej informacji",
   "Name not defined in current configuration.": "Nazwa nie jest zdefiniowana w bieżącej konfiguracji.",
+  "Nested Code Action": "Akcja kodu zagnieżdżonego",
   "No executable projects": "Brak projektów wykonywalnych",
   "No launchable target found for '{0}'": "Nie znaleziono elementu docelowego możliwego do uruchomienia w przypadku „{0}”",
   "No process was selected.": "Nie wybrano żadnego procesu.",

l10n/bundle.l10n.pt-br.json

@@ -50,6 +50,7 @@
   "Failed to set extension directory": "Falha ao configurar o diretório da extensão",
   "Failed to set install complete file path": "Falha ao configurar o caminho do arquivo para concluir a instalação",
   "Fix All Code Action": "Corrigir Todas as Ações de Código",
+  "Fix All: ": "Corrigir Tudo: ",
   "For further information visit {0}": "Para obter mais informações, acesse {0}",
   "For further information visit {0}.": "Para obter mais informações, visite {0}.",
   "For more information about the 'console' field, see {0}": "Para obter mais informações sobre o campo \"console\", confira {0}",
@@ -67,6 +68,7 @@
   "Machine information": "Informações do computador",
   "More Information": "Mais Informações",
   "Name not defined in current configuration.": "Nome não definido na configuração atual.",
+  "Nested Code Action": "Ação de Código Aninhado",
   "No executable projects": "Nenhum projeto executável",
   "No launchable target found for '{0}'": "Nenhum destino inicializável encontrado para \"{0}\"",
   "No process was selected.": "Nenhum processo foi selecionado.",

l10n/bundle.l10n.ru.json

@@ -50,6 +50,7 @@
   "Failed to set extension directory": "Не удалось установить каталог расширений",
   "Failed to set install complete file path": "Не удалось установить полный путь к файлу установки",
   "Fix All Code Action": "Исправить все действия с кодом",
+  "Fix All: ": "Исправить все: ",
   "For further information visit {0}": "Для получения дополнительных сведений посетите {0}",
   "For further information visit {0}.": "Для получения дополнительных сведений посетите {0}.",
   "For more information about the 'console' field, see {0}": "Дополнительные сведения о поле \"console\" см. в {0}",
@@ -67,6 +68,7 @@
   "Machine information": "Сведения о компьютере",
   "More Information": "Дополнительные сведения",
   "Name not defined in current configuration.": "Имя не определено в текущей конфигурации.",
+  "Nested Code Action": "Действие вложенного кода",
   "No executable projects": "Нет исполняемых проектов",
   "No launchable target found for '{0}'": "Не найдена запускаемая цель для \"{0}\"",
   "No process was selected.": "Процесс не выбран.",

l10n/bundle.l10n.tr.json

@@ -37,7 +37,7 @@
   "Do not load any": "Hiçbir şey yükleme",
   "Does not contain .NET Core projects.": ".NET Core projeleri içermiyor.",
   "Don't Ask Again": "Bir Daha Sorma",
-  "Downloading Razor Telemetry Package": "Downloading Razor Telemetry Package",
+  "Downloading Razor Telemetry Package": "Razor Telemetri Paketi İndiriliyor",
   "Enable launching a web browser when ASP.NET Core starts. For more information: {0}": "ASP.NET Core başlatıldığında bir web tarayıcısını başlatmayı etkinleştirin. Daha fazla bilgi için: {0}",
   "Error Message: ": "Hata İletisi: ",
   "Expand": "Genişlet",
@@ -50,6 +50,7 @@
   "Failed to set extension directory": "Uzantı dizini ayarlanamadı",
   "Failed to set install complete file path": "Tam dosya yolu yüklemesi ayarlanamadı",
   "Fix All Code Action": "Tümünü Düzelt Kod Eylemi",
+  "Fix All: ": "Tümünü Düzelt: ",
   "For further information visit {0}": "Daha fazla bilgi için bkz. {0}",
   "For further information visit {0}.": "Daha fazla bilgi için bkz. {0}.",
   "For more information about the 'console' field, see {0}": "'Konsol' alanı hakkında daha fazla bilgi için bkz. {0}",
@@ -67,6 +68,7 @@
   "Machine information": "Makine bilgileri",
   "More Information": "Daha Fazla Bilgi",
   "Name not defined in current configuration.": "Ad geçerli yapılandırmada tanımlanmadı.",
+  "Nested Code Action": "İç İçe Kod Eylemi",
   "No executable projects": "Yürütülebilir proje yok",
   "No launchable target found for '{0}'": "'{0}' için başlatılabilir hedef bulunamadı.",
   "No process was selected.": "İşlem seçilmedi.",

l10n/bundle.l10n.zh-cn.json

@@ -50,6 +50,7 @@
   "Failed to set extension directory": "无法设置扩展目录",
   "Failed to set install complete file path": "无法设置安装完成文件路径",
   "Fix All Code Action": "修复所有代码操作",
+  "Fix All: ": "全部修复: ",
   "For further information visit {0}": "有关详细信息，请访问 {0}",
   "For further information visit {0}.": "有关详细信息，请访问 {0}。",
   "For more information about the 'console' field, see {0}": "有关“控制台”字段的详细信息，请参阅 {0}",
@@ -67,6 +68,7 @@
   "Machine information": "计算机信息",
   "More Information": "详细信息",
   "Name not defined in current configuration.": "当前配置中未定义名称。",
+  "Nested Code Action": "嵌套代码操作",
   "No executable projects": "无可执行项目",
   "No launchable target found for '{0}'": "找不到 \"{0}\" 的可启动目标",
   "No process was selected.": "未选择任何进程。",

l10n/bundle.l10n.zh-tw.json

@@ -50,6 +50,7 @@
   "Failed to set extension directory": "無法設定延伸模組目錄",
   "Failed to set install complete file path": "無法設定安裝完整檔案路徑",
   "Fix All Code Action": "修正所有程式碼動作",
+  "Fix All: ": "全部修正: ",
   "For further information visit {0}": "如需詳細資訊，請造訪 {0}",
   "For further information visit {0}.": "如需詳細資訊，請造訪 {0}。",
   "For more information about the 'console' field, see {0}": "如需 [主控台] 欄位的詳細資訊，請參閱 {0}",
@@ -67,6 +68,7 @@
   "Machine information": "電腦資訊",
   "More Information": "其他資訊",
   "Name not defined in current configuration.": "未在目前的設定中定義名稱。",
+  "Nested Code Action": "巢狀程式碼動作",
   "No executable projects": "沒有可執行的專案",
   "No launchable target found for '{0}'": "'{0}' 找不到可啟動的目標",
   "No process was selected.": "未選取處理序。",

package.json

@@ -37,7 +37,7 @@
     }
   },
   "defaults": {
-    "roslyn": "4.9.0-2.23563.2",
+    "roslyn": "4.9.0-2.23571.2",
     "omniSharp": "1.39.10",
     "razor": "7.0.0-preview.23528.1",
     "razorOmnisharp": "7.0.0-preview.23363.1",