Skip to content

Commit 817e245

Browse files
JoeRobichJoeRobich
authored
Merge pull request #7180 from dotnet/main-to-prerelease
Merge main to prerelease
2 parents 3277243 + 2bd9031 commit 817e245

18 files changed

+105
-82
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

66
# Latest
7-
* Update Roslyn to 4.11.0-2.24266.3 (PR: [#<>](https://github.com/dotnet/vscode-csharp/pull/<>))
7+
* Use XML settings for XAML language-configuration.json (PR: https://github.com/dotnet/vscode-csharp/pull/7162)
8+
* Bump xamlTools to the latest (PR: https://github.com/dotnet/vscode-csharp/pull/7161)
9+
* Update Debugger to v2.30.1 (PR: https://github.com/dotnet/vscode-csharp/pull/7145)
10+
11+
# 2.30.28
12+
* Update Roslyn to 4.11.0-2.24266.3 (PR: [#7135](https://github.com/dotnet/vscode-csharp/pull/7135))
813
* Various performance improvements and allocation reductions
914
* Reduce allocations in retrieving text from parsed trees (PR: [#73512](https://github.com/dotnet/roslyn/pull/73512))
1015
* Improve code action performance (PR: [#73493](https://github.com/dotnet/roslyn/pull/73493))

‎azure-pipelines.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@ trigger:
88
- main
99

1010
pr:
11-
- feature/*
12-
- release
13-
- prerelease
14-
- main
11+
branches:
12+
include:
13+
- feature/*
14+
- release
15+
- prerelease
16+
- main
17+
paths:
18+
exclude:
19+
- ./*.md
1520

1621
stages:
1722
- template: azure-pipelines/build-all.yml

‎package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"razor": "7.0.0-preview.24266.1",
4343
"razorOmnisharp": "7.0.0-preview.23363.1",
4444
"razorTelemetry": "7.0.0-preview.24178.4",
45-
"xamlTools": "17.11.34917.22"
45+
"xamlTools": "17.11.34924.19"
4646
},
4747
"main": "./dist/extension",
4848
"l10n": "./l10n",
@@ -421,7 +421,7 @@
421421
{
422422
"id": "Debugger",
423423
"description": ".NET Core Debugger (Windows / x64)",
424-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-win7-x64.zip",
424+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-win7-x64.zip",
425425
"installPath": ".debugger/x86_64",
426426
"platforms": [
427427
"win32"
@@ -431,12 +431,12 @@
431431
"arm64"
432432
],
433433
"installTestPath": "./.debugger/x86_64/vsdbg-ui.exe",
434-
"integrity": "73C4FA5922404E5789986DBD744EB65E59F7122F797E7846FAF7F844E60EDE07"
434+
"integrity": "8DD0C7B6936A538220E8A4DB7D9263A151986DE4956E33E86C80465BAD8521C0"
435435
},
436436
{
437437
"id": "Debugger",
438438
"description": ".NET Core Debugger (Windows / ARM64)",
439-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-win10-arm64.zip",
439+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-win10-arm64.zip",
440440
"installPath": ".debugger/arm64",
441441
"platforms": [
442442
"win32"
@@ -445,12 +445,12 @@
445445
"arm64"
446446
],
447447
"installTestPath": "./.debugger/arm64/vsdbg-ui.exe",
448-
"integrity": "60051C810E72C3E9A1314C08245586461A06735E1E528FACA1095C40365E8279"
448+
"integrity": "7D284CB85CDC1E85EB1BE143A31DC22FECFE3C4B576A507907AC7D32C7610E65"
449449
},
450450
{
451451
"id": "Debugger",
452452
"description": ".NET Core Debugger (macOS / x64)",
453-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-osx-x64.zip",
453+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-osx-x64.zip",
454454
"installPath": ".debugger/x86_64",
455455
"platforms": [
456456
"darwin"
@@ -464,12 +464,12 @@
464464
"./vsdbg"
465465
],
466466
"installTestPath": "./.debugger/x86_64/vsdbg-ui",
467-
"integrity": "E6AE6D46B3FE4E8D8124E06FC9374C39844907EAB91A7B774F6128175CB3C1AD"
467+
"integrity": "A61ABA3B6F3A1524E95C7FE07ECF70F156996652E5E3CBB01C50E75CC5A08CEE"
468468
},
469469
{
470470
"id": "Debugger",
471471
"description": ".NET Core Debugger (macOS / arm64)",
472-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-osx-arm64.zip",
472+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-osx-arm64.zip",
473473
"installPath": ".debugger/arm64",
474474
"platforms": [
475475
"darwin"
@@ -482,12 +482,12 @@
482482
"./vsdbg"
483483
],
484484
"installTestPath": "./.debugger/arm64/vsdbg-ui",
485-
"integrity": "0BF425B67C155012790C5EC7DCB69BE7087774A51B3AF59B7BEBA467BFD48997"
485+
"integrity": "9DE76C63EF7D2A2BA8600B381158C57EBD58D8BF235B85D1F1DDE4E7239282B1"
486486
},
487487
{
488488
"id": "Debugger",
489489
"description": ".NET Core Debugger (linux / ARM)",
490-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-linux-arm.zip",
490+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-linux-arm.zip",
491491
"installPath": ".debugger",
492492
"platforms": [
493493
"linux"
@@ -500,12 +500,12 @@
500500
"./vsdbg"
501501
],
502502
"installTestPath": "./.debugger/vsdbg-ui",
503-
"integrity": "063298BEB4D9D9F0741E0BC7E3999B71E6BB4C3221A4E3DF29D5153FA27E6DA3"
503+
"integrity": "2AB179096B5202ED0EAC6BF0C5D17F4506191D24A9A51867B4F4024E036764E2"
504504
},
505505
{
506506
"id": "Debugger",
507507
"description": ".NET Core Debugger (linux / ARM64)",
508-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-linux-arm64.zip",
508+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-linux-arm64.zip",
509509
"installPath": ".debugger",
510510
"platforms": [
511511
"linux"
@@ -518,12 +518,12 @@
518518
"./vsdbg"
519519
],
520520
"installTestPath": "./.debugger/vsdbg-ui",
521-
"integrity": "6DC9F98C34B41F08A449F9E4EE04E6BAFFD5A57E3632990A3B83BDCB2D2FF7B9"
521+
"integrity": "25DA86215FD5E0EB091130C9A82443D8B28F3A20A1159127C7F3AE4BE8B9B7AD"
522522
},
523523
{
524524
"id": "Debugger",
525525
"description": ".NET Core Debugger (linux musl / x64)",
526-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-linux-musl-x64.zip",
526+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-linux-musl-x64.zip",
527527
"installPath": ".debugger",
528528
"platforms": [
529529
"linux-musl"
@@ -536,12 +536,12 @@
536536
"./vsdbg"
537537
],
538538
"installTestPath": "./.debugger/vsdbg-ui",
539-
"integrity": "F985AFFA755734A6262F52C1E8D5D7235F4448628CA949A06D0F6806552EC64B"
539+
"integrity": "7DAB78E1955D95511665A4037E5CEDCF7C39A9FCC269A19A6738672238AE1A52"
540540
},
541541
{
542542
"id": "Debugger",
543543
"description": ".NET Core Debugger (linux musl / ARM64)",
544-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-linux-musl-arm64.zip",
544+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-linux-musl-arm64.zip",
545545
"installPath": ".debugger",
546546
"platforms": [
547547
"linux-musl"
@@ -554,12 +554,12 @@
554554
"./vsdbg"
555555
],
556556
"installTestPath": "./.debugger/vsdbg-ui",
557-
"integrity": "ED7A76B386478AD54D97E6FAB06D7AB56970770CD6499FC902316FA3BB3484D1"
557+
"integrity": "F28A3A76C13A36D94E59C53494D7BAF2A12EB4B005249246972999F064434573"
558558
},
559559
{
560560
"id": "Debugger",
561561
"description": ".NET Core Debugger (linux / x64)",
562-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-linux-x64.zip",
562+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-linux-x64.zip",
563563
"installPath": ".debugger",
564564
"platforms": [
565565
"linux"
@@ -572,7 +572,7 @@
572572
"./vsdbg"
573573
],
574574
"installTestPath": "./.debugger/vsdbg-ui",
575-
"integrity": "7AD45121D59DBFE8A96952E6BF8D474A5249CF7AE87C64AB24F9DC1DB5A8E6BA"
575+
"integrity": "83EF1FF3BEE1E152550DB53C1EB8625794F0CCDBB94DBBB4B6876CD36A02DBDC"
576576
},
577577
{
578578
"id": "Razor",

‎package.nls.cs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"configuration.dotnet.completion.showNameCompletionSuggestions": "Pro členy, které jste nedávno vybrali, proveďte automatické dokončování názvů objektů.",
4444
"configuration.dotnet.defaultSolution.description": "Cesta výchozího řešení, které se má otevřít v pracovním prostoru. Můžete přeskočit nastavením na „zakázat“. (Dříve omnisharp.defaultLaunchSolution)",
4545
"configuration.dotnet.dotnetPath": "Zadává cestu k adresáři instalace dotnet, která se má použít místo výchozí systémové instalace. To má vliv pouze na instalaci dotnet, která se má použít k hostování samotného jazykového serveru. Příklad: /home/username/mycustomdotnetdirectory",
46-
"configuration.dotnet.enableXamlTools": "Enables XAML tools when using C# Dev Kit",
46+
"configuration.dotnet.enableXamlTools": "Povolí nástroje XAML při použití sady C# Dev Kit",
4747
"configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Zvýrazněte související komponenty JSON pod kurzorem.",
4848
"configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Zvýraznit související komponenty regulárního výrazu pod kurzorem.",
4949
"configuration.dotnet.implementType.insertionBehavior": "Umístění vložení vlastností, událostí a metod při implementaci rozhraní nebo abstraktní třídy.",

‎package.nls.de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"configuration.dotnet.completion.showNameCompletionSuggestions": "Führen Sie die automatische Vervollständigung des Objektnamens für die Elemente aus, die Sie kürzlich ausgewählt haben.",
4444
"configuration.dotnet.defaultSolution.description": "Der Pfad der Standardlösung, die im Arbeitsbereich geöffnet werden soll, oder auf \"deaktivieren\" festlegen, um sie zu überspringen. (Zuvor \"omnisharp.defaultLaunchSolution\")",
4545
"configuration.dotnet.dotnetPath": "Gibt den Pfad zu einem dotnet-Installationsverzeichnis an, das anstelle des Standardsystems verwendet werden soll. Dies wirkt sich nur auf die dotnet-Installation aus, die zum Hosten des Sprachservers selbst verwendet werden soll. Beispiel: \"/home/username/mycustomdotnetdirectory\".",
46-
"configuration.dotnet.enableXamlTools": "Enables XAML tools when using C# Dev Kit",
46+
"configuration.dotnet.enableXamlTools": "Aktiviert XAML-Tools bei Verwendung des C#-Dev Kit",
4747
"configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Zugehörige JSON-Komponenten unter dem Cursor markieren.",
4848
"configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Zugehörige Komponenten regulärer Ausdrücke unter dem Cursor markieren.",
4949
"configuration.dotnet.implementType.insertionBehavior": "Die Einfügeposition von Eigenschaften, Ereignissen und Methoden beim Implementieren der Schnittstelle oder abstrakten Klasse.",

‎package.nls.es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"configuration.dotnet.completion.showNameCompletionSuggestions": "Realice la finalización automática del nombre de objeto para los miembros que ha seleccionado recientemente.",
4444
"configuration.dotnet.defaultSolution.description": "Ruta de acceso de la solución predeterminada que se va a abrir en el área de trabajo o se establece en \"deshabilitar\" para omitirla. (Anteriormente \"omnisharp.defaultLaunchSolution\")",
4545
"configuration.dotnet.dotnetPath": "Especifica la ruta de acceso a un directorio de instalación de dotnet que se va a usar en lugar del predeterminado del sistema. Esto solo influye en la instalación de dotnet que se va a usar para hospedar el propio servidor de idioma. Ejemplo: \"/home/username/mycustomdotnetdirectory\".",
46-
"configuration.dotnet.enableXamlTools": "Enables XAML tools when using C# Dev Kit",
46+
"configuration.dotnet.enableXamlTools": "Habilita las herramientas XAML al usar el Kit de desarrollo de C#",
4747
"configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Resaltar los componentes JSON relacionados bajo el cursor.",
4848
"configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Resaltar los componentes de expresiones regulares relacionados bajo el cursor.",
4949
"configuration.dotnet.implementType.insertionBehavior": "Ubicación de inserción de propiedades, eventos y métodos cuando se implementa una interfaz o una clase abstracta.",

‎package.nls.fr.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"configuration.dotnet.completion.showNameCompletionSuggestions": "Effectuez la complétion automatique du nom d’objet pour les membres que vous avez récemment sélectionnés.",
4444
"configuration.dotnet.defaultSolution.description": "Le chemin d’accès de la solution par défaut à ouvrir dans l’espace de travail, ou la valeur ’disable’ pour l’ignorer. (Précédemment `omnisharp.defaultLaunchSolution`)",
4545
"configuration.dotnet.dotnetPath": "Spécifie le chemin d’accès à un répertoire d’installation de dotnet à utiliser à la place du répertoire par défaut du système. Cela n’a d’influence que sur l’installation dotnet à utiliser pour héberger le serveur de langues lui-même. Exemple : \"/home/username/mycustomdotnetdirect\" : \"/home/nom d’utilisateur/monrépertoiredotnetpersonnalisé\".",
46-
"configuration.dotnet.enableXamlTools": "Enables XAML tools when using C# Dev Kit",
46+
"configuration.dotnet.enableXamlTools": "Active les outils XAML lors de l’utilisation du Kit de développement C#",
4747
"configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Mettez en surbrillance les composants JSON associés sous le curseur.",
4848
"configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Mettre en surbrillance les composants d’expression régulière associés sous le curseur.",
4949
"configuration.dotnet.implementType.insertionBehavior": "Emplacement d’insertion des propriétés, des événements et des méthodes lors de l’implémentation d’une interface ou d’une classe abstraite.",

‎package.nls.it.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"configuration.dotnet.completion.showNameCompletionSuggestions": "Consente di eseguire il completamento automatico del nome dell'oggetto per i membri selezionati di recente.",
4444
"configuration.dotnet.defaultSolution.description": "Percorso della soluzione predefinita da aprire nell'area di lavoro o impostare su 'disabilita' per ignorarla. (In precedenza “omnisharp.defaultLaunchSolution”)",
4545
"configuration.dotnet.dotnetPath": "Specifica il percorso di una directory di installazione dotnet da usare al posto di quella predefinita del sistema. Ciò influisce solo sull'installazione di dotnet da usare per ospitare il server di linguaggio stesso. Esempio: \"/home/username/mycustomdotnetdirectory\".",
46-
"configuration.dotnet.enableXamlTools": "Enables XAML tools when using C# Dev Kit",
46+
"configuration.dotnet.enableXamlTools": "Abilita gli strumenti XAML quando si usa il kit di sviluppo C#",
4747
"configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Evidenziare i componenti JSON correlati sotto il cursore.",
4848
"configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Evidenzia i componenti dell'espressione regolare correlati sotto il cursore.",
4949
"configuration.dotnet.implementType.insertionBehavior": "La posizione di inserimento di proprietà, eventi e metodi quando si implementa un'interfaccia o una classe astratta.",

‎package.nls.ja.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"configuration.dotnet.completion.showNameCompletionSuggestions": "最近選択したメンバーの自動オブジェクト名の完了を実行します。",
4444
"configuration.dotnet.defaultSolution.description": "ワークスペースで開く既定のソリューションのパス。スキップするには 'disable' に設定します。(以前の `omnisharp.defaultLaunchSolution`)",
4545
"configuration.dotnet.dotnetPath": "既定のシステム ディレクトリの代わりに使用する dotnet インストール ディレクトリへのパスを指定します。これは、言語サーバー自体をホストするために使用する dotnet インストールにのみ影響します。例: \"/home/username/mycustomdotnetdirectory\"。",
46-
"configuration.dotnet.enableXamlTools": "Enables XAML tools when using C# Dev Kit",
46+
"configuration.dotnet.enableXamlTools": "C# 開発キットを使用するときに XAML ツールを有効にします",
4747
"configuration.dotnet.highlighting.highlightRelatedJsonComponents": "カーソルの下にある関連する JSON コンポーネントをハイライトします。",
4848
"configuration.dotnet.highlighting.highlightRelatedRegexComponents": "カーソルの下にある関連する正規表現コンポーネントをハイライトします。",
4949
"configuration.dotnet.implementType.insertionBehavior": "インターフェイスまたは抽象クラスを実装する場合の、プロパティ、イベント、メソッドの挿入場所です。",

‎package.nls.ko.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"configuration.dotnet.completion.showNameCompletionSuggestions": "최근에 선택한 멤버에 대해 자동 개체 이름 완성을 수행합니다.",
4444
"configuration.dotnet.defaultSolution.description": "작업 영역에서 열릴 기본 솔루션의 경로, 건너뛰려면 '비활성화'로 설정하세요(이전 `omnisharp.defaultLaunchSolution`).",
4545
"configuration.dotnet.dotnetPath": "기본 시스템 대신 사용할 dotnet 설치 디렉터리를 지정합니다. 이는 언어 서버 자체를 호스팅하는 데 사용할 dotnet 설치에만 영향을 줍니다(예: \"/home/username/mycustomdotnetdirectory\").",
46-
"configuration.dotnet.enableXamlTools": "Enables XAML tools when using C# Dev Kit",
46+
"configuration.dotnet.enableXamlTools": "C# 개발자 키트를 사용할 때 XAML 도구 사용",
4747
"configuration.dotnet.highlighting.highlightRelatedJsonComponents": "커서 아래에서 관련 JSON 구성 요소를 강조 표시합니다.",
4848
"configuration.dotnet.highlighting.highlightRelatedRegexComponents": "커서 아래의 관련 정규식 구성 요소를 강조 표시합니다.",
4949
"configuration.dotnet.implementType.insertionBehavior": "인터페이스 또는 추상 클래스를 구현할 때 속성, 이벤트 및 메서드의 삽입 위치입니다.",

0 commit comments

Comments
 (0)