Skip to content

Commit

Permalink
Merge pull request #7697 from dotnet/merge/main-to-prerelease
Browse files Browse the repository at this point in the history
[automated] Merge branch 'main' => 'prerelease'
  • Loading branch information
dibarbet authored Oct 25, 2024
2 parents cef8fbf + c894500 commit de2caae
Show file tree
Hide file tree
Showing 30 changed files with 173 additions and 68 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/branch-snap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:
- name: Install dependencies
run: npm ci
- name: Update version.json
run: npx gulp incrementVersionJson
- name: Create version.json update PR
run: npx gulp incrementVersion
- name: Create version update PR
uses: peter-evans/create-pull-request@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
23 changes: 22 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,28 @@
- 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)

# Latest
# 2.54.x
* Update debugger packages to v2.54.0 (PR: [#7691](https://github.com/dotnet/vscode-csharp/pull/7691))
* Only show misc files warning toast after delay. (PR: [#7689](https://github.com/dotnet/vscode-csharp/pull/7689))
* Update Roslyn to 4.13.0-1.24525.2 (PR: [#7694](https://github.com/dotnet/vscode-csharp/pull/7694))
* Fix error message spelling (PR: [#75601](https://github.com/dotnet/roslyn/pull/75601))
* Improve diagnostic performance by re-using results if diagnostic data is the same (PR: [#75587](https://github.com/dotnet/roslyn/pull/75587))
* Improve performance in checksum computation (PR: [#75479](https://github.com/dotnet/roslyn/pull/75479))
* Bumped xamlTools to 17.13.35422.31 (PR: [#7685](https://github.com/dotnet/vscode-csharp/pull/7685))
* Update Razor to 9.0.0-preview.24524.4 (PR: [#7692](https://github.com/dotnet/vscode-csharp/pull/7692))
* Roslyn Tokenizer (#11086) (PR: [#11086](https://github.com/dotnet/razor/pull/11086))
* **Experimental feature**
* Add flush method and make it implementation detail on how that happens (#11087) (PR: [#11087](https://github.com/dotnet/razor/pull/11087))
* Do not extract component into code block (#11069) (PR: [#11069](https://github.com/dotnet/razor/pull/11069))
* **New code action to handle extracting razor code into a new razor component**
* Handle EditorRequired *Changed/*Expression parameters (#11043) (PR: [#11043](https://github.com/dotnet/razor/pull/11043))
* Avoid ambiguous `object` reference in generic component recovery (#11053) (PR: [#11053](https://github.com/dotnet/razor/pull/11053))
* Move culture info check (#11057) (PR: [#11057](https://github.com/dotnet/razor/pull/11057))
* Report a better error for void components (#11041) (PR: [#11041](https://github.com/dotnet/razor/pull/11041))
* Ensure model directives are mapped at runtime (#11007) (PR: [#11007](https://github.com/dotnet/razor/pull/11007))
* Including @using for Out-of-Scope Razor Component References (#10651) (PR: [#10651](https://github.com/dotnet/razor/pull/10651))

# 2.53.x
* Update Roslyn to 4.13.0-1.24518.1 (PR: [#7670](https://github.com/dotnet/vscode-csharp/pull/7670))
* Fix issue where server sometimes crashed when saving new C# file for the first time (PR: [#75509](https://github.com/dotnet/roslyn/pull/75509))
* Report LSP loading telemetry (PR: [#75402](https://github.com/dotnet/roslyn/pull/75402))
Expand Down
4 changes: 2 additions & 2 deletions l10n/bundle.l10n.cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"Disable message in settings": "Zakázat zprávu v nastavení",
"Dismiss": "Zrušit",
"Do not load any": "Nic nenačítat",
"Do not show for this workspace": "Do not show for this workspace",
"Do not show for this workspace": "Nezobrazovat pro tento pracovní prostor",
"Does not contain .NET Core projects.": "Neobsahuje projekty .NET Core.",
"Don't Ask Again": "Příště už se neptat",
"Download Mono": "Stáhnout Mono",
Expand Down Expand Up @@ -158,7 +158,7 @@
"The C# extension for Visual Studio Code is incompatible on {0} {1}.": "Rozšíření jazyka C# pro Visual Studio Code není na {0} {1} kompatibilní.",
"The C# extension is still downloading packages. Please see progress in the output window below.": "Rozšíření C# stále stahuje balíčky. Průběh si můžete prohlédnout v okně výstupu níže.",
"The C# extension was unable to automatically decode projects in the current workspace to create a runnable launch.json file. A template launch.json file has been created as a placeholder.\r\n\r\nIf the server is currently unable to load your project, you can attempt to resolve this by restoring any missing project dependencies (example: run 'dotnet restore') and by fixing any reported errors from building the projects in your workspace.\r\nIf this allows the server to now load your project then --\r\n * Delete this file\r\n * Open the Visual Studio Code command palette (View->Command Palette)\r\n * run the command: '.NET: Generate Assets for Build and Debug'.\r\n\r\nIf your project requires a more complex launch configuration, you may wish to delete this configuration and pick a different template using the 'Add Configuration...' button at the bottom of this file.": "Rozšíření C# nemohlo automaticky dekódovat projekty v aktuálním pracovním prostoru a vytvořit spustitelný soubor launch.json. Soubor launch.json šablony se vytvořil jako zástupný symbol.\r\n\r\nPokud server momentálně nemůže načíst váš projekt, můžete se pokusit tento problém vyřešit obnovením chybějících závislostí projektu (například spuštěním příkazu dotnet restore) a opravou všech nahlášených chyb při sestavování projektů ve vašem pracovním prostoru.\r\nPokud to serveru umožní načíst váš projekt, pak --\r\n * Odstraňte tento soubor\r\n * Otevřete paletu příkazů Visual Studio Code (View->Command Palette)\r\n * Spusťte příkaz: .“NET: Generate Assets for Build and Debug“ (Generovat prostředky pro sestavení a ladění).\r\n\r\nPokud váš projekt vyžaduje složitější konfiguraci spuštění, možná budete chtít tuto konfiguraci odstranit a vybrat jinou šablonu pomocí možnosti „Přidat konfiguraci“ v dolní části tohoto souboru.",
"The active document is not part of the open workspace. Not all language features will be available.": "The active document is not part of the open workspace. Not all language features will be available.",
"The active document is not part of the open workspace. Not all language features will be available.": "Aktivní dokument není součástí otevřeného pracovního prostoru. Nebudou k dispozici všechny jazykové funkce.",
"The selected launch configuration is configured to launch a web browser but no trusted development certificate was found. Create a trusted self-signed certificate?": "Vybraná konfigurace spuštění je nakonfigurovaná tak, aby spustila webový prohlížeč, ale nenašel se žádný důvěryhodný vývojový certifikát. Chcete vytvořit důvěryhodný certifikát podepsaný svým držitelem (self-signed certificate)?",
"The value '{0}' for 'targetArchitecture' in launch configuraiton is invalid. Expected 'x86_64' or 'arm64'.": "Hodnota {0} pro parametr targetArchitecture v konfiguraci spuštění je neplatná. Očekávala se hodnota x86_64 nebo arm64.",
"There are unresolved dependencies. Please execute the restore command to continue.": "Existují nevyřešené závislosti. Pokud chcete pokračovat, spusťte prosím příkaz pro obnovení.",
Expand Down
4 changes: 2 additions & 2 deletions l10n/bundle.l10n.de.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"Disable message in settings": "Nachricht in Einstellungen deaktivieren",
"Dismiss": "Schließen",
"Do not load any": "Keine laden",
"Do not show for this workspace": "Do not show for this workspace",
"Do not show for this workspace": "Nicht für diesen Arbeitsbereich anzeigen",
"Does not contain .NET Core projects.": "Enthält keine .NET Core-Projekte.",
"Don't Ask Again": "Nicht mehr fragen",
"Download Mono": "Mono Herunterladen",
Expand Down Expand Up @@ -158,7 +158,7 @@
"The C# extension for Visual Studio Code is incompatible on {0} {1}.": "Die C#-Erweiterung für Visual Studio Code ist auf {0} {1} nicht kompatibel.",
"The C# extension is still downloading packages. Please see progress in the output window below.": "Die C#-Erweiterung lädt weiterhin Pakete herunter. Den Fortschritt finden Sie unten im Ausgabefenster.",
"The C# extension was unable to automatically decode projects in the current workspace to create a runnable launch.json file. A template launch.json file has been created as a placeholder.\r\n\r\nIf the server is currently unable to load your project, you can attempt to resolve this by restoring any missing project dependencies (example: run 'dotnet restore') and by fixing any reported errors from building the projects in your workspace.\r\nIf this allows the server to now load your project then --\r\n * Delete this file\r\n * Open the Visual Studio Code command palette (View->Command Palette)\r\n * run the command: '.NET: Generate Assets for Build and Debug'.\r\n\r\nIf your project requires a more complex launch configuration, you may wish to delete this configuration and pick a different template using the 'Add Configuration...' button at the bottom of this file.": "Die C#-Erweiterung konnte Projekte im aktuellen Arbeitsbereich nicht automatisch decodieren, um eine ausführbare Datei \"launch.json\" zu erstellen. Eine launch.json-Vorlagendatei wurde als Platzhalter erstellt.\r\n\r\nWenn der Server Ihr Projekt zurzeit nicht laden kann, können Sie versuchen, dies zu beheben, indem Sie fehlende Projektabhängigkeiten wiederherstellen (Beispiel: \"dotnet restore\" ausführen), und alle gemeldeten Fehler beim Erstellen der Projekte in Ihrem Arbeitsbereich beheben.\r\nWenn der Server ihr Projekt jetzt laden kann, dann --\r\n * Diese Datei löschen\r\n * Öffnen Sie die Visual Studio Code-Befehlspalette (Ansicht -> Befehlspalette).\r\n * Führen Sie den Befehl \".NET: Assets für Build und Debug generieren\" aus.\r\n\r\nWenn ihr Projekt eine komplexere Startkonfiguration erfordert, können Sie diese Konfiguration löschen und eine andere Vorlage auswählen, mithilfe der Schaltfläche \"Konfiguration hinzufügen...\" am Ende dieser Datei.",
"The active document is not part of the open workspace. Not all language features will be available.": "The active document is not part of the open workspace. Not all language features will be available.",
"The active document is not part of the open workspace. Not all language features will be available.": "Das aktive Dokument ist nicht Teil des geöffneten Arbeitsbereichs. Nicht alle Sprachfeatures sind verfügbar.",
"The selected launch configuration is configured to launch a web browser but no trusted development certificate was found. Create a trusted self-signed certificate?": "Die ausgewählte Startkonfiguration ist so konfiguriert, dass ein Webbrowser gestartet wird, es wurde jedoch kein vertrauenswürdiges Entwicklungszertifikat gefunden. Vertrauenswürdiges selbstsigniertes Zertifikat erstellen?",
"The value '{0}' for 'targetArchitecture' in launch configuraiton is invalid. Expected 'x86_64' or 'arm64'.": "Der Wert \"{0}\" für \"targetArchitecture\" in der Startkonfiguration ist ungültig. \"x86_64\" oder \"arm64\" wurde erwartet.",
"There are unresolved dependencies. Please execute the restore command to continue.": "Es sind nicht aufgelöste Abhängigkeiten vorhanden. Führen Sie den Wiederherstellungsbefehl aus, um den Vorgang fortzusetzen.",
Expand Down
4 changes: 2 additions & 2 deletions l10n/bundle.l10n.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"Disable message in settings": "Deshabilitar mensaje en la configuración",
"Dismiss": "Descartar",
"Do not load any": "No cargar ninguno",
"Do not show for this workspace": "Do not show for this workspace",
"Do not show for this workspace": "No mostrar para esta área de trabajo",
"Does not contain .NET Core projects.": "No contiene proyectos de .NET Core.",
"Don't Ask Again": "No volver a preguntar",
"Download Mono": "Descargar Mono",
Expand Down Expand Up @@ -158,7 +158,7 @@
"The C# extension for Visual Studio Code is incompatible on {0} {1}.": "La extensión de C# para Visual Studio Code no es compatible con {0} {1}.",
"The C# extension is still downloading packages. Please see progress in the output window below.": "La extensión de C# aún está descargando paquetes. Vea el progreso en la ventana de salida siguiente.",
"The C# extension was unable to automatically decode projects in the current workspace to create a runnable launch.json file. A template launch.json file has been created as a placeholder.\r\n\r\nIf the server is currently unable to load your project, you can attempt to resolve this by restoring any missing project dependencies (example: run 'dotnet restore') and by fixing any reported errors from building the projects in your workspace.\r\nIf this allows the server to now load your project then --\r\n * Delete this file\r\n * Open the Visual Studio Code command palette (View->Command Palette)\r\n * run the command: '.NET: Generate Assets for Build and Debug'.\r\n\r\nIf your project requires a more complex launch configuration, you may wish to delete this configuration and pick a different template using the 'Add Configuration...' button at the bottom of this file.": "La extensión C# no pudo descodificar automáticamente los proyectos del área de trabajo actual para crear un archivo launch.json que se pueda ejecutar. Se ha creado un archivo launch.json de plantilla como marcador de posición.\r\n\r\nSi el servidor no puede cargar el proyecto en este momento, puede intentar resolverlo restaurando las dependencias del proyecto que falten (por ejemplo, ejecute \"dotnet restore\") y corrija los errores notificados de la compilación de los proyectos en el área de trabajo.\r\nSi esto permite al servidor cargar ahora el proyecto, entonces --\r\n * Elimine este archivo\r\n * Abra la paleta de comandos de Visual Studio Code (Vista->Paleta de comandos)\r\n * ejecute el comando: \".NET: Generar recursos para compilar y depurar\".\r\n\r\nSi el proyecto requiere una configuración de inicio más compleja, puede eliminar esta configuración y seleccionar otra plantilla con el botón \"Agregar configuración...\" de la parte inferior de este archivo.",
"The active document is not part of the open workspace. Not all language features will be available.": "The active document is not part of the open workspace. Not all language features will be available.",
"The active document is not part of the open workspace. Not all language features will be available.": "El documento activo no forma parte del área de trabajo abierta. No todas las características de lenguaje estarán disponibles.",
"The selected launch configuration is configured to launch a web browser but no trusted development certificate was found. Create a trusted self-signed certificate?": "La configuración de inicio seleccionada está configurada para iniciar un explorador web, pero no se encontró ningún certificado de desarrollo de confianza. ¿Desea crear un certificado autofirmado de confianza?",
"The value '{0}' for 'targetArchitecture' in launch configuraiton is invalid. Expected 'x86_64' or 'arm64'.": "El valor “{0}” para “targetArchitecture” en la configuración de inicio no es válido. El valor que se esperaba es “x86_64” o “arm64”.",
"There are unresolved dependencies. Please execute the restore command to continue.": "Hay dependencias sin resolver. Ejecute el comando de restauración para continuar.",
Expand Down
4 changes: 2 additions & 2 deletions l10n/bundle.l10n.fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"Disable message in settings": "Désactiver le message dans les paramètres",
"Dismiss": "Ignorer",
"Do not load any": "Ne charger aucun",
"Do not show for this workspace": "Do not show for this workspace",
"Do not show for this workspace": "Ne pas afficher pour cet espace de travail",
"Does not contain .NET Core projects.": "Ne contient pas de projets .NET Core.",
"Don't Ask Again": "Ne plus me poser la question",
"Download Mono": "Télécharger Mono",
Expand Down Expand Up @@ -158,7 +158,7 @@
"The C# extension for Visual Studio Code is incompatible on {0} {1}.": "L’extension C# pour Visual Studio Code est incompatible sur {0} {1}.",
"The C# extension is still downloading packages. Please see progress in the output window below.": "L’extension C# est toujours en train de télécharger des packages. Consultez la progression dans la fenêtre sortie ci-dessous.",
"The C# extension was unable to automatically decode projects in the current workspace to create a runnable launch.json file. A template launch.json file has been created as a placeholder.\r\n\r\nIf the server is currently unable to load your project, you can attempt to resolve this by restoring any missing project dependencies (example: run 'dotnet restore') and by fixing any reported errors from building the projects in your workspace.\r\nIf this allows the server to now load your project then --\r\n * Delete this file\r\n * Open the Visual Studio Code command palette (View->Command Palette)\r\n * run the command: '.NET: Generate Assets for Build and Debug'.\r\n\r\nIf your project requires a more complex launch configuration, you may wish to delete this configuration and pick a different template using the 'Add Configuration...' button at the bottom of this file.": "L’extension C# n’a pas pu décoder automatiquement les projets dans l’espace de travail actuel pour créer un fichier launch.json exécutable. Un fichier launch.json de modèle a été créé en tant qu’espace réservé.\r\n\r\nSi le serveur ne parvient pas actuellement à charger votre projet, vous pouvez tenter de résoudre ce problème en restaurant les dépendances de projet manquantes (par exemple, exécuter « dotnet restore ») et en corrigeant les erreurs signalées lors de la génération des projets dans votre espace de travail.\r\nSi cela permet au serveur de charger votre projet, --\r\n * Supprimez ce fichier\r\n * Ouvrez la palette de commandes Visual Studio Code (View->Command Palette)\r\n * exécutez la commande : « .NET: Generate Assets for Build and Debug ».\r\n\r\nSi votre projet nécessite une configuration de lancement plus complexe, vous pouvez supprimer cette configuration et choisir un autre modèle à l’aide du bouton « Ajouter une configuration... » en bas de ce fichier.",
"The active document is not part of the open workspace. Not all language features will be available.": "The active document is not part of the open workspace. Not all language features will be available.",
"The active document is not part of the open workspace. Not all language features will be available.": "Le document actif ne fait pas partie de l’espace de travail ouvert. Toutes les fonctionnalités de langage ne seront pas disponibles.",
"The selected launch configuration is configured to launch a web browser but no trusted development certificate was found. Create a trusted self-signed certificate?": "La configuration de lancement sélectionnée est configurée pour lancer un navigateur web, mais aucun certificat de développement approuvé n’a été trouvé. Créer un certificat auto-signé approuvé ?",
"The value '{0}' for 'targetArchitecture' in launch configuraiton is invalid. Expected 'x86_64' or 'arm64'.": "La valeur « {0} » pour « Architecture cible » dans la configuration de lancement n'est pas valide. \"x86_64\" ou \"arm64\" attendu.",
"There are unresolved dependencies. Please execute the restore command to continue.": "Il existe des dépendances non résolues. Exécutez la commande de restauration pour continuer.",
Expand Down
Loading

0 comments on commit de2caae

Please sign in to comment.