Skip to content

Commit ebddccb

Browse files
authored
Merge branch 'main' into update_roslyn
2 parents 8f1a62d + 1ce3303 commit ebddccb

17 files changed

+38
-34
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
* Fix 'this' keyword not being recomended where allowed(PR: [#79514](https://github.com/dotnet/roslyn/pull/79514))
2222
* Fix 'switch' keyword recomendations after an expression(PR: [#79515](https://github.com/dotnet/roslyn/pull/79515))
2323
* Suggest proper 'Async'-suffixed name for Task-returning symbols(PR: [#79518](https://github.com/dotnet/roslyn/pull/79518))
24+
* Bump Razor to 10.0.0-preview.25377.4 (PR: [#8459](https://github.com/dotnet/vscode-csharp/pull/8459))
25+
* Cache MEF composition in OOP and VS Code (PR: [#12041](https://github.com/dotnet/razor/pull/12041))
2426
* Fix issue acquiring components when using proxies (PR: [#8457](https://github.com/dotnet/vscode-csharp/pull/8457))
2527
* Support activating the extension with limited support in untrusted workspaces (PR: [#8435](https://github.com/dotnet/vscode-csharp/pull/8435))
2628
* Report specific c# settings in issue template (PR: [#8433](https://github.com/dotnet/vscode-csharp/pull/8433))

CONTRIBUTING.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,22 +118,24 @@ This section provides instructions on how to debug locally built Roslyn and Razo
118118

119119
#### Configuring Roslyn Language Server
120120

121-
In your `settings.json` file, add the following lines:
121+
Add the following lines to your `settings.json`. Replace `<roslynRepoRoot>` with the actual path to your Roslyn repository.
122122

123123
```json
124124
"dotnet.server.waitForDebugger": true,
125125
"dotnet.server.path": "<roslynRepoRoot>/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net9.0/Microsoft.CodeAnalysis.LanguageServer.dll"
126126
```
127127

128-
Replace <roslynRepoRoot> with the actual path to your Roslyn repository.
128+
---
129129

130-
If using C# Dev Kit, you can also override the Roslyn DevKit component in your `settings.json`:
130+
**If using C# Dev Kit**, you also need to override the Roslyn DevKit component in your `settings.json`. This step is not necessary if you are not loading the Dev Kit extension.
131131
```json
132132
"dotnet.server.componentPaths": {
133133
"roslynDevKit": "<roslynRepoRoot>/artifacts/bin/Microsoft.VisualStudio.LanguageServices.DevKit/Debug/net9.0"
134134
},
135135
```
136136

137+
---
138+
137139
Or, in VSCode settings (`Ctrl+,`):
138140

139141
1. Search for `dotnet server`.
@@ -143,15 +145,15 @@ Or, in VSCode settings (`Ctrl+,`):
143145

144146
#### Configuring Razor Language Server
145147

146-
In your workspace settings.json file, add the following lines:
148+
Add the following lines to your `settings.json`. Replace `<razorRepoRoot>` with the actual path to your Razor repository.
147149

148150
```json
149151
"razor.languageServer.debug": true,
150152
"razor.languageServer.directory": "<razorRepoRoot>/artifacts/bin/rzls/Debug/net9.0",
151153
"razor.server.trace": "Debug"
152154
```
153155

154-
Replace `$razorRepoRoot` with your actual values.
156+
---
155157

156158
Or, in VSCode settings (`Ctrl+,`):
157159

l10n/bundle.l10n.cs.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"Razor issue data collection stopped. Copying issue content...": "Shromažďování dat o problému s Razorem se zastavilo. Kopíruje se obsah problému…",
139139
"Razor.VSCode version": "Verze Razor.VSCode",
140140
"Recording trace...": "Zaznamenává se trasování...",
141-
"Reload C# Extension": "Reload C# Extension",
141+
"Reload C# Extension": "Znovu načíst rozšíření C#",
142142
"Reload Window": "Znovu načíst okno",
143143
"Replace existing build and debug assets?": "Nahradit existující prostředky sestavení a ladění?",
144144
"Report Razor Issue": "Nahlásit problém s Razorem",
@@ -215,7 +215,7 @@
215215
"WARNING": "UPOZORNĚNÍ",
216216
"Workspace information": "Informace o pracovním prostoru",
217217
"Workspace projects": "Projekty pracovních prostorů",
218-
"Workspace trust has changed. Would you like to reload the C# extension?": "Workspace trust has changed. Would you like to reload the C# extension?",
218+
"Workspace trust has changed. Would you like to reload the C# extension?": "Vztah důvěryhodnosti pracovního prostoru se změnil. Chcete znovu načíst rozšíření C#?",
219219
"Yes": "Ano",
220220
"You can modify the default arguments if needed": "V případě potřeby můžete změnit výchozí argumenty.",
221221
"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.",

l10n/bundle.l10n.de.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"Razor issue data collection stopped. Copying issue content...": "Die Sammlung von Razor-Problemdaten wurde beendet. Probleminhalt wird kopiert...",
139139
"Razor.VSCode version": "Razor.VSCode-Version",
140140
"Recording trace...": "Ablaufverfolgung wird aufgezeichnet...",
141-
"Reload C# Extension": "Reload C# Extension",
141+
"Reload C# Extension": "C#-Erweiterung neu laden",
142142
"Reload Window": "Fenster neu laden",
143143
"Replace existing build and debug assets?": "Vorhandene Build- und Debugressourcen ersetzen?",
144144
"Report Razor Issue": "Razor-Problem melden",
@@ -215,7 +215,7 @@
215215
"WARNING": "WARNUNG",
216216
"Workspace information": "Arbeitsbereichsinformationen",
217217
"Workspace projects": "Arbeitsbereichsprojekte",
218-
"Workspace trust has changed. Would you like to reload the C# extension?": "Workspace trust has changed. Would you like to reload the C# extension?",
218+
"Workspace trust has changed. Would you like to reload the C# extension?": "Die Vertrauensstellung des Arbeitsbereichs wurde geändert. Möchten Sie die C#-Erweiterung neu laden?",
219219
"Yes": "Ja",
220220
"You can modify the default arguments if needed": "Sie können die Standardargumente bei Bedarf ändern.",
221221
"You must first start the data collection before copying.": "Sie müssen die Datensammlung vor dem Kopieren starten.",

l10n/bundle.l10n.es.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"Razor issue data collection stopped. Copying issue content...": "Se detuvo la recopilación de datos de problemas de Razor. Copiando el contenido del problema...",
139139
"Razor.VSCode version": "Versión de Razor.VSCode",
140140
"Recording trace...": "Grabando seguimiento...",
141-
"Reload C# Extension": "Reload C# Extension",
141+
"Reload C# Extension": "Recargar la extensión de C#",
142142
"Reload Window": "Recargar ventana",
143143
"Replace existing build and debug assets?": "¿Quiere reemplazar los recursos de compilación y depuración existentes?",
144144
"Report Razor Issue": "Notificar problema de Razor",
@@ -215,7 +215,7 @@
215215
"WARNING": "ADVERTENCIA",
216216
"Workspace information": "Ver información del área de trabajo",
217217
"Workspace projects": "Proyectos de área de trabajo",
218-
"Workspace trust has changed. Would you like to reload the C# extension?": "Workspace trust has changed. Would you like to reload the C# extension?",
218+
"Workspace trust has changed. Would you like to reload the C# extension?": "La confianza del área de trabajo ha cambiado. ¿Desea recargar la extensión de C#?",
219219
"Yes": "",
220220
"You can modify the default arguments if needed": "Puede modificar los argumentos predeterminados si es necesario",
221221
"You must first start the data collection before copying.": "Primero debe iniciar la recopilación de datos antes de copiar.",

l10n/bundle.l10n.fr.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"Razor issue data collection stopped. Copying issue content...": "La collecte des données de problème Razor s’est arrêtée. Copie du contenu du problème...",
139139
"Razor.VSCode version": "Version de Razor.VSCode",
140140
"Recording trace...": "Enregistrement de la trace...",
141-
"Reload C# Extension": "Reload C# Extension",
141+
"Reload C# Extension": "Recharger l'extension C#",
142142
"Reload Window": "Recharger la fenêtre",
143143
"Replace existing build and debug assets?": "Remplacer les ressources de build et de débogage existantes ?",
144144
"Report Razor Issue": "Signaler un problème Razor",
@@ -215,7 +215,7 @@
215215
"WARNING": "AVERTISSEMENT",
216216
"Workspace information": "Informations sur l’espace de travail",
217217
"Workspace projects": "Projets de l’espace de travail",
218-
"Workspace trust has changed. Would you like to reload the C# extension?": "Workspace trust has changed. Would you like to reload the C# extension?",
218+
"Workspace trust has changed. Would you like to reload the C# extension?": "La confiance dans l’espace de travail a changé. Souhaitez-vous recharger l'extension C# ?",
219219
"Yes": "Oui",
220220
"You can modify the default arguments if needed": "Vous pouvez modifier les arguments par défaut si nécessaire",
221221
"You must first start the data collection before copying.": "Vous devez d’abord démarrer la collecte de données avant de la copier.",

l10n/bundle.l10n.it.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"Razor issue data collection stopped. Copying issue content...": "La raccolta dei dati del problema Razor è stata arrestata. Copia del contenuto del problema in corso...",
139139
"Razor.VSCode version": "Versione Razor.VSCode",
140140
"Recording trace...": "Registrazione della traccia in corso...",
141-
"Reload C# Extension": "Reload C# Extension",
141+
"Reload C# Extension": "Ricaricare l'estensione C#",
142142
"Reload Window": "Ricaricare la finestra",
143143
"Replace existing build and debug assets?": "Sostituire gli asset di compilazione ed debug esistenti?",
144144
"Report Razor Issue": "Segnala problema Razor",
@@ -215,7 +215,7 @@
215215
"WARNING": "AVVISO",
216216
"Workspace information": "Informazioni area di lavoro",
217217
"Workspace projects": "Progetti dell’area di lavoro",
218-
"Workspace trust has changed. Would you like to reload the C# extension?": "Workspace trust has changed. Would you like to reload the C# extension?",
218+
"Workspace trust has changed. Would you like to reload the C# extension?": "L'attendibilità dell'area di lavoro è cambiata. Ricaricare l'estensione C#?",
219219
"Yes": "",
220220
"You can modify the default arguments if needed": "Se necessario, è possibile modificare gli argomenti predefiniti",
221221
"You must first start the data collection before copying.": "Prima di eseguire la copia, è necessario avviare la raccolta dati.",

l10n/bundle.l10n.ja.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"Razor issue data collection stopped. Copying issue content...": "Razor の問題のデータ収集が停止しました。 問題の内容をコピーしています...",
139139
"Razor.VSCode version": "Razor.VSCode のバージョン",
140140
"Recording trace...": "トレースを記録しています...",
141-
"Reload C# Extension": "Reload C# Extension",
141+
"Reload C# Extension": "C# 拡張機能を再度読み込む",
142142
"Reload Window": "ウィンドウの再読み込み",
143143
"Replace existing build and debug assets?": "既存のビルドとデバッグ アセットを置き換えますか?",
144144
"Report Razor Issue": "Razor の問題を報告する",
@@ -215,7 +215,7 @@
215215
"WARNING": "警告",
216216
"Workspace information": "ワークスペース情報",
217217
"Workspace projects": "ワークスペース プロジェクト",
218-
"Workspace trust has changed. Would you like to reload the C# extension?": "Workspace trust has changed. Would you like to reload the C# extension?",
218+
"Workspace trust has changed. Would you like to reload the C# extension?": "ワークスペースの信頼が変更されました。C# 拡張機能を再度読み込みますか?",
219219
"Yes": "はい",
220220
"You can modify the default arguments if needed": "必要に応じて既定の引数を変更できます",
221221
"You must first start the data collection before copying.": "コピーする前に、まずデータ収集を開始する必要があります。",

l10n/bundle.l10n.ko.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"Razor issue data collection stopped. Copying issue content...": "Razor 문제 데이터 수집이 중지되었습니다. 문제 내용을 복사하는 중...",
139139
"Razor.VSCode version": "Razor.VSCode 버전",
140140
"Recording trace...": "추적 기록 중...",
141-
"Reload C# Extension": "Reload C# Extension",
141+
"Reload C# Extension": "C# 확장 다시 로드",
142142
"Reload Window": "창 다시 로드",
143143
"Replace existing build and debug assets?": "기존 빌드 및 디버그 자산을 바꾸시겠습니까?",
144144
"Report Razor Issue": "Razor 문제 보고",
@@ -215,7 +215,7 @@
215215
"WARNING": "경고",
216216
"Workspace information": "작업 영역 정보",
217217
"Workspace projects": "작업 영역 프로젝트",
218-
"Workspace trust has changed. Would you like to reload the C# extension?": "Workspace trust has changed. Would you like to reload the C# extension?",
218+
"Workspace trust has changed. Would you like to reload the C# extension?": "작업 영역 신뢰가 변경되었습니다. C# 확장을 다시 로드하시겠습니까?",
219219
"Yes": "",
220220
"You can modify the default arguments if needed": "필요한 경우 기본 인수를 수정할 수 있습니다.",
221221
"You must first start the data collection before copying.": "복사하기 전에 먼저 데이터 수집을 시작해야 합니다.",

l10n/bundle.l10n.pl.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"Razor issue data collection stopped. Copying issue content...": "Zbieranie danych problemu aparatu Razor zostało zatrzymane. Trwa kopiowanie zawartości problemu...",
139139
"Razor.VSCode version": "Wersja Razor.VSCode",
140140
"Recording trace...": "Trwa rejestrowanie śledzenia...",
141-
"Reload C# Extension": "Reload C# Extension",
141+
"Reload C# Extension": "Ponowne ładowanie rozszerzenia języka C#",
142142
"Reload Window": "Ponownie załaduj okno",
143143
"Replace existing build and debug assets?": "Zamienić istniejące zasoby kompilacji i debugowania?",
144144
"Report Razor Issue": "Zgłoś problem z aparatem Razor",
@@ -215,7 +215,7 @@
215215
"WARNING": "OSTRZEŻENIE",
216216
"Workspace information": "Informacje o obszarze roboczym",
217217
"Workspace projects": "Projekty obszaru roboczego",
218-
"Workspace trust has changed. Would you like to reload the C# extension?": "Workspace trust has changed. Would you like to reload the C# extension?",
218+
"Workspace trust has changed. Would you like to reload the C# extension?": "Relacja zaufania obszaru roboczego została zmieniona. Czy chcesz ponownie załadować rozszerzenie języka C#?",
219219
"Yes": "Tak",
220220
"You can modify the default arguments if needed": "W razie potrzeby możesz zmodyfikować argumenty domyślne",
221221
"You must first start the data collection before copying.": "Przed skopiowaniem należy najpierw rozpocząć zbieranie danych.",

0 commit comments

Comments
 (0)