Skip to content

Commit cc28f41

Browse files
[automated] Merge branch 'prerelease' => 'release' (#8141)
2 parents afdc45b + 70db520 commit cc28f41

Some content is hidden

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

45 files changed

+725
-295
lines changed

.github/policies/resourceManagement.yml

+19
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,25 @@ configuration:
3333
- enableAutoMerge:
3434
mergeMethod: merge
3535

36+
- description: Auto-approve/merge automated localization PRs
37+
triggerOnOwnActions: false
38+
if:
39+
- payloadType: Pull_Request
40+
- isPullRequest
41+
- isActivitySender:
42+
user: dotnet-bot
43+
issueAuthor: False
44+
- titleContains:
45+
pattern: "Localization result based on"
46+
isRegex: False
47+
- isAction:
48+
action: Opened
49+
then:
50+
- approvePullRequest:
51+
comment: Auto-approve
52+
- enableAutoMerge:
53+
mergeMethod: merge
54+
3655
- description: Add "untriaged" label to issues when opened
3756
triggerOnOwnActions: false
3857
if:

.gitignore

+1
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

+1
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

+154-115
Large diffs are not rendered by default.

CONTRIBUTING.md

+2-2
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

azure-pipelines.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ pr:
1616
- main
1717
paths:
1818
exclude:
19-
- ./*.md
19+
- '*.md'
2020
- .github/*
21+
- azure-pipelines/release.yml
22+
- CHANGELOG.
2123

2224
# Run a scheduled build every night on main to run tests against insiders VSCode.
2325
# The variable testVSCodeVersion is set to insiders based on the build reason.

azure-pipelines/release.yml

+22
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,27 @@ extends:
5151
runOnce:
5252
deploy:
5353
steps:
54+
- pwsh: |
55+
$artifactVersion = '$(resources.pipeline.officialBuildCI.runName)'
56+
$artifactBranchName = '$(resources.pipeline.officialBuildCI.sourceBranch)' -replace 'refs/heads/',''
57+
58+
# Set the BuildNumber in the form `# Publish prerelease v2.69.22 #` to improve readability in AzDO
59+
$buildNumberName = "Publish $artifactBranchName $artifactVersion"
60+
if ('${{ parameters.test }}' -eq 'true') {
61+
$buildNumberName = 'Test ' + $buildNumberName
62+
}
63+
64+
# Replace invalid characters
65+
$buildNumberName = $buildNumberName -replace '["/:<>\|?@*]','_'
66+
# Maximum buildnumber length is 255 chars and we are going to add a prefix and suffix so ensure we have space.
67+
if ($buildNumberName.Length -GT 252) {
68+
$buildNumberName = $buildNumberName.Substring(0, 252)
69+
}
70+
# Avoid ever ending the BuildNumber with a `.` by always appending to it.
71+
$buildNumberName = ' ' + $buildNumberName + ' #'
72+
73+
Write-Host "##vso[build.updatebuildnumber]$buildNumberName"
74+
displayName: Set BuildNumber
5475
- template: /azure-pipelines/install-node.yml@self
5576
- pwsh: |
5677
npm install --global @vscode/vsce
@@ -113,6 +134,7 @@ extends:
113134
Write-Host "##[command]vsce $publishArgs"
114135
vsce @publishArgs
115136
}
137+
116138
- stage: 'TagRelease'
117139
displayName: 'Tag release of vscode-csharp'
118140
dependsOn: 'PublishStage'

l10n/bundle.l10n.cs.json

+1-1
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 set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.": "Když je {0} nastavené na {1}, nejde zahájit shromažďování protokolů Razor. Nastavte prosím {0} na {2}, znovu načtěte prostředí VSCode a opakujte příkaz pro nahlášení problémů s Razorem.",
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

+1-1
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 set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.": "Das Sammeln von Razor-Protokollen kann nicht gestartet werden, wenn {0} auf {1} festgelegt ist. Legen Sie {0} auf {2} fest, laden Sie dann Ihre VSCode-Umgebung neu, und führen Sie den Befehl \"Razor-Problem melden\" erneut aus.",
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

+1-1
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 set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.": "No se puede iniciar la recopilación de registros de Razor cuando {0} se establece en {1}. {0} Establezca y vuelva a cargar el entorno de VSCode y vuelva a {2} ejecutar el comando de problema de Razor del informe.",
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

+1-1
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 set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.": "Impossible de démarrer la collecte des journaux Razor lorsque {0} est défini sur {1}. Définissez {0} sur {2}, puis rechargez votre environnement VSCode et réexécutez la commande de signalement de problème Razor.",
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

+1-1
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 set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.": "Non è possibile avviare la raccolta dei log Razor quando {0} è impostato su {1}. Impostare {0} su {2} ricaricare l'ambiente VSCode ed eseguire di nuovo il comando Segnala problema Razor.",
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

+1-1
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 set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.": "{0} が {1} に設定されている場合、Razor ログの収集を開始できません。{0} を {2} に設定してから、VSCode 環境を再度読み込み、Razor の問題を報告するコマンドを再実行してください",
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": "既定の選択と設定",

l10n/bundle.l10n.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.",
100100
"Privacy Alert! The contents copied to your clipboard may contain personal data. Prior to posting to GitHub, please remove any personal data which should not be publicly viewable.": "Privacy Alert! The contents copied to your clipboard may contain personal data. Prior to posting to GitHub, please remove any personal data which should not be publicly viewable.",
101101
"Copy issue content again": "Copy issue content again",
102-
"Cannot start collecting Razor logs when {0} is set to {1}. Please set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.": "Cannot start collecting Razor logs when {0} is set to {1}. Please set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.",
102+
"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\".",
103103
"Non Razor file as active document": "Non Razor file as active document",
104104
"Could not determine CSharp content": "Could not determine CSharp content",
105105
"Could not determine Html content": "Could not determine Html content",

l10n/bundle.l10n.ko.json

+1-1
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 set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.": "{0}이(가) {1}(으)로 설정되면 Razor 로그 수집을 시작할 수 없습니다. {0}을(를) {2}(으)로 설정한 다음 VSCode 환경을 다시 로드하고 Razor 문제 보고서 명령을 다시 실행하세요.",
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": "기본값 선택 및 설정",

l10n/bundle.l10n.pl.json

+1-1
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.": "Nie można utworzyć konfiguracji debugowania platformy .NET. Serwer nadal inicjuje się lub nieoczekiwanie zakończył działanie.",
2626
"Cannot load Razor language server because the directory was not found: '{0}'": "Nie można załadować serwera języka Razor, ponieważ nie znaleziono katalogu: „{0}”",
2727
"Cannot resolve .NET debug configurations. The server is still initializing or has exited unexpectedly.": "Nie można rozpoznać konfiguracji debugowania platformy .NET. Serwer nadal inicjuje się lub nieoczekiwanie zakończył działanie.",
28-
"Cannot start collecting Razor logs when {0} is set to {1}. Please set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.": "Nie można rozpocząć zbierania dzienników Razor, gdy element {0} jest ustawiony na wartość {1}. Ustaw element {0} na {2}, a następnie ponownie załaduj środowisko VSCode i uruchom ponownie polecenie raportowania problemu aparatu Razor.",
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\".": "Nie można rozpocząć zbierania dzienników Razor, gdy wartość {0} jest ustawiona na {1}. Otwórz okno danych wyjściowych, wybierz pozycję „Dziennik Razor” i użyj ikony koła zębatego, aby upewnić się, że poziom dziennika ma wartość „Debugowanie” lub „Śledzenie”.",
2929
"Cannot stop Razor Language Server as it is already stopped.": "Nie można zatrzymać serwera języka Razor, ponieważ jest on już zatrzymany.",
3030
"Choose": "Wybierz",
3131
"Choose and set default": "Wybierz i ustaw wartość domyślną",

0 commit comments

Comments
 (0)