Skip to content

Commit d27b1bc

Browse files
authored
[Razor] Support platform agnostic language server & telemetry (#6600)
1 parent 1a8a3a9 commit d27b1bc

File tree

3 files changed

+44
-1
lines changed

3 files changed

+44
-1
lines changed

package.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,22 @@
732732
],
733733
"integrity": "AB4D44465EA5135912737F8D943DB8DB7ADF1CC213F433188401FEE36B78A319"
734734
},
735+
{
736+
"id": "Razor",
737+
"description": "Razor Language Server (Platform Agnostic)",
738+
"url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/e456a753103b84b87bf5f000499ce3d7/razorlanguageserver-platformagnostic-7.0.0-preview.23513.5.zip",
739+
"installPath": ".razor",
740+
"platforms": [
741+
"neutral"
742+
],
743+
"architectures": [
744+
"neutral"
745+
],
746+
"binaries": [
747+
"./rzls"
748+
],
749+
"integrity": "0CDC371C58614CBD5BAE83A0AEDF9896115A637E3AF007B7E399F5414CA66451"
750+
},
735751
{
736752
"id": "RazorOmnisharp",
737753
"description": "Razor Language Server for OmniSharp (Windows / x64)",
@@ -974,6 +990,19 @@
974990
"arm64"
975991
],
976992
"integrity": "65B17BBB7BA66987F74ED0B9261FC495BBB40C8C1C4FC4F8981BA5824B300A00"
993+
},
994+
{
995+
"id": "RazorTelemetry",
996+
"description": "Razor Language Server Telemetry (Platform Agnostic)",
997+
"url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/1affdce6b3431a5ed16d545a325a8474/devkittelemetry-platformagnostic-7.0.0-preview.23513.5.zip",
998+
"installPath": ".razortelemetry",
999+
"platforms": [
1000+
"netural"
1001+
],
1002+
"architectures": [
1003+
"neutral"
1004+
],
1005+
"integrity": "5410885094C69A494D847755CC974F41850AC21C613D140B4A775DE7E531880E"
9771006
}
9781007
],
9791008
"engines": {

src/razor/razorTelemetryDownloader.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,21 @@ export class RazorTelemetryDownloader {
2424
public async DownloadAndInstallRazorTelemetry(version: string): Promise<boolean> {
2525
const runtimeDependencies = getRuntimeDependenciesPackages(this.packageJSON);
2626
const razorPackages = runtimeDependencies.filter((inputPackage) => inputPackage.id === 'RazorTelemetry');
27-
const packagesToInstall = await getAbsolutePathPackagesToInstall(
27+
let packagesToInstall = await getAbsolutePathPackagesToInstall(
2828
razorPackages,
2929
this.platformInfo,
3030
this.extensionPath
3131
);
3232

33+
if (packagesToInstall.length == 0) {
34+
const platformNeutral = new PlatformInformation('neutral', 'neutral');
35+
packagesToInstall = await getAbsolutePathPackagesToInstall(
36+
razorPackages,
37+
platformNeutral,
38+
this.extensionPath
39+
);
40+
}
41+
3342
if (packagesToInstall.length > 0) {
3443
this.eventStream.post(new PackageInstallation(`Razor Telemetry Version = ${version}`));
3544
this.eventStream.post(new LogPlatformInfo(this.platformInfo));

tasks/offlinePackagingTasks.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ async function acquireRoslyn(
138138
}
139139

140140
async function installRazor(packageJSON: any, platformInfo: PlatformInformation) {
141+
if (platformInfo === undefined) {
142+
const platformNeutral = new PlatformInformation('neutral', 'neutral');
143+
return await installPackageJsonDependency('Razor', packageJSON, platformNeutral);
144+
}
145+
141146
return await installPackageJsonDependency('Razor', packageJSON, platformInfo);
142147
}
143148

0 commit comments

Comments
 (0)