Make Razor a built in feature of the Roslyn language server

package.json

@@ -42,7 +42,6 @@
   "defaults": {
     "roslyn": "5.8.0-1.26252.1",
     "omniSharp": "1.39.14",
-    "razor": "10.4.0-preview.26252.1",
     "razorOmnisharp": "7.0.0-preview.23363.1",
     "xamlTools": "18.7.11727.258"
   },
@@ -98,7 +97,6 @@
     "test:unit": "npm run compileDev && npx ts-node tasks/tests/testUnit.ts",
     "updateChangelog": "npx ts-node tasks/snap/updateChangelog.ts",
     "updatePackageDependencies": "npx ts-node tasks/debugger/updatePackageDependencies.ts",
-    "updateRazorVersion": "npx ts-node tasks/packaging/updateRazorVersion.ts",
     "updateRoslynVersion": "npx ts-node tasks/packaging/updateRoslynVersion.ts",
     "updateVersionForStableRelease": "npx ts-node tasks/snap/updateVersionForStableRelease.ts",
     "verifyVsix": "npx ts-node tasks/signing/verifyVsix.ts",
@@ -1480,10 +1478,6 @@
               "roslynCopilot": {
                 "description": "%configuration.dotnet.server.componentPaths.roslynCopilot%",
                 "type": "string"
-              },
-              "razorExtension": {
-                "description": "%configuration.dotnet.server.componentPaths.razorExtension%",
-                "type": "string"
               }
             },
             "default": {}

src/lsptoolshost/extensions/builtInComponents.ts

@@ -29,11 +29,6 @@ export const componentInfo: { [key: string]: ComponentInfo } = {
             'Microsoft.VisualStudio.DesignTools.CodeAnalysis.Diagnostics.dll',
         ],
     },
-    razorExtension: {
-        defaultFolderName: '.razorExtension',
-        optionName: 'razorExtension',
-        componentDllPaths: ['Microsoft.VisualStudioCode.RazorExtension.dll'],
-    },
     roslynCopilot: {
         defaultFolderName: '.roslynCopilot',
         optionName: 'roslynCopilot',

src/lsptoolshost/server/roslynLanguageServer.ts

@@ -671,19 +671,6 @@ export class RoslynLanguageServer {
             args.push('--sourceGeneratorExecutionPreference', sourceGeneratorExecution);
         }
 
-        let razorComponentPath = '';
-        getComponentPaths('razorExtension', languageServerOptions, channel).forEach((extPath) => {
-            additionalExtensionPaths.push(extPath);
-            razorComponentPath = path.dirname(extPath);
-        });
-
-        args.push('--razorSourceGenerator', path.join(razorComponentPath, 'Microsoft.CodeAnalysis.Razor.Compiler.dll'));
-
-        args.push(
-            '--razorDesignTimePath',
-            path.join(razorComponentPath, 'Targets', 'Microsoft.NET.Sdk.Razor.DesignTime.targets')
-        );
-
         // Get the brokered service pipe name from C# Dev Kit (if installed).
         if (csharpDevKitExtensionExports) {
             _wasActivatedWithCSharpDevkit = true;
@@ -712,6 +699,7 @@ export class RoslynLanguageServer {
 
             // Razor has code in Microsoft.CSharp.DesignTime.targets to handle non-Razor-SDK projects, but that doesn't get imported outside
             // of DevKit so we polyfill with a mini-version that Razor provides for that scenario.
+            const razorComponentPath = path.dirname(serverPath);
             args.push(
                 '--csharpDesignTimePath',
                 path.join(razorComponentPath, 'Targets', 'Microsoft.CSharpExtension.DesignTime.targets')

tasks/packaging/offlinePackagingTasks.ts

@@ -23,7 +23,6 @@ import {
     rootPath,
     devKitDependenciesDirectory,
     xamlToolsDirectory,
-    razorExtensionDirectory,
 } from '../projectPaths';
 import { getPackageJSON } from '../packageJson';
 import { createPackageAsync, generateVsixManifest } from './vsceTasks';
@@ -92,12 +91,6 @@ export const allNugetPackages: { [key: string]: NugetPackageInfo } = {
         getPackageContentPath: (_platformInfo) => 'content',
         vsixOutputPath: xamlToolsDirectory,
     },
-    razorExtension: {
-        getPackageName: (_platformInfo) => 'Microsoft.VisualStudioCode.RazorExtension',
-        packageJsonName: 'razor',
-        getPackageContentPath: (_platformInfo) => 'content',
-        vsixOutputPath: razorExtensionDirectory,
-    },
 };
 
 interface PlatformEntry {

tasks/projectPaths.ts

@@ -18,7 +18,6 @@ export const nugetTempPath = path.join(rootPath, 'out', '.nuget');
 export const languageServerDirectory = path.join(rootPath, '.roslyn');
 export const devKitDependenciesDirectory = path.join(rootPath, componentInfo.roslynDevKit.defaultFolderName);
 export const xamlToolsDirectory = path.join(rootPath, componentInfo.xamlTools.defaultFolderName);
-export const razorExtensionDirectory = path.join(rootPath, componentInfo.razorExtension.defaultFolderName);
 
 export const codeExtensionPath = commandLineOptions.codeExtensionPath || rootPath;
 

tasks/tags/createTags.ts

@@ -24,7 +24,6 @@ interface CreateTagsOptions {
 
 async function createTags(): Promise<void> {
     await createTagsRoslyn();
-    await createTagsRazor();
     await createTagsVSCodeCSharp();
 }
 
@@ -47,25 +46,6 @@ async function createTagsRoslyn(): Promise<void> {
     );
 }
 
-async function createTagsRazor(): Promise<void> {
-    const options = minimist<CreateTagsOptions>(process.argv.slice(2));
-
-    return createTagsAsync(
-        options,
-        'dotnet',
-        'razor',
-        async (releaseCommit: string, githubPAT: string) =>
-            getCommitFromNugetAsync(allNugetPackages.razorExtension, releaseCommit, githubPAT),
-        (releaseVersion: string, isPrerelease: boolean): [string, string] => {
-            const prereleaseText = isPrerelease ? '-prerelease' : '';
-            return [
-                `VSCode-CSharp-${releaseVersion}${prereleaseText}`,
-                `${releaseVersion} VSCode C# extension ${prereleaseText}`,
-            ];
-        }
-    );
-}
-
 async function createTagsVSCodeCSharp(): Promise<void> {
     const options = minimist<CreateTagsOptions>(process.argv.slice(2));