Skip to content

Commit a025c16

Browse files
committed
Merge remote-tracking branch 'upstream/prerelease' into merge/prerelease-to-main
2 parents 4cd502b + 769ccbd commit a025c16

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# 2.57.x
77

88
# 2.56.x
9+
* Update Roslyn to 4.13.0-2.24561.3 (PR: [#7765](https://github.com/dotnet/vscode-csharp/pull/7765))
10+
* Update Razor to fix serialization issue loading projects (PR: [#75794](https://github.com/dotnet/roslyn/pull/75794))
911
* Update Razor to 9.0.0-preview.24557.11 (PR: [#7756](https://github.com/dotnet/vscode-csharp/pull/7756))
1012
* Fix FUSE hook up in VS Code (#11175) (PR: [#11175](https://github.com/dotnet/razor/pull/11175))
1113
* Update VSTelemetryAPI version (#11181) (PR: [#11181](https://github.com/dotnet/razor/pull/11181))
@@ -29,6 +31,10 @@
2931
* XAML IntelliseSense completions for Image.Source
3032

3133
# 2.55.x
34+
* Update Razor to 9.0.0-preview.24557.10 (PR: [#7757](https://github.com/dotnet/vscode-csharp/pull/7757))
35+
* Update VSTelemetryAPI version (#11181) (PR: [#11181](https://github.com/dotnet/razor/pull/11181))
36+
* Update Roslyn to 4.13.0-2.24557.6 (PR: [#7751](https://github.com/dotnet/vscode-csharp/pull/7751))
37+
* Fix issue telemetry reporting incorrect property value (PR: [#75817](https://github.com/dotnet/roslyn/pull/75817))
3238
* Update Roslyn to 4.13.0-2.24531.3 (PR: [#7722](https://github.com/dotnet/vscode-csharp/pull/7722))
3339
* Proffer project system query service (PR: [#75682](https://github.com/dotnet/roslyn/pull/75682))
3440
* Ensure discards are initially soft selected in VSCode (PR: [#75655](https://github.com/dotnet/roslyn/pull/75655))

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
}
3838
},
3939
"defaults": {
40-
"roslyn": "4.13.0-2.24557.5",
40+
"roslyn": "4.13.0-2.24561.3",
4141
"omniSharp": "1.39.11",
4242
"razor": "9.0.0-preview.24557.11",
4343
"razorOmnisharp": "7.0.0-preview.23363.1",

0 commit comments

Comments
 (0)