Skip to content

Commit f94bbb3

Browse files
authored
Merge pull request #6695 from dibarbet/merge_main
Merge main to release
2 parents 4f18a92 + 6f7904a commit f94bbb3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+352
-188
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ obj
33
node_modules
44
out
55
.roslyn/
6+
.roslynDevKit/
67
.omnisharp/
78
.omnisharp-*/
89
.vs/

.vscodeignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.logs/**
33
.nyc_output/**
44
!.roslyn/**
5+
!.roslynDevKit/**
56
!.omnisharp/**
67
!.razor/**
78
!.razoromnisharp/**

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@
66
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
77

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

l10n/bundle.l10n.cs.json

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

l10n/bundle.l10n.de.json

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

l10n/bundle.l10n.es.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"Failed to set extension directory": "No se pudo establecer el directorio de la extensión",
5151
"Failed to set install complete file path": "No se pudo establecer la ruta de acceso completa del archivo de instalación",
5252
"Fix All Code Action": "Corregir toda la acción de código",
53+
"Fix All: ": "Corregir todo: ",
5354
"For further information visit {0}": "Para obtener más información, visite {0}",
5455
"For further information visit {0}.": "Para obtener más información, visite {0}.",
5556
"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 @@
6768
"Machine information": "Información del equipo",
6869
"More Information": "Más información",
6970
"Name not defined in current configuration.": "Nombre no definido en la configuración actual.",
71+
"Nested Code Action": "Acción de código anidado",
7072
"No executable projects": "No hay proyectos ejecutables",
7173
"No launchable target found for '{0}'": "No se encontró ningún destino para '{0}' que se pueda iniciar.",
7274
"No process was selected.": "No se seleccionó ningún proceso.",

l10n/bundle.l10n.fr.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"Do not load any": "Ne charger aucun",
3838
"Does not contain .NET Core projects.": "Ne contient pas de projets .NET Core.",
3939
"Don't Ask Again": "Ne plus me poser la question",
40-
"Downloading Razor Telemetry Package": "Downloading Razor Telemetry Package",
40+
"Downloading Razor Telemetry Package": "Téléchargement du package de télémétrie Razor",
4141
"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}",
4242
"Error Message: ": "Message d'erreur : ",
4343
"Expand": "Développer",
@@ -50,6 +50,7 @@
5050
"Failed to set extension directory": "Échec de la définition du répertoire d’extensions",
5151
"Failed to set install complete file path": "Échec de la définition du chemin d’accès complet à l’installation",
5252
"Fix All Code Action": "Corriger toutes les actions de code",
53+
"Fix All: ": "Corriger tout : ",
5354
"For further information visit {0}": "Pour plus d’informations, consultez {0}",
5455
"For further information visit {0}.": "Pour plus d’informations, consultez {0}.",
5556
"For more information about the 'console' field, see {0}": "Pour plus d’informations sur le champ « console », consultez {0}",
@@ -67,6 +68,7 @@
6768
"Machine information": "Informations sur l'ordinateur",
6869
"More Information": "Plus d'informations",
6970
"Name not defined in current configuration.": "Nom non défini dans la configuration actuelle.",
71+
"Nested Code Action": "Action de code imbriqué",
7072
"No executable projects": "Aucun projet exécutable",
7173
"No launchable target found for '{0}'": "Aucune cible pouvant être lancée n’a été trouvée pour « {0} »",
7274
"No process was selected.": "Aucun processus n’a été sélectionné.",

l10n/bundle.l10n.it.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"Do not load any": "Non caricare",
3838
"Does not contain .NET Core projects.": "Non contiene progetti .NET Core.",
3939
"Don't Ask Again": "Non chiedere più",
40-
"Downloading Razor Telemetry Package": "Downloading Razor Telemetry Package",
40+
"Downloading Razor Telemetry Package": "Download del pacchetto di telemetria Razor",
4141
"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}",
4242
"Error Message: ": "Messaggio di errore: ",
4343
"Expand": "Espandi",
@@ -50,6 +50,7 @@
5050
"Failed to set extension directory": "Non è stato possibile impostare la directory delle estensioni",
5151
"Failed to set install complete file path": "Non è stato possibile impostare il percorso completo del file di installazione",
5252
"Fix All Code Action": "Correzione di tutte le azioni del codice",
53+
"Fix All: ": "Correggi tutto: ",
5354
"For further information visit {0}": "Per ulteriori informazioni, visitare {0}",
5455
"For further information visit {0}.": "Per ulteriori informazioni, visitare {0}.",
5556
"For more information about the 'console' field, see {0}": "Per ulteriori informazioni sul campo 'console', vedere {0}",
@@ -67,6 +68,7 @@
6768
"Machine information": "Informazioni computer",
6869
"More Information": "Altre informazioni",
6970
"Name not defined in current configuration.": "Nome non definito nella configurazione corrente.",
71+
"Nested Code Action": "Azione codice annidato",
7072
"No executable projects": "Nessun progetto eseguibile",
7173
"No launchable target found for '{0}'": "Non è stata trovata alcuna destinazione avviabile per '{0}'",
7274
"No process was selected.": "Nessun processo selezionato.",

l10n/bundle.l10n.ja.json

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

l10n/bundle.l10n.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@
136136
"Restore": "Restore",
137137
"Sending request": "Sending request",
138138
"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?",
139+
"Nested Code Action": "Nested Code Action",
140+
"Fix All: ": "Fix All: ",
139141
"Pick a fix all scope": "Pick a fix all scope",
140142
"Fix All Code Action": "Fix All Code Action",
141143
"pipeArgs must be a string or a string array type": "pipeArgs must be a string or a string array type",

0 commit comments

Comments
 (0)