Skip to content

Commit 8a28a53

Browse files
authored
Merge branch 'main' into WaitForHtmlBufferUpdate
2 parents ce999a5 + 36690b2 commit 8a28a53

File tree

9 files changed

+16
-8
lines changed

9 files changed

+16
-8
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,15 @@
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+
68
# 2.97.x
9+
* Add integration test for restore of file-based programs (PR: [#8470](https://github.com/dotnet/vscode-csharp/pull/8470))
10+
* Update setting documentation for on auto insert (PR: [#8742](https://github.com/dotnet/vscode-csharp/pull/8742))
11+
* Bump xamlTools to fix "Color" auto-completion and code navigation (PR: [#8740](https://github.com/dotnet/vscode-csharp/pull/8740))
12+
* Update VM image to macOS-15 in pipeline (PR: [#8741](https://github.com/dotnet/vscode-csharp/pull/8741))
13+
* Add instructions for creating private feedback (PR: [#8732](https://github.com/dotnet/vscode-csharp/pull/8732))
14+
* Implement tiered versioning scheme for branch snapping workflow (PR: [#8728](https://github.com/dotnet/vscode-csharp/pull/8728))
715
* Bump xamlTools to 18.3.11128.18 (PR: [#8669](https://github.com/dotnet/vscode-csharp/pull/8740))
816
* Update target framework in Razor integration test (PR: [#8729](https://github.com/dotnet/vscode-csharp/pull/8729))
917
* Use global.json with rollforward instead of pipeline versions (PR: [#8722](https://github.com/dotnet/vscode-csharp/pull/8722))

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.ko.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": "없음",

package.nls.pl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Pokaż wskazówki dla indeksatorów",
3030
"configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Pokaż wskazówki dla typów parametrów funkcji lambda",
3131
"configuration.csharp.inlayHints.enableInlayHintsForTypes": "Wyświetl wskazówki w tekście dla typów",
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": "Włącz automatyczne korekty konstrukcji kodu podczas wpisywania, w tym wstawianie komentarzy dokumentacji, korekty formatowania nawiasów klamrowych i obsługę nieprzetworzonych literałów ciągów.",
3333
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Uruchom analizę kodu w tle dla: (Wcześniej „omnisharp.enableRoslynAnalyzers”)",
3434
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Całe rozwiązanie",
3535
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Brak",

package.nls.tr.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"configuration.csharp.inlayHints.enableInlayHintsForIndexerParameters": "Dizin oluşturucular için ipuçlarını göster",
3030
"configuration.csharp.inlayHints.enableInlayHintsForLambdaParameterTypes": "Lambda parametre türleri için ipuçlarını göster",
3131
"configuration.csharp.inlayHints.enableInlayHintsForTypes": "Satır içi tür ipuçlarını göster",
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": "Belge açıklaması ekleme, ayraç biçimlendirme ayarlamaları ve ham dize değişmez desteği dahil olmak üzere yazım sırasında kod yapılarının otomatik ayarlamalarını etkinleştirin.",
3333
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope": "Şunun için arka plan kodu analizini çalıştırın: (Daha önce `omnisharp.enableRoslynAnalyzers`)",
3434
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.fullSolution": "Tüm çözüm",
3535
"configuration.dotnet.backgroundAnalysis.analyzerDiagnosticsScope.none": "Yok",

package.nls.zh-tw.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": "顯示 Lambda 參數類型的提示",
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": "",

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "2.97",
3+
"version": "2.101",
44
"publicReleaseRefSpec": [
55
"^refs/heads/release$",
66
"^refs/heads/prerelease$",

0 commit comments

Comments
 (0)