Remove Razor EA For Roslyn #11510

ryzngard · 2025-02-19T01:46:33Z

Remove Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace, we no longer ship an EA for Roslyn
Add a new Microsoft.VisualStudioCode.RazorExtension and package that will be put in .razorExtension in VS Code
- This will contain endpoints and LSP services that will be loaded in the roslyn language server for VS Code.
Remove Microsoft.AspNetCore.Razor.ProjectEngineHost as that layer of separation is no longer needed

Copilot description below

This pull request includes several changes to the Razor project, focusing on project restructuring and dependency updates. The most important changes include adding a new package version, renaming and removing projects, and updating the RazorWorkspaceListenerBase class.

Project restructuring:

Razor.sln: Renamed Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace to Microsoft.VisualStudioCode.RazorExtension and removed Microsoft.AspNetCore.Razor.ProjectEngineHost and its test project. [1] [2] [3]
docs/ProjectsAndLayering.md: Updated documentation to reflect the new project name.

Code updates:

RazorWorkspaceListenerBase.cs: Replaced _disposed with _disposeTokenSource.IsCancellationRequested for better disposal handling and added _tagHelperResolver and _projectChecksums fields. [1] [2] [3] [4]

Project removals:

Removed Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace project and its related files. [1] [2] [3]

MS.CA.Razor.Workspaces

davidwengier · 2025-02-19T02:40:12Z

Do you want reviews? I'll admit, the first thing I saw in here was code that used to be in ExternalAccess.RoslynWorkspace, which used to be VS Code exclusive, moved to MS.VS.RazorExtension which used to be VS exclusive, and I got very confused by what the intent was.

Then I re-read it! :)

ryzngard · 2025-02-19T02:52:16Z

Do you want reviews? I'll admit, the first thing I saw in here was code that used to be in ExternalAccess.RoslynWorkspace, which used to be VS Code exclusive, moved to MS.VS.RazorExtension which used to be VS exclusive, and I got very confused by what the intent was.

Then I re-read it! :)

I don't think it's ready for reviews yet

DustinCampbell · 2025-02-20T16:34:47Z

I don't think it's ready for reviews yet

Feel free to ping in Teams when you're ready.

ryzngard · 2025-03-21T00:25:44Z

eng/Versions.props

+    <MicrosoftNetCompilersToolsetPackageVersion>4.14.0-dev</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.14.0-dev</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
+    <MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.14.0-dev</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
+    <MicrosoftCodeAnalysisCommonPackageVersion>4.14.0-dev</MicrosoftCodeAnalysisCommonPackageVersion>


These will need to be updated once the package is available.

davidwengier

Mostly LGTM. I skipped the one file with the merge conflict markers though 😛

davidwengier · 2025-03-21T00:49:28Z

Razor.sln

@@ -106,11 +106,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compiler Tests", "Compiler
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Microbenchmarks.Generator", "src\Compiler\perf\Microsoft.AspNetCore.Razor.Microbenchmarks.Generator\Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj", "{7400A168-2552-49C7-93E3-D4DAA90C216F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace", "src\Razor\src\Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace\Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj", "{2223B8FD-D98A-47BE-94A9-6A3A6B8557B8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudioCode.RazorExtension", "src\Razor\src\Microsoft.VisualStudioCode.RazorExtension\Microsoft.VisualStudioCode.RazorExtension.csproj", "{2223B8FD-D98A-47BE-94A9-6A3A6B8557B8}"


I don't know of a better name, and I don't think it matters, but I would like to state for the record that Microsoft.VisualStudio.RazorExtension is a visual studio extension and Microsoft.VisualStudioCode.RazorExtension is not a visual studio code extension 😛

davidwengier · 2025-03-21T00:51:23Z

.../src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/RazorWorkspaceListenerBase.cs

    {
+<<<<<<< HEAD


davidwengier · 2025-03-21T00:57:26Z

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Endpoints/RazorFileChangedResponse.cs

+
+namespace Microsoft.VisualStudioCode.RazorExtension.Endpoints;
+
+internal class RazorFileChangedResponse


davidwengier · 2025-03-21T01:04:55Z

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/RazorDynamicFileUpdate.cs

+internal sealed class RazorDynamicFileUpdate
+{
+    [JsonPropertyName("edits")]
+    public required ServerTextChange[] Edits { get; set; }


We have RazorTextChange which looks the same as ServerTextChange. Also, why not put this array directly in RazorProvideDynamicFileResponse? Looks like there is even a debug assert to ensure there is only ever one RazorDynamicFileUpdate anyway

davidwengier · 2025-03-21T01:07:15Z

...or/src/Microsoft.VisualStudioCode.RazorExtension/Services/RazorLspDynamicFileInfoProvider.cs

+
+file sealed class LspDynamicFileProvider(IRazorClientLanguageServerManager clientLanguageServerManager) : RazorLspDynamicFileInfoProvider
+{
+    private const string ProvideRazorDynamicFileInfoMethodName = "razor/provideDynamicFileInfo";


Looks like there are two files in this project that define this. Centralize?

davidwengier · 2025-03-21T01:12:19Z

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/RazorWorkspaceService.cs

+
+[ExportRazorStatelessLspService(typeof(RazorWorkspaceService)), Shared]
+[method: ImportingConstructor]
+file class WorkspaceService(ILoggerFactory loggerFactory) : RazorWorkspaceService


File name doesn't match class name. Also not sure why this is a file class. I guess it doens't hurt, but seems odd.

davidwengier · 2025-03-21T01:12:39Z

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/RazorWorkspaceService.cs

+file class WorkspaceService(ILoggerFactory loggerFactory) : RazorWorkspaceService
+{
+    private readonly ILoggerFactory _loggerFactory = loggerFactory;
+    private readonly ILogger _logger = loggerFactory.CreateLogger<RazorWorkspaceService>();


This should probably create a logged for WorkspaceService, though being a file class, that type name probably looks ugly.

davidwengier · 2025-03-21T01:14:13Z

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/RazorWorkspaceService.cs

+
+            projectsToInitialize = _projectIdWithDynamicFiles;
+            // May as well clear out the collection, it will never get used again anyway.
+            _projectIdWithDynamicFiles = [];


I think you copied this code from the C# extension, where I was the one who wrote it, but I must ask Past Dave™, why not just call .Clear()? Could make the hashset readonly. Or set the hashset to null?

davidwengier · 2025-03-21T01:14:27Z

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/RazorWorkspaceService.cs

+{
+    private readonly ILoggerFactory _loggerFactory = loggerFactory;
+    private readonly ILogger _logger = loggerFactory.CreateLogger<RazorWorkspaceService>();
+    private Lock _initializeLock = new();


ryzngard added 8 commits February 11, 2025 14:58

Move naming

9abb389

Fix build

e4cb0ac

Remove ProjectEngineHost project by moving things into

3ef44b4

MS.CA.Razor.Workspaces

Update resource files

315658b

Fix compilation

590367c

Bump local packages

1413236

Respond to changes in roslyn EA

a3eeb9f

Merge branch 'main' into remove_razor_ea

0f09a56

ryzngard added 2 commits February 18, 2025 19:10

Nullability and usings

2a57a43

Remove local nuget

fdacf95

ryzngard added 8 commits February 20, 2025 18:40

Final changes

059341f

Compiling and ready for testing. Still failing

404c321

Merge branch 'main' into remove_razor_ea

f265359

Merge branch 'main' into remove_razor_ea

46a9970

Don't export stateless service

4c4871b

Merge branch 'main' into remove_razor_ea

1eb80e6

Remove using

f964da7

Working...

5bce5e4

ryzngard mentioned this pull request Mar 20, 2025

Reduce likelihood of needing a dual insertion in VS Code dotnet/roslyn#77715

Open

Package the extension into a nupkg

5cc494e

ryzngard marked this pull request as ready for review March 21, 2025 00:11

ryzngard requested review from a team as code owners March 21, 2025 00:11

Remove Nuget.config changes

24381ea

ryzngard commented Mar 21, 2025

View reviewed changes

Update layering doc and undo unnecessary changes

951f9ea

davidwengier reviewed Mar 21, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove Razor EA For Roslyn #11510

Remove Razor EA For Roslyn #11510

ryzngard commented Feb 19, 2025 •

edited

Loading

davidwengier commented Feb 19, 2025

ryzngard commented Feb 19, 2025

DustinCampbell commented Feb 20, 2025

ryzngard Mar 21, 2025

davidwengier left a comment

davidwengier Mar 21, 2025

davidwengier Mar 21, 2025

ryzngard Mar 21, 2025

davidwengier Mar 21, 2025

davidwengier Mar 21, 2025

davidwengier Mar 21, 2025

davidwengier Mar 21, 2025

davidwengier Mar 21, 2025

davidwengier Mar 21, 2025

davidwengier Mar 21, 2025


		namespace Microsoft.VisualStudioCode.RazorExtension.Endpoints;

		internal class RazorFileChangedResponse

		{
		<<<<<<< HEAD

Remove Razor EA For Roslyn #11510

Are you sure you want to change the base?

Remove Razor EA For Roslyn #11510

Conversation

ryzngard commented Feb 19, 2025 • edited Loading

Copilot description below

Project restructuring:

Code updates:

Project removals:

davidwengier commented Feb 19, 2025

ryzngard commented Feb 19, 2025

DustinCampbell commented Feb 20, 2025

Choose a reason for hiding this comment

davidwengier left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryzngard commented Feb 19, 2025 •

edited

Loading