Skip to content

Commit 91271ad

Browse files
authored
Update Roslyn to tool version (#8926)
2 parents b9f55d0 + 6439c05 commit 91271ad

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

66
# 2.121.x
7+
* Update Roslyn to 5.4.0-2.26077.7 (PR: [#](https://github.com/dotnet/vscode-csharp/pull/))
8+
* Convert language server project into .NET tool (PR: [#82154](https://github.com/dotnet/roslyn/pull/82154))
9+
* Add more details to stale project update warning (PR: [#82053](https://github.com/dotnet/roslyn/pull/82053))
10+
* Cleanup server capabilities providers and delete unused LSP providers (PR: [#82116](https://github.com/dotnet/roslyn/pull/82116))
11+
* Reduce allocations in LSP completion handling. (PR: [#82133](https://github.com/dotnet/roslyn/pull/82133))
712

813
# 2.114.x
914
* Adjust Select Project Context editor menu item location (PR: [#8907](https://github.com/dotnet/vscode-csharp/pull/8907))

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"workspace"
4141
],
4242
"defaults": {
43-
"roslyn": "5.4.0-2.26076.6",
43+
"roslyn": "5.4.0-2.26077.7",
4444
"omniSharp": "1.39.14",
4545
"razor": "10.0.0-preview.26075.11",
4646
"razorOmnisharp": "7.0.0-preview.23363.1",

tasks/offlinePackagingTasks.ts

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,19 @@ export interface NugetPackageInfo {
6767
// Set of NuGet packages that we need to download and install.
6868
export const allNugetPackages: { [key: string]: NugetPackageInfo } = {
6969
roslyn: {
70-
getPackageName: (platformInfo) => `Microsoft.CodeAnalysis.LanguageServer.${platformInfo?.rid ?? 'neutral'}`,
70+
getPackageName: (platformInfo) => {
71+
if (platformInfo === undefined) {
72+
throw new Error('Platform info is required for roslyn package name.');
73+
}
74+
return `roslyn-language-server.${platformInfo.rid}`;
75+
},
7176
packageJsonName: 'roslyn',
72-
getPackageContentPath: (platformInfo) => path.join('content', 'LanguageServer', platformInfo?.rid ?? 'neutral'),
77+
getPackageContentPath: (platformInfo) => {
78+
if (platformInfo === undefined) {
79+
throw new Error('Platform info is required for roslyn package content path.');
80+
}
81+
return path.join('tools', 'net10.0', platformInfo.rid);
82+
},
7383
vsixOutputPath: languageServerDirectory,
7484
},
7585
roslynDevKit: {
@@ -115,9 +125,6 @@ for (const p of platformSpecificPackages) {
115125
gulp.task('vsix:release:package:windows', gulp.series(...vsixTasks.filter((t) => t.includes('windows'))));
116126
gulp.task('vsix:release:package:linux', gulp.series(...vsixTasks.filter((t) => t.includes('linux'))));
117127
gulp.task('vsix:release:package:darwin', gulp.series(...vsixTasks.filter((t) => t.includes('darwin'))));
118-
gulp.task('vsix:release:package:neutral', async () => {
119-
await doPackageOffline(undefined);
120-
});
121128

122129
gulp.task(
123130
'vsix:release:package',
@@ -230,11 +237,6 @@ async function installNuGetPackage(
230237
}
231238

232239
async function installRazor(packageJSON: any, platformInfo: PlatformInformation) {
233-
if (platformInfo === undefined) {
234-
const platformNeutral = new PlatformInformation('neutral', 'neutral');
235-
return await installPackageJsonDependency('Razor', packageJSON, platformNeutral);
236-
}
237-
238240
return await installPackageJsonDependency('Razor', packageJSON, platformInfo);
239241
}
240242

@@ -351,7 +353,7 @@ async function doPackageOffline(vsixPlatform: VSIXPlatformInfo | undefined) {
351353
const message = (err instanceof Error ? err.stack : err) ?? '<unknown error>';
352354
// NOTE: Extra `\n---` at the end is because gulp will print this message following by the
353355
// stack trace of this line. So that seperates the two stack traces.
354-
throw Error(`Failed to create package ${vsixPlatform?.vsceTarget ?? 'neutral'}. ${message}\n---`);
356+
throw Error(`Failed to create package ${vsixPlatform?.vsceTarget ?? 'undefined'}. ${message}\n---`);
355357
} finally {
356358
// Reset package version to the placeholder value.
357359
await nbgv.resetPackageVersionPlaceholder();
@@ -396,9 +398,6 @@ function getPackageName(packageJSON: any, vscodePlatformId?: string) {
396398
async function updateNugetPackageVersion(packageInfo: NugetPackageInfo) {
397399
const packageJSON = getPackageJSON();
398400

399-
// Fetch the neutral package that we don't otherwise have in our platform list
400-
await acquireNugetPackage(packageInfo, undefined, packageJSON, true);
401-
402401
// And now fetch each platform specific
403402
for (const p of platformSpecificPackages) {
404403
await acquireNugetPackage(packageInfo, p, packageJSON, true);

0 commit comments

Comments
 (0)