Skip to content

Commit

Permalink
[automated] Merge branch 'main' => 'prerelease' (#7795)
Browse files Browse the repository at this point in the history
  • Loading branch information
dibarbet authored Nov 16, 2024
2 parents eceb573 + dca86e3 commit ea6b502
Show file tree
Hide file tree
Showing 31 changed files with 141 additions and 24 deletions.
21 changes: 20 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@
- Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)

# 2.57.x
* Update Razor to 9.0.0-preview.24565.1 (PR: [#7793])(https://github.com/dotnet/vscode-csharp/pull/7793)
* Update Roslyn to 4.13.0-2.24565.3 (PR: [#7792](https://github.com/dotnet/vscode-csharp/pull/7792))
* Add support for go to type definition (PR: [#75819](https://github.com/dotnet/roslyn/pull/75819))
* Reduce formatting allocations when scrolling (PR: [#75912](https://github.com/dotnet/roslyn/pull/75912))
* Improve go-to-impl with error conditions (PR: [#75913](https://github.com/dotnet/roslyn/pull/75913))
* Update 'use simple using statement' to support global statements (PR: [#75921](https://github.com/dotnet/roslyn/pull/75921))
* Fix case where we were erroneously offering to convert a dictionary to use a collection expression. (PR: [#75897](https://github.com/dotnet/roslyn/pull/75897))
* Recover better when a user uses commas in a for-statement instead of semicolons (PR: [#75632](https://github.com/dotnet/roslyn/pull/75632))
* Do not run 'remove unnecessary imports' on generated code (PR: [#74762](https://github.com/dotnet/roslyn/pull/74762))
* improve goto-def on an invalid override (PR: [#75901](https://github.com/dotnet/roslyn/pull/75901))
* Fix formatting of simplify-linq-expression (PR: [#75860](https://github.com/dotnet/roslyn/pull/75860))
* Add new line before 'where' constraints in Quick Info (PR: [#60545](https://github.com/dotnet/roslyn/pull/60545))
* Increase default server start timeout to 2minutes (PR: [#7788](https://github.com/dotnet/vscode-csharp/pull/7788))
* Update Razor to 9.0.0-preview.24561.3 (PR: [#7748](https://github.com/dotnet/vscode-csharp/pull/7748))
* Add feature flag to turn on the new Roslyn tokenizer (PR: [#11185](https://github.com/dotnet/razor/pull/11185))
* Fix Razor preview panel button colors to have more visible contrast ratio (PR: [#7766](https://github.com/dotnet/vscode-csharp/pull/7766))
* Bump xamltools to 17.13.35513.19 (PR: [#7777](https://github.com/dotnet/vscode-csharp/pull/7777))

# 2.56.x
* Update Roslyn to 4.13.0-2.24561.3 (PR: [#7765](https://github.com/dotnet/vscode-csharp/pull/7765))
* Update Razor to fix serialization issue loading projects (PR: [#75794](https://github.com/dotnet/roslyn/pull/75794))
Expand All @@ -26,7 +45,7 @@
* Reduce memory and CPU costs due to SegmentedList usage (PR: [#75661](https://github.com/dotnet/roslyn/pull/75661))
* Bump xamltools to 17.13.35506.24 (PR: [#7740](https://github.com/dotnet/vscode-csharp/pull/7740))
* Bump xamltools to 17.13.35507.225 (PR: [#7755](https://github.com/dotnet/vscode-csharp/pull/7755))
* XAML IntelliseSense completions for Image.Source
* XAML IntelliseSense completions for Image.Source

# 2.55.x
* Update Razor to 9.0.0-preview.24557.10 (PR: [#7757](https://github.com/dotnet/vscode-csharp/pull/7757))
Expand Down
4 changes: 4 additions & 0 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ parameters:
- auto
default: auto

variables:
defaultDotnetVersion: '8.0.403'

resources:
repositories:
- repository: 1ESPipelineTemplates
Expand Down Expand Up @@ -63,3 +66,4 @@ extends:
isOfficial: true
channel: ${{ parameters.channel }}
signType: ${{ parameters.signType }}
dotnetVersion: $(defaultDotnetVersion)
36 changes: 31 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,32 @@ pr:
- main
paths:
exclude:
- ./*.md
- ./*.md

# Run a scheduled build every night on main to run tests against insiders VSCode.
# The variable testVSCodeVersion is set to insiders based on the build reason.
schedules:
- cron: "0 0 * * *"
displayName: Daily Insiders Build
branches:
include:
- main

variables:
- name: defaultDotnetVersion
value: '8.0.403'
- name: testVSCodeVersion
${{ if eq( variables['Build.Reason'], 'Schedule' ) }}:
value: insiders
${{ else }}:
value: stable

stages:
- template: azure-pipelines/build-all.yml
parameters:
isOfficial: false
signType: test
dotnetVersion: $(defaultDotnetVersion)

- stage:
displayName: Test Linux (.NET 6)
Expand All @@ -31,7 +50,8 @@ stages:
- template: azure-pipelines/test-matrix.yml
parameters:
# Prefer the dotnet from the container.
installDotNet: false
dotnetVersion: ''
testVSCodeVersion: $(testVSCodeVersion)
installAdditionalLinuxDependencies: true
pool:
name: NetCore-Public
Expand All @@ -45,7 +65,8 @@ stages:
- template: azure-pipelines/test-matrix.yml
parameters:
# Prefer the dotnet from the container.
installDotNet: false
dotnetVersion: ''
testVSCodeVersion: $(testVSCodeVersion)
installAdditionalLinuxDependencies: true
pool:
name: NetCore-Public
Expand All @@ -58,7 +79,8 @@ stages:
jobs:
- template: azure-pipelines/test-matrix.yml
parameters:
installDotNet: true
dotnetVersion: $(defaultDotnetVersion)
testVSCodeVersion: $(testVSCodeVersion)
pool:
name: NetCore-Public
demands: ImageOverride -equals 1es-windows-2022-open
Expand All @@ -69,7 +91,8 @@ stages:
jobs:
- template: azure-pipelines/test-matrix.yml
parameters:
installDotNet: true
dotnetVersion: $(defaultDotnetVersion)
testVSCodeVersion: $(testVSCodeVersion)
pool:
name: Azure Pipelines
vmImage: macOS-13
Expand All @@ -90,3 +113,6 @@ stages:
demands: ImageOverride -equals $(demandsName)
steps:
- template: azure-pipelines/test-omnisharp.yml
parameters:
dotnetVersion: $(defaultDotnetVersion)
testVSCodeVersion: $(testVSCodeVersion)
5 changes: 5 additions & 0 deletions azure-pipelines/build-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ parameters:
default: 'default'
- name: isOfficial
type: boolean
- name: dotnetVersion
type: string
- name: channel
values:
- release
Expand Down Expand Up @@ -96,6 +98,7 @@ stages:
versionNumberOverride: ${{ parameters.versionNumberOverride }}
platform: linux
isOfficial: ${{ parameters.isOfficial }}
dotnetVersion: ${{ parameters.dotnetVersion }}
pool:
${{ if eq(parameters.isOfficial, true) }}:
name: netcore1espool-internal
Expand All @@ -109,6 +112,7 @@ stages:
versionNumberOverride: ${{ parameters.versionNumberOverride }}
platform: windows
isOfficial: ${{ parameters.isOfficial }}
dotnetVersion: ${{ parameters.dotnetVersion }}
pool:
${{ if eq(parameters.isOfficial, true) }}:
name: netcore1espool-internal
Expand All @@ -122,6 +126,7 @@ stages:
versionNumberOverride: ${{ parameters.versionNumberOverride }}
platform: darwin
isOfficial: ${{ parameters.isOfficial }}
dotnetVersion: ${{ parameters.dotnetVersion }}
pool:
name: Azure Pipelines
${{ if eq(parameters.isOfficial, true) }}:
Expand Down
3 changes: 3 additions & 0 deletions azure-pipelines/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ parameters:
type: object
- name: isOfficial
type: boolean
- name: dotnetVersion
type: string

jobs:
- job: 'Build_${{ parameters.platform }}_vsixs'
Expand All @@ -27,6 +29,7 @@ jobs:
- template: /azure-pipelines/prereqs.yml@self
parameters:
versionNumberOverride: ${{ parameters.versionNumberOverride }}
dotnetVersion: ${{ parameters.dotnetVersion}}

- task: UsePythonVersion@0
displayName: 'Use Python 3.11'
Expand Down
9 changes: 4 additions & 5 deletions azure-pipelines/prereqs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ parameters:
- name: versionNumberOverride
type: string
default: 'default'
- name: installDotNet
type: boolean
default: true
- name: dotnetVersion
type: string

steps:

Expand All @@ -15,11 +14,11 @@ steps:

# Some tests use predefined docker images with a specific version of .NET installed.
# So we avoid installing .NET in those cases.
- ${{ if eq(parameters.installDotNet, true) }}:
- ${{ if parameters.dotnetVersion }}:
- task: UseDotNet@2
displayName: 'Install .NET SDK'
inputs:
version: '8.0.403'
version: ${{ parameters.dotnetVersion }}

- script: dotnet --info
displayName: Display dotnet info
Expand Down
11 changes: 7 additions & 4 deletions azure-pipelines/test-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ parameters:
- name: containerName
type: string
default: ''
- name: installDotNet
type: boolean
- name: dotnetVersion
type: string
- name: installAdditionalLinuxDependencies
type: boolean
default: false
- name: testVSCodeVersion
type: string

jobs:
- job:
Expand All @@ -24,6 +26,7 @@ jobs:
steps:
- template: /azure-pipelines/test.yml@self
parameters:
installDotNet: true
dotnetVersion: ${{ parameters.dotnetVersion }}
installAdditionalLinuxDependencies: true
npmCommand: $(npmCommand)
npmCommand: $(npmCommand)
testVSCodeVersion: ${{ parameters.testVSCodeVersion }}
9 changes: 9 additions & 0 deletions azure-pipelines/test-omnisharp.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
parameters:
- name: dotnetVersion
type: string
- name: testVSCodeVersion
type: string

steps:
- checkout: self
clean: true
Expand All @@ -6,13 +12,16 @@ steps:
fetchDepth: 1

- template: prereqs.yml
parameters:
dotnetVersion: ${{ parameters.dotnetVersion }}

- template: test-prereqs.yml

- script: npm run omnisharptest
displayName: 🧪 Run unit and integration tests
env:
DISPLAY: :99.0
CODE_VERSION: ${{ parameters.testVSCodeVersion }}

- task: PublishTestResults@2
condition: succeededOrFailed()
Expand Down
9 changes: 6 additions & 3 deletions azure-pipelines/test.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
parameters:
- name: installDotNet
type: boolean
- name: dotnetVersion
type: string
- name: installAdditionalLinuxDependencies
type: boolean
default: false
- name: npmCommand
type: string
- name: testVSCodeVersion
type: string

steps:
- checkout: self
Expand All @@ -16,7 +18,7 @@ steps:

- template: prereqs.yml
parameters:
installDotNet: ${{ parameters.installDotNet }}
dotnetVersion: ${{ parameters.dotnetVersion }}

- ${{ if eq(parameters.installAdditionalLinuxDependencies, true) }}:
- template: test-linux-docker-prereqs.yml
Expand All @@ -29,6 +31,7 @@ steps:
displayName: 🧪 Run $(Agent.JobName)
env:
DISPLAY: :99.0
CODE_VERSION: ${{ parameters.testVSCodeVersion }}

- task: PublishTestResults@2
condition: succeededOrFailed()
Expand Down
15 changes: 11 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
}
},
"defaults": {
"roslyn": "4.13.0-2.24561.3",
"roslyn": "4.13.0-2.24565.3",
"omniSharp": "1.39.11",
"razor": "9.0.0-preview.24557.11",
"razor": "9.0.0-preview.24565.1",
"razorOmnisharp": "7.0.0-preview.23363.1",
"xamlTools": "17.13.35507.225"
"xamlTools": "17.13.35513.19"
},
"main": "./dist/extension",
"l10n": "./l10n",
Expand Down Expand Up @@ -1433,7 +1433,7 @@
"dotnet.server.startTimeout": {
"type": "number",
"scope": "machine-overridable",
"default": 30000,
"default": 120000,
"description": "%configuration.dotnet.server.startTimeout%"
},
"dotnet.server.waitForDebugger": {
Expand Down Expand Up @@ -1528,6 +1528,13 @@
"description": "%configuration.razor.languageServer.forceRuntimeCodeGeneration%",
"order": 90
},
"razor.languageServer.useRoslynTokenizer": {
"type": "boolean",
"scope": "machine-overridable",
"default": false,
"markdownDescription": "%configuration.razor.languageServer.useRoslynTokenizer%",
"order": 90
},
"razor.languageServer.suppressLspErrorToasts": {
"type": "boolean",
"default": true,
Expand Down
1 change: 1 addition & 0 deletions package.nls.cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
"configuration.razor.languageServer.directory": "Přepíše cestu k adresáři jazykového serveru Razor.",
"configuration.razor.languageServer.forceRuntimeCodeGeneration": "(EXPERIMENTÁLNÍ) Povolit kombinované generování kódu v době návrhu / za běhu pro soubory Razor",
"configuration.razor.languageServer.suppressLspErrorToasts": "Potlačí zobrazování informačních zpráv o chybách, pokud na serveru dojde k chybě, ze které se dá zotavit.",
"configuration.razor.languageServer.useRoslynTokenizer": "(EXPERIMENTÁLNÍ) Pro soubory Razor v integrovaném vývojovém prostředí (IDE) použijte tokenizér C#. Povolí některé nové funkce jazyka C#, jako jsou interpolované a nezpracované řetězce, v souborech Razor otevřených v aplikaci Visual Studio Code. To odpovídá použití tokenizátoru <features>use-roslyn-tokenizer</feature> v souboru .csproj pro sestavení příkazového řádku. Pokud se tato možnost a soubory projektu neshodují, může dojít k nekonzistenci.",
"configuration.razor.server.trace": "Určuje úroveň protokolování, která se má použít pro server Razor.",
"debuggers.coreclr.configurationSnippets.description.attach": "Připojte ladicí program .NET (coreclr) ke spuštěným procesům. Můžete to provést také pomocí příkazu „Připojit k procesu .NET 5+ nebo .NET Core“.",
"debuggers.coreclr.configurationSnippets.description.blazor-hosted": "Tento fragment kódu se používá ke spuštění nového procesu v ladicím programu Blazor WebAssembly (blazorwasm), který určuje cestu ke spustitelnému souboru, který se má spustit. Ve většině případů je „.NET: Spustit projekt jazyka C#“ fragment kódu lepší volbou, ale tento fragment kódu lze použít k úplné kontrole nad všemi možnostmi spuštění. Tento fragment kódu je pro hostované projekty Blazor, což je projekt, který má back-endovou aplikaci ASP.NET Core pro obsluhu svých souborů.",
Expand Down
1 change: 1 addition & 0 deletions package.nls.de.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
"configuration.razor.languageServer.directory": "Überschreibt den Pfad zum Razor-Sprachserver-Verzeichnis.",
"configuration.razor.languageServer.forceRuntimeCodeGeneration": "(EXPERIMENTELL) Kombinierte Entwurfszeit-/Runtime-Codegenerierung für Razor-Dateien aktivieren",
"configuration.razor.languageServer.suppressLspErrorToasts": "Unterdrückt, dass Fehler-Popups angezeigt werden, wenn auf dem Server ein wiederherstellbarer Fehler auftritt.",
"configuration.razor.languageServer.useRoslynTokenizer": "(EXPERIMENTELL) Verwenden Sie den C#-Tokenizer für Razor-Dateien in der IDE. Aktiviert einige neue C#-Features, z. B. interpolierte und unformatierte Zeichenfolgen, in Razor-Dateien, die in Visual Studio Code geöffnet sind. Dies entspricht der Verwendung von \"<features>use-roslyn-tokenizer</feature>\" in einer CSPROJ-Datei für Befehlszeilenbuilds und kann zu Inkonsistenzen führen, wenn diese Option und Ihre Projektdateien nicht übereinstimmen.",
"configuration.razor.server.trace": "Gibt den Protokolliergrad an, der für den Razor-Server verwendet werden soll.",
"debuggers.coreclr.configurationSnippets.description.attach": "Fügen Sie den .NET-Debugger (coreclr) an einen laufenden Prozess an. Dies kann auch mit dem Befehl \"An einen .NET 5+- oder .NET Core-Prozess anfügen\" erfolgen.",
"debuggers.coreclr.configurationSnippets.description.blazor-hosted": "Dieser Codeschnipsel wird verwendet, um einen neuen Prozess unter dem Blazor WebAssembly-Debugger (blazorwasm) zu starten. Dabei wird der Pfad zu der ausführbaren Datei angegeben, die gestartet werden soll. In den meisten Fällen ist der Codeschnipsel \".NET: C#-Projekt starten\" die bessere Wahl. Dieser Codeschnipsel kann jedoch verwendet werden, um Vollzugriff auf alle Startoptionen zu erhalten. Dieser Codeschnipsel ist für gehostete Blazor-Projekte vorgesehen. Dabei handelt es sich um ein Projekt, das im Back-End über eine ASP.NET Core-App zum Verarbeiten der Dateien verfügt.",
Expand Down
1 change: 1 addition & 0 deletions package.nls.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
"configuration.razor.languageServer.directory": "Invalida la ruta de acceso al directorio del servidor de lenguaje Razor.",
"configuration.razor.languageServer.forceRuntimeCodeGeneration": "(EXPERIMENTAL) Habilitación de la generación de código en tiempo de ejecución y tiempo de diseño combinado para archivos de Razor",
"configuration.razor.languageServer.suppressLspErrorToasts": "Suprime la visualización de notificaciones del sistema de error si el servidor encuentra un error recuperable.",
"configuration.razor.languageServer.useRoslynTokenizer": "(EXPERIMENTAL) Use el tokenizador de C# para los archivos de Razor en el IDE. Habilita algunas características nuevas de C#, como cadenas interpoladas y sin formato, en archivos de Razor abiertos en Visual Studio Code. Esto coincide con el uso del \"<features>use-roslyn-tokenizador</feature>\" en un archivo \".csproj\" para las compilaciones de línea de comandos y puede dar lugar a incoherencias si esta opción y los archivos del proyecto no coinciden.",
"configuration.razor.server.trace": "Especifica el nivel de registro que se va a usar para el servidor Razor.",
"debuggers.coreclr.configurationSnippets.description.attach": "Adjunte el depurador de .NET (coreclr) a un proceso en ejecución. Esto también se puede hacer mediante el comando \"Asociar a un proceso de .NET 5+ o .NET Core\".",
"debuggers.coreclr.configurationSnippets.description.blazor-hosted": "Este fragmento de código se usa para iniciar un nuevo proceso en el depurador Blazor WebAssembly (blazorwasm), especificando la ruta de acceso al ejecutable que se va a iniciar. En la mayoría de los casos, \".NET: Launch C# project\" (Iniciar proyecto de C#) es una mejor opción, pero este fragmento de código se puede usar para tener control total sobre todas las opciones de inicio. Este fragmento de código es para proyectos de Blazor hospedados, que es un proyecto que tiene un back-end ASP.NET aplicación Core para atender sus archivos.",
Expand Down
1 change: 1 addition & 0 deletions package.nls.fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
"configuration.razor.languageServer.directory": "Remplace le chemin d’accès au répertoire du serveur de langage Razor.",
"configuration.razor.languageServer.forceRuntimeCodeGeneration": "(EXPÉRIMENTAL) Activer la génération combinée de code au moment de la conception/à l’exécution pour les fichiers Razor",
"configuration.razor.languageServer.suppressLspErrorToasts": "Supprime l’affichage des notifications toast d’erreur si le serveur a rencontré une erreur récupérable.",
"configuration.razor.languageServer.useRoslynTokenizer": "(EXPÉRIMENTAL) Utilisez le générateur de jetons C# pour les fichiers Razor dans l’IDE. Permet d’activer certaines nouvelles fonctionnalités de C#, comme les chaînes brutes et interpolées dans des fichiers Razor ouverts dans Visual Studio Code. Cela correspond à l’utilisation de `<features>use-roslyn-tokenizer</feature>` dans un fichier `.csproj` pour les générations de ligne de commande et peut entraîner des incohérences si cette option et vos fichiers de projet ne correspondent pas.",
"configuration.razor.server.trace": "Spécifie le niveau de journalisation à utiliser pour le serveur Razor.",
"debuggers.coreclr.configurationSnippets.description.attach": "Attachez le débogueur .NET (coreclr) à un processus en cours d'exécution. Cela peut également être fait à l'aide de la commande « Attacher à un processus .NET 5+ ou .NET Core ».",
"debuggers.coreclr.configurationSnippets.description.blazor-hosted": "Cet extrait est utilisé pour lancer un nouveau processus sous le débogueur Blazor WebAssembly (blazorwasm), en spécifiant le chemin d'accès à l'exécutable à lancer. Dans la plupart des cas, le \".NET : L'extrait \"Lancer le projet C#\" est un meilleur choix, mais cet extrait peut être utilisé pour avoir un contrôle total sur toutes les options de lancement. Cet extrait est destiné aux projets Blazor hébergés, qui sont un projet doté d'une application backend ASP.NET Core pour servir ses fichiers.",
Expand Down
Loading

0 comments on commit ea6b502

Please sign in to comment.