Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'main' => 'prerelease' #7758

Merged
merged 36 commits into from
Nov 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
8e3c7b8
Update Debugger Packages for v2.55.0
WardenGnaw Oct 30, 2024
0d5ed5b
Update main version
dibarbet Nov 1, 2024
c809a50
Disable server restart command with devkit
dibarbet Nov 1, 2024
1c7c84e
Merge pull request #7731 from dibarbet/disable_restart_devkit
dibarbet Nov 2, 2024
802be73
Merge pull request #7730 from dotnet/merge/update-main-version
dibarbet Nov 2, 2024
d9312f1
Localization result of 802be7399e947ab82f2a69780d43a57c1d5be6aa.
dotnet-bot Nov 2, 2024
1479efd
Localize LSP Trace Logs
Cosifne Oct 30, 2024
da2c4d2
Localizae other output channel
Cosifne Nov 4, 2024
05241f7
Localize razor
Cosifne Nov 4, 2024
ccfca2b
Merge pull request #7733 from dotnet/localization/802be7399e947ab82f2…
JoeRobich Nov 5, 2024
71eb610
Localization result of ccfca2bad0bd2d752d86feb01ad2a3f9a5d4ace6.
dotnet-bot Nov 5, 2024
f63f671
Merge pull request #7732 from dotnet/merge/prerelease-to-main
JoeRobich Nov 5, 2024
fe404cc
Merge pull request #7735 from dotnet/localization/ccfca2bad0bd2d752d8…
JoeRobich Nov 5, 2024
c51b3c7
Merge pull request #7703 from Cosifne/dev/shech/localizedOutputWindow
Cosifne Nov 5, 2024
9b065d6
Localization result of c51b3c75ee599ded4c88b0d3415ed11f6d5cf6d9.
dotnet-bot Nov 5, 2024
9d0fb89
Merge pull request #7738 from dotnet/localization/c51b3c75ee599ded4c8…
Cosifne Nov 6, 2024
5ca35ee
Bump xamlTools to 17.13.35506.24
etvorun Nov 6, 2024
2213221
Merge pull request #7740 from etvorun/xamlTools_17.13.35506.24
dibarbet Nov 6, 2024
275acc1
Merge pull request #7741 from dotnet/merge/prerelease-to-main
dibarbet Nov 6, 2024
850affd
Add razor rename integration tests (#7675)
ryzngard Nov 7, 2024
13f1d7a
Localization result of 850affd17b222eee10dd51deeffbbbae7a5f652d.
dotnet-bot Nov 7, 2024
b894c3e
Merge pull request #7743 from dotnet/localization/850affd17b222eee10d…
JoeRobich Nov 7, 2024
a9cf04f
Merge pull request #7710 from dotnet/dev/waan/debugger2_55_0
dibarbet Nov 8, 2024
da46e13
Localization result of a9cf04f5d928914b8a94d269fef5594ef974fc15.
dotnet-bot Nov 8, 2024
6dce908
Update Roslyn to 4.13.0-2.24557.5
dibarbet Nov 8, 2024
adbf55d
Merge pull request #7747 from dotnet/localization/a9cf04f5d928914b8a9…
JoeRobich Nov 8, 2024
d1af62b
Merge pull request #7752 from dibarbet/update_roslyn
dibarbet Nov 8, 2024
7bec887
Localization result of d1af62b8f141f4aa9fa5f4ec1767ca6e7cd82ea7.
dotnet-bot Nov 8, 2024
2ed9be7
Merge pull request #7754 from dotnet/localization/d1af62b8f141f4aa9fa…
dibarbet Nov 8, 2024
8e74e77
Update roslyn and xamlTools versions
etvorun Nov 8, 2024
cd85617
Update PR number
etvorun Nov 8, 2024
a4c632c
Update razor package
ryzngard Nov 8, 2024
8c07e27
Update CHANGELOG
ryzngard Nov 8, 2024
f890f49
Merge pull request #7755 from etvorun/xamlTools_17.13.35507.225
dibarbet Nov 8, 2024
c46aa82
Merge pull request #7756 from ryzngard/bump_razor
dibarbet Nov 8, 2024
e3b8b97
Merge branch 'prerelease' into merge/main-to-prerelease
dibarbet Nov 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "Launch Current File BasicRazorApp2_1 Integration Tests",
"name": "[Razor] Run Current File Integration Test",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
Expand All @@ -76,7 +76,7 @@
// The profile can be found under /test/csharp-test-profile.
"--profile",
"csharp-test-profile",
"${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace",
"${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/RazorApp.code-workspace",
"--extensionDevelopmentPath=${workspaceRoot}",
"--extensionTestsPath=${workspaceRoot}/out/test/razor/razorIntegrationTests",
"--log",
Expand All @@ -89,7 +89,7 @@
"sourceMaps": true,
"outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
"preLaunchTask": "buildDev",
"preLaunchTask": "buildTest",
"internalConsoleOptions": "openOnSessionStart"
},
{
Expand Down Expand Up @@ -204,7 +204,7 @@
"id": "omnisharpAssetName",
"description": "The name of the asset folder to use for the OmniSharp integration test.",
"type": "pickString",
"options": ["singleCsproj", "BasicRazorApp2_1", "slnWithCsproj", "slnFilterWithCsproj", "slnWithGenerator"]
"options": ["singleCsproj", "RazorApp", "slnWithCsproj", "slnFilterWithCsproj", "slnWithGenerator"]
},
{
"id": "gulpTaskName",
Expand Down
96 changes: 49 additions & 47 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,48 +1,50 @@
{
"version": "2.0.0",
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "shared"
},
"tasks": [
{
"label": "build",
"command": "npm",
"type": "shell",
"args": [
"run",
"compile"
],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "buildDev",
"command": "npm",
"type": "shell",
"args": [
"run",
"compileDev"
],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "test",
"command": "echo",
"group": {
"kind": "test",
"isDefault": true
},
"args": [
"Run tests in VS Code by launching the debugger with the 'Launch Tests' configuration."
]
},
]
}
"version": "2.0.0",
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "shared"
},
"tasks": [
{
"label": "build",
"command": "npm",
"type": "shell",
"args": ["run", "compile"],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "buildDev",
"command": "npm",
"type": "shell",
"args": ["run", "compileDev"],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "buildTest",
"command": "npm",
"type": "shell",
"args": ["run", "compileTest"],
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "test",
"command": "echo",
"group": {
"kind": "test",
"isDefault": true
},
"args": ["Run tests in VS Code by launching the debugger with the 'Launch Tests' configuration."]
}
]
}
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,29 @@
- 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.56.x
* Update Razor to 9.0.0-preview.24557.11 (PR: [#7756](https://github.com/dotnet/vscode-csharp/pull/7756))
* Fix FUSE hook up in VS Code (#11175) (PR: [#11175](https://github.com/dotnet/razor/pull/11175))
* Update VSTelemetryAPI version (#11181) (PR: [#11181](https://github.com/dotnet/razor/pull/11181))
* Improvements for Assumed.Unreachable(...) (#11155) (PR: [#11155](https://github.com/dotnet/razor/pull/11155))
* Better logging for named pipe (#11144) (PR: [#11144](https://github.com/dotnet/razor/pull/11144))
* Fix code actions (and code actions integration tests) (#11141) (PR: [#11141](https://github.com/dotnet/razor/pull/11141))
* Fix some things for extract component (#11137) (PR: [#11137](https://github.com/dotnet/razor/pull/11137))
* More CodeAction moves in preparation for cohosting (#11135) (PR: [#11135](https://github.com/dotnet/razor/pull/11135))
* Update Roslyn to 4.13.0-2.24557.5 (PR: [#7752](https://github.com/dotnet/vscode-csharp/pull/7752))
* Fix telemetry property value (PR: [#75813](https://github.com/dotnet/roslyn/pull/75813))
* Classify 'await' as a control keyword (PR: [#75782](https://github.com/dotnet/roslyn/pull/75782))
* Allow renaming with overload resolution when only one overload exists(PR: [#75752](https://github.com/dotnet/roslyn/pull/75752))
* Fix issue loading completion providers from `<Analyyzer>` project items (PR: [#75721](https://github.com/dotnet/roslyn/pull/75721))
* Expose code actions to Razor cohosting (PR: [#75711](https://github.com/dotnet/roslyn/pull/75711))
* Do not include source generated documents in related document results (PR: [#75718](https://github.com/dotnet/roslyn/pull/75718))
* Fix issue where inlay hints could not be resolved if multiple editors opened side by side (PR: [#75709](https://github.com/dotnet/roslyn/pull/75709))
* Reduce allocations in ProjectSystemProjectFactory.ConvertMetadataReferencesToProjectReferences_NoLock (PR: [#75646](https://github.com/dotnet/roslyn/pull/75646))
* 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

# 2.55.x
* Update Razor to 9.0.0-preview.24557.10 (PR: [#7757](https://github.com/dotnet/vscode-csharp/pull/7757))
* Update VSTelemetryAPI version (#11181) (PR: [#11181](https://github.com/dotnet/razor/pull/11181))
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ To debug integration tests
1. Import the `csharp-test-profile.code-profile` in VSCode to setup a clean profile in which to run integration tests. This must be imported at least once to use the launch configurations (ensure the extensions are updated in the profile).
2. Open any integration test file and <kbd>F5</kbd> launch with the correct launch configuration selected.
- For integration tests inside `test/lsptoolshost`, use either `Launch Current File slnWithCsproj Integration Tests` or `[DevKit] Launch Current File slnWithCsproj Integration Tests` (to run tests using C# + C# Dev Kit)
- For integration tests inside `test/razor`, use `Launch Current File BasicRazorApp2_1 Integration Tests`
- For integration tests inside `test/razor`, use `[Razor] Run Current File Integration Test`
- For integration tests inside `test/omnisharp`, use one of the `Omnisharp:` current file profiles

These will allow you to actually debug the test, but the 'Razor integration tests' configuration does not.
Expand Down
8 changes: 8 additions & 0 deletions l10n/bundle.l10n.cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
"'{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}",
".NET NuGet Restore": "Obnovení .NET NuGet",
".NET Test Log": "Protokol testů .NET",
"1 reference": "1 odkaz",
"A valid dotnet installation could not be found: {0}": "Nepovedlo se najít platnou instalaci rozhraní dotnet: {0}",
"Active File Context": "Kontext aktivního souboru",
"Actual behavior": "Skutečné chování",
"An error occurred during installation of the .NET Debugger. The C# extension may need to be reinstalled.": "Při instalaci ladicího programu .NET došlo k chybě. Rozšíření C# může být nutné přeinstalovat.",
"Author": "Autor",
"Bug": "Chyba",
"C# LSP Trace Logs": "Protokoly trasování C# LSP",
"C# Project Context Status": "Stav kontextu projektu jazyka C#",
"C# Workspace Status": "Stav pracovního prostoru C#",
"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?",
Expand Down Expand Up @@ -93,6 +96,7 @@
"Non Razor file as active document": "Soubor, který není Razor, jako aktivní dokument",
"Not Now": "Teď ne",
"OmniSharp": "OmniSharp",
"OmniSharp Log": "Protokol OmniSharp",
"OmniSharp requires a complete install of Mono (including MSBuild) to provide language services when `omnisharp.useModernNet` is disabled in Settings. Please install the latest Mono and restart.": "OmniSharp vyžaduje kompletní instalaci modulu runtime Mono (včetně MSBuildu), aby mohl poskytovat jazykové služby, pokud je v nastavení vypnutý parametr omnisharp.useModernNet. Nainstalujte prosím nejnovější verzi modulu runtime Mono a proveďte restart.",
"Open envFile": "Otevřít soubor envFile",
"Open settings": "Otevřít nastavení",
Expand All @@ -116,6 +120,7 @@
"Razor HTML copied to clipboard": "Kód HTML Razor se zkopíroval do schránky.",
"Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.": "Neočekávaně se nepovedlo spustit jazykový server Razor. Zkontrolujte prosím protokol Razor a nahlaste problém.",
"Razor Language Server failed to stop correctly, please check the 'Razor Log' and report an issue.": "Nepovedlo se správně zastavit jazykový server Razor. Zkontrolujte prosím protokol Razor a nahlaste problém.",
"Razor Log": "Protokol Razor",
"Razor document": "Dokument Razor",
"Razor issue copied to clipboard": "Problém s Razorem se zkopíroval do schránky.",
"Razor issue data collection started. Reproduce the issue then press \"Stop\"": "Spustilo se shromažďování dat o problému Razor. Reprodukujte problém a stiskněte Zastavit.",
Expand All @@ -134,8 +139,10 @@
"Restore {0}": "Obnovit {0}",
"Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Spustit a ladit: Není nainstalovaný platný prohlížeč. Nainstalujte si prosím Edge nebo Chrome.",
"Run and Debug: auto-detection found {0} for a launch browser": "Spustit a ladit: Automatická detekce našla {0} pro spouštěný prohlížeč.",
"Security Warning": "Upozornění zabezpečení",
"See {0} output": "Zobrazit výstup {0}",
"Select fix all action": "Vybrat akci Opravit vše",
"Select project": "Vybrat projekt",
"Select the process to attach to": "Vyberte proces, ke kterému se má program připojit.",
"Select the project to launch": "Vyberte projekt, který se má spustit.",
"Self-signed certificate sucessfully {0}": "Certifikát podepsaný svým držitelem se úspěšně {0}",
Expand Down Expand Up @@ -203,6 +210,7 @@
"dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "Možnost dotnet.server.useOmharharp se změnila. Pokud chcete změnu použít, načtěte prosím znovu okno.",
"pipeArgs must be a string or a string array type": "pipeArgs musí být řetězec nebo typ pole řetězců",
"project.json is no longer a supported project format for .NET Core applications.": "project.json již není podporovaným formátem projektu pro aplikace .NET Core.",
"remote-attach": "remote-attach",
"{0} references": "Počet odkazů: {0}",
"{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, vložte obsah problému jako text problému. Nezapomeňte vyplnit všechny podrobnosti, které ještě vyplněné nejsou."
}
8 changes: 8 additions & 0 deletions l10n/bundle.l10n.de.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
"'{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.",
".NET NuGet Restore": ".NET NuGet-Wiederherstellung",
".NET Test Log": ".NET-Testprotokoll",
"1 reference": "1 Verweis",
"A valid dotnet installation could not be found: {0}": "Es wurde keine gültige dotnet-Installation gefunden: {0}",
"Active File Context": "Aktiver Dateikontext",
"Actual behavior": "Tatsächliches Verhalten",
"An error occurred during installation of the .NET Debugger. The C# extension may need to be reinstalled.": "Fehler bei der Installation des .NET-Debuggers. Die C#-Erweiterung muss möglicherweise neu installiert werden.",
"Author": "Autor",
"Bug": "Fehler",
"C# LSP Trace Logs": "C#-LSP-Ablaufverfolgungsprotokolle",
"C# Project Context Status": "C#-Projektkontextstatus",
"C# Workspace Status": "C#-Arbeitsbereichsstatus",
"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?",
Expand Down Expand Up @@ -93,6 +96,7 @@
"Non Razor file as active document": "Nicht-Razor-Datei als aktives Dokument",
"Not Now": "Nicht jetzt",
"OmniSharp": "OmniSharp",
"OmniSharp Log": "OmniSharp-Protokoll",
"OmniSharp requires a complete install of Mono (including MSBuild) to provide language services when `omnisharp.useModernNet` is disabled in Settings. Please install the latest Mono and restart.": "OmniSharp erfordert eine vollständige Installation von Mono (einschließlich MSBuild), um Sprachdienste bereitzustellen, wenn „omnisharp.useModernNet“ in den Einstellungen deaktiviert ist. Installieren Sie die neueste Mono-Version, und führen Sie einen Neustart aus.",
"Open envFile": "envFile öffnen",
"Open settings": "Einstellungen öffnen",
Expand All @@ -116,6 +120,7 @@
"Razor HTML copied to clipboard": "Razor-HTML in Zwischenablage kopiert",
"Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.": "Unerwarteter Fehler beim Start des Razor-Sprachservers. Überprüfen Sie das Razor-Protokoll, und melden Sie ein Problem.",
"Razor Language Server failed to stop correctly, please check the 'Razor Log' and report an issue.": "Fehler beim Beenden des Razor-Sprachservers. Überprüfen Sie das Razor-Protokoll, und melden Sie ein Problem.",
"Razor Log": "Razor-Protokoll",
"Razor document": "Razor-Dokument",
"Razor issue copied to clipboard": "Razor-Problem in Zwischenablage kopiert",
"Razor issue data collection started. Reproduce the issue then press \"Stop\"": "Die Sammlung von Razor-Problemdaten wurde gestartet. Reproduzieren Sie das Problem, und drücken Sie dann \"Beenden\".",
Expand All @@ -134,8 +139,10 @@
"Restore {0}": "\"{0}\" wiederherstellen",
"Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Ausführen und Debuggen: Es ist kein gültiger Browser installiert. Installieren Sie Edge oder Chrome.",
"Run and Debug: auto-detection found {0} for a launch browser": "Ausführen und Debuggen: Die automatische Erkennung hat {0} für einen Startbrowser gefunden.",
"Security Warning": "Sicherheitswarnung",
"See {0} output": "{0}-Ausgabe anzeigen",
"Select fix all action": "Aktion „Alle korrigieren“ auswählen",
"Select project": "Projekt auswählen",
"Select the process to attach to": "Prozess auswählen, an den angefügt werden soll",
"Select the project to launch": "Wählen Sie das Projekt aus, das gestartet werden soll.",
"Self-signed certificate sucessfully {0}": "Selbstsigniertes Zertifikat erfolgreich {0}",
Expand Down Expand Up @@ -203,6 +210,7 @@
"dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "Die Option \"dotnet.server.useOmnisharp\" wurde geändert. Laden Sie das Fenster neu, um die Änderung anzuwenden.",
"pipeArgs must be a string or a string array type": "pipeArgs muss eine Zeichenfolge oder ein Zeichenfolgenarraytyp sein.",
"project.json is no longer a supported project format for .NET Core applications.": "„project.json“ ist kein unterstütztes Projektformat mehr für .NET Core-Anwendungen.",
"remote-attach": "Remoteanfügung",
"{0} references": "{0} Verweise",
"{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, fügen Sie den Inhalt des Problems als Textkörper des Problems ein. Vergessen Sie nicht, alle nicht ausgefüllten Details auszufüllen."
}
Loading
Loading