Skip to content

Commit 02b3b37

Browse files
Consume per-runtime language servers
To keep our package size more manageable, we now create a separate language server package per runtime. This changes our download tasks to adjust for this and updates to a new Roslyn version that has separate packages.
1 parent 77c8b39 commit 02b3b37

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

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.8.0-2.23428.2",
40+
"roslyn": "4.8.0-3.23451.2",
4141
"omniSharp": "1.39.7",
4242
"razor": "7.0.0-preview.23423.3",
4343
"razorOmnisharp": "7.0.0-preview.23363.1"

server/ServerDownload.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageDownload Include="Microsoft.CodeAnalysis.LanguageServer" version="[$(MicrosoftCodeAnalysisLanguageServerVersion)]" />
23+
<PackageDownload Include="$(PackageName)" version="[$(PackageVersion)]" />
2424
</ItemGroup>
2525

2626
</Project>

tasks/offlinePackagingTasks.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ gulp.task('installDependencies', async () => {
7676
// Install Tasks
7777
async function installRoslyn(packageJSON: any, platformInfo?: PlatformInformation) {
7878
const roslynVersion = packageJSON.defaults.roslyn;
79-
const packagePath = await acquireNugetPackage('Microsoft.CodeAnalysis.LanguageServer', roslynVersion);
8079

8180
// Find the matching server RID for the current platform.
8281
let serverPlatform: string;
@@ -90,6 +89,11 @@ async function installRoslyn(packageJSON: any, platformInfo?: PlatformInformatio
9089
)!.rid;
9190
}
9291

92+
const packagePath = await acquireNugetPackage(
93+
`Microsoft.CodeAnalysis.LanguageServer.${serverPlatform}`,
94+
roslynVersion
95+
);
96+
9397
// Get the directory containing the server executable for the current platform.
9498
const serverExecutableDirectory = path.join(packagePath, 'content', 'LanguageServer', serverPlatform);
9599
if (!fs.existsSync(serverExecutableDirectory)) {
@@ -150,7 +154,8 @@ async function acquireNugetPackage(packageName: string, packageVersion: string):
150154
const dotnetArgs = [
151155
'restore',
152156
path.join(rootPath, 'server'),
153-
`/p:MicrosoftCodeAnalysisLanguageServerVersion=${packageVersion}`,
157+
`/p:PackageName=${packageName}`,
158+
`/p:PackageVersion=${packageVersion}`,
154159
];
155160
if (argv.interactive) {
156161
dotnetArgs.push('--interactive');

0 commit comments

Comments
 (0)