Skip to content

Commit

Permalink
[automated] Merge branch 'main' => 'prerelease' (#7995)
Browse files Browse the repository at this point in the history
  • Loading branch information
dibarbet authored Feb 18, 2025
2 parents 00c5f8e + be7ee2e commit b5f8824
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 4 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@
- Diagnostics related feature requests and improvements [#5951](/~https://github.com/dotnet/vscode-csharp/issues/5951)
- Debug from .csproj and .sln [#5876](/~https://github.com/dotnet/vscode-csharp/issues/5876)

# 2.66.x
* Update Razor to 9.0.0-preview.25113.1 (PR: [#7989](/~https://github.com/dotnet/vscode-csharp/pull/7989))
* Update Telemetry package (#11468) (PR: [#11468](/~https://github.com/dotnet/razor/pull/11468))
* Don't hold onto Roslyn projects longer than necessary (#11458) (PR: [#11458](/~https://github.com/dotnet/razor/pull/11458))
* Fix formatting of escaped at signs (#11462) (PR: [#11462](/~https://github.com/dotnet/razor/pull/11462))
* Code action to offer to wrap Html attributes (#11422) (PR: [#11422](/~https://github.com/dotnet/razor/pull/11422))
* Make sure we go through GetAbsolutePosition to handle LSP edge cases (#11441) (PR: [#11441](/~https://github.com/dotnet/razor/pull/11441))
* Make log levels match LogLevel.cs (#11436) (PR: [#11436](/~https://github.com/dotnet/razor/pull/11436))
* Fix on type formatting line delta calculations (#11435) (PR: [#11435](/~https://github.com/dotnet/razor/pull/11435))
* Clean up and rationalize imports in the compiler (#11409) (PR: [#11409](/~https://github.com/dotnet/razor/pull/11409))
* Fix typo in setting description (#11423) (PR: [#11423](/~https://github.com/dotnet/razor/pull/11423))
* Bump xamlTools to 17.14.35813.246 (PR: [#7993](/~https://github.com/dotnet/vscode-csharp/pull/7993))

# 2.65.x
* Update Roslyn LSP to run on .NET 9 (PR: [#7946](/~https://github.com/dotnet/vscode-csharp/pull/7946))
* Update Roslyn to 4.14.0-2.25106.12 (PR: [#7969](/~https://github.com/dotnet/vscode-csharp/pull/7969))
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"defaults": {
"roslyn": "4.14.0-2.25106.12",
"omniSharp": "1.39.12",
"razor": "9.0.0-preview.25073.1",
"razor": "9.0.0-preview.25113.1",
"razorOmnisharp": "7.0.0-preview.23363.1",
"xamlTools": "17.14.35807.11"
"xamlTools": "17.14.35813.246"
},
"main": "./dist/extension",
"l10n": "./l10n",
Expand Down
2 changes: 1 addition & 1 deletion src/shared/utils/getDotnetInfo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ async function parseDotnetInfo(dotnetInfo: string, dotnetExecutablePath: string
let match: RegExpMatchArray | null;
if ((match = /^\s*Version:\s*([^\s].*)$/.exec(line))) {
version = match[1];
} else if ((match = /^ RID:\s*([\w\-.]+)$/.exec(line))) {
} else if ((match = /^\s*RID:\s*([\w\-.]+)$/.exec(line))) {
runtimeId = match[1];
} else if ((match = /^\s*Architecture:\s*(.*)/.exec(line))) {
architecture = match[1];
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "2.65",
"version": "2.66",
"publicReleaseRefSpec": [
"^refs/heads/release$",
"^refs/heads/prerelease$",
Expand Down

0 comments on commit b5f8824

Please sign in to comment.