diff --git a/package.json b/package.json index c510ffc91..d8c9f994d 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ } }, "defaults": { - "roslyn": "4.8.0-2.23428.2", + "roslyn": "4.8.0-3.23451.2", "omniSharp": "1.39.7", "razor": "7.0.0-preview.23423.3", "razorOmnisharp": "7.0.0-preview.23363.1" diff --git a/server/ServerDownload.csproj b/server/ServerDownload.csproj index 3d88b952a..bde703f88 100644 --- a/server/ServerDownload.csproj +++ b/server/ServerDownload.csproj @@ -20,7 +20,7 @@ - + \ No newline at end of file diff --git a/tasks/offlinePackagingTasks.ts b/tasks/offlinePackagingTasks.ts index 2da434ec2..73ff97dd4 100644 --- a/tasks/offlinePackagingTasks.ts +++ b/tasks/offlinePackagingTasks.ts @@ -76,7 +76,6 @@ gulp.task('installDependencies', async () => { // Install Tasks async function installRoslyn(packageJSON: any, platformInfo?: PlatformInformation) { const roslynVersion = packageJSON.defaults.roslyn; - const packagePath = await acquireNugetPackage('Microsoft.CodeAnalysis.LanguageServer', roslynVersion); // Find the matching server RID for the current platform. let serverPlatform: string; @@ -90,6 +89,11 @@ async function installRoslyn(packageJSON: any, platformInfo?: PlatformInformatio )!.rid; } + const packagePath = await acquireNugetPackage( + `Microsoft.CodeAnalysis.LanguageServer.${serverPlatform}`, + roslynVersion + ); + // Get the directory containing the server executable for the current platform. const serverExecutableDirectory = path.join(packagePath, 'content', 'LanguageServer', serverPlatform); if (!fs.existsSync(serverExecutableDirectory)) { @@ -150,7 +154,8 @@ async function acquireNugetPackage(packageName: string, packageVersion: string): const dotnetArgs = [ 'restore', path.join(rootPath, 'server'), - `/p:MicrosoftCodeAnalysisLanguageServerVersion=${packageVersion}`, + `/p:PackageName=${packageName}`, + `/p:PackageVersion=${packageVersion}`, ]; if (argv.interactive) { dotnetArgs.push('--interactive');