Skip to content

Commit 03f884c

Browse files
author
Andrew Hall
authored
Merge branch 'main' into reference_integration_test
2 parents ae3e1be + ae1ba70 commit 03f884c

38 files changed

+495
-221
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,21 @@
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

66
# 2.77.x
7+
* Bump xamlTools to 17.14.36106.43 (PR: [#8260](https://github.com/dotnet/vscode-csharp/pull/8260))
8+
* Bump Razor to 10.0.0-preview.25255.4 (PR: [#8249](https://github.com/dotnet/vscode-csharp/pull/8249))
9+
* Port remaining cohosting endpoints to VS Code (#11815) (PR: [#11815](https://github.com/dotnet/razor/pull/11815))
10+
* Fix cohost semantic tokens in VS Code (#11816) (PR: [#11816](https://github.com/dotnet/razor/pull/11816))
11+
* Fix some hardcoded values in cohosting (#11817) (PR: [#11817](https://github.com/dotnet/razor/pull/11817))
12+
* Add new shared SelectXXXAsArray helpers (#11796) (PR: [#11796](https://github.com/dotnet/razor/pull/11796))
13+
* Bump Roslyn to 5.0.0-1.25255.4 (PR: [#8249](https://github.com/dotnet/vscode-csharp/pull/8249))
14+
* Ensure hover markdown for supported platforms uses non-breaking spaces for indentation (#78405) (PR: [#78405](https://github.com/dotnet/roslyn/pull/78405))
15+
* Change O(n) + O(lg n) search in SolutionState.SortedProjectStates to just O(lg n) (#78427) (PR: [#78427](https://github.com/dotnet/roslyn/pull/78427))
16+
* Fix syntax tree creation when modifying source generated documents (#78343) (PR: [#78343](https://github.com/dotnet/roslyn/pull/78343))
717

818
# 2.76.x
19+
* Bump Roslyn to 5.0.0-1.25256.5 (PR: [#8254](https://github.com/dotnet/vscode-csharp/pull/8254))
20+
* Do not parse URIs during LSP serialization/deserialization(PR: [#76691](https://github.com/dotnet/roslyn/pull/76691))
21+
* Ensure hover markdown for supported platforms uses non-breaking spaces for indentation(PR: [#78405](https://github.com/dotnet/roslyn/pull/78405))
922
* Bump Razor to 10.0.0-preview.25252.1 (PR: [#8239](https://github.com/dotnet/vscode-csharp/pull/8239))
1023
* If SupportDiagnostics is false then dynamic files don't report diagnostics... (PR: #11807)
1124
* Client settings tweaks, and implement VS Code configuration monitoring (PR: #11800)

l10n/bundle.l10n.cs.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"'{0}' was not set in the debug configuration.": "Nenastaveno v konfiguraci ladění: {0}",
66
".NET NuGet Restore": "Obnovení .NET NuGet",
77
".NET Test Log": "Protokol testů .NET",
8+
".NET: Generate Assets for Build and Debug": ".NET: Generate Assets for Build and Debug",
89
"1 reference": "1 odkaz",
910
"A valid dotnet installation could not be found: {0}": "Nepovedlo se najít platnou instalaci rozhraní dotnet: {0}",
1011
"Active File Context": "Kontext aktivního souboru",
@@ -30,6 +31,7 @@
3031
"Choose": "Zvolit",
3132
"Choose and set default": "Zvolit a nastavit výchozí",
3233
"Click {0}. This will copy all relevant issue information.": "Klikněte na {0}. Zkopírují se tím všechny relevantní informace o problému.",
34+
"Cohosting is on, client has no access to CSharp content": "Cohosting is on, client has no access to CSharp content",
3335
"Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.": "Konfigurace „{0}“ v souboru launch.json nemá argument {1} s {2} pro výpis vzdáleného procesu.",
3436
"Copy C#": "Kopírovat kód C#",
3537
"Copy Html": "Kopírovat HTML",
@@ -89,6 +91,7 @@
8991
"More Information": "Další informace",
9092
"Name not defined in current configuration.": "Název není v aktuální konfiguraci definován.",
9193
"Nested Code Action": "Akce vnořeného kódu",
94+
"No": "No",
9295
"No executable projects": "Žádné spustitelné projekty",
9396
"No launchable target found for '{0}'": "Pro „{0}“ se nenašel žádný spustitelný cíl",
9497
"No launchable target found.": "Nenašel se žádný spustitelný cíl.",
@@ -158,6 +161,7 @@
158161
"Synchronization timed out": "Vypršel časový limit synchronizace.",
159162
"Test run already in progress": "Už probíhá testovací běh.",
160163
"Text editor must be focused to fix all issues": "Aby bylo možné vyřešit všechny problémy, musí mít textový editor fokus.",
164+
"The '{0}' command is not recommended to be used when C# Dev Kit extension is installed. Would you like build and debug using a dynamic configuration instead?": "The '{0}' command is not recommended to be used when C# Dev Kit extension is installed. Would you like build and debug using a dynamic configuration instead?",
161165
"The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": "Nelze nalézt sadu .NET Core SDK: {0}. Ladění .NET Core se nepovolí. Ujistěte se, že je sada .NET Core SDK nainstalovaná a umístěná v dané cestě.",
162166
"The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "Sada .NET Core SDK umístěná v cestě je příliš stará. Ladění .NET Core se nepovolí. Minimální podporovaná verze je {0}.",
163167
"The C# extension for Visual Studio Code is incompatible on {0} {1} with the VS Code Remote Extensions. To see avaliable workarounds, click on '{2}'.": "Rozšíření jazyka C# pro Visual Studio Code není kompatibilní na {0} {1} se vzdálenými rozšířeními VS Code. Pokud chcete zobrazit dostupná alternativní řešení, klikněte na {2}.",

l10n/bundle.l10n.de.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"'{0}' was not set in the debug configuration.": "\"{0}\" wurde in der Debugkonfiguration nicht festgelegt.",
66
".NET NuGet Restore": ".NET NuGet-Wiederherstellung",
77
".NET Test Log": ".NET-Testprotokoll",
8+
".NET: Generate Assets for Build and Debug": ".NET: Generate Assets for Build and Debug",
89
"1 reference": "1 Verweis",
910
"A valid dotnet installation could not be found: {0}": "Es wurde keine gültige dotnet-Installation gefunden: {0}",
1011
"Active File Context": "Aktiver Dateikontext",
@@ -30,6 +31,7 @@
3031
"Choose": "Auswählen",
3132
"Choose and set default": "Standard auswählen und festlegen",
3233
"Click {0}. This will copy all relevant issue information.": "Klicken Sie auf {0}. Dadurch werden alle relevanten Probleminformationen kopiert.",
34+
"Cohosting is on, client has no access to CSharp content": "Cohosting is on, client has no access to CSharp content",
3335
"Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.": "Die Konfiguration \"{0}\" in \"launch.json\" weist kein {1}-Argument mit {2} für die Remoteprozessauflistung auf.",
3436
"Copy C#": "C# kopieren",
3537
"Copy Html": "HTML kopieren",
@@ -89,6 +91,7 @@
8991
"More Information": "Weitere Informationen",
9092
"Name not defined in current configuration.": "Der Name ist in der aktuellen Konfiguration nicht definiert.",
9193
"Nested Code Action": "Geschachtelte Codeaktion",
94+
"No": "No",
9295
"No executable projects": "Keine ausführbaren Projekte",
9396
"No launchable target found for '{0}'": "Für \"{0}\" wurde kein startbares Ziel gefunden.",
9497
"No launchable target found.": "Kein startbares Ziel gefunden.",
@@ -158,6 +161,7 @@
158161
"Synchronization timed out": "Timeout bei der Synchronisierung",
159162
"Test run already in progress": "Es wird bereits ein Testlauf ausgeführt.",
160163
"Text editor must be focused to fix all issues": "Der Texteditor muss den Fokus haben, um alle Probleme zu beheben.",
164+
"The '{0}' command is not recommended to be used when C# Dev Kit extension is installed. Would you like build and debug using a dynamic configuration instead?": "The '{0}' command is not recommended to be used when C# Dev Kit extension is installed. Would you like build and debug using a dynamic configuration instead?",
161165
"The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": "Das .NET Core SDK kann nicht gefunden werden: {0}. Das .NET Core-Debuggen wird nicht aktiviert. Stellen Sie sicher, dass das .NET Core SDK installiert ist und sich im Pfad befindet.",
162166
"The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "Das .NET Core SDK auf dem Pfad ist zu alt. Das .NET Core-Debuggen wird nicht aktiviert. Die unterstützte Mindestversion ist {0}.",
163167
"The C# extension for Visual Studio Code is incompatible on {0} {1} with the VS Code Remote Extensions. To see avaliable workarounds, click on '{2}'.": "Die C#-Erweiterung für Visual Studio Code ist auf {0} {1} nicht mit den VS Code-Remoteerweiterungen kompatibel. Klicken Sie auf „{2}“, um verfügbare Problemumgehungen anzuzeigen.",

l10n/bundle.l10n.es.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"'{0}' was not set in the debug configuration.": "No se estableció '{0}' en la configuración de depuración.",
66
".NET NuGet Restore": "Restauración de NuGet de .NET",
77
".NET Test Log": "Registro de pruebas de .NET",
8+
".NET: Generate Assets for Build and Debug": ".NET: Generate Assets for Build and Debug",
89
"1 reference": "1 referencia",
910
"A valid dotnet installation could not be found: {0}": "No se encontró una instalación de dotnet válida: {0}",
1011
"Active File Context": "Contexto de archivo activo",
@@ -30,6 +31,7 @@
3031
"Choose": "Elegir",
3132
"Choose and set default": "Elegir y establecer el valor predeterminado",
3233
"Click {0}. This will copy all relevant issue information.": "Haga clic en {0}. Esto copiará toda la información del problema pertinente.",
34+
"Cohosting is on, client has no access to CSharp content": "Cohosting is on, client has no access to CSharp content",
3335
"Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.": "La configuración \"{0}\" de launch.json no tiene un argumento {1} con {2} para la lista de procesos remotos.",
3436
"Copy C#": "Copiar C#",
3537
"Copy Html": "Copiar HTML",
@@ -89,6 +91,7 @@
8991
"More Information": "Más información",
9092
"Name not defined in current configuration.": "Nombre no definido en la configuración actual.",
9193
"Nested Code Action": "Acción de código anidado",
94+
"No": "No",
9295
"No executable projects": "No hay proyectos ejecutables",
9396
"No launchable target found for '{0}'": "No se encontró ningún destino para '{0}' que se pueda iniciar.",
9497
"No launchable target found.": "No se encontró ningún destino que se pueda iniciar.",
@@ -158,6 +161,7 @@
158161
"Synchronization timed out": "Tiempo de espera de sincronización agotado.",
159162
"Test run already in progress": "La ejecución de prueba ya está en curso",
160163
"Text editor must be focused to fix all issues": "El editor de texto debe estar centrado para corregir todos los problemas",
164+
"The '{0}' command is not recommended to be used when C# Dev Kit extension is installed. Would you like build and debug using a dynamic configuration instead?": "The '{0}' command is not recommended to be used when C# Dev Kit extension is installed. Would you like build and debug using a dynamic configuration instead?",
161165
"The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": "No se encuentra el SDK de .NET Core: {0}. No se habilitará la depuración de .NET Core. Asegúrese de que el SDK de .NET Core está instalado y en la ruta de acceso.",
162166
"The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "El SDK de .NET Core ubicado en la ruta de acceso es muy antiguo. No se habilitará la depuración de .NET Core. La versión mínima admitida es {0}.",
163167
"The C# extension for Visual Studio Code is incompatible on {0} {1} with the VS Code Remote Extensions. To see avaliable workarounds, click on '{2}'.": "La extensión de C# para Visual Studio Code no es compatible en {0} {1}con las extensiones remotas VS Code. Para ver soluciones alternativas disponibles, haga clic en \"{2}\".",

l10n/bundle.l10n.fr.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"'{0}' was not set in the debug configuration.": "« {0} » n’a pas été défini dans la configuration de débogage.",
66
".NET NuGet Restore": "Restauration de .NET NuGet",
77
".NET Test Log": "Journal des tests .NET",
8+
".NET: Generate Assets for Build and Debug": ".NET: Generate Assets for Build and Debug",
89
"1 reference": "1 référence",
910
"A valid dotnet installation could not be found: {0}": "Une installation dotnet valide est introuvable : {0}",
1011
"Active File Context": "Contexte de fichier actif",
@@ -30,6 +31,7 @@
3031
"Choose": "Choisir",
3132
"Choose and set default": "Choisir et définir la valeur par défaut",
3233
"Click {0}. This will copy all relevant issue information.": "Cliquez sur {0}. Cette opération copie toutes les informations pertinentes sur le problème.",
34+
"Cohosting is on, client has no access to CSharp content": "Cohosting is on, client has no access to CSharp content",
3335
"Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.": "La configuration « {0} » dans launch.json n’a pas d’argument {1} avec {2} pour la liste des processus distants.",
3436
"Copy C#": "Copier C#",
3537
"Copy Html": "Copier du code HTML",
@@ -89,6 +91,7 @@
8991
"More Information": "Plus d'informations",
9092
"Name not defined in current configuration.": "Nom non défini dans la configuration actuelle.",
9193
"Nested Code Action": "Action de code imbriqué",
94+
"No": "No",
9295
"No executable projects": "Aucun projet exécutable",
9396
"No launchable target found for '{0}'": "Aucune cible pouvant être lancée n’a été trouvée pour « {0} »",
9497
"No launchable target found.": "Aucune cible pouvant être lancée n’a été trouvée.",
@@ -158,6 +161,7 @@
158161
"Synchronization timed out": "Délai de synchronisation dépassé",
159162
"Test run already in progress": "Série de tests déjà en cours",
160163
"Text editor must be focused to fix all issues": "L’éditeur de texte doit être axé sur la résolution de tous les problèmes",
164+
"The '{0}' command is not recommended to be used when C# Dev Kit extension is installed. Would you like build and debug using a dynamic configuration instead?": "The '{0}' command is not recommended to be used when C# Dev Kit extension is installed. Would you like build and debug using a dynamic configuration instead?",
161165
"The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": "Le SDK .NET Core est introuvable : {0}. Le débogage .NET Core ne sera pas activé. Assurez-vous que le SDK .NET Core est installé et se trouve sur le chemin.",
162166
"The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "Le SDK .NET Core situé sur le chemin est trop ancien. Le débogage .NET Core ne sera pas activé. La version minimale prise en charge est {0}.",
163167
"The C# extension for Visual Studio Code is incompatible on {0} {1} with the VS Code Remote Extensions. To see avaliable workarounds, click on '{2}'.": "L’extension C# pour Visual Studio Code est incompatible sur {0} {1} avec les extensions distantes VS Code. Pour voir les solutions de contournement disponibles, cliquez sur «{2}».",

l10n/bundle.l10n.it.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"'{0}' was not set in the debug configuration.": "'{0}' non è stato impostato nella configurazione di debug.",
66
".NET NuGet Restore": "Ripristino NuGet .NET",
77
".NET Test Log": "Log di test .NET",
8+
".NET: Generate Assets for Build and Debug": ".NET: Generate Assets for Build and Debug",
89
"1 reference": "1 riferimento",
910
"A valid dotnet installation could not be found: {0}": "Non è stato possibile trovare un'installazione dotnet valida: {0}",
1011
"Active File Context": "Contesto del file attivo",
@@ -30,6 +31,7 @@
3031
"Choose": "Scegli",
3132
"Choose and set default": "Scegliere e impostare il valore predefinito",
3233
"Click {0}. This will copy all relevant issue information.": "Fare clic su {0}. Verranno copiate tutte le informazioni rilevanti sul problema.",
34+
"Cohosting is on, client has no access to CSharp content": "Cohosting is on, client has no access to CSharp content",
3335
"Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.": "Il \"{0}\" di configurazione in launch.json non contiene un argomento {1} con {2} per l'elenco dei processi remoti.",
3436
"Copy C#": "Copia C#",
3537
"Copy Html": "Copia HTML",
@@ -89,6 +91,7 @@
8991
"More Information": "Altre informazioni",
9092
"Name not defined in current configuration.": "Nome non definito nella configurazione corrente.",
9193
"Nested Code Action": "Azione codice annidato",
94+
"No": "No",
9295
"No executable projects": "Nessun progetto eseguibile",
9396
"No launchable target found for '{0}'": "Non è stata trovata alcuna destinazione avviabile per '{0}'",
9497
"No launchable target found.": "Non è stata trovata alcuna destinazione avviabile.",
@@ -158,6 +161,7 @@
158161
"Synchronization timed out": "Timeout sincronizzazione",
159162
"Test run already in progress": "Esecuzione del test già in corso",
160163
"Text editor must be focused to fix all issues": "L'editor di testo deve avere lo stato attivo per risolvere tutti i problemi",
164+
"The '{0}' command is not recommended to be used when C# Dev Kit extension is installed. Would you like build and debug using a dynamic configuration instead?": "The '{0}' command is not recommended to be used when C# Dev Kit extension is installed. Would you like build and debug using a dynamic configuration instead?",
161165
"The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": "L'SDK .NET Core non può essere localizzato: {0}. Il debug di .NET Core non sarà abilitato. Assicurarsi che .NET Core SDK sia installato e si trovi nel percorso.",
162166
"The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "L'SDK .NET Core situato nel percorso è troppo vecchio. Il debug di .NET Core non sarà abilitato. La versione minima supportata è {0}.",
163167
"The C# extension for Visual Studio Code is incompatible on {0} {1} with the VS Code Remote Extensions. To see avaliable workarounds, click on '{2}'.": "L'estensione C# per Visual Studio Code non è compatibile in {0} {1} con le estensioni di VS Code remoto. Per visualizzare soluzioni alternative disponibili, fare clic su \"{2}\".",

0 commit comments

Comments
 (0)