Skip to content

Commit

Permalink
Merge pull request #7213 from dibarbet/merge_prerelease
Browse files Browse the repository at this point in the history
Merge prerelease into release
  • Loading branch information
dibarbet authored Jun 7, 2024
2 parents 7dd9b0c + e80689f commit ae04c33
Show file tree
Hide file tree
Showing 23 changed files with 197 additions and 127 deletions.
42 changes: 42 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,48 @@
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)

# Latest
* Update Roslyn to 4.11.0-3.24304.4 (PR: [#7191](https://github.com/dotnet/vscode-csharp/pull/7191))
* Fix build host when only the .net 6 SDK is installed (PR: [#73818](https://github.com/dotnet/roslyn/pull/73818))
* Bump Razor to 9.0.0-preview.24281.3 (PR: [#73817](https://github.com/dotnet/roslyn/pull/73817))
* Fix null reference exception during shutdown (PR: [#73790](https://github.com/dotnet/roslyn/pull/73790))
* Fix race causing workspace diagnostics to be stale (PR: [#73653](https://github.com/dotnet/roslyn/pull/73653))
* Reduce upfront assembly loads in language server (PR: [#73566](https://github.com/dotnet/roslyn/pull/73566))
* Update Debugger.Contracts to 17.11.0-beta.24274.2 (PR: [#73748](https://github.com/dotnet/roslyn/pull/73748))
* Fix signature help in nested method calls (PR: [#73606](https://github.com/dotnet/roslyn/pull/73606))
* Ignore drive casing when comparing paths for .editorconfig on windows platforms (PR: [#73380](https://github.com/dotnet/roslyn/pull/73380))
* Remove dependency on all Roslyn assemblies from build host (PR: [#73497](https://github.com/dotnet/roslyn/pull/73497))
* Various performance improvements and allocation reductions
* Improve AddImport conflict detection performance (PR: [#73780](https://github.com/dotnet/roslyn/pull/73780))
* Modify (Large/Source)Text.ParseLineStart to specify an initial capacity for line count (PR: [#73701](https://github.com/dotnet/roslyn/pull/73701))
* Reduce exceptions in work queue (PR: [#73766](https://github.com/dotnet/roslyn/pull/73766))
* Run providers in parallel when determining if we should show the lightbulb icon (PR: [#73758](https://github.com/dotnet/roslyn/pull/73758))
* Change the DocumentationCommentId to use a PooledStringBuilder (PR: [#73737](https://github.com/dotnet/roslyn/pull/73737))
* Avoid unnecessary array+linq allocs in common case (PR: [#73727](https://github.com/dotnet/roslyn/pull/73727))
* Improve performance in async / await keyword highlighting (PR: [#73721](https://github.com/dotnet/roslyn/pull/73721))
* Avoid unnecessary tree walk when hitting non-relevant directives (PR: [#73720](https://github.com/dotnet/roslyn/pull/73720))
* Utilize ImmutableCollectionsMarshal to get ROS for XxHash128.Hash call (PR: [#73692](https://github.com/dotnet/roslyn/pull/73692))
* Use IAsyncEnumerable for Find References (PR: [#73613](https://github.com/dotnet/roslyn/pull/73613))
* Compute classifications for FAR results in parallel (PR: [#73599](https://github.com/dotnet/roslyn/pull/73599))
* Switch to a List as the backing store for the FAR window from an ImmutableList (PR: [#73589](https://github.com/dotnet/roslyn/pull/73589))
* Switch FAR data from an immutable dictionary to an immutable array (PR: [#73587](https://github.com/dotnet/roslyn/pull/73587))
* More classification perf fixes. (PR: [#73535](https://github.com/dotnet/roslyn/pull/73535))
* Avoid unnecessary allocations while finding token matches in a file (PR: [#73547](https://github.com/dotnet/roslyn/pull/73547))
* Lower the amount of time FAR spends in classification by 4% (PR: [#73533](https://github.com/dotnet/roslyn/pull/73533))

# 2.33.13
* Update xamlTools to 17.11.34931.156 (PR: [#7195](https://github.com/dotnet/vscode-csharp/pull/7195))
* Support XAML Hot Reload on iOS physical devices
* Encrypt Hot Reload connection
* Fix issue where WinUI Hot Reload stops working on successive debug sessions
* Fix issue where Hot Reload sometimes doesn't work on first debug launch
* Include process environment variables when running shell commands (PR: [#7152](https://github.com/dotnet/vscode-csharp/pull/7152))

# 2.32.14
* Use XML settings for XAML language-configuration.json (PR: https://github.com/dotnet/vscode-csharp/pull/7162)
* Bump xamlTools to the latest (PR: https://github.com/dotnet/vscode-csharp/pull/7161)
* Update Debugger to v2.30.1 (PR: https://github.com/dotnet/vscode-csharp/pull/7145)

# 2.31.28
* Update Razor to use source generator shipped in extension instead of the SDK (PR: [#7134](https://github.com/dotnet/vscode-csharp/pull/7134))
* Fixes incorrect 'Amibuity between' errors displaying in Razor files (Issue: [#10351](https://github.com/dotnet/razor/issues/10351))
* Update Roslyn to 4.11.0-2.24267.3 (PR: [#7134](https://github.com/dotnet/vscode-csharp/pull/7134))
Expand Down
13 changes: 9 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,15 @@ trigger:
- main

pr:
- feature/*
- release
- prerelease
- main
branches:
include:
- feature/*
- release
- prerelease
- main
paths:
exclude:
- ./*.md

stages:
- template: azure-pipelines/build-all.yml
Expand Down
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
}
},
"defaults": {
"roslyn": "4.11.0-2.24267.3",
"roslyn": "4.11.0-3.24304.4",
"omniSharp": "1.39.11",
"razor": "7.0.0-preview.24266.1",
"razorOmnisharp": "7.0.0-preview.23363.1",
"razorTelemetry": "7.0.0-preview.24178.4",
"xamlTools": "17.11.34917.22"
"xamlTools": "17.11.34931.156"
},
"main": "./dist/extension",
"l10n": "./l10n",
Expand Down Expand Up @@ -421,7 +421,7 @@
{
"id": "Debugger",
"description": ".NET Core Debugger (Windows / x64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-win7-x64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-win7-x64.zip",
"installPath": ".debugger/x86_64",
"platforms": [
"win32"
Expand All @@ -431,12 +431,12 @@
"arm64"
],
"installTestPath": "./.debugger/x86_64/vsdbg-ui.exe",
"integrity": "73C4FA5922404E5789986DBD744EB65E59F7122F797E7846FAF7F844E60EDE07"
"integrity": "8DD0C7B6936A538220E8A4DB7D9263A151986DE4956E33E86C80465BAD8521C0"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (Windows / ARM64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-win10-arm64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-win10-arm64.zip",
"installPath": ".debugger/arm64",
"platforms": [
"win32"
Expand All @@ -445,12 +445,12 @@
"arm64"
],
"installTestPath": "./.debugger/arm64/vsdbg-ui.exe",
"integrity": "60051C810E72C3E9A1314C08245586461A06735E1E528FACA1095C40365E8279"
"integrity": "7D284CB85CDC1E85EB1BE143A31DC22FECFE3C4B576A507907AC7D32C7610E65"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (macOS / x64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-osx-x64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-osx-x64.zip",
"installPath": ".debugger/x86_64",
"platforms": [
"darwin"
Expand All @@ -464,12 +464,12 @@
"./vsdbg"
],
"installTestPath": "./.debugger/x86_64/vsdbg-ui",
"integrity": "E6AE6D46B3FE4E8D8124E06FC9374C39844907EAB91A7B774F6128175CB3C1AD"
"integrity": "A61ABA3B6F3A1524E95C7FE07ECF70F156996652E5E3CBB01C50E75CC5A08CEE"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (macOS / arm64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-osx-arm64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-osx-arm64.zip",
"installPath": ".debugger/arm64",
"platforms": [
"darwin"
Expand All @@ -482,12 +482,12 @@
"./vsdbg"
],
"installTestPath": "./.debugger/arm64/vsdbg-ui",
"integrity": "0BF425B67C155012790C5EC7DCB69BE7087774A51B3AF59B7BEBA467BFD48997"
"integrity": "9DE76C63EF7D2A2BA8600B381158C57EBD58D8BF235B85D1F1DDE4E7239282B1"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (linux / ARM)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-linux-arm.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-linux-arm.zip",
"installPath": ".debugger",
"platforms": [
"linux"
Expand All @@ -500,12 +500,12 @@
"./vsdbg"
],
"installTestPath": "./.debugger/vsdbg-ui",
"integrity": "063298BEB4D9D9F0741E0BC7E3999B71E6BB4C3221A4E3DF29D5153FA27E6DA3"
"integrity": "2AB179096B5202ED0EAC6BF0C5D17F4506191D24A9A51867B4F4024E036764E2"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (linux / ARM64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-linux-arm64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-linux-arm64.zip",
"installPath": ".debugger",
"platforms": [
"linux"
Expand All @@ -518,12 +518,12 @@
"./vsdbg"
],
"installTestPath": "./.debugger/vsdbg-ui",
"integrity": "6DC9F98C34B41F08A449F9E4EE04E6BAFFD5A57E3632990A3B83BDCB2D2FF7B9"
"integrity": "25DA86215FD5E0EB091130C9A82443D8B28F3A20A1159127C7F3AE4BE8B9B7AD"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (linux musl / x64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-linux-musl-x64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-linux-musl-x64.zip",
"installPath": ".debugger",
"platforms": [
"linux-musl"
Expand All @@ -536,12 +536,12 @@
"./vsdbg"
],
"installTestPath": "./.debugger/vsdbg-ui",
"integrity": "F985AFFA755734A6262F52C1E8D5D7235F4448628CA949A06D0F6806552EC64B"
"integrity": "7DAB78E1955D95511665A4037E5CEDCF7C39A9FCC269A19A6738672238AE1A52"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (linux musl / ARM64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-linux-musl-arm64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-linux-musl-arm64.zip",
"installPath": ".debugger",
"platforms": [
"linux-musl"
Expand All @@ -554,12 +554,12 @@
"./vsdbg"
],
"installTestPath": "./.debugger/vsdbg-ui",
"integrity": "ED7A76B386478AD54D97E6FAB06D7AB56970770CD6499FC902316FA3BB3484D1"
"integrity": "F28A3A76C13A36D94E59C53494D7BAF2A12EB4B005249246972999F064434573"
},
{
"id": "Debugger",
"description": ".NET Core Debugger (linux / x64)",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-0/coreclr-debug-linux-x64.zip",
"url": "https://vsdebugger.azureedge.net/coreclr-debug-2-30-1/coreclr-debug-linux-x64.zip",
"installPath": ".debugger",
"platforms": [
"linux"
Expand All @@ -572,7 +572,7 @@
"./vsdbg"
],
"installTestPath": "./.debugger/vsdbg-ui",
"integrity": "7AD45121D59DBFE8A96952E6BF8D474A5249CF7AE87C64AB24F9DC1DB5A8E6BA"
"integrity": "83EF1FF3BEE1E152550DB53C1EB8625794F0CCDBB94DBBB4B6876CD36A02DBDC"
},
{
"id": "Razor",
Expand Down
2 changes: 1 addition & 1 deletion package.nls.cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"configuration.dotnet.completion.showNameCompletionSuggestions": "Pro členy, které jste nedávno vybrali, proveďte automatické dokončování názvů objektů.",
"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)",
"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",
"configuration.dotnet.enableXamlTools": "Enables XAML tools when using C# Dev Kit",
"configuration.dotnet.enableXamlTools": "Povolí nástroje XAML při použití sady C# Dev Kit",
"configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Zvýrazněte související komponenty JSON pod kurzorem.",
"configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Zvýraznit související komponenty regulárního výrazu pod kurzorem.",
"configuration.dotnet.implementType.insertionBehavior": "Umístění vložení vlastností, událostí a metod při implementaci rozhraní nebo abstraktní třídy.",
Expand Down
2 changes: 1 addition & 1 deletion package.nls.de.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"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.",
"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\")",
"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\".",
"configuration.dotnet.enableXamlTools": "Enables XAML tools when using C# Dev Kit",
"configuration.dotnet.enableXamlTools": "Aktiviert XAML-Tools bei Verwendung des C#-Dev Kit",
"configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Zugehörige JSON-Komponenten unter dem Cursor markieren.",
"configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Zugehörige Komponenten regulärer Ausdrücke unter dem Cursor markieren.",
"configuration.dotnet.implementType.insertionBehavior": "Die Einfügeposition von Eigenschaften, Ereignissen und Methoden beim Implementieren der Schnittstelle oder abstrakten Klasse.",
Expand Down
2 changes: 1 addition & 1 deletion package.nls.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"configuration.dotnet.completion.showNameCompletionSuggestions": "Realice la finalización automática del nombre de objeto para los miembros que ha seleccionado recientemente.",
"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\")",
"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\".",
"configuration.dotnet.enableXamlTools": "Enables XAML tools when using C# Dev Kit",
"configuration.dotnet.enableXamlTools": "Habilita las herramientas XAML al usar el Kit de desarrollo de C#",
"configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Resaltar los componentes JSON relacionados bajo el cursor.",
"configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Resaltar los componentes de expresiones regulares relacionados bajo el cursor.",
"configuration.dotnet.implementType.insertionBehavior": "Ubicación de inserción de propiedades, eventos y métodos cuando se implementa una interfaz o una clase abstracta.",
Expand Down
2 changes: 1 addition & 1 deletion package.nls.fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"configuration.dotnet.completion.showNameCompletionSuggestions": "Effectuez la complétion automatique du nom d’objet pour les membres que vous avez récemment sélectionnés.",
"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`)",
"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é\".",
"configuration.dotnet.enableXamlTools": "Enables XAML tools when using C# Dev Kit",
"configuration.dotnet.enableXamlTools": "Active les outils XAML lors de l’utilisation du Kit de développement C#",
"configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Mettez en surbrillance les composants JSON associés sous le curseur.",
"configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Mettre en surbrillance les composants d’expression régulière associés sous le curseur.",
"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.",
Expand Down
2 changes: 1 addition & 1 deletion package.nls.it.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"configuration.dotnet.completion.showNameCompletionSuggestions": "Consente di eseguire il completamento automatico del nome dell'oggetto per i membri selezionati di recente.",
"configuration.dotnet.defaultSolution.description": "Percorso della soluzione predefinita da aprire nell'area di lavoro o impostare su 'disabilita' per ignorarla. (In precedenza “omnisharp.defaultLaunchSolution”)",
"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\".",
"configuration.dotnet.enableXamlTools": "Enables XAML tools when using C# Dev Kit",
"configuration.dotnet.enableXamlTools": "Abilita gli strumenti XAML quando si usa il kit di sviluppo C#",
"configuration.dotnet.highlighting.highlightRelatedJsonComponents": "Evidenziare i componenti JSON correlati sotto il cursore.",
"configuration.dotnet.highlighting.highlightRelatedRegexComponents": "Evidenzia i componenti dell'espressione regolare correlati sotto il cursore.",
"configuration.dotnet.implementType.insertionBehavior": "La posizione di inserimento di proprietà, eventi e metodi quando si implementa un'interfaccia o una classe astratta.",
Expand Down
2 changes: 1 addition & 1 deletion package.nls.ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"configuration.dotnet.completion.showNameCompletionSuggestions": "最近選択したメンバーの自動オブジェクト名の完了を実行します。",
"configuration.dotnet.defaultSolution.description": "ワークスペースで開く既定のソリューションのパス。スキップするには 'disable' に設定します。(以前の `omnisharp.defaultLaunchSolution`)",
"configuration.dotnet.dotnetPath": "既定のシステム ディレクトリの代わりに使用する dotnet インストール ディレクトリへのパスを指定します。これは、言語サーバー自体をホストするために使用する dotnet インストールにのみ影響します。例: \"/home/username/mycustomdotnetdirectory\"",
"configuration.dotnet.enableXamlTools": "Enables XAML tools when using C# Dev Kit",
"configuration.dotnet.enableXamlTools": "C# 開発キットを使用するときに XAML ツールを有効にします",
"configuration.dotnet.highlighting.highlightRelatedJsonComponents": "カーソルの下にある関連する JSON コンポーネントをハイライトします。",
"configuration.dotnet.highlighting.highlightRelatedRegexComponents": "カーソルの下にある関連する正規表現コンポーネントをハイライトします。",
"configuration.dotnet.implementType.insertionBehavior": "インターフェイスまたは抽象クラスを実装する場合の、プロパティ、イベント、メソッドの挿入場所です。",
Expand Down
Loading

0 comments on commit ae04c33

Please sign in to comment.