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.

eng/Versions.props

davidwengier

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

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

Razor.sln

 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 😛

I don't love the name either. It's a bit too generic, and MS.VS.RazorExtension is not something to emulate. 😄

Yea... I didn't love writing it but wasn't able to come up with an alternative.

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

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

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

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

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

…nto remove_razor_ea

…de side

DustinCampbell · 2025-03-25T21:21:36Z

...azor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectEngineHost/ProjectEngineFactories.cs

 using System.Collections.Immutable;

-namespace Microsoft.AspNetCore.Razor.ProjectEngineHost;
+namespace Microsoft.CodeAnalysis.Razor.Workspaces.ProjectEngineHost;


This can be fixed later, but we generally don't add "Workspaces" into namespaces in MS.CA.Razor.Workspaces anymore. This should probably have been Microsoft.CodeAnalysis.Razor.ProjectEngineHost, but please feel free to fix that later or tell somebody else to do it. 😄

DustinCampbell · 2025-03-25T21:23:58Z

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/IDocumentSnapshot.cs

Shouldn't this (and other files moved to this folder) switch to the Microsoft.CodeAnalysis.Razor.ProjectSystem namespace?

Depends on the following PRs: dotnet/razor#11510 dotnet/roslyn#77715

Andrew Hall 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

Andrew Hall added 2 commits February 18, 2025 19:10

Nullability and usings

2a57a43

Remove local nuget

fdacf95

Andrew Hall 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

Merged

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

eng/Versions.props Outdated Show resolved Hide resolved

Update layering doc and undo unnecessary changes

951f9ea

davidwengier reviewed Mar 21, 2025

View reviewed changes

Andrew Hall added 6 commits March 24, 2025 16:08

Remove unused type

7cda646

Merge branch 'remove_razor_ea' of https://github.com/ryzngard/razor i…

003e335

…nto remove_razor_ea

Remove duplicated types

76ee9d5

Reuse types

f7a49db

Fix HashSet usage and null out when done

6c7b39b

Allow multiple updates to be applied since we allow that in the vs co…

be26139

…de side

ryzngard mentioned this pull request Mar 25, 2025

Add .razorExtension dotnet/vscode-csharp#8096

Merged

Consolidate code

39a5c88

DustinCampbell reviewed Mar 25, 2025

View reviewed changes

DustinCampbell approved these changes Mar 25, 2025

View reviewed changes

davidwengier approved these changes Mar 25, 2025

View reviewed changes

Andrew Hall added 5 commits March 25, 2025 16:15

Handle null response

8758737

Use real versions

ba48169

Update namespaces

b70298f

Update Version.details.xml

6fa2618

Update with darc and fix source build

9d86df7

ryzngard requested a review from a team as a code owner March 26, 2025 18:49

ryzngard mentioned this pull request Mar 26, 2025

Normalize_NonWindows_AddsLeadingForwardSlash was not previously running on merge PRs #11660

Open

Andrew Hall added 2 commits March 26, 2025 12:54

Skip failing test

91ba66c

Unblock for now

e812dab

ryzngard merged commit 64ba82d into dotnet:main Mar 27, 2025
12 checks passed

dotnet-policy-service bot added this to the Next milestone Mar 27, 2025

ryzngard pushed a commit to dotnet/vscode-csharp that referenced this pull request Mar 28, 2025

Add .razorExtension (#8096)

e342e51

Depends on the following PRs: dotnet/razor#11510 dotnet/roslyn#77715

dotnet-bot mentioned this pull request Mar 29, 2025

[Automated] PRs inserted in VS build main-35928.14 #11674

Closed

jjonescz modified the milestones: Next, 17.14 P3 Apr 1, 2025

This was referenced Apr 2, 2025

[Automated] PRs inserted in VS build feature.debugger.main-36001.245 #11693

Closed

[Automated] PRs inserted in VS build feature.d18initial-10502.05 #11698

Closed

dotnet-bot mentioned this pull request Apr 17, 2025

[Automated] PRs inserted in VS build feature.telemetry.d18OpenTelemetry-10516.102 #11747

Closed

Remove Razor EA For Roslyn #11510

Remove Razor EA For Roslyn #11510

Uh oh!

Conversation

ryzngard commented Feb 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Copilot description below

Project restructuring:

Code updates:

Project removals:

Uh oh!

davidwengier commented Feb 19, 2025

Uh oh!

ryzngard commented Feb 19, 2025

Uh oh!

DustinCampbell commented Feb 20, 2025

Uh oh!

Uh oh!

davidwengier left a comment

Choose a reason for hiding this comment

Uh oh!

davidwengier Mar 21, 2025

Choose a reason for hiding this comment

Uh oh!

DustinCampbell Mar 21, 2025

Choose a reason for hiding this comment

Uh oh!

ryzngard Mar 21, 2025

Choose a reason for hiding this comment

Uh oh!

DustinCampbell Mar 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DustinCampbell Mar 25, 2025

Choose a reason for hiding this comment

Uh oh!

DustinCampbell Mar 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ryzngard commented Feb 19, 2025 •

edited

Loading