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

Lines changed: 19 additions & 0 deletions
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

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: 154 additions & 115 deletions
Large diffs are not rendered by default.

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

azure-pipelines.yml

Lines changed: 3 additions & 1 deletion
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

Lines changed: 22 additions & 0 deletions
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

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

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

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 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",

0 commit comments

Comments
 (0)