Skip to content

Commit b5f8824

Browse files
authored
[automated] Merge branch 'main' => 'prerelease' (#7995)
2 parents 00c5f8e + be7ee2e commit b5f8824

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
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.66.x
7+
* Update Razor to 9.0.0-preview.25113.1 (PR: [#7989](https://github.com/dotnet/vscode-csharp/pull/7989))
8+
* Update Telemetry package (#11468) (PR: [#11468](https://github.com/dotnet/razor/pull/11468))
9+
* Don't hold onto Roslyn projects longer than necessary (#11458) (PR: [#11458](https://github.com/dotnet/razor/pull/11458))
10+
* Fix formatting of escaped at signs (#11462) (PR: [#11462](https://github.com/dotnet/razor/pull/11462))
11+
* Code action to offer to wrap Html attributes (#11422) (PR: [#11422](https://github.com/dotnet/razor/pull/11422))
12+
* Make sure we go through GetAbsolutePosition to handle LSP edge cases (#11441) (PR: [#11441](https://github.com/dotnet/razor/pull/11441))
13+
* Make log levels match LogLevel.cs (#11436) (PR: [#11436](https://github.com/dotnet/razor/pull/11436))
14+
* Fix on type formatting line delta calculations (#11435) (PR: [#11435](https://github.com/dotnet/razor/pull/11435))
15+
* Clean up and rationalize imports in the compiler (#11409) (PR: [#11409](https://github.com/dotnet/razor/pull/11409))
16+
* Fix typo in setting description (#11423) (PR: [#11423](https://github.com/dotnet/razor/pull/11423))
17+
* Bump xamlTools to 17.14.35813.246 (PR: [#7993](https://github.com/dotnet/vscode-csharp/pull/7993))
18+
619
# 2.65.x
720
* Update Roslyn LSP to run on .NET 9 (PR: [#7946](https://github.com/dotnet/vscode-csharp/pull/7946))
821
* Update Roslyn to 4.14.0-2.25106.12 (PR: [#7969](https://github.com/dotnet/vscode-csharp/pull/7969))

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
"defaults": {
4040
"roslyn": "4.14.0-2.25106.12",
4141
"omniSharp": "1.39.12",
42-
"razor": "9.0.0-preview.25073.1",
42+
"razor": "9.0.0-preview.25113.1",
4343
"razorOmnisharp": "7.0.0-preview.23363.1",
44-
"xamlTools": "17.14.35807.11"
44+
"xamlTools": "17.14.35813.246"
4545
},
4646
"main": "./dist/extension",
4747
"l10n": "./l10n",

src/shared/utils/getDotnetInfo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ async function parseDotnetInfo(dotnetInfo: string, dotnetExecutablePath: string
6262
let match: RegExpMatchArray | null;
6363
if ((match = /^\s*Version:\s*([^\s].*)$/.exec(line))) {
6464
version = match[1];
65-
} else if ((match = /^ RID:\s*([\w\-.]+)$/.exec(line))) {
65+
} else if ((match = /^\s*RID:\s*([\w\-.]+)$/.exec(line))) {
6666
runtimeId = match[1];
6767
} else if ((match = /^\s*Architecture:\s*(.*)/.exec(line))) {
6868
architecture = match[1];

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.65",
3+
"version": "2.66",
44
"publicReleaseRefSpec": [
55
"^refs/heads/release$",
66
"^refs/heads/prerelease$",

0 commit comments

Comments
 (0)