Skip to content

Commit f60527a

Browse files
authored
[automated] Merge branch 'main' => 'prerelease' (#8778)
2 parents 66d78cc + 910de18 commit f60527a

23 files changed

+195
-38
lines changed

.github/workflows/branch-snap.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ jobs:
6464
run: npm ci
6565
- name: Update version.json for release
6666
run: npx gulp updateVersionForStableRelease
67-
- name: Create PR with version update
68-
uses: peter-evans/create-pull-request@v4
69-
with:
70-
token: ${{ secrets.GITHUB_TOKEN }}
71-
commit-message: Update version for stable release
72-
branch: merge/prerelease-to-release
73-
base: release
67+
- name: Commit and push version update
68+
run: |
69+
git config user.name "github-actions[bot]"
70+
git config user.email "github-actions[bot]@users.noreply.github.com"
71+
git add .
72+
git commit -m "Update version for stable release"
73+
git push origin merge/prerelease-to-release

CHANGELOG.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
33
- Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

6+
# 2.101.x
7+
* Fix auto-insert ignoring language-specific editor.tabSize (PR: [#8768](https://github.com/dotnet/vscode-csharp/pull/8768))
8+
* Update Roslyn to 5.3.0-2.25557.4 (PR: [#8759](https://github.com/dotnet/vscode-csharp/pull/8759))
9+
* Fix file extension in debugger troubleshooting doc (PR: [#8756](https://github.com/dotnet/vscode-csharp/pull/8756))
10+
* Update Roslyn to 5.3.0-2.25557.6 (PR: [#8761](https://github.com/dotnet/vscode-csharp/pull/8761))
11+
* File-based programs live directive diagnostics (PR: [#80575](https://github.com/dotnet/roslyn/pull/80575))
12+
* Implement canonical miscellaneous files project loader for non-file-based programs (PR: [#80748](https://github.com/dotnet/roslyn/pull/80748))
13+
* Better handle if a BuildHost process crashes that prevents connection (PR: [#81041](https://github.com/dotnet/roslyn/pull/81041))
14+
* Wait for Html buffer updates before making requests (PR: [#8748](https://github.com/dotnet/vscode-csharp/pull/8748))
15+
* Bump Razor to 10.0.0-preview.25557.2 (PR: [#8765](https://github.com/dotnet/vscode-csharp/pull/8765))
16+
* Support Roslyn's custom nested code actions in VS Code (PR: [#12467](https://github.com/dotnet/razor/pull/12467))
17+
* Format type parameter values as types (PR: [#12448](https://github.com/dotnet/razor/pull/12448))
18+
* Default the cohosting option in the generator to on. (PR: [#12446](https://github.com/dotnet/razor/pull/12446))
19+
* Add UnboundDirectiveAttributeAddUsingCodeActionProvider for directive attributes (PR: [#12404](https://github.com/dotnet/razor/pull/12404))
20+
* Fix edit in one project not being reflected in consuming project (PR: [#12439](https://github.com/dotnet/razor/pull/12439))
21+
622
# 2.97.x
723
* Add integration test for restore of file-based programs (PR: [#8470](https://github.com/dotnet/vscode-csharp/pull/8470))
824
* Update setting documentation for on auto insert (PR: [#8742](https://github.com/dotnet/vscode-csharp/pull/8742))
@@ -116,7 +132,7 @@
116132

117133
# 2.92.x
118134
* Bump Razor to 10.0.0-preview.25464.2 (PR: [#8628](https://github.com/dotnet/vscode-csharp/pull/8628))
119-
* Improve go to definition for mvc tag helpers (PR: [#12216](https://github.com/dotnet/razor/pull/12216))
135+
* Improve go to definition for mvc tag helpers (PR: [#12216](https://github.com/dotnet/razor/pull/12216))
120136
* Filter CSS024 when caused by C# code in an attribute (PR: [#12209](https://github.com/dotnet/razor/pull/12209))
121137
* Provide more specific information in cohosting failures (PR: [#12193](https://github.com/dotnet/razor/pull/12193))
122138
* Fix renaming file (PR: [#12196](https://github.com/dotnet/razor/pull/12196))

docs/debugger/Troubleshoot-loading-the-.NET-Debug-Services.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ You can test for this condition by adding the following code to the start of you
4646
else if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.OSX))
4747
{
4848
nativeLibraryPrefix = "lib";
49-
nativeLibraryExtension = ".so";
49+
nativeLibraryExtension = ".dylib";
5050
}
5151
else
5252
{
@@ -101,4 +101,4 @@ Step 5: Start debugging. You should hopefully see debugging still fail with the
101101
### Error cause 3: Mismatched processor architecture (macOS only)
102102

103103
On ARM64 macOS, this error can be caused if the processor architecture of the debugger is different from the processor architecture of the target process. See [Debugging x64 processes on an arm64 computer
104-
](Debugging-x64-processes-on-an-arm64-computer) for more information.
104+
](Debugging-x64-processes-on-an-arm64-computer) for more information.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
"workspace"
4141
],
4242
"defaults": {
43-
"roslyn": "5.3.0-2.25553.6",
43+
"roslyn": "5.3.0-2.25557.6",
4444
"omniSharp": "1.39.14",
45-
"razor": "10.0.0-preview.25552.2",
45+
"razor": "10.0.0-preview.25557.2",
4646
"razorOmnisharp": "7.0.0-preview.23363.1",
4747
"xamlTools": "18.3.11128.18"
4848
},

package.nls.cs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Zobrazit tipy pro indexery",
3030
"configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Zobrazit nápovědy pro typy parametrů lambda",
3131
"configuration.csharp.inlayHints.enableInlayHintsForTypes": "Zobrazovat vložené nápovědy k typům",
32-
"configuration.dotnet.autoInsert.enableAutoInsert": "Enable automatic adjustments of code constructs on typing, including documentation comment insertion, brace formatting adjustments, and raw string literal support.",
32+
"configuration.dotnet.autoInsert.enableAutoInsert": "Umožňuje automatické úpravy konstruktů kódu při psaní, včetně vkládání komentářů k dokumentaci, úprav formátování složených závorek a podpory nezpracovaných řetězcových literálů.",
3333
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Spustit analýzu kódu na pozadí pro: (Dříve omnisharp.enableRoslynAnalyzers)",
3434
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Celé řešení",
3535
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Žádné",

package.nls.de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Hinweise für Indexer anzeigen",
3030
"configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Hinweise für Lambda-Parametertypen anzeigen",
3131
"configuration.csharp.inlayHints.enableInlayHintsForTypes": "Inlinetyphinweise anzeigen",
32-
"configuration.dotnet.autoInsert.enableAutoInsert": "Enable automatic adjustments of code constructs on typing, including documentation comment insertion, brace formatting adjustments, and raw string literal support.",
32+
"configuration.dotnet.autoInsert.enableAutoInsert": "Aktivieren Sie die automatische Anpassungen von Codekonstrukten bei der Eingabe, einschließlich der Einfügung von Dokumentationskommentaren, Anpassungen der Formatierung von geschweiften Klammern und Unterstützung für unformatierte Zeichenfolgenliterale.",
3333
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Ausführen der Hintergrundcodeanalyse für: (Zuvor \"omnisharp.enableRoslynAnalyzers\")",
3434
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Gesamte Projektmappe",
3535
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Keine",

package.nls.es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Mostrar sugerencias para indizadores",
3030
"configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Mostrar sugerencias para los tipos de parámetros lambda",
3131
"configuration.csharp.inlayHints.enableInlayHintsForTypes": "Mostrar sugerencias de tipo insertado",
32-
"configuration.dotnet.autoInsert.enableAutoInsert": "Enable automatic adjustments of code constructs on typing, including documentation comment insertion, brace formatting adjustments, and raw string literal support.",
32+
"configuration.dotnet.autoInsert.enableAutoInsert": "Habilite los ajustes automáticos de construcciones de código al escribir, incluyendo la inserción de comentarios de documentación, los ajustes de formato de llaves y la compatibilidad con literales de cadena sin formato.",
3333
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Ejecutar análisis de código en segundo plano para: (anteriormente \"omnisharp.enableRoslynAnalyzers\")",
3434
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Toda la solución",
3535
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Ninguno",

package.nls.fr.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Afficher les indicateurs pour les indexeurs",
3030
"configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Afficher les indicateurs pour les types de paramètre lambda",
3131
"configuration.csharp.inlayHints.enableInlayHintsForTypes": "Afficher les indicateurs de type inline",
32-
"configuration.dotnet.autoInsert.enableAutoInsert": "Enable automatic adjustments of code constructs on typing, including documentation comment insertion, brace formatting adjustments, and raw string literal support.",
32+
"configuration.dotnet.autoInsert.enableAutoInsert": "Activez les ajustements automatiques des constructions de code lors de la saisie, notamment l’insertion de commentaires de documentation, les ajustements de mise en forme des accolades et la prise en charge des littéraux de chaîne brute.",
3333
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Exécuter l’analyse du code en arrière-plan pour : (précédemment, « omnisharp.enableRoslynAnalyzers »)",
3434
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Solution complète",
3535
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Aucun",

package.nls.it.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Mostra suggerimenti per i valori letterali",
3030
"configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Mostra suggerimenti per i tipi di parametro lambda",
3131
"configuration.csharp.inlayHints.enableInlayHintsForTypes": "Visualizza suggerimenti di tipo inline",
32-
"configuration.dotnet.autoInsert.enableAutoInsert": "Enable automatic adjustments of code constructs on typing, including documentation comment insertion, brace formatting adjustments, and raw string literal support.",
32+
"configuration.dotnet.autoInsert.enableAutoInsert": "Abilitare le regolazioni automatiche dei costrutti di codice durante la digitazione, inclusi l'inserimento dei commenti nella documentazione, le modifiche alla formattazione delle parentesi graffe e il supporto per le stringhe letterali non elaborate.",
3333
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Eseguire l'analisi del codice in background per: (In precedenza “omnisharp.enableRoslynAnalyzers”)",
3434
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Intera soluzione",
3535
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Nessuno",

package.nls.ja.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "インデクサーのヒントを表示する",
3030
"configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "ラムダ パラメーター型のヒントを表示する",
3131
"configuration.csharp.inlayHints.enableInlayHintsForTypes": "インライン型のヒントを表示する",
32-
"configuration.dotnet.autoInsert.enableAutoInsert": "Enable automatic adjustments of code constructs on typing, including documentation comment insertion, brace formatting adjustments, and raw string literal support.",
32+
"configuration.dotnet.autoInsert.enableAutoInsert": "ドキュメント コメントの挿入、波かっこの書式調整、生文字列リテラルのサポートなど、入力時のコード構造の自動調整を有効にします。",
3333
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "次のバックグラウンド コード分析を実行します: (以前の `omnisharp.enableRoslynAnalyzers`)",
3434
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "ソリューション全体",
3535
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "なし",

0 commit comments

Comments
 (0)