Skip to content

Commit

Permalink
Merge branch 'dotnet:main' into thays_support_mono_debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
thaystg authored Dec 19, 2023
2 parents f4f9f0f + 056f531 commit 6bc5dc4
Show file tree
Hide file tree
Showing 33 changed files with 235 additions and 124 deletions.
8 changes: 4 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@
"updatePackageDependencies"
],
"env": {
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/e0f801bdafd01c3f43da737947281f81/razorlanguageserver-linux-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/527a542a3ba900550caefea6846ced7d/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/c8a0653ea1e819861e8c5a95aec6e910/razorlanguageserver-linux-musl-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/768c5dde8e54c2072e8db38a00336155/razorlanguageserver-linux-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/df06d231751e0027d7fca3ca68177a8a/razorlanguageserver-osx-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/3be409a63d071b7f146cd0add8e969a8/razorlanguageserver-osx-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/52819418a9dc741619b81118f6c319be/razorlanguageserver-platformagnostic-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/b4819f7f31e1001bfdd217bd6a91253b/razorlanguageserver-win-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/50352dafd482a09e3f7ebb0b67346459/razorlanguageserver-win-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/12ebd9174d0b62a837da0109a5ed7e60/razorlanguageserver-win-x86-7.0.0-preview.23611.2.zip",
"NEW_DEPS_VERSION": "7.0.0-preview.23611.2",
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/c272788e7d4dae4b7ddaac5f51f98a78/razorlanguageserver-linux-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/9391972405d093eaa406482ffe73925e/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7d68e714a49ffa67169bdb2f979d9625/razorlanguageserver-linux-musl-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/9c1986fb1da8db7882cc4af6e624a92e/razorlanguageserver-linux-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/374d6a0c0ae5b043fa424a89e740e82e/razorlanguageserver-osx-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/44eced55816edabb41d131eec4db442b/razorlanguageserver-osx-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/1e21370d7aa085b5ef9da0708e73707d/razorlanguageserver-platformagnostic-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/2b08591e0a9532a95cbb4d961e543624/razorlanguageserver-win-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/b6fc013fa813d42c44ffe33bc31742f9/razorlanguageserver-win-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/21e60c5e4f6423182ea9725cd3d28668/razorlanguageserver-win-x86-7.0.0-preview.23616.1.zip",
"NEW_DEPS_VERSION": "7.0.0-preview.23616.1",
"NEW_DEPS_ID": "Razor"
},
"cwd": "${workspaceFolder}"
Expand All @@ -184,8 +184,8 @@
"updatePackageDependencies"
],
"env": {
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/239d3947eac895453bd1145d5e0b8b3d/devkittelemetry-linux-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/bf770a7f0b7a374e64a21c335958d77b/devkittelemetry-linux-musl-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/efb6b7891e87bdffd43dd20bb58715cf/devkittelemetry-linux-musl-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/8c006ed01d9901a824f1986a9f8867cc/devkittelemetry-linux-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/13ed152d6d94d9135f705151846ce026/devkittelemetry-osx-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/2966a3d87b6a914cf3e22bbbb571c016/devkittelemetry-osx-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/52129618a1908d39137a27bd71c98e5f/devkittelemetry-platformagnostic-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/2625dff1e7d78fdb88282a709195e00c/devkittelemetry-win-arm64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/bded259717edabe1af8e703e0a8b825d/devkittelemetry-win-x64-7.0.0-preview.23611.2.zip,https://download.visualstudio.microsoft.com/download/pr/59ebeea0-c017-4758-9f32-402950d93b6c/fa215cdb51b645b9848daafd65198281/devkittelemetry-win-x86-7.0.0-preview.23611.2.zip",
"NEW_DEPS_VERSION": "7.0.0-preview.23611.2",
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/2cb789acba83c4d4080cf10b3e91720c/devkittelemetry-linux-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7dc0d68d9ed50a0de44894d0ac7d9fa9/devkittelemetry-linux-musl-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7f3d45705e5ce18781dc69a7bb1084b9/devkittelemetry-linux-musl-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/91916990f7b25c357bb577c60c00e9f5/devkittelemetry-linux-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/09ae5baf1e9f1c894ba269aa4484ca48/devkittelemetry-osx-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/3ab2d6e1d3bdc5575075d9a062a24166/devkittelemetry-osx-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/40b4a00152d07869d12ce44b96572d4c/devkittelemetry-platformagnostic-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/6d5a093349b5e749c44457cb758f718f/devkittelemetry-win-arm64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/7e92c77e99d0291a9ab78c8c993315a2/devkittelemetry-win-x64-7.0.0-preview.23616.1.zip,https://download.visualstudio.microsoft.com/download/pr/bafe42f7-f4b1-42b0-8111-16162d978fcc/902166e7b43e0a87a62bc9c39aa21c7b/devkittelemetry-win-x86-7.0.0-preview.23616.1.zip",
"NEW_DEPS_VERSION": "7.0.0-preview.23616.1",
"NEW_DEPS_ID": "RazorTelemetry"
},
"cwd": "${workspaceFolder}"
Expand Down
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)

## Latest
* Update Razor to 7.0.0-preview.23611.2 (PR: [#6741](https://github.com/dotnet/vscode-csharp/pull/6741)

## 2.14.?
* Update Razor to 7.0.0-preview.23616.1 (PR: [#6760](https://github.com/dotnet/vscode-csharp/pull/6760)
* Update Roslyn to 4.9.0-3.23611.3 (PR: [#6736](https://github.com/dotnet/vscode-csharp/pull/6736))

## 2.14.8
* Fix Remote Process Listing from Windows (PR: [#6730](https://github.com/dotnet/vscode-csharp/pull/6730))
* Fix description of debugger `console` setting (PR: [#6726](https://github.com/dotnet/vscode-csharp/pull/6726))
* Read extension paths option (PR: [#6724](https://github.com/dotnet/vscode-csharp/pull/6724))
Expand Down
5 changes: 5 additions & 0 deletions l10n/bundle.l10n.cs.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"'{0}' is not an executable project.": "„{0}“ není spustitelný projekt.",
"'{0}' request is not supported for the '{1}' configuration.": "Žádost {0} se pro konfiguraci {1} nepodporuje.",
"'{0}' was not provided in the debug configuration.": "Nezadáno v konfiguraci ladění: {0}",
"'{0}' was not set in the debug configuration.": "Nenastaveno v konfiguraci ladění: {0}",
"1 reference": "1 odkaz",
"A valid dotnet installation could not be found: {0}": "Nepovedlo se najít platnou instalaci rozhraní dotnet: {0}",
"Actual behavior": "Skutečné chování",
Expand All @@ -8,6 +11,7 @@
"Bug": "Chyba",
"C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "Konfigurace jazyka C# se změnila. Chcete znovu spustit jazykový server se změnami?",
"C# configuration has changed. Would you like to reload the window to apply your changes?": "Konfigurace jazyka C# se změnila. Chcete znovu načíst okno, aby se změny použily?",
"Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "Nelze najít otevřenou složku pracovního prostoru. Než začnete ladit s konfigurací {0}, otevřete prosím složku.",
"Can't parse envFile {0} because of {1}": "Nelze analyzovat envFile {0} z důvodu {1}",
"Cancel": "Zrušit",
"Cannot create .NET debug configurations. No workspace folder was selected.": "Nelze vytvořit konfigurace ladění .NET. Nebyla vybrána žádná složka pracovního prostoru.",
Expand Down Expand Up @@ -71,6 +75,7 @@
"Nested Code Action": "Akce vnořeného kódu",
"No executable projects": "Žádné spustitelné projekty",
"No launchable target found for '{0}'": "Pro „{0}“ se nenašel žádný spustitelný cíl",
"No launchable target found.": "Nenašel se žádný spustitelný cíl.",
"No process was selected.": "Nebyl vybrán žádný proces.",
"Non Razor file as active document": "Soubor, který není Razor, jako aktivní dokument",
"Not Now": "Teď ne",
Expand Down
5 changes: 5 additions & 0 deletions l10n/bundle.l10n.de.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"'{0}' is not an executable project.": "\"{0}\" ist kein ausführbares Projekt.",
"'{0}' request is not supported for the '{1}' configuration.": "Die Anforderung \"{0}\" wird für die Konfiguration \"{1}\" nicht unterstützt.",
"'{0}' was not provided in the debug configuration.": "\"{0}\" wurde in der Debugkonfiguration nicht angegeben.",
"'{0}' was not set in the debug configuration.": "\"{0}\" wurde in der Debugkonfiguration nicht festgelegt.",
"1 reference": "1 Verweis",
"A valid dotnet installation could not be found: {0}": "Es wurde keine gültige dotnet-Installation gefunden: {0}",
"Actual behavior": "Tatsächliches Verhalten",
Expand All @@ -8,6 +11,7 @@
"Bug": "Fehler",
"C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "Die C#-Konfiguration wurde geändert. Möchten Sie den Sprachserver mit Ihren Änderungen neu starten?",
"C# configuration has changed. Would you like to reload the window to apply your changes?": "Die C#-Konfiguration wurde geändert. Möchten Sie das Fenster neu laden, um Ihre Änderungen anzuwenden?",
"Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "Es wurde kein geöffneter Arbeitsbereichsordner gefunden. Öffnen Sie einen Ordner, bevor Sie mit dem Debuggen mit einer {0}-Konfiguration beginnen.",
"Can't parse envFile {0} because of {1}": "envFile {0} kann aufgrund von {1} nicht analysiert werden.",
"Cancel": "Abbrechen",
"Cannot create .NET debug configurations. No workspace folder was selected.": ".NET-Debugkonfigurationen können nicht erstellt werden. Es wurde kein Arbeitsbereichsordner ausgewählt.",
Expand Down Expand Up @@ -71,6 +75,7 @@
"Nested Code Action": "Geschachtelte Codeaktion",
"No executable projects": "Keine ausführbaren Projekte",
"No launchable target found for '{0}'": "Für \"{0}\" wurde kein startbares Ziel gefunden.",
"No launchable target found.": "Kein startbares Ziel gefunden.",
"No process was selected.": "Es wurde kein Prozess ausgewählt.",
"Non Razor file as active document": "Nicht-Razor-Datei als aktives Dokument",
"Not Now": "Nicht jetzt",
Expand Down
5 changes: 5 additions & 0 deletions l10n/bundle.l10n.es.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"'{0}' is not an executable project.": "'{0}' no es un proyecto ejecutable.",
"'{0}' request is not supported for the '{1}' configuration.": "No se admite la solicitud '{0}' para la configuración '{1}'.",
"'{0}' was not provided in the debug configuration.": "No se proporcionó '{0}' en la configuración de depuración.",
"'{0}' was not set in the debug configuration.": "No se estableció '{0}' en la configuración de depuración.",
"1 reference": "1 referencia",
"A valid dotnet installation could not be found: {0}": "No se encontró una instalación de dotnet válida: {0}",
"Actual behavior": "Comportamiento real",
Expand All @@ -8,6 +11,7 @@
"Bug": "Error",
"C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "La configuración de C# ha cambiado. ¿Desea volver a iniciar el servidor de lenguaje con los cambios?",
"C# configuration has changed. Would you like to reload the window to apply your changes?": "La configuración de C# ha cambiado. ¿Desea volver a cargar la ventana para aplicar los cambios?",
"Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "No se encuentra ninguna carpeta de área de trabajo abierta. Abra una carpeta antes de iniciar la depuración con una configuración de '{0}'.",
"Can't parse envFile {0} because of {1}": "No se puede analizar envFile {0} debido a {1}",
"Cancel": "Cancelar",
"Cannot create .NET debug configurations. No workspace folder was selected.": "No se pueden crear configuraciones de depuración de .NET. No se seleccionó ninguna carpeta del área de trabajo.",
Expand Down Expand Up @@ -71,6 +75,7 @@
"Nested Code Action": "Acción de código anidado",
"No executable projects": "No hay proyectos ejecutables",
"No launchable target found for '{0}'": "No se encontró ningún destino para '{0}' que se pueda iniciar.",
"No launchable target found.": "No se encontró ningún destino que se pueda iniciar.",
"No process was selected.": "No se seleccionó ningún proceso.",
"Non Razor file as active document": "Archivo que no es de Razor como documento activo",
"Not Now": "Ahora no",
Expand Down
5 changes: 5 additions & 0 deletions l10n/bundle.l10n.fr.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"'{0}' is not an executable project.": "« {0} » n’est pas un projet exécutable.",
"'{0}' request is not supported for the '{1}' configuration.": "La requête « {0} » n’est pas prise en charge pour la configuration « {1} ».",
"'{0}' was not provided in the debug configuration.": "« {0} » n’a pas été fourni dans la configuration de débogage.",
"'{0}' was not set in the debug configuration.": "« {0} » n’a pas été défini dans la configuration de débogage.",
"1 reference": "1 référence",
"A valid dotnet installation could not be found: {0}": "Une installation dotnet valide est introuvable : {0}",
"Actual behavior": "Comportement réel",
Expand All @@ -8,6 +11,7 @@
"Bug": "Bogue",
"C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "La configuration C# a changé. Voulez-vous relancer le serveur de langage avec vos modifications ?",
"C# configuration has changed. Would you like to reload the window to apply your changes?": "La configuration C# a changé. Voulez-vous recharger la fenêtre pour appliquer vos modifications ?",
"Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "Impossible de trouver un dossier d’espace de travail ouvert. Ouvrez un dossier avant de commencer à déboguer avec une configuration « {0} ».",
"Can't parse envFile {0} because of {1}": "Impossible d’analyser envFile {0} en raison de {1}",
"Cancel": "Annuler",
"Cannot create .NET debug configurations. No workspace folder was selected.": "Impossible de créer des configurations de débogage .NET. Aucun dossier d’espace de travail n’a été sélectionné.",
Expand Down Expand Up @@ -71,6 +75,7 @@
"Nested Code Action": "Action de code imbriqué",
"No executable projects": "Aucun projet exécutable",
"No launchable target found for '{0}'": "Aucune cible pouvant être lancée n’a été trouvée pour « {0} »",
"No launchable target found.": "Aucune cible pouvant être lancée n’a été trouvée.",
"No process was selected.": "Aucun processus n’a été sélectionné.",
"Non Razor file as active document": "Fichier non Razor comme document actif",
"Not Now": "Pas maintenant",
Expand Down
5 changes: 5 additions & 0 deletions l10n/bundle.l10n.it.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"'{0}' is not an executable project.": "'{0}' non è un progetto eseguibile.",
"'{0}' request is not supported for the '{1}' configuration.": "La richiesta '{0}' non è supportata per la configurazione '{1}'.",
"'{0}' was not provided in the debug configuration.": "'{0}' non è stato specificato nella configurazione di debug.",
"'{0}' was not set in the debug configuration.": "'{0}' non è stato impostato nella configurazione di debug.",
"1 reference": "1 riferimento",
"A valid dotnet installation could not be found: {0}": "Non è stato possibile trovare un'installazione dotnet valida: {0}",
"Actual behavior": "Comportamento effettivo",
Expand All @@ -8,6 +11,7 @@
"Bug": "Bug",
"C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "La configurazione di C# è stata modificata. Riavviare il server di linguaggio con le modifiche?",
"C# configuration has changed. Would you like to reload the window to apply your changes?": "La configurazione di C# è stata modificata. Ricaricare la finestra per applicare le modifiche?",
"Can not find an opened workspace folder. Please open a folder before starting to debug with a '{0}' configuration'.": "Non è possibile trovare una cartella dell'area di lavoro aperta. Aprire una cartella prima di avviare il debug con una configurazione '{0}'.",
"Can't parse envFile {0} because of {1}": "Non è possibile analizzare envFile {0} a causa di {1}",
"Cancel": "Annulla",
"Cannot create .NET debug configurations. No workspace folder was selected.": "Impossibile creare configurazioni di debug .NET. Non è stata selezionata alcuna cartella dell'area di lavoro.",
Expand Down Expand Up @@ -71,6 +75,7 @@
"Nested Code Action": "Azione codice annidato",
"No executable projects": "Nessun progetto eseguibile",
"No launchable target found for '{0}'": "Non è stata trovata alcuna destinazione avviabile per '{0}'",
"No launchable target found.": "Non è stata trovata alcuna destinazione avviabile.",
"No process was selected.": "Nessun processo selezionato.",
"Non Razor file as active document": "File non Razor come documento attivo",
"Not Now": "Non ora",
Expand Down
Loading

0 comments on commit 6bc5dc4

Please sign in to comment.