Skip to content

Commit

Permalink
Merge pull request #7449 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 Aug 17, 2024
2 parents 29425b0 + 771ac6e commit a953d8f
Show file tree
Hide file tree
Showing 16 changed files with 42 additions and 21 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)

# Latest
* Bump Roslyn to 4.12.0-2.24416.3 (PR: [#7448](https://github.com/dotnet/vscode-csharp/pull/7448))
* Use EnableCodeStyleSeverity instead of AnalysisLevel to control new diagnostic severity behavior (PR: [#73843](https://github.com/dotnet/roslyn/pull/73843))
* Cleanup LSP error reporting (PR: [#74530](https://github.com/dotnet/roslyn/pull/74530))
* Add support in DevKit for source link go to definition (requires C# DevKit version `v1.10.6 (pre-release)` or higher) (PR: [#74626](https://github.com/dotnet/roslyn/pull/74626))
* Bump xamltools to 17.12.35216.22 (PR: [#7447](https://github.com/dotnet/vscode-csharp/pull/7447))
* Update Debugger to v2.43.0 (PR: [#7420](https://github.com/dotnet/vscode-csharp/pull/7420))

# 2.43.16
* Fix handling Razor files with non-ascii characters (PR: [#7442](https://github.com/dotnet/vscode-csharp/pull/7442))
* Bump Roslyn to 4.12.0-2.24413.5 (PR: [#7442](https://github.com/dotnet/vscode-csharp/pull/7442))
* Fix URI comparisons for different casing (PR: [#74746](https://github.com/dotnet/roslyn/pull/74746))
Expand Down
1 change: 1 addition & 0 deletions l10n/bundle.l10n.cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
"Unable to determine debug settings for project '{0}'": "Nepovedlo se určit nastavení ladění pro projekt „{0}“",
"Unable to find Razor extension version.": "Nepovedlo se najít verzi rozšíření Razor.",
"Unable to generate assets to build and debug. {0}.": "Nepovedlo se vygenerovat prostředky pro sestavení a ladění. {0}",
"Unable to launch Attach to Process dialog: ": "Nelze spustit dialogové okno Připojit k procesu: ",
"Unable to resolve VSCode's version of CSharp": "Nepovedlo se rozpoznat verzi jazyka CSharp v nástroji VSCode.",
"Unable to resolve VSCode's version of Html": "Nepovedlo se přeložit verzi HTML nástroje VSCode.",
"Unexpected RuntimeId '{0}'.": "Neočekávané RuntimeId „{0}“",
Expand Down
1 change: 1 addition & 0 deletions l10n/bundle.l10n.de.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
"Unable to determine debug settings for project '{0}'": "Debugeinstellungen für Projekt \"{0}\" können nicht ermittelt werden.",
"Unable to find Razor extension version.": "Die Razor-Erweiterungsversion wurde nicht gefunden.",
"Unable to generate assets to build and debug. {0}.": "Objekte zum Erstellen und Debuggen können nicht generiert werden. {0}.",
"Unable to launch Attach to Process dialog: ": "Das Dialogfeld „An Prozess anhängen“ kann nicht gestartet werden: ",
"Unable to resolve VSCode's version of CSharp": "VSCode-Version von CSharp kann nicht aufgelöst werden.",
"Unable to resolve VSCode's version of Html": "VSCode-Version von HTML kann nicht aufgelöst werden",
"Unexpected RuntimeId '{0}'.": "Unerwartete RuntimeId \"{0}\".",
Expand Down
1 change: 1 addition & 0 deletions l10n/bundle.l10n.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
"Unable to determine debug settings for project '{0}'": "No se puede determinar la configuración de depuración para el proyecto '{0}'",
"Unable to find Razor extension version.": "No se encuentra la versión de la extensión de Razor.",
"Unable to generate assets to build and debug. {0}.": "No se pueden generar recursos para compilar y depurar. {0}.",
"Unable to launch Attach to Process dialog: ": "No se puede iniciar el cuadro de diálogo Adjuntar al proceso: ",
"Unable to resolve VSCode's version of CSharp": "No se puede resolver la versión de CSharp de VSCode",
"Unable to resolve VSCode's version of Html": "No se puede resolver la versión de HTML de VSCode",
"Unexpected RuntimeId '{0}'.": "RuntimeId '{0}' inesperado.",
Expand Down
1 change: 1 addition & 0 deletions l10n/bundle.l10n.fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
"Unable to determine debug settings for project '{0}'": "Impossible de déterminer les paramètres de débogage pour le projet « {0} »",
"Unable to find Razor extension version.": "La version de l’extension Razor est introuvable.",
"Unable to generate assets to build and debug. {0}.": "Impossible de générer des ressources pour la génération et le débogage. {0}.",
"Unable to launch Attach to Process dialog: ": "Impossible de lancer la boîte de dialogue Attacher au processus : ",
"Unable to resolve VSCode's version of CSharp": "Impossible de résoudre la version de CSharp de VSCode",
"Unable to resolve VSCode's version of Html": "Impossible de résoudre la version HTML de VSCode",
"Unexpected RuntimeId '{0}'.": "RuntimeId « {0} » inattendu.",
Expand Down
1 change: 1 addition & 0 deletions l10n/bundle.l10n.it.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
"Unable to determine debug settings for project '{0}'": "Non è possibile determinare le impostazioni di debug per il progetto '{0}'",
"Unable to find Razor extension version.": "Non è possibile trovare la versione dell'estensione Razor.",
"Unable to generate assets to build and debug. {0}.": "Non è possibile generare gli asset per la compilazione e il debug. {0}.",
"Unable to launch Attach to Process dialog: ": "Non è possibile avviare la finestra di dialogo Collega al processo: ",
"Unable to resolve VSCode's version of CSharp": "Non è possibile risolvere la versione VSCode di CSharp",
"Unable to resolve VSCode's version of Html": "Non è possibile risolvere la versione HTML di VSCode",
"Unexpected RuntimeId '{0}'.": "RuntimeId imprevisto '{0}'.",
Expand Down
1 change: 1 addition & 0 deletions l10n/bundle.l10n.ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
"Unable to determine debug settings for project '{0}'": "プロジェクト '{0}' のデバッグ設定を特定できません",
"Unable to find Razor extension version.": "Razor 拡張機能のバージョンが見つかりません。",
"Unable to generate assets to build and debug. {0}.": "ビルドおよびデバッグする資産を生成できません。{0}。",
"Unable to launch Attach to Process dialog: ": "[プロセスにアタッチ] ダイアログを起動できません:",
"Unable to resolve VSCode's version of CSharp": "VSCode の CSharp のバージョンを解決できません",
"Unable to resolve VSCode's version of Html": "VSCode の HTML のバージョンを解決できません",
"Unexpected RuntimeId '{0}'.": "予期しない RuntimeId '{0}' です。",
Expand Down
1 change: 1 addition & 0 deletions l10n/bundle.l10n.ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
"Unable to determine debug settings for project '{0}'": "프로젝트 '{0}'에 대한 디버그 설정을 결정할 수 없습니다.",
"Unable to find Razor extension version.": "Razor 확장 버전을 찾을 수 없음.",
"Unable to generate assets to build and debug. {0}.": "빌드 및 디버그할 자산을 생성할 수 없습니다. {0}.",
"Unable to launch Attach to Process dialog: ": "프로세스에 연결 대화 상자를 시작할 수 없음: ",
"Unable to resolve VSCode's version of CSharp": "VSCode의 CSharp 버전을 해결할 수 없음",
"Unable to resolve VSCode's version of Html": "VSCode의 HTML 버전을 해결할 수 없음",
"Unexpected RuntimeId '{0}'.": "예기치 않은 RuntimeId '{0}'입니다.",
Expand Down
1 change: 1 addition & 0 deletions l10n/bundle.l10n.pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
"Unable to determine debug settings for project '{0}'": "Nie można określić ustawień debugowania dla projektu „{0}”",
"Unable to find Razor extension version.": "Nie można odnaleźć wersji rozszerzenia Razor.",
"Unable to generate assets to build and debug. {0}.": "Nie można wygenerować zasobów do skompilowania i debugowania. {0}.",
"Unable to launch Attach to Process dialog: ": "Nie można uruchomić okna dialogowego Dołączanie do procesu: ",
"Unable to resolve VSCode's version of CSharp": "Nie można rozpoznać wersji CSharp programu VSCode",
"Unable to resolve VSCode's version of Html": "Nie można rozpoznać wersji HTML programu VSCode",
"Unexpected RuntimeId '{0}'.": "Nieoczekiwany identyfikator RuntimeId „{0}”.",
Expand Down
1 change: 1 addition & 0 deletions l10n/bundle.l10n.pt-br.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
"Unable to determine debug settings for project '{0}'": "Não foi possível determinar as configurações de depuração para o projeto \"{0}\"",
"Unable to find Razor extension version.": "Não é possível localizar a versão da extensão do Razor.",
"Unable to generate assets to build and debug. {0}.": "Não foi possível gerar os ativos para compilar e depurar. {0}.",
"Unable to launch Attach to Process dialog: ": "Não é possível iniciar a caixa de diálogo Anexar ao Processo: ",
"Unable to resolve VSCode's version of CSharp": "Não é possível resolver a versão do CSharp do VSCode",
"Unable to resolve VSCode's version of Html": "Não é possível resolver a versão do Html do VSCode",
"Unexpected RuntimeId '{0}'.": "RuntimeId inesperada \"{0}\".",
Expand Down
1 change: 1 addition & 0 deletions l10n/bundle.l10n.ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
"Unable to determine debug settings for project '{0}'": "Не удалось определить параметры отладки для проекта \"{0}\"",
"Unable to find Razor extension version.": "Не удалось найти версию расширения Razor.",
"Unable to generate assets to build and debug. {0}.": "Не удалось создать ресурсы для сборки и отладки. {0}.",
"Unable to launch Attach to Process dialog: ": "Не удалось запустить диалоговое окно \"Присоединить к процессу\": ",
"Unable to resolve VSCode's version of CSharp": "Не удалось разрешить версию VSCode CSharp",
"Unable to resolve VSCode's version of Html": "Не удалось разрешить версию VSCode HTML",
"Unexpected RuntimeId '{0}'.": "Неожиданный RuntimeId \"{0}\".",
Expand Down
1 change: 1 addition & 0 deletions l10n/bundle.l10n.tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
"Unable to determine debug settings for project '{0}'": "'{0}' projesi için hata ayıklama ayarları belirlenemedi",
"Unable to find Razor extension version.": "Razor uzantısı sürümü bulunamıyor.",
"Unable to generate assets to build and debug. {0}.": "Derlemek ve hata ayıklamak için varlıklar oluşturulamıyor. {0}.",
"Unable to launch Attach to Process dialog: ": "İşleme Ekle iletişim kutusu başlatılamıyor: ",
"Unable to resolve VSCode's version of CSharp": "VSCode'un CSharp sürümü çözümlenemiyor",
"Unable to resolve VSCode's version of Html": "VSCode'un HTML sürümü çözümlenemiyor",
"Unexpected RuntimeId '{0}'.": "Beklenmeyen RuntimeId '{0}'.",
Expand Down
1 change: 1 addition & 0 deletions l10n/bundle.l10n.zh-cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
"Unable to determine debug settings for project '{0}'": "无法确定项目 \"{0}\" 的调试设置",
"Unable to find Razor extension version.": "找不到 Razor 扩展版本。",
"Unable to generate assets to build and debug. {0}.": "无法生成资产以生成和调试。{0}。",
"Unable to launch Attach to Process dialog: ": "无法启动“附加到进程”对话框:",
"Unable to resolve VSCode's version of CSharp": "无法解析 VSCode 的 CSharp 版本",
"Unable to resolve VSCode's version of Html": "无法解析 VSCode 的 Html 版本",
"Unexpected RuntimeId '{0}'.": "意外的 RuntimeId \"{0}\"",
Expand Down
1 change: 1 addition & 0 deletions l10n/bundle.l10n.zh-tw.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
"Unable to determine debug settings for project '{0}'": "無法判斷專案 '{0}' 的偵錯設定",
"Unable to find Razor extension version.": "找不到 Razor 延伸模組版本。",
"Unable to generate assets to build and debug. {0}.": "無法產生資產以建置及偵錯。{0}。",
"Unable to launch Attach to Process dialog: ": "無法啟動 [附加至處理序] 對話方塊:",
"Unable to resolve VSCode's version of CSharp": "無法解析 VSCode 的 CSharp 版本",
"Unable to resolve VSCode's version of Html": "無法解析 VSCode 的 HTML 版本",
"Unexpected RuntimeId '{0}'.": "未預期的 RuntimeId '{0}'。",
Expand Down
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
}
},
"defaults": {
"roslyn": "4.12.0-2.24413.5",
"roslyn": "4.12.0-2.24416.3",
"omniSharp": "1.39.11",
"razor": "9.0.0-preview.24366.2",
"razorOmnisharp": "7.0.0-preview.23363.1",
"xamlTools": "17.12.35209.18"
"xamlTools": "17.12.35216.22"
},
"main": "./dist/extension",
"l10n": "./l10n",
Expand Down Expand Up @@ -420,7 +420,7 @@
{
"id": "Debugger",
"description": ".NET Core Debugger (Windows / x64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-win7-x64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-43-0/coreclr-debug-win7-x64.zip",
"installPath": ".debugger/x86_64",
"platforms": [
"win32"
Expand All @@ -430,12 +430,12 @@
"arm64"
],
"installTestPath": "./.debugger/x86_64/vsdbg-ui.exe",
"integrity": "44FC0222F5AB8C70EFA2EC0039D8589A9F441BEBB686779AD0DEEAA2585D32BF"
"integrity": "09B636A0CDDE06B822EE767A2A0637845F313427029E860D25C1271E738E4C9D"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (Windows / ARM64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-win10-arm64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-43-0/coreclr-debug-win10-arm64.zip",
"installPath": ".debugger/arm64",
"platforms": [
"win32"
Expand All @@ -444,12 +444,12 @@
"arm64"
],
"installTestPath": "./.debugger/arm64/vsdbg-ui.exe",
"integrity": "05CADC2AEAAF7B178545390304D7156D48C9AE3F1FACC36F08EA1D679B999488"
"integrity": "68AB910A1204FC164A211BF80F55C07227B1D557A4F8A0D0290B598F19B2388C"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (macOS / x64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-osx-x64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-43-0/coreclr-debug-osx-x64.zip",
"installPath": ".debugger/x86_64",
"platforms": [
"darwin"
Expand All @@ -463,12 +463,12 @@
"./vsdbg"
],
"installTestPath": "./.debugger/x86_64/vsdbg-ui",
"integrity": "6DFB48E8FDBA688B406D8EC9B9561355C035126062C33EAC945D6D93CA444BF3"
"integrity": "D65C1C28F8EAB504B67C6B05AF86990135E0B2E43041CDB398F849D1F30488A0"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (macOS / arm64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-osx-arm64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-43-0/coreclr-debug-osx-arm64.zip",
"installPath": ".debugger/arm64",
"platforms": [
"darwin"
Expand All @@ -481,12 +481,12 @@
"./vsdbg"
],
"installTestPath": "./.debugger/arm64/vsdbg-ui",
"integrity": "82DD26E2A4D34B4E68BB939182C55D13CDC5F9576010C807B476C7ADB236407C"
"integrity": "127FBE4D4B5CD361B4FFCA3971565F87807510CAC599424F886A74CF6FBDB7E3"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (linux / ARM)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-linux-arm.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-43-0/coreclr-debug-linux-arm.zip",
"installPath": ".debugger",
"platforms": [
"linux"
Expand All @@ -499,12 +499,12 @@
"./vsdbg"
],
"installTestPath": "./.debugger/vsdbg-ui",
"integrity": "7A4E2973607CE1B09902E9512D21953CAE9D4884560B9F0D752FDB0008D8A4B3"
"integrity": "FBED7C822402B978B5F6102C1526CD6294842C5ACE014AFF2C510ED980BC8FE7"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (linux / ARM64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-linux-arm64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-43-0/coreclr-debug-linux-arm64.zip",
"installPath": ".debugger",
"platforms": [
"linux"
Expand All @@ -517,12 +517,12 @@
"./vsdbg"
],
"installTestPath": "./.debugger/vsdbg-ui",
"integrity": "43EE8F9FEF81FC255CB4B598083BCB45AF42DF8C7AEAFFF61785425EE1376EA8"
"integrity": "E5FB62E79BC08C67890933913CBAD1D25FB875DD73C553F73F00ECFC22CDE28B"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (linux musl / x64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-linux-musl-x64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-43-0/coreclr-debug-linux-musl-x64.zip",
"installPath": ".debugger",
"platforms": [
"linux-musl"
Expand All @@ -535,12 +535,12 @@
"./vsdbg"
],
"installTestPath": "./.debugger/vsdbg-ui",
"integrity": "B5FD9381FD2B79CA97BD2BA7DC1B572F8E318F3BCBC3D40C9190DA41C0A897BC"
"integrity": "B4BAF73895504D04584BF7E03BBCED840B2405B6F8F432C2E6E8E2C8CB8F952E"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (linux musl / ARM64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-linux-musl-arm64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-43-0/coreclr-debug-linux-musl-arm64.zip",
"installPath": ".debugger",
"platforms": [
"linux-musl"
Expand All @@ -553,12 +553,12 @@
"./vsdbg"
],
"installTestPath": "./.debugger/vsdbg-ui",
"integrity": "23C13F9294CC08977BF46591E4020E3CB49126C8D03F57D1A97C18489CF27FDC"
"integrity": "1F56B47005E7F29C653F351D2A53038AF7E9E4B27969B30DC6C030B2DB0CF6CB"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (linux / x64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-40-0/coreclr-debug-linux-x64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-43-0/coreclr-debug-linux-x64.zip",
"installPath": ".debugger",
"platforms": [
"linux"
Expand All @@ -571,7 +571,7 @@
"./vsdbg"
],
"installTestPath": "./.debugger/vsdbg-ui",
"integrity": "14E2A59A049EE150C85A9C1D711CED928FF993C81C1C635CE83B4A890CC3F486"
"integrity": "D26DDB552DCED21D979174FB4783560AA4F8EE3AFC195EA93B0D1A7EBCFCBA79"
},
{
"id": "RazorOmnisharp",
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "2.43",
"version": "2.44",
"publicReleaseRefSpec": [
"^refs/heads/release$",
"^refs/heads/prerelease$",
Expand Down

0 comments on commit a953d8f

Please sign in to comment.