Skip to content

Commit 1f2546d

Browse files
authored
Merge pull request #6898 from dotnet/prerelease
Merge prerelease into release
2 parents c3f7c03 + 4ffa462 commit 1f2546d

27 files changed

+181
-94
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

66
## Latest
7+
* Fix regression in override completion (PR: [#6869](https://github.com/dotnet/vscode-csharp/pull/6869))
8+
* Update debugger to 2.18.0 release (PR: [#6853](https://github.com/dotnet/vscode-csharp/pull/6853))
9+
10+
## 2.17.7
11+
* Update Roslyn to 4.10.0-2.24102.11 (PR: [#6847](https://github.com/dotnet/vscode-csharp/pull/6847))
12+
* Fix another issue loading .NET projects when only the 6.0 SDK is installed (PR: [#71881](https://github.com/dotnet/roslyn/pull/71881))
13+
* Fix request info leak when project loading is cancelled (PR: [#71737](https://github.com/dotnet/roslyn/pull/71737))
14+
* Load Roslyn DevKit assemblies into the default ALC (PR: [#71807](https://github.com/dotnet/roslyn/pull/71807))
15+
16+
## 2.16.24
717
* Update Roslyn to 4.10.0-1.24069.13 (PR: [#6823](https://github.com/dotnet/vscode-csharp/pull/6823))
818
* Fix request metric logging (PR: [#71734](https://github.com/dotnet/roslyn/pull/71734))
919
* Fix issue loading .NET 6.0 projects when only the 6.0 SDK is installed (PR: [#71597](https://github.com/dotnet/roslyn/pull/71597))

azure-pipelines-official.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ trigger:
33
include:
44
- main
55
- release
6+
- prerelease
67
pr: none
78

89
parameters:

azure-pipelines.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ trigger:
44
include:
55
- feature/*
66
- release
7+
- prerelease
78
- main
89

910
pr:
1011
- feature/*
1112
- release
13+
- prerelease
1214
- main
1315

1416
stages:

l10n/bundle.l10n.cs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"Could not determine CSharp content": "Nepovedlo se určit obsah CSharp.",
3232
"Could not determine Html content": "Nepovedlo se určit obsah HTML.",
3333
"Could not find '{0}' in or above '{1}'.": "Nepovedlo se najít {0} v {1} ani výše.",
34-
"Could not find Razor Language Server executable within directory '{0}'": "V adresáři {0} se nepovedlo najít spustitelný soubor jazykového serveru Razor.",
34+
"Could not find Razor Language Server executable '{0}' within directory": "V adresáři se nepovedlo najít spustitelný soubor jazykového serveru Razor {0}.",
3535
"Could not find a process id to attach.": "Nepovedlo se najít ID procesu, který se má připojit.",
3636
"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.",
3737
"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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"Could not determine CSharp content": "Der CSharp-Inhalt konnte nicht bestimmt werden.",
3232
"Could not determine Html content": "Der HTML-Inhalt konnte nicht bestimmt werden.",
3333
"Could not find '{0}' in or above '{1}'.": "\"{0}\" wurde in oder über \"{1}\" nicht gefunden.",
34-
"Could not find Razor Language Server executable within directory '{0}'": "Die ausführbare Datei des Razor-Sprachservers wurde im Verzeichnis \"{0}\" nicht gefunden.",
34+
"Could not find Razor Language Server executable '{0}' within directory": "Die ausführbare Razor Language Server-Datei „{0}“ wurde im Verzeichnis nicht gefunden.",
3535
"Could not find a process id to attach.": "Es wurde keine anzufügende Prozess-ID gefunden.",
3636
"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.",
3737
"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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"Could not determine CSharp content": "No se pudo determinar el contenido de CSharp",
3232
"Could not determine Html content": "No se pudo determinar el contenido HTML",
3333
"Could not find '{0}' in or above '{1}'.": "No se pudo encontrar '{0}' en '' o encima de '{1}'.",
34-
"Could not find Razor Language Server executable within directory '{0}'": "No se encontró el ejecutable del servidor de lenguaje Razor en el directorio '{0}'",
34+
"Could not find Razor Language Server executable '{0}' within directory": "No se encontró el ejecutable del servidor de lenguaje Razor en el directorio ''{0}''",
3535
"Could not find a process id to attach.": "No se pudo encontrar un id. de proceso para adjuntar.",
3636
"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.",
3737
"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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"Could not determine CSharp content": "Impossible de déterminer le contenu CSharp",
3232
"Could not determine Html content": "Impossible de déterminer le contenu HTML",
3333
"Could not find '{0}' in or above '{1}'.": "Impossible de trouver '{0}' dans ou au-dessus '{1}'.",
34-
"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}'",
34+
"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} »",
3535
"Could not find a process id to attach.": "Impossible de trouver un ID de processus à joindre.",
3636
"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.",
3737
"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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"Could not determine CSharp content": "Non è stato possibile determinare il contenuto CSharp",
3232
"Could not determine Html content": "Non è stato possibile determinare il contenuto HTML",
3333
"Could not find '{0}' in or above '{1}'.": "Non è stato possibile trovare '{0}{0}' in o sopra '{1}'.",
34-
"Could not find Razor Language Server executable within directory '{0}'": "Non è stato possibile trovare l'eseguibile del server di linguaggio Razor nella directory '{0}'",
34+
"Could not find Razor Language Server executable '{0}' within directory": "Non è possibile trovare l'eseguibile del server di linguaggio Razor '{0}' nella directory",
3535
"Could not find a process id to attach.": "Non è stato possibile trovare un ID processo da collegare.",
3636
"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.",
3737
"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

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

l10n/bundle.l10n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"Cannot load Razor language server because the directory was not found: '{0}'": "Cannot load Razor language server because the directory was not found: '{0}'",
4949
"Could not find '{0}' in or above '{1}'.": "Could not find '{0}' in or above '{1}'.",
5050
"Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'",
51-
"Could not find Razor Language Server executable within directory '{0}'": "Could not find Razor Language Server executable within directory '{0}'",
51+
"Could not find Razor Language Server executable '{0}' within directory": "Could not find Razor Language Server executable '{0}' within directory",
5252
"Server failed to start after retrying 5 times.": "Server failed to start after retrying 5 times.",
5353
"Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.": "Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.",
5454
"Tried to send requests while server is not started.": "Tried to send requests while server is not started.",

0 commit comments

Comments
 (0)