Skip to content

Commit 15e97c2

Browse files
[automated] Merge branch 'main' => 'prerelease' (#8111)
2 parents 3132bb1 + d22e884 commit 15e97c2

34 files changed

+449
-158
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ out
1313
.razoromnisharp/
1414
.razortelemetry/
1515
.razorDevKit/
16+
.razorExtension/
1617
.vscode-test/
1718
msbuild/signing/signJs/*.log
1819
msbuild/signing/signVsix/*.log

.vscodeignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
!.razor/**
88
!.razorDevKit/**
99
!.razoromnisharp/**
10+
!.razorExtension/**
1011
.rpt2_cache/**
1112
.config/**
1213
.devcontainer/**

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,24 @@
33
- Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

6+
# 2.72.x
7+
* Bump xamlTools to 17.14.35927.264 (PR: [#8100](https://github.com/dotnet/vscode-csharp/pull/8100))
8+
* Update Roslyn to 4.14.0-3.25178.1 (PR: [#8103](https://github.com/dotnet/vscode-csharp/pull/8103))
9+
* Merge `null conditional assignment` to main (PR: [#77867](https://github.com/dotnet/roslyn/pull/77867))
10+
* Merge `features/extensions` into `main` (PR: [#77851](https://github.com/dotnet/roslyn/pull/77851))
11+
* Set the default namespace for the project and proper folders for documents (PR: [#77787](https://github.com/dotnet/roslyn/pull/77787))
12+
* Fix move to namespace offering for primary constructor (PR: [#77751](https://github.com/dotnet/roslyn/pull/77751))
13+
* Rework analyzer assembly loading (PR: [#77004](https://github.com/dotnet/roslyn/pull/77004))
14+
* Improve raw string completion (PR: [#77742](https://github.com/dotnet/roslyn/pull/77742))
15+
* Avoid adding duplicate suppressors to the host analyzer arrays (PR: [#77062](https://github.com/dotnet/roslyn/pull/77062))
16+
* Cleanup and make semantic token processing and testing code more consistent (PR: [#77684](https://github.com/dotnet/roslyn/pull/77684))
17+
* Fix generation of attribute with array constant (PR: [#77661](https://github.com/dotnet/roslyn/pull/77661))
18+
* Bump Razor to (PR: [#8096](https://github.com/dotnet/vscode-csharp/pull/8096))
19+
* Some code actions ordering and cleanup (#11659) (PR: [#11659](https://github.com/dotnet/razor/pull/11659))
20+
* Emit pragmas for empty @ expressions in MVC (#11653) (PR: [#11653](https://github.com/dotnet/razor/pull/11653))
21+
* Couple of small code actions tweaks (#11630) (PR: [#11630](https://github.com/dotnet/razor/pull/11630))
22+
* Fix text area formatting in the new formatting engine (#11624) (PR: [#11624](https://github.com/dotnet/razor/pull/11624))
23+
624
# 2.71.x
725
* Bump xamlTools to 17.14.35920.284 (PR: [#8083](https://github.com/dotnet/vscode-csharp/pull/8083))
826
* Localization (PR: [#8084](https://github.com/dotnet/vscode-csharp/pull/8084))

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ The server DLL is typically at `$roslynRepoRoot/artifacts/bin/Microsoft.CodeAnal
8282
1. Clone the [Razor repository](https://github.com/dotnet/razor). This repository contains the Razor server implementation.
8383
2. Follow the build instructions provided in the repository.
8484

85-
The server DLL is typically at `$razorRepoRoot/artifacts/bin/rzls/Debug/net8.0`.
85+
The server DLL is typically at `$razorRepoRoot/artifacts/bin/rzls/Debug/net9.0`.
8686

8787
### Debugging Local Language Servers
8888

@@ -135,7 +135,7 @@ In your workspace settings.json file, add the following lines:
135135

136136
```json
137137
"razor.languageServer.debug": true,
138-
"razor.languageServer.directory": "<razorRepoRoot>/artifacts/bin/rzls/Debug/net8.0",
138+
"razor.languageServer.directory": "<razorRepoRoot>/artifacts/bin/rzls/Debug/net9.0",
139139
"razor.server.trace": "Debug"
140140
```
141141

l10n/bundle.l10n.cs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"Cannot create .NET debug configurations. The server is still initializing or has exited unexpectedly.": "Nelze vytvořit konfigurace ladění .NET. Server se stále inicializuje nebo se neočekávaně ukončil.",
2626
"Cannot load Razor language server because the directory was not found: '{0}'": "Nepovedlo se načíst jazykový server Razor, protože se nenašel adresář: {0}",
2727
"Cannot resolve .NET debug configurations. The server is still initializing or has exited unexpectedly.": "Nelze přeložit konfigurace ladění .NET. Server se stále inicializuje nebo se neočekávaně ukončil.",
28-
"Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".": "Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".",
28+
"Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".": "Nelze spustit shromažďování protokolů Razor, když je {0} nastaveno na {1}. Otevřete prosím okno výstupu, zvolte Protokol Razor a pomocí ikony ozubeného kola ověřte, že úroveň protokolu je nastavená na Ladit nebo Trasovat.",
2929
"Cannot stop Razor Language Server as it is already stopped.": "Jazykový server Razor se nedá zastavit, protože už je zastavený.",
3030
"Choose": "Zvolit",
3131
"Choose and set default": "Zvolit a nastavit výchozí",

l10n/bundle.l10n.de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"Cannot create .NET debug configurations. The server is still initializing or has exited unexpectedly.": ".NET-Debugkonfigurationen können nicht erstellt werden. Der Server wird noch initialisiert oder wurde unerwartet beendet.",
2626
"Cannot load Razor language server because the directory was not found: '{0}'": "Der Razor-Sprachserver kann nicht geladen werden, weil das Verzeichnis nicht gefunden wurde: \"{0}\"",
2727
"Cannot resolve .NET debug configurations. The server is still initializing or has exited unexpectedly.": ".NET-Debugkonfigurationen können nicht aufgelöst werden. Der Server wird noch initialisiert oder wurde unerwartet beendet.",
28-
"Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".": "Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".",
28+
"Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".": "Die Erfassung von Razor-Protokollen kann nicht gestartet werden, wenn {0} auf {1} festgelegt ist. Öffnen Sie das Ausgabefenster, wählen Sie das „Razor-Protokoll“ aus und stellen Sie über das Zahnradsymbol sicher, dass die Protokollstufe auf „Debuggen“ oder „Nachverfolgung“ eingestellt ist.",
2929
"Cannot stop Razor Language Server as it is already stopped.": "Der Razor-Sprachserver kann nicht beendet werden, da er bereits beendet wurde.",
3030
"Choose": "Auswählen",
3131
"Choose and set default": "Standard auswählen und festlegen",

l10n/bundle.l10n.es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"Cannot create .NET debug configurations. The server is still initializing or has exited unexpectedly.": "No se pueden crear configuraciones de depuración de .NET. El servidor aún se está inicializando o se cerró inesperadamente.",
2626
"Cannot load Razor language server because the directory was not found: '{0}'": "No se puede cargar el servidor de lenguaje Razor porque no se encontró el directorio: '{0}'",
2727
"Cannot resolve .NET debug configurations. The server is still initializing or has exited unexpectedly.": "No se pueden resolver configuraciones de depuración de .NET. El servidor aún se está inicializando o se cerró inesperadamente.",
28-
"Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".": "Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".",
28+
"Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".": "No se puede iniciar la recopilación de registros de Razor cuando {0} está establecido en {1}. Abra la ventana de salida, elija \"Registro de Razor\" y utilice el icono de engranaje para asegurarse de que el nivel de registro esté configurado en \"Depurar\" o \"Seguimiento\".",
2929
"Cannot stop Razor Language Server as it is already stopped.": "No se puede detener el servidor de lenguaje Razor porque ya está detenido.",
3030
"Choose": "Elegir",
3131
"Choose and set default": "Elegir y establecer el valor predeterminado",

l10n/bundle.l10n.fr.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"Cannot create .NET debug configurations. The server is still initializing or has exited unexpectedly.": "Impossible de créer des configurations de débogage .NET. Le serveur est toujours en cours d’initialisation ou s’est arrêté de manière inattendue.",
2626
"Cannot load Razor language server because the directory was not found: '{0}'": "Impossible de charger le serveur de langage Razor, car le répertoire est introuvable : «{0}»",
2727
"Cannot resolve .NET debug configurations. The server is still initializing or has exited unexpectedly.": "Impossible de résoudre les configurations de débogage .NET. Le serveur est toujours en cours d’initialisation ou s’est arrêté de manière inattendue.",
28-
"Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".": "Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".",
28+
"Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".": "Impossible de démarrer la collecte des journaux Razor lorsque {0} est défini sur {1}. Veuillez ouvrir la fenêtre de sortie, choisir « Journal Razor », et utiliser l’icône d’engrenage pour vous assurer que le niveau de journal est réglé sur « Débogage » ou « Trace ».",
2929
"Cannot stop Razor Language Server as it is already stopped.": "Impossible d’arrêter le serveur de langage Razor, car il est déjà arrêté.",
3030
"Choose": "Choisir",
3131
"Choose and set default": "Choisir et définir la valeur par défaut",

l10n/bundle.l10n.it.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"Cannot create .NET debug configurations. The server is still initializing or has exited unexpectedly.": "Impossibile creare configurazioni di debug .NET. Inizializzazione del server ancora in corso o chiusura imprevista.",
2626
"Cannot load Razor language server because the directory was not found: '{0}'": "Non è possibile caricare il server di linguaggio Razor perché la directory non è stata trovata: '{0}'",
2727
"Cannot resolve .NET debug configurations. The server is still initializing or has exited unexpectedly.": "Impossibile risolvere le configurazioni di debug .NET. Inizializzazione del server ancora in corso o chiusura imprevista.",
28-
"Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".": "Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".",
28+
"Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".": "Non è possibile avviare la raccolta dei log Razor quando {0} è impostato su {1}. Aprire la finestra di output, scegliere \"Log Razor\" e utilizzare l'icona a forma di ingranaggi per assicurarsi che il livello di registrazione sia impostato su \"Debug\" o \"Traccia\".",
2929
"Cannot stop Razor Language Server as it is already stopped.": "Non è possibile arrestare il server di linguaggio Razor perché è già stato arrestato.",
3030
"Choose": "Scegli",
3131
"Choose and set default": "Scegliere e impostare il valore predefinito",

l10n/bundle.l10n.ja.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"Cannot create .NET debug configurations. The server is still initializing or has exited unexpectedly.": ".NET デバッグ構成を作成できません。サーバーはまだ初期化中か、予期せず終了しました。",
2626
"Cannot load Razor language server because the directory was not found: '{0}'": "ディレクトリが見つからないため、Razor 言語サーバーを読み込めません: '{0}'",
2727
"Cannot resolve .NET debug configurations. The server is still initializing or has exited unexpectedly.": ".NET デバッグ構成を解決できません。サーバーはまだ初期化中か、予期せず終了しました。",
28-
"Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".": "Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".",
28+
"Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".": "{0} {1} に設定されている場合、Razor ログの収集を開始できません。出力ウィンドウを開き、[Razor ログ] を選択し、歯車アイコンを使用してログ レベルが [デバッグ] または [トレース] に設定されていることを確認してください。",
2929
"Cannot stop Razor Language Server as it is already stopped.": "Razor 言語サーバーは既に停止しているため、停止できません。",
3030
"Choose": "選択",
3131
"Choose and set default": "既定の選択と設定",

0 commit comments

Comments
 (0)