Skip to content

Commit 115bc08

Browse files
authored
Merge feature branch (#7972)
2 parents a0d14ba + 07f1b11 commit 115bc08

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ This section shows how to set up local Razor or Roslyn language servers for debu
7373
1. Clone the [Roslyn repository](https://github.com/dotnet/roslyn). This repository contains the Roslyn server implementation.
7474
2. Follow the build instructions provided in the repository.
7575

76-
The server DLL is typically at `$roslynRepoRoot/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net8.0/Microsoft.CodeAnalysis.LanguageServer.dll`, but this may vary based on the built configuration.
76+
The server DLL is typically at `$roslynRepoRoot/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net9.0/Microsoft.CodeAnalysis.LanguageServer.dll`, but this may vary based on the built configuration.
7777

7878
#### Razor
7979

@@ -116,7 +116,7 @@ In your workspace `settings.json` file, add the following lines:
116116

117117
```json
118118
"dotnet.server.waitForDebugger": true,
119-
"dotnet.server.path": "<roslynRepoRoot>/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net8.0/Microsoft.CodeAnalysis.LanguageServer.dll"
119+
"dotnet.server.path": "<roslynRepoRoot>/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net9.0/Microsoft.CodeAnalysis.LanguageServer.dll"
120120
```
121121

122122
Replace <roslynRepoRoot> with the actual path to your Roslyn repository.

azure-pipelines.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ stages:
4444
dotnetVersion: $(defaultDotnetVersion)
4545

4646
- stage:
47-
displayName: Test Linux (.NET 6)
47+
displayName: Test Linux (.NET 8)
4848
dependsOn: []
4949
jobs:
5050
- template: azure-pipelines/test-matrix.yml
@@ -56,10 +56,10 @@ stages:
5656
pool:
5757
name: NetCore-Public
5858
demands: ImageOverride -equals 1es-ubuntu-2004-open
59-
containerName: mcr.microsoft.com/dotnet/sdk:6.0
59+
containerName: mcr.microsoft.com/dotnet/sdk:8.0
6060

6161
- stage:
62-
displayName: Test Linux (.NET 8)
62+
displayName: Test Linux (.NET 9)
6363
dependsOn: []
6464
jobs:
6565
- template: azure-pipelines/test-matrix.yml
@@ -71,7 +71,7 @@ stages:
7171
pool:
7272
name: NetCore-Public
7373
demands: ImageOverride -equals 1es-ubuntu-2004-open
74-
containerName: mcr.microsoft.com/dotnet/sdk:8.0
74+
containerName: mcr.microsoft.com/dotnet/sdk:9.0
7575

7676
- stage: Test_Windows_Stage
7777
displayName: Test Windows

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.14.0-1.25074.7",
40+
"roslyn": "4.14.0-2.25106.12",
4141
"omniSharp": "1.39.12",
4242
"razor": "9.0.0-preview.25073.1",
4343
"razorOmnisharp": "7.0.0-preview.23363.1",

src/lsptoolshost/dotnetRuntime/dotnetRuntimeExtensionResolver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import { CSharpExtensionId } from '../../constants/csharpExtensionId';
1414
import { readFile } from 'fs/promises';
1515
import { IDotnetAcquireResult, IDotnetFindPathContext } from './dotnetRuntimeExtensionApi';
1616

17-
const DotNetMajorVersion = '8';
17+
const DotNetMajorVersion = '9';
1818
const DotNetMinorVersion = '0';
19-
const DotNetPatchVersion = '10';
19+
const DotNetPatchVersion = '1';
2020
export const DotNetRuntimeVersion = `${DotNetMajorVersion}.${DotNetMinorVersion}.${DotNetPatchVersion}`;
2121

2222
/**

0 commit comments

Comments
 (0)