diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 064908f082f..c3c60c45d96 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -11,82 +11,82 @@
       <Sha>136e43e45e20bd58bf86eeabba0a0fa7e1a4b3ae</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-1.24522.7">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-2.24554.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>77c6704c42b162e89095631f12e2661398a75ba7</Sha>
+      <Sha>8fc87e00bbe35131f7d3707621ae18e1af1aae55</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
   </ProductDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index ee26d584b7f..904a29e3ea4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -53,25 +53,25 @@
     <MicrosoftSourceBuildIntermediatearcadePackageVersion>9.0.0-beta.24516.2</MicrosoftSourceBuildIntermediatearcadePackageVersion>
     <MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23475.1</MicrosoftDotNetXliffTasksPackageVersion>
     <MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>1.0.0-beta.23475.1</MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>
-    <MicrosoftNetCompilersToolsetPackageVersion>4.13.0-1.24522.7</MicrosoftNetCompilersToolsetPackageVersion>
-    <MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.13.0-1.24522.7</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
-    <MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.13.0-1.24522.7</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
-    <MicrosoftCodeAnalysisCommonPackageVersion>4.13.0-1.24522.7</MicrosoftCodeAnalysisCommonPackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-1.24522.7</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.13.0-1.24522.7</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-1.24522.7</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-1.24522.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.13.0-1.24522.7</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.13.0-1.24522.7</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.13.0-1.24522.7</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.13.0-1.24522.7</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
-    <MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.13.0-1.24522.7</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
-    <MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.13.0-1.24522.7</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
-    <MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.13.0-1.24522.7</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.13.0-1.24522.7</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-1.24522.7</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
-    <MicrosoftSourceBuildIntermediateroslynPackageVersion>4.13.0-1.24522.7</MicrosoftSourceBuildIntermediateroslynPackageVersion>
-    <MicrosoftVisualStudioLanguageServicesPackageVersion>4.13.0-1.24522.7</MicrosoftVisualStudioLanguageServicesPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>4.13.0-2.24554.8</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.13.0-2.24554.8</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
+    <MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.13.0-2.24554.8</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
+    <MicrosoftCodeAnalysisCommonPackageVersion>4.13.0-2.24554.8</MicrosoftCodeAnalysisCommonPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-2.24554.8</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.13.0-2.24554.8</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-2.24554.8</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-2.24554.8</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.13.0-2.24554.8</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.13.0-2.24554.8</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
+    <MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.13.0-2.24554.8</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
+    <MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.13.0-2.24554.8</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
+    <MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.13.0-2.24554.8</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
+    <MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.13.0-2.24554.8</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
+    <MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.13.0-2.24554.8</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.13.0-2.24554.8</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-2.24554.8</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
+    <MicrosoftSourceBuildIntermediateroslynPackageVersion>4.13.0-2.24554.8</MicrosoftSourceBuildIntermediateroslynPackageVersion>
+    <MicrosoftVisualStudioLanguageServicesPackageVersion>4.13.0-2.24554.8</MicrosoftVisualStudioLanguageServicesPackageVersion>
     <!--
       Exception - Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages are not updated by automation,
       but are present in Version.Details.xml for source-build PVP flow. See the comment in Version.Details.xml for more information.
diff --git a/eng/targets/Services.props b/eng/targets/Services.props
index bd7e570cebe..72a31d7a3fc 100644
--- a/eng/targets/Services.props
+++ b/eng/targets/Services.props
@@ -35,5 +35,6 @@
     <ServiceHubService Include="Microsoft.VisualStudio.Razor.Diagnostics" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteDiagnosticsService+Factory" />
     <ServiceHubService Include="Microsoft.VisualStudio.Razor.Hover" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteHoverService+Factory" />
     <ServiceHubService Include="Microsoft.VisualStudio.Razor.Completion" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteCompletionService+Factory" />
+    <ServiceHubService Include="Microsoft.VisualStudio.Razor.CodeActions" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteCodeActionsService+Factory" />
   </ItemGroup>
 </Project>
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimePreprocessorDirectiveTest/StartOfLine_08/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimePreprocessorDirectiveTest/StartOfLine_08/TestComponent.mappings.txt
index ce5560674bc..d872bb49eb6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimePreprocessorDirectiveTest/StartOfLine_08/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimePreprocessorDirectiveTest/StartOfLine_08/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
-Source Location: (2:0,2 [13] x:\dir\subdir\Test\TestComponent.razor)
+Source Location: (2:0,2 [13] x:\dir\subdir\Test\TestComponent.razor)
 |
 #if true
-|
-Generated Location: (986:28,2 [13] )
+|
+Generated Location: (986:28,2 [13] )
 |
 #if true
-|
-
-Source Location: (20:3,2 [11] x:\dir\subdir\Test\TestComponent.razor)
+|
+
+Source Location: (20:3,2 [11] x:\dir\subdir\Test\TestComponent.razor)
 |
 #endif
-|
-Generated Location: (1120:36,2 [11] )
+|
+Generated Location: (1120:36,2 [11] )
 |
 #endif
-|
-
+|
+
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimePreprocessorDirectiveTest/StartOfLine_08/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimePreprocessorDirectiveTest/StartOfLine_08/TestComponent.mappings.txt
index c146d0ee00e..9d31e478d82 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimePreprocessorDirectiveTest/StartOfLine_08/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimePreprocessorDirectiveTest/StartOfLine_08/TestComponent.mappings.txt
@@ -1,18 +1,18 @@
-Source Location: (2:0,2 [13] x:\dir\subdir\Test\TestComponent.razor)
+Source Location: (2:0,2 [13] x:\dir\subdir\Test\TestComponent.razor)
 |
 #if true
-|
-Generated Location: (733:21,0 [13] )
+|
+Generated Location: (733:21,0 [13] )
 |
 #if true
-|
-
-Source Location: (20:3,2 [11] x:\dir\subdir\Test\TestComponent.razor)
+|
+
+Source Location: (20:3,2 [11] x:\dir\subdir\Test\TestComponent.razor)
 |
 #endif
-|
-Generated Location: (877:30,0 [11] )
+|
+Generated Location: (877:30,0 [11] )
 |
 #endif
-|
-
+|
+
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement_ListPattern.stree.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement_ListPattern.stree.txt
index 183e6b0044b..85ae1d250bb 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement_ListPattern.stree.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement_ListPattern.stree.txt
@@ -23,7 +23,8 @@
                 Keyword;[case];
                 Whitespace;[ ];
                 LeftBracket;[[];
-                CSharpOperator;[..];
+                Dot;[.];
+                Dot;[.];
                 Comma;[,];
                 Whitespace;[ ];
                 NumericLiteral;[3];
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CodeActionEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CodeActionEndpoint.cs
index 5637ac86808..324965c53c6 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CodeActionEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CodeActionEndpoint.cs
@@ -89,7 +89,13 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(VSCodeActionParams reque
             _ => []
         };
 
-        return await _codeActionsService.GetCodeActionsAsync(request, documentSnapshot, delegatedCodeActions, _supportsCodeActionResolve, cancellationToken).ConfigureAwait(false);
+        return await _codeActionsService.GetCodeActionsAsync(
+            request,
+            documentSnapshot,
+            delegatedCodeActions,
+            delegatedDocumentUri: null, // We don't use delegatedDocumentUri in the LSP server, as we can trivially recalculate it
+            _supportsCodeActionResolve,
+            cancellationToken).ConfigureAwait(false);
     }
 
     private async Task<RazorVSInternalCodeAction[]> GetHtmlCodeActionsAsync(IDocumentSnapshot documentSnapshot, VSCodeActionParams request, Guid correlationId, CancellationToken cancellationToken)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/RoslynCodeActionHelpers.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/RoslynCodeActionHelpers.cs
index 0da843edba0..23920547fbe 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/RoslynCodeActionHelpers.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/RoslynCodeActionHelpers.cs
@@ -5,24 +5,30 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor.CodeActions;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Protocol.CodeActions;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
+using Microsoft.CodeAnalysis.Formatting;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions;
 
 internal sealed class RoslynCodeActionHelpers(IClientConnection clientConnection) : IRoslynCodeActionHelpers
 {
+    private static readonly Lazy<Workspace> s_workspace = new Lazy<Workspace>(() => new AdhocWorkspace());
+
     private readonly IClientConnection _clientConnection = clientConnection;
 
-    public Task<string?> GetFormattedNewFileContentsAsync(string projectFilePath, Uri csharpFileUri, string newFileContent, CancellationToken cancellationToken)
+    public async Task<string> GetFormattedNewFileContentsAsync(IProjectSnapshot projectSnapshot, Uri csharpFileUri, string newFileContent, CancellationToken cancellationToken)
     {
         var parameters = new FormatNewFileParams()
         {
             Project = new TextDocumentIdentifier
             {
-                Uri = new Uri(projectFilePath, UriKind.Absolute)
+                Uri = new Uri(projectSnapshot.FilePath, UriKind.Absolute)
             },
             Document = new TextDocumentIdentifier
             {
@@ -30,14 +36,30 @@ internal sealed class RoslynCodeActionHelpers(IClientConnection clientConnection
             },
             Contents = newFileContent
         };
-        return _clientConnection.SendRequestAsync<FormatNewFileParams, string?>(CustomMessageNames.RazorFormatNewFileEndpointName, parameters, cancellationToken);
+
+        var fixedContent = await _clientConnection.SendRequestAsync<FormatNewFileParams, string?>(CustomMessageNames.RazorFormatNewFileEndpointName, parameters, cancellationToken).ConfigureAwait(false);
+
+        if (fixedContent is not null)
+        {
+            return fixedContent;
+        }
+
+        // Sadly we can't use a "real" workspace here, because we don't have access. If we use our workspace, it wouldn't have the right settings
+        // for C# formatting, only Razor formatting, and we have no access to Roslyn's real workspace, since it could be in another process.
+        var node = await CSharpSyntaxTree.ParseText(newFileContent, cancellationToken: cancellationToken).GetRootAsync(cancellationToken).ConfigureAwait(false);
+        node = Formatter.Format(node, s_workspace.Value, cancellationToken: cancellationToken);
+
+        return node.ToFullString();
     }
 
-    public Task<TextEdit[]?> GetSimplifiedTextEditsAsync(Uri codeBehindUri, TextEdit edit, bool requiresVirtualDocument, CancellationToken cancellationToken)
+    public Task<TextEdit[]?> GetSimplifiedTextEditsAsync(DocumentContext documentContext, Uri? codeBehindUri, TextEdit edit, CancellationToken cancellationToken)
     {
+        var tdi = codeBehindUri is null
+            ? documentContext.GetTextDocumentIdentifierAndVersion()
+            : new TextDocumentIdentifierAndVersion(new TextDocumentIdentifier() { Uri = codeBehindUri }, 1);
         var delegatedParams = new DelegatedSimplifyMethodParams(
-            new TextDocumentIdentifierAndVersion(new TextDocumentIdentifier() { Uri = codeBehindUri }, 1),
-            requiresVirtualDocument,
+            tdi,
+            RequiresVirtualDocument: codeBehindUri == null,
             edit);
 
         return _clientConnection.SendRequestAsync<DelegatedSimplifyMethodParams, TextEdit[]?>(
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageServer.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageServer.cs
index bc5fdf51527..b82abc29366 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageServer.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageServer.cs
@@ -129,7 +129,6 @@ protected override ILspServices ConstructLspServices()
         services.AddSemanticTokensServices(featureOptions);
         services.AddDocumentManagementServices(featureOptions);
         services.AddFormattingServices(featureOptions);
-        services.AddCodeActionsServices();
         services.AddOptionsServices(_lspOptions);
         services.AddTextDocumentServices(featureOptions);
 
@@ -138,6 +137,8 @@ protected override ILspServices ConstructLspServices()
             // Diagnostics
             services.AddDiagnosticServices();
 
+            services.AddCodeActionsServices();
+
             // Completion
             services.AddCompletionServices();
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/CSharpCodeActionProvider.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/CSharpCodeActionProvider.cs
index 5f893c6e624..b06724851f0 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/CSharpCodeActionProvider.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/CSharpCodeActionProvider.cs
@@ -17,7 +17,7 @@
 
 namespace Microsoft.CodeAnalysis.Razor.CodeActions;
 
-internal sealed class CSharpCodeActionProvider(LanguageServerFeatureOptions languageServerFeatureOptions) : ICSharpCodeActionProvider
+internal class CSharpCodeActionProvider(LanguageServerFeatureOptions languageServerFeatureOptions) : ICSharpCodeActionProvider
 {
     // Internal for testing
     internal static readonly HashSet<string> SupportedDefaultCodeActionNames =
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/CSharpCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/CSharpCodeActionResolver.cs
index ab57ceb5406..46f23c36e7a 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/CSharpCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/CSharpCodeActionResolver.cs
@@ -12,7 +12,7 @@
 
 namespace Microsoft.CodeAnalysis.Razor.CodeActions;
 
-internal sealed class CSharpCodeActionResolver(IRazorFormattingService razorFormattingService) : ICSharpCodeActionResolver
+internal class CSharpCodeActionResolver(IRazorFormattingService razorFormattingService) : ICSharpCodeActionResolver
 {
     private readonly IRazorFormattingService _razorFormattingService = razorFormattingService;
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/TypeAccessibilityCodeActionProvider.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/TypeAccessibilityCodeActionProvider.cs
index dde537f6a73..d60297bbc00 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/TypeAccessibilityCodeActionProvider.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/TypeAccessibilityCodeActionProvider.cs
@@ -27,7 +27,7 @@ namespace Microsoft.CodeAnalysis.Razor.CodeActions;
 
 using SyntaxNode = Microsoft.AspNetCore.Razor.Language.Syntax.SyntaxNode;
 
-internal sealed class TypeAccessibilityCodeActionProvider : ICSharpCodeActionProvider
+internal class TypeAccessibilityCodeActionProvider : ICSharpCodeActionProvider
 {
     private static readonly IEnumerable<string> s_supportedDiagnostics = new[]
     {
@@ -144,7 +144,7 @@ private static ImmutableArray<RazorVSInternalCodeAction> ProcessCodeActionsVSCod
                 var fqnCodeAction = CreateFQNCodeAction(context, diagnostic, codeAction, fqn);
                 typeAccessibilityCodeActions.Add(fqnCodeAction);
 
-                if (AddUsingsCodeActionResolver.TryCreateAddUsingResolutionParams(fqn, context.Request.TextDocument, additionalEdit: null, out var @namespace, out var resolutionParams))
+                if (AddUsingsCodeActionResolver.TryCreateAddUsingResolutionParams(fqn, context.Request.TextDocument, additionalEdit: null, context.DelegatedDocumentUri, out var @namespace, out var resolutionParams))
                 {
                     var addUsingCodeAction = RazorCodeActionFactory.CreateAddComponentUsing(@namespace, newTagName: null, resolutionParams);
                     typeAccessibilityCodeActions.Add(addUsingCodeAction);
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/UnformattedRemappingCSharpCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/UnformattedRemappingCSharpCodeActionResolver.cs
index d1e20dbf914..56c2329a7fc 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/UnformattedRemappingCSharpCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/UnformattedRemappingCSharpCodeActionResolver.cs
@@ -16,7 +16,7 @@ namespace Microsoft.CodeAnalysis.Razor.CodeActions;
 /// <summary>
 /// Resolves and remaps the code action, without running formatting passes.
 /// </summary>
-internal sealed class UnformattedRemappingCSharpCodeActionResolver(IDocumentMappingService documentMappingService) : ICSharpCodeActionResolver
+internal class UnformattedRemappingCSharpCodeActionResolver(IDocumentMappingService documentMappingService) : ICSharpCodeActionResolver
 {
     private readonly IDocumentMappingService _documentMappingService = documentMappingService;
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CodeActionResolveService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CodeActionResolveService.cs
index ec24477bf30..d842c00bed1 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CodeActionResolveService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CodeActionResolveService.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.CodeAnalysis.Razor.CodeActions;
 
-internal sealed class CodeActionResolveService(
+internal class CodeActionResolveService(
     IEnumerable<IRazorCodeActionResolver> razorCodeActionResolvers,
     IEnumerable<ICSharpCodeActionResolver> csharpCodeActionResolvers,
     IEnumerable<IHtmlCodeActionResolver> htmlCodeActionResolvers,
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CodeActionsService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CodeActionsService.cs
index aff8109a42f..beabb31bd21 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CodeActionsService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CodeActionsService.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -22,7 +23,7 @@
 
 namespace Microsoft.CodeAnalysis.Razor.CodeActions;
 
-internal sealed class CodeActionsService(
+internal class CodeActionsService(
     IDocumentMappingService documentMappingService,
     IEnumerable<IRazorCodeActionProvider> razorCodeActionProviders,
     IEnumerable<ICSharpCodeActionProvider> csharpCodeActionProviders,
@@ -37,9 +38,9 @@ internal sealed class CodeActionsService(
     private readonly IEnumerable<IHtmlCodeActionProvider> _htmlCodeActionProviders = htmlCodeActionProviders;
     private readonly LanguageServerFeatureOptions _languageServerFeatureOptions = languageServerFeatureOptions;
 
-    public async Task<SumType<Command, CodeAction>[]?> GetCodeActionsAsync(VSCodeActionParams request, IDocumentSnapshot documentSnapshot, RazorVSInternalCodeAction[] delegatedCodeActions, bool supportsCodeActionResolve, CancellationToken cancellationToken)
+    public async Task<SumType<Command, CodeAction>[]?> GetCodeActionsAsync(VSCodeActionParams request, IDocumentSnapshot documentSnapshot, RazorVSInternalCodeAction[] delegatedCodeActions, Uri? delegatedDocumentUri, bool supportsCodeActionResolve, CancellationToken cancellationToken)
     {
-        var razorCodeActionContext = await GenerateRazorCodeActionContextAsync(request, documentSnapshot, supportsCodeActionResolve, cancellationToken).ConfigureAwait(false);
+        var razorCodeActionContext = await GenerateRazorCodeActionContextAsync(request, documentSnapshot, delegatedDocumentUri, supportsCodeActionResolve, cancellationToken).ConfigureAwait(false);
         if (razorCodeActionContext is null)
         {
             return null;
@@ -64,12 +65,12 @@ internal sealed class CodeActionsService(
         // Grouping the code actions causes VS to sort them into groups, rather than just alphabetically sorting them
         // by title. The latter is bad for us because it can put "Remove <div>" at the top in some locales, and our fully
         // qualify component code action at the bottom, depending on the users namespace.
-        ConvertCodeActionsToSumType(request.TextDocument, razorCodeActions, "A-Razor");
-        ConvertCodeActionsToSumType(request.TextDocument, filteredCodeActions, "B-Delegated");
+        ConvertCodeActionsToSumType(razorCodeActions, "A-Razor");
+        ConvertCodeActionsToSumType(filteredCodeActions, "B-Delegated");
 
         return commandsOrCodeActions.ToArray();
 
-        void ConvertCodeActionsToSumType(VSTextDocumentIdentifier textDocument, ImmutableArray<RazorVSInternalCodeAction> codeActions, string groupName)
+        void ConvertCodeActionsToSumType(ImmutableArray<RazorVSInternalCodeAction> codeActions, string groupName)
         {
             // We must cast the RazorCodeAction into a platform compliant code action
             // For VS (SupportsCodeActionResolve = true) this means just encapsulating the RazorCodeAction in the `CommandOrCodeAction` struct
@@ -87,7 +88,7 @@ void ConvertCodeActionsToSumType(VSTextDocumentIdentifier textDocument, Immutabl
             {
                 foreach (var action in codeActions)
                 {
-                    commandsOrCodeActions.Add(action.AsVSCodeCommandOrCodeAction(textDocument));
+                    commandsOrCodeActions.Add(action.AsVSCodeCommandOrCodeAction(request.TextDocument, delegatedDocumentUri));
                 }
             }
         }
@@ -96,6 +97,7 @@ void ConvertCodeActionsToSumType(VSTextDocumentIdentifier textDocument, Immutabl
     private async Task<RazorCodeActionContext?> GenerateRazorCodeActionContextAsync(
         VSCodeActionParams request,
         IDocumentSnapshot documentSnapshot,
+        Uri? delegatedDocumentUri,
         bool supportsCodeActionResolve,
         CancellationToken cancellationToken)
     {
@@ -122,6 +124,7 @@ void ConvertCodeActionsToSumType(VSTextDocumentIdentifier textDocument, Immutabl
             request,
             documentSnapshot,
             codeDocument,
+            delegatedDocumentUri,
             startLocation,
             endLocation,
             languageKind,
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Html/HtmlCodeActionProvider.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Html/HtmlCodeActionProvider.cs
index a29cbd0083c..4dbe2e9aa41 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Html/HtmlCodeActionProvider.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Html/HtmlCodeActionProvider.cs
@@ -15,7 +15,7 @@
 
 namespace Microsoft.CodeAnalysis.Razor.CodeActions;
 
-internal sealed class HtmlCodeActionProvider(IEditMappingService editMappingService) : IHtmlCodeActionProvider
+internal class HtmlCodeActionProvider(IEditMappingService editMappingService) : IHtmlCodeActionProvider
 {
     private readonly IEditMappingService _editMappingService = editMappingService;
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Html/HtmlCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Html/HtmlCodeActionResolver.cs
index fc7317a539b..538b01ee571 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Html/HtmlCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Html/HtmlCodeActionResolver.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.CodeAnalysis.Razor.CodeActions;
 
-internal sealed class HtmlCodeActionResolver(IEditMappingService editMappingService) : IHtmlCodeActionResolver
+internal class HtmlCodeActionResolver(IEditMappingService editMappingService) : IHtmlCodeActionResolver
 {
     private readonly IEditMappingService _editMappingService = editMappingService;
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/ICodeActionsService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/ICodeActionsService.cs
index d968064976b..3cd139b99c1 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/ICodeActionsService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/ICodeActionsService.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor.CodeActions.Models;
@@ -12,7 +13,13 @@ namespace Microsoft.CodeAnalysis.Razor.CodeActions;
 
 internal interface ICodeActionsService
 {
-    Task<SumType<Command, CodeAction>[]?> GetCodeActionsAsync(VSCodeActionParams request, IDocumentSnapshot documentSnapshot, RazorVSInternalCodeAction[] delegatedCodeActions, bool supportsCodeActionResolve, CancellationToken cancellationToken);
+    Task<SumType<Command, CodeAction>[]?> GetCodeActionsAsync(
+        VSCodeActionParams request,
+        IDocumentSnapshot documentSnapshot,
+        RazorVSInternalCodeAction[] delegatedCodeActions,
+        Uri? delegatedDocumentUri,
+        bool supportsCodeActionResolve,
+        CancellationToken cancellationToken);
 
     Task<VSCodeActionParams?> GetCSharpCodeActionsRequestAsync(IDocumentSnapshot documentSnapshot, VSCodeActionParams request, CancellationToken cancellationToken);
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Models/CodeActionExtensions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Models/CodeActionExtensions.cs
index 3661d10f485..088fd58e3c4 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Models/CodeActionExtensions.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Models/CodeActionExtensions.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System;
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Nodes;
@@ -12,7 +13,7 @@ namespace Microsoft.CodeAnalysis.Razor.CodeActions.Models;
 
 internal static class CodeActionExtensions
 {
-    public static SumType<Command, CodeAction> AsVSCodeCommandOrCodeAction(this VSInternalCodeAction razorCodeAction, VSTextDocumentIdentifier textDocument)
+    public static SumType<Command, CodeAction> AsVSCodeCommandOrCodeAction(this VSInternalCodeAction razorCodeAction, VSTextDocumentIdentifier textDocument, Uri? delegatedDocumentUri)
     {
         if (razorCodeAction.Data is null)
         {
@@ -23,6 +24,7 @@ public static SumType<Command, CodeAction> AsVSCodeCommandOrCodeAction(this VSIn
                 TextDocument = textDocument,
                 Action = LanguageServerConstants.CodeActions.EditBasedCodeActionCommand,
                 Language = RazorLanguageKind.Razor,
+                DelegatedDocumentUri = delegatedDocumentUri,
                 Data = razorCodeAction.Edit ?? new WorkspaceEdit(),
             };
 
@@ -57,6 +59,7 @@ public static RazorVSInternalCodeAction WrapResolvableCodeAction(
             TextDocument = context.Request.TextDocument,
             Action = action,
             Language = language,
+            DelegatedDocumentUri = context.DelegatedDocumentUri,
             Data = razorCodeAction.Data
         };
         razorCodeAction.Data = JsonSerializer.SerializeToElement(resolutionParams);
@@ -89,6 +92,7 @@ private static VSInternalCodeAction WrapResolvableCodeAction(
             TextDocument = context.Request.TextDocument,
             Action = action,
             Language = language,
+            DelegatedDocumentUri = context.DelegatedDocumentUri,
             Data = razorCodeAction.Data
         };
         razorCodeAction.Data = JsonSerializer.SerializeToElement(resolutionParams);
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Models/RazorCodeActionResolutionParams.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Models/RazorCodeActionResolutionParams.cs
index 5fa246b822f..e3422a5fdad 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Models/RazorCodeActionResolutionParams.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Models/RazorCodeActionResolutionParams.cs
@@ -1,15 +1,19 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System;
 using System.Text.Json.Serialization;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 
 namespace Microsoft.CodeAnalysis.Razor.CodeActions.Models;
 
-internal sealed class RazorCodeActionResolutionParams
+internal sealed class RazorCodeActionResolutionParams 
 {
-    [JsonPropertyName("textDocument")]
+    // NOTE: Capital T here is required to match Roslyn's DocumentResolveData structure, so that the Roslyn
+    //       language server can correctly route requests to us in cohosting. In future when we normalize
+    //       on to Roslyn types, we should inherit from that class so we don't have to remember to do this.
+    [JsonPropertyName("TextDocument")]
     public required VSTextDocumentIdentifier TextDocument { get; set; }
 
     [JsonPropertyName("action")]
@@ -18,6 +22,9 @@ internal sealed class RazorCodeActionResolutionParams
     [JsonPropertyName("language")]
     public required RazorLanguageKind Language { get; set; }
 
+    [JsonPropertyName("delegatedDocumentUri")]
+    public required Uri? DelegatedDocumentUri { get; set; }
+
     [JsonPropertyName("data")]
     public object? Data { get; set; }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/AddUsingsCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/AddUsingsCodeActionResolver.cs
index d5f7b7c335d..fffc8ec4b55 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/AddUsingsCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/AddUsingsCodeActionResolver.cs
@@ -15,7 +15,7 @@
 
 namespace Microsoft.CodeAnalysis.Razor.CodeActions;
 
-internal sealed class AddUsingsCodeActionResolver : IRazorCodeActionResolver
+internal class AddUsingsCodeActionResolver : IRazorCodeActionResolver
 {
     public string Action => LanguageServerConstants.CodeActions.AddUsing;
 
@@ -39,7 +39,7 @@ internal sealed class AddUsingsCodeActionResolver : IRazorCodeActionResolver
         return AddUsingsHelper.CreateAddUsingWorkspaceEdit(actionParams.Namespace, actionParams.AdditionalEdit, codeDocument, codeDocumentIdentifier);
     }
 
-    internal static bool TryCreateAddUsingResolutionParams(string fullyQualifiedName, VSTextDocumentIdentifier textDocument, TextDocumentEdit? additionalEdit, [NotNullWhen(true)] out string? @namespace, [NotNullWhen(true)] out RazorCodeActionResolutionParams? resolutionParams)
+    internal static bool TryCreateAddUsingResolutionParams(string fullyQualifiedName, VSTextDocumentIdentifier textDocument, TextDocumentEdit? additionalEdit, Uri? delegatedDocumentUri, [NotNullWhen(true)] out string? @namespace, [NotNullWhen(true)] out RazorCodeActionResolutionParams? resolutionParams)
     {
         @namespace = GetNamespaceFromFQN(fullyQualifiedName);
         if (string.IsNullOrEmpty(@namespace))
@@ -60,6 +60,7 @@ internal static bool TryCreateAddUsingResolutionParams(string fullyQualifiedName
             TextDocument = textDocument,
             Action = LanguageServerConstants.CodeActions.AddUsing,
             Language = RazorLanguageKind.Razor,
+            DelegatedDocumentUri = delegatedDocumentUri,
             Data = actionParams,
         };
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ComponentAccessibilityCodeActionProvider.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ComponentAccessibilityCodeActionProvider.cs
index 28a44f8d41e..9ee3afc06cd 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ComponentAccessibilityCodeActionProvider.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ComponentAccessibilityCodeActionProvider.cs
@@ -25,7 +25,7 @@ namespace Microsoft.CodeAnalysis.Razor.CodeActions;
 
 using SyntaxNode = Microsoft.AspNetCore.Razor.Language.Syntax.SyntaxNode;
 
-internal sealed class ComponentAccessibilityCodeActionProvider : IRazorCodeActionProvider
+internal class ComponentAccessibilityCodeActionProvider : IRazorCodeActionProvider
 {
     public async Task<ImmutableArray<RazorVSInternalCodeAction>> ProvideAsync(RazorCodeActionContext context, CancellationToken cancellationToken)
     {
@@ -118,6 +118,7 @@ private static void AddCreateComponentFromTag(RazorCodeActionContext context, IS
             TextDocument = context.Request.TextDocument,
             Action = LanguageServerConstants.CodeActions.CreateComponentFromTag,
             Language = RazorLanguageKind.Razor,
+            DelegatedDocumentUri = context.DelegatedDocumentUri,
             Data = actionParams,
         };
 
@@ -179,7 +180,7 @@ private static async Task AddComponentAccessFromTagAsync(RazorCodeActionContext
                 // name to give the tag.
                 if (!tagHelperPair.CaseInsensitiveMatch || newTagName is not null)
                 {
-                    if (AddUsingsCodeActionResolver.TryCreateAddUsingResolutionParams(fullyQualifiedName, context.Request.TextDocument, additionalEdit, out var @namespace, out var resolutionParams))
+                    if (AddUsingsCodeActionResolver.TryCreateAddUsingResolutionParams(fullyQualifiedName, context.Request.TextDocument, additionalEdit, context.DelegatedDocumentUri, out var @namespace, out var resolutionParams))
                     {
                         var addUsingCodeAction = RazorCodeActionFactory.CreateAddComponentUsing(@namespace, newTagName, resolutionParams);
                         container.Add(addUsingCodeAction);
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/CreateComponentCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/CreateComponentCodeActionResolver.cs
index fa398c9662d..85084b0d596 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/CreateComponentCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/CreateComponentCodeActionResolver.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.CodeAnalysis.Razor.CodeActions;
 
-internal sealed class CreateComponentCodeActionResolver(LanguageServerFeatureOptions languageServerFeatureOptions) : IRazorCodeActionResolver
+internal class CreateComponentCodeActionResolver(LanguageServerFeatureOptions languageServerFeatureOptions) : IRazorCodeActionResolver
 {
     private readonly LanguageServerFeatureOptions _languageServerFeatureOptions = languageServerFeatureOptions;
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToCodeBehindCodeActionProvider.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToCodeBehindCodeActionProvider.cs
index 9fd9cd646d8..2a1348b82e5 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToCodeBehindCodeActionProvider.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToCodeBehindCodeActionProvider.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.CodeAnalysis.Razor.CodeActions;
 
-internal sealed class ExtractToCodeBehindCodeActionProvider(ILoggerFactory loggerFactory) : IRazorCodeActionProvider
+internal class ExtractToCodeBehindCodeActionProvider(ILoggerFactory loggerFactory) : IRazorCodeActionProvider
 {
     private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<ExtractToCodeBehindCodeActionProvider>();
 
@@ -113,6 +113,7 @@ public Task<ImmutableArray<RazorVSInternalCodeAction>> ProvideAsync(RazorCodeAct
             TextDocument = context.Request.TextDocument,
             Action = LanguageServerConstants.CodeActions.ExtractToCodeBehindAction,
             Language = RazorLanguageKind.Razor,
+            DelegatedDocumentUri = context.DelegatedDocumentUri,
             Data = actionParams,
         };
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToCodeBehindCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToCodeBehindCodeActionResolver.cs
index 25cc910e853..0fb7523ce3b 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToCodeBehindCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToCodeBehindCodeActionResolver.cs
@@ -10,8 +10,6 @@
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.AspNetCore.Razor.Utilities;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Razor.CodeActions.Models;
 using Microsoft.CodeAnalysis.Razor.Formatting;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
@@ -22,12 +20,10 @@
 
 namespace Microsoft.CodeAnalysis.Razor.CodeActions;
 
-internal sealed class ExtractToCodeBehindCodeActionResolver(
+internal class ExtractToCodeBehindCodeActionResolver(
     LanguageServerFeatureOptions languageServerFeatureOptions,
     IRoslynCodeActionHelpers roslynCodeActionHelpers) : IRazorCodeActionResolver
 {
-    private static readonly Workspace s_workspace = new AdhocWorkspace();
-
     private readonly LanguageServerFeatureOptions _languageServerFeatureOptions = languageServerFeatureOptions;
     private readonly IRoslynCodeActionHelpers _roslynCodeActionHelpers = roslynCodeActionHelpers;
 
@@ -71,8 +67,10 @@ internal sealed class ExtractToCodeBehindCodeActionResolver(
         var text = await documentContext.GetSourceTextAsync(cancellationToken).ConfigureAwait(false);
 
         var className = Path.GetFileNameWithoutExtension(path);
-        var codeBlockContent = text.GetSubTextString(new CodeAnalysis.Text.TextSpan(actionParams.ExtractStart, actionParams.ExtractEnd - actionParams.ExtractStart)).Trim();
-        var codeBehindContent = await GenerateCodeBehindClassAsync(documentContext.Project, codeBehindUri, className, actionParams.Namespace, codeBlockContent, codeDocument, cancellationToken).ConfigureAwait(false);
+        var codeBlockContent = text.GetSubTextString(new TextSpan(actionParams.ExtractStart, actionParams.ExtractEnd - actionParams.ExtractStart)).Trim();
+        var codeBehindContent = GenerateCodeBehindClass(className, actionParams.Namespace, codeBlockContent, codeDocument);
+
+        codeBehindContent = await _roslynCodeActionHelpers.GetFormattedNewFileContentsAsync(documentContext.Project, codeBehindUri, codeBehindContent, cancellationToken).ConfigureAwait(false);
 
         var removeRange = codeDocument.Source.Text.GetRange(actionParams.RemoveStart, actionParams.RemoveEnd);
 
@@ -100,7 +98,7 @@ internal sealed class ExtractToCodeBehindCodeActionResolver(
         };
     }
 
-    private async Task<string> GenerateCodeBehindClassAsync(IProjectSnapshot project, Uri codeBehindUri, string className, string namespaceName, string contents, RazorCodeDocument razorCodeDocument, CancellationToken cancellationToken)
+    private string GenerateCodeBehindClass(string className, string namespaceName, string contents, RazorCodeDocument razorCodeDocument)
     {
         using var _ = StringBuilderPool.GetPooledObject(out var builder);
 
@@ -132,20 +130,6 @@ private async Task<string> GenerateCodeBehindClassAsync(IProjectSnapshot project
         builder.AppendLine(contents);
         builder.Append('}');
 
-        var newFileContent = builder.ToString();
-
-        var fixedContent = await _roslynCodeActionHelpers.GetFormattedNewFileContentsAsync(project.FilePath, codeBehindUri, newFileContent, cancellationToken).ConfigureAwait(false);
-
-        if (fixedContent is null)
-        {
-            // Sadly we can't use a "real" workspace here, because we don't have access. If we use our workspace, it wouldn't have the right settings
-            // for C# formatting, only Razor formatting, and we have no access to Roslyn's real workspace, since it could be in another process.
-            var node = await CSharpSyntaxTree.ParseText(newFileContent, cancellationToken: cancellationToken).GetRootAsync(cancellationToken).ConfigureAwait(false);
-            node = Formatter.Format(node, s_workspace, cancellationToken: cancellationToken);
-
-            return node.ToFullString();
-        }
-
-        return fixedContent;
+        return builder.ToString();
     }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToComponentCodeActionProvider.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToComponentCodeActionProvider.cs
index a91f95755d9..9a0a25559c7 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToComponentCodeActionProvider.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToComponentCodeActionProvider.cs
@@ -17,7 +17,7 @@ namespace Microsoft.CodeAnalysis.Razor.CodeActions.Razor;
 
 using SyntaxNode = Microsoft.AspNetCore.Razor.Language.Syntax.SyntaxNode;
 
-internal sealed class ExtractToComponentCodeActionProvider() : IRazorCodeActionProvider
+internal class ExtractToComponentCodeActionProvider() : IRazorCodeActionProvider
 {
     public Task<ImmutableArray<RazorVSInternalCodeAction>> ProvideAsync(RazorCodeActionContext context, CancellationToken cancellationToken)
     {
@@ -73,6 +73,7 @@ public Task<ImmutableArray<RazorVSInternalCodeAction>> ProvideAsync(RazorCodeAct
             TextDocument = context.Request.TextDocument,
             Action = LanguageServerConstants.CodeActions.ExtractToNewComponentAction,
             Language = RazorLanguageKind.Razor,
+            DelegatedDocumentUri = context.DelegatedDocumentUri,
             Data = actionParams,
         };
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToComponentCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToComponentCodeActionResolver.cs
index 9ffc571f000..7ff931c52e7 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToComponentCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToComponentCodeActionResolver.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.CodeAnalysis.Razor.CodeActions.Razor;
 
-internal sealed class ExtractToComponentCodeActionResolver(
+internal class ExtractToComponentCodeActionResolver(
     LanguageServerFeatureOptions languageServerFeatureOptions) : IRazorCodeActionResolver
 {
     private readonly LanguageServerFeatureOptions _languageServerFeatureOptions = languageServerFeatureOptions;
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/GenerateMethodCodeActionProvider.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/GenerateMethodCodeActionProvider.cs
index bd421fabff6..dab71fd0176 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/GenerateMethodCodeActionProvider.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/GenerateMethodCodeActionProvider.cs
@@ -20,7 +20,7 @@ namespace Microsoft.CodeAnalysis.Razor.CodeActions.Razor;
 
 using SyntaxNode = Microsoft.AspNetCore.Razor.Language.Syntax.SyntaxNode;
 
-internal sealed class GenerateMethodCodeActionProvider : IRazorCodeActionProvider
+internal class GenerateMethodCodeActionProvider : IRazorCodeActionProvider
 {
     public Task<ImmutableArray<RazorVSInternalCodeAction>> ProvideAsync(RazorCodeActionContext context, CancellationToken cancellationToken)
     {
@@ -38,8 +38,8 @@ public Task<ImmutableArray<RazorVSInternalCodeAction>> ProvideAsync(RazorCodeAct
             var textDocument = context.Request.TextDocument;
             return Task.FromResult<ImmutableArray<RazorVSInternalCodeAction>>(
                 [
-                    RazorCodeActionFactory.CreateGenerateMethod(textDocument, methodName, eventName),
-                    RazorCodeActionFactory.CreateAsyncGenerateMethod(textDocument, methodName, eventName)
+                    RazorCodeActionFactory.CreateGenerateMethod(textDocument, context.DelegatedDocumentUri, methodName, eventName),
+                    RazorCodeActionFactory.CreateAsyncGenerateMethod(textDocument, context.DelegatedDocumentUri, methodName, eventName)
                 ]);
         }
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/GenerateMethodCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/GenerateMethodCodeActionResolver.cs
index 129d7fca5da..d130d1faca3 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/GenerateMethodCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/GenerateMethodCodeActionResolver.cs
@@ -24,7 +24,7 @@
 
 namespace Microsoft.CodeAnalysis.Razor.CodeActions.Razor;
 
-internal sealed class GenerateMethodCodeActionResolver(
+internal class GenerateMethodCodeActionResolver(
     IRoslynCodeActionHelpers roslynCodeActionHelpers,
     IDocumentMappingService documentMappingService,
     IRazorFormattingService razorFormattingService) : IRazorCodeActionResolver
@@ -110,7 +110,7 @@ razorClassName is null ||
             character: 0,
             $"{formattedMethod}{Environment.NewLine}");
 
-        var result = await _roslynCodeActionHelpers.GetSimplifiedTextEditsAsync(codeBehindUri, edit, requiresVirtualDocument: false, cancellationToken).ConfigureAwait(false);
+        var result = await _roslynCodeActionHelpers.GetSimplifiedTextEditsAsync(documentContext, codeBehindUri, edit, cancellationToken).ConfigureAwait(false);
 
         var codeBehindTextDocEdit = new TextDocumentEdit()
         {
@@ -152,7 +152,7 @@ private async Task<WorkspaceEdit> GenerateMethodInCodeBlockAsync(
                 character: 0,
                 editToSendToRoslyn.NewText);
 
-            var result = await _roslynCodeActionHelpers.GetSimplifiedTextEditsAsync(documentContext.Uri, tempTextEdit, requiresVirtualDocument: true, cancellationToken).ConfigureAwait(false);
+            var result = await _roslynCodeActionHelpers.GetSimplifiedTextEditsAsync(documentContext, codeBehindUri: null, tempTextEdit, cancellationToken).ConfigureAwait(false);
 
             // Roslyn should have passed back 2 edits. One that contains the simplified method stub and the other that contains the new
             // location for the class end brace since we had asked to insert the method stub at the original class end brace location.
@@ -175,7 +175,7 @@ private async Task<WorkspaceEdit> GenerateMethodInCodeBlockAsync(
                 .Replace(FormattingUtilities.Indent, string.Empty);
 
             var remappedEdit = VsLspFactory.CreateTextEdit(remappedRange, unformattedMethodSignature);
-            var result = await _roslynCodeActionHelpers.GetSimplifiedTextEditsAsync(documentContext.Uri, remappedEdit, requiresVirtualDocument: true, cancellationToken).ConfigureAwait(false);
+            var result = await _roslynCodeActionHelpers.GetSimplifiedTextEditsAsync(documentContext, codeBehindUri: null, remappedEdit, cancellationToken).ConfigureAwait(false);
 
             if (result is not null)
             {
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/IRoslynCodeActionHelpers.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/IRoslynCodeActionHelpers.cs
index 9d57b459fe9..2936be19835 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/IRoslynCodeActionHelpers.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/IRoslynCodeActionHelpers.cs
@@ -4,12 +4,21 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 
 namespace Microsoft.CodeAnalysis.Razor.CodeActions;
 
 internal interface IRoslynCodeActionHelpers
 {
-    Task<string?> GetFormattedNewFileContentsAsync(string projectFilePath, Uri csharpFileUri, string newFileContent, CancellationToken cancellationToken);
-    Task<TextEdit[]?> GetSimplifiedTextEditsAsync(Uri codeBehindUri, TextEdit edit, bool requiresVirtualDocument, CancellationToken cancellationToken);
+    Task<string> GetFormattedNewFileContentsAsync(IProjectSnapshot projectSnapshot, Uri csharpFileUri, string newFileContent, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Apply the edit to the specified document, get Roslyn to simplify it, and return the simplified edit
+    /// </summary>
+    /// <param name="documentContext">The Razor document context for the edit</param>
+    /// <param name="codeBehindUri">If present, the Roslyn document to apply the edit to. Otherwise the generated C# document will be used</param>
+    /// <param name="edit">The edit to apply</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    Task<TextEdit[]?> GetSimplifiedTextEditsAsync(DocumentContext documentContext, Uri? codeBehindUri, TextEdit edit, CancellationToken cancellationToken);
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/RazorCodeActionFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/RazorCodeActionFactory.cs
index b7ba525d95e..3b028b60da2 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/RazorCodeActionFactory.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/RazorCodeActionFactory.cs
@@ -84,7 +84,7 @@ public static RazorVSInternalCodeAction CreateExtractToComponent(RazorCodeAction
         return codeAction;
     }
 
-    public static RazorVSInternalCodeAction CreateGenerateMethod(VSTextDocumentIdentifier textDocument, string methodName, string eventName)
+    public static RazorVSInternalCodeAction CreateGenerateMethod(VSTextDocumentIdentifier textDocument, Uri? delegatedDocumentUri, string methodName, string eventName)
     {
         var @params = new GenerateMethodCodeActionParams
         {
@@ -97,6 +97,7 @@ public static RazorVSInternalCodeAction CreateGenerateMethod(VSTextDocumentIdent
             TextDocument = textDocument,
             Action = LanguageServerConstants.CodeActions.GenerateEventHandler,
             Language = RazorLanguageKind.Razor,
+            DelegatedDocumentUri = delegatedDocumentUri,
             Data = @params,
         };
 
@@ -111,7 +112,7 @@ public static RazorVSInternalCodeAction CreateGenerateMethod(VSTextDocumentIdent
         return codeAction;
     }
 
-    public static RazorVSInternalCodeAction CreateAsyncGenerateMethod(VSTextDocumentIdentifier textDocument, string methodName, string eventName)
+    public static RazorVSInternalCodeAction CreateAsyncGenerateMethod(VSTextDocumentIdentifier textDocument, Uri? delegatedDocumentUri, string methodName, string eventName)
     {
         var @params = new GenerateMethodCodeActionParams
         {
@@ -124,6 +125,7 @@ public static RazorVSInternalCodeAction CreateAsyncGenerateMethod(VSTextDocument
             TextDocument = textDocument,
             Action = LanguageServerConstants.CodeActions.GenerateEventHandler,
             Language = RazorLanguageKind.Razor,
+            DelegatedDocumentUri = delegatedDocumentUri,
             Data = @params,
         };
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/RazorCodeActionContext.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/RazorCodeActionContext.cs
index 8ceaf675f10..d8e5f257e94 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/RazorCodeActionContext.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/RazorCodeActionContext.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Protocol.CodeActions;
@@ -12,6 +13,7 @@ internal sealed record class RazorCodeActionContext(
     VSCodeActionParams Request,
     IDocumentSnapshot DocumentSnapshot,
     RazorCodeDocument CodeDocument,
+    Uri? DelegatedDocumentUri,
     int StartAbsoluteIndex,
     int EndAbsoluteIndex,
     Protocol.RazorLanguageKind LanguageKind,
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/CodeActionRequestInfo.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/CodeActionRequestInfo.cs
new file mode 100644
index 00000000000..396d28f5822
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/CodeActionRequestInfo.cs
@@ -0,0 +1,12 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System.Text.Json.Serialization;
+using Microsoft.CodeAnalysis.Razor.Protocol;
+using Microsoft.CodeAnalysis.Razor.Protocol.CodeActions;
+
+namespace Microsoft.CodeAnalysis.Razor.Remote;
+
+internal record CodeActionRequestInfo(
+    [property: JsonPropertyName("languageKind")] RazorLanguageKind LanguageKind,
+    [property: JsonPropertyName("csharpRequest")] VSCodeActionParams? CSharpRequest);
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/IRemoteCodeActionsService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/IRemoteCodeActionsService.cs
new file mode 100644
index 00000000000..16dc36c7828
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/IRemoteCodeActionsService.cs
@@ -0,0 +1,36 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.Razor.CodeActions.Models;
+using Microsoft.CodeAnalysis.Razor.Formatting;
+using Microsoft.CodeAnalysis.Razor.Protocol.CodeActions;
+using Microsoft.VisualStudio.LanguageServer.Protocol;
+
+namespace Microsoft.CodeAnalysis.Razor.Remote;
+
+internal interface IRemoteCodeActionsService : IRemoteJsonService
+{
+    ValueTask<CodeActionRequestInfo> GetCodeActionRequestInfoAsync(
+        JsonSerializableRazorPinnedSolutionInfoWrapper solutionInfo,
+        JsonSerializableDocumentId razorDocumentId,
+        VSCodeActionParams request,
+        CancellationToken cancellationToken);
+
+    ValueTask<SumType<Command, CodeAction>[]?> GetCodeActionsAsync(
+        JsonSerializableRazorPinnedSolutionInfoWrapper solutionInfo,
+        JsonSerializableDocumentId razorDocumentId,
+        VSCodeActionParams request,
+        RazorVSInternalCodeAction[] delegatedCodeActions,
+        CancellationToken cancellationToken);
+
+    ValueTask<CodeAction> ResolveCodeActionAsync(
+        JsonSerializableRazorPinnedSolutionInfoWrapper solutionInfo,
+        JsonSerializableDocumentId razorDocumentId,
+        CodeAction request,
+        CodeAction? delegatedCodeAction,
+        RazorFormattingOptions options,
+        CancellationToken cancellationToken);
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RazorServices.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RazorServices.cs
index 84080c98e0d..d4888b79317 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RazorServices.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RazorServices.cs
@@ -38,6 +38,7 @@ internal static class RazorServices
             (typeof(IRemoteGoToImplementationService), null),
             (typeof(IRemoteDiagnosticsService), null),
             (typeof(IRemoteCompletionService), null),
+            (typeof(IRemoteCodeActionsService), null),
         ];
 
     private const string ComponentName = "Razor";
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteClientInitializationOptions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteClientInitializationOptions.cs
index 5bd3a09b409..d3b6331cf3c 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteClientInitializationOptions.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RemoteClientInitializationOptions.cs
@@ -27,4 +27,10 @@ internal struct RemoteClientInitializationOptions
 
     [JsonPropertyName("forceRuntimeCodeGeneration")]
     public required bool ForceRuntimeCodeGeneration { get; set; }
+
+    [JsonPropertyName("supportsFileManipulation")]
+    public required bool SupportsFileManipulation { get; set; }
+
+    [JsonPropertyName("showAllCSharpCodeActions")]
+    public required bool ShowAllCSharpCodeActions { get; set; }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RemoteCodeActionsService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RemoteCodeActionsService.cs
new file mode 100644
index 00000000000..9fabf787caf
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RemoteCodeActionsService.cs
@@ -0,0 +1,89 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.Razor.CodeActions;
+using Microsoft.CodeAnalysis.Razor.CodeActions.Models;
+using Microsoft.CodeAnalysis.Razor.Formatting;
+using Microsoft.CodeAnalysis.Razor.Protocol;
+using Microsoft.CodeAnalysis.Razor.Protocol.CodeActions;
+using Microsoft.CodeAnalysis.Razor.Remote;
+using Microsoft.CodeAnalysis.Remote.Razor.ProjectSystem;
+using Microsoft.VisualStudio.LanguageServer.Protocol;
+
+namespace Microsoft.CodeAnalysis.Remote.Razor;
+
+internal sealed partial class RemoteCodeActionsService(in ServiceArgs args) : RazorDocumentServiceBase(in args), IRemoteCodeActionsService
+{
+    internal sealed class Factory : FactoryBase<IRemoteCodeActionsService>
+    {
+        protected override IRemoteCodeActionsService CreateService(in ServiceArgs args)
+            => new RemoteCodeActionsService(in args);
+    }
+
+    private readonly ICodeActionsService _codeActionsService = args.ExportProvider.GetExportedValue<ICodeActionsService>();
+    private readonly ICodeActionResolveService _codeActionResolveService = args.ExportProvider.GetExportedValue<ICodeActionResolveService>();
+    private readonly IClientCapabilitiesService _clientCapabilitiesService = args.ExportProvider.GetExportedValue<IClientCapabilitiesService>();
+
+    public ValueTask<CodeActionRequestInfo> GetCodeActionRequestInfoAsync(JsonSerializableRazorPinnedSolutionInfoWrapper solutionInfo, JsonSerializableDocumentId razorDocumentId, VSCodeActionParams request, CancellationToken cancellationToken)
+        => RunServiceAsync(
+            solutionInfo,
+            razorDocumentId,
+            context => GetCodeActionRequestInfoAsync(context, request, cancellationToken),
+            cancellationToken);
+
+    private async ValueTask<CodeActionRequestInfo> GetCodeActionRequestInfoAsync(RemoteDocumentContext context, VSCodeActionParams request, CancellationToken cancellationToken)
+    {
+        var codeDocument = await context.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
+
+        var absoluteIndex = codeDocument.Source.Text.GetRequiredAbsoluteIndex(request.Range.Start);
+
+        var languageKind = codeDocument.GetLanguageKind(absoluteIndex, rightAssociative: false);
+
+        VSCodeActionParams? csharpRequest = null;
+        if (languageKind == RazorLanguageKind.CSharp)
+        {
+            csharpRequest = await _codeActionsService.GetCSharpCodeActionsRequestAsync(context.Snapshot, request, cancellationToken).ConfigureAwait(false);
+
+            if (csharpRequest is not null)
+            {
+                // Since we're here, we may as well fill in the generated document Uri so the other caller won't have to calculate it
+                var generatedDocument = await context.Snapshot.GetGeneratedDocumentAsync(cancellationToken).ConfigureAwait(false);
+                csharpRequest.TextDocument.Uri = generatedDocument.CreateUri();
+            }
+        }
+
+        return new CodeActionRequestInfo(languageKind, csharpRequest);
+    }
+
+    public ValueTask<SumType<Command, CodeAction>[]?> GetCodeActionsAsync(JsonSerializableRazorPinnedSolutionInfoWrapper solutionInfo, JsonSerializableDocumentId razorDocumentId, VSCodeActionParams request, RazorVSInternalCodeAction[] delegatedCodeActions, CancellationToken cancellationToken)
+        => RunServiceAsync(
+            solutionInfo,
+            razorDocumentId,
+            context => GetCodeActionsAsync(context, request, delegatedCodeActions, cancellationToken),
+            cancellationToken);
+
+    private async ValueTask<SumType<Command, CodeAction>[]?> GetCodeActionsAsync(RemoteDocumentContext context, VSCodeActionParams request, RazorVSInternalCodeAction[] delegatedCodeActions, CancellationToken cancellationToken)
+    {
+        var generatedDocument = await context.Snapshot.GetGeneratedDocumentAsync(cancellationToken).ConfigureAwait(false);
+        var generatedDocumentUri = generatedDocument.CreateUri();
+
+        var supportsCodeActionResolve = _clientCapabilitiesService.ClientCapabilities.TextDocument?.CodeAction?.ResolveSupport is not null;
+        return await _codeActionsService.GetCodeActionsAsync(request, context.Snapshot, delegatedCodeActions, generatedDocumentUri, supportsCodeActionResolve, cancellationToken).ConfigureAwait(false);
+    }
+
+    public ValueTask<CodeAction> ResolveCodeActionAsync(JsonSerializableRazorPinnedSolutionInfoWrapper solutionInfo, JsonSerializableDocumentId razorDocumentId, CodeAction request, CodeAction? delegatedCodeAction, RazorFormattingOptions options, CancellationToken cancellationToken)
+        => RunServiceAsync(
+            solutionInfo,
+            razorDocumentId,
+            context => ResolveCodeActionAsync(context, request, delegatedCodeAction, options, cancellationToken),
+            cancellationToken);
+
+    private ValueTask<CodeAction> ResolveCodeActionAsync(RemoteDocumentContext context, CodeAction request, CodeAction? delegatedCodeAction, RazorFormattingOptions options, CancellationToken cancellationToken)
+    {
+        return new(_codeActionResolveService.ResolveCodeActionAsync(context, request, delegatedCodeAction, options, cancellationToken));
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RemoteServices.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RemoteServices.cs
new file mode 100644
index 00000000000..e67dff93e49
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RemoteServices.cs
@@ -0,0 +1,100 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Composition;
+using Microsoft.CodeAnalysis.Razor.CodeActions;
+using Microsoft.CodeAnalysis.Razor.CodeActions.Razor;
+using Microsoft.CodeAnalysis.Razor.DocumentMapping;
+using Microsoft.CodeAnalysis.Razor.Formatting;
+using Microsoft.CodeAnalysis.Razor.Logging;
+using Microsoft.CodeAnalysis.Razor.Workspaces;
+
+namespace Microsoft.CodeAnalysis.Remote.Razor.CodeActions;
+
+// Services
+
+[Export(typeof(ICodeActionsService)), Shared]
+[method: ImportingConstructor]
+internal sealed class OOPCodeActionsService(
+    IDocumentMappingService documentMappingService,
+    [ImportMany] IEnumerable<IRazorCodeActionProvider> razorCodeActionProviders,
+    [ImportMany] IEnumerable<ICSharpCodeActionProvider> csharpCodeActionProviders,
+    [ImportMany] IEnumerable<IHtmlCodeActionProvider> htmlCodeActionProviders,
+    LanguageServerFeatureOptions languageServerFeatureOptions)
+    : CodeActionsService(documentMappingService, razorCodeActionProviders, csharpCodeActionProviders, htmlCodeActionProviders, languageServerFeatureOptions);
+
+[Export(typeof(ICodeActionResolveService)), Shared]
+[method: ImportingConstructor]
+internal sealed class OOPCodeActionResolveService(
+    [ImportMany] IEnumerable<IRazorCodeActionResolver> razorCodeActionResolvers,
+    [ImportMany] IEnumerable<ICSharpCodeActionResolver> csharpCodeActionResolvers,
+    [ImportMany] IEnumerable<IHtmlCodeActionResolver> htmlCodeActionResolvers,
+    ILoggerFactory loggerFactory)
+    : CodeActionResolveService(razorCodeActionResolvers, csharpCodeActionResolvers, htmlCodeActionResolvers, loggerFactory);
+
+// Code Action Providers
+
+[Export(typeof(IRazorCodeActionProvider)), Shared]
+[method: ImportingConstructor]
+internal sealed class OOPExtractToCodeBehindCodeActionProvider(ILoggerFactory loggerFactory) : ExtractToCodeBehindCodeActionProvider(loggerFactory);
+
+[Export(typeof(IRazorCodeActionProvider)), Shared]
+internal sealed class OOPExtractToComponentCodeActionProvider : ExtractToComponentCodeActionProvider;
+
+[Export(typeof(IRazorCodeActionProvider)), Shared]
+internal sealed class OOPComponentAccessibilityCodeActionProvider : ComponentAccessibilityCodeActionProvider;
+
+[Export(typeof(IRazorCodeActionProvider)), Shared]
+internal sealed class OOPGenerateMethodCodeActionProvider : GenerateMethodCodeActionProvider;
+
+[Export(typeof(ICSharpCodeActionProvider)), Shared]
+internal sealed class OOPTypeAccessibilityCodeActionProvider : TypeAccessibilityCodeActionProvider;
+
+[Export(typeof(ICSharpCodeActionProvider)), Shared]
+[method: ImportingConstructor]
+internal sealed class OOPDefaultCSharpCodeActionProvider(LanguageServerFeatureOptions languageServerFeatureOptions) : CSharpCodeActionProvider(languageServerFeatureOptions);
+
+[Export(typeof(IHtmlCodeActionProvider)), Shared]
+[method: ImportingConstructor]
+internal sealed class OOPDefaultHtmlCodeActionProvider(IEditMappingService editMappingService) : HtmlCodeActionProvider(editMappingService);
+
+// Code Action Resolvers
+
+[Export(typeof(IRazorCodeActionResolver)), Shared]
+[method: ImportingConstructor]
+internal sealed class OOPExtractToCodeBehindCodeActionResolver(
+    LanguageServerFeatureOptions languageServerFeatureOptions,
+    IRoslynCodeActionHelpers roslynCodeActionHelpers)
+    : ExtractToCodeBehindCodeActionResolver(languageServerFeatureOptions, roslynCodeActionHelpers);
+
+[Export(typeof(IRazorCodeActionResolver)), Shared]
+[method: ImportingConstructor]
+internal sealed class OOPExtractToComponentCodeActionResolver(LanguageServerFeatureOptions languageServerFeatureOptions) : ExtractToComponentCodeActionResolver(languageServerFeatureOptions);
+
+[Export(typeof(IRazorCodeActionResolver)), Shared]
+[method: ImportingConstructor]
+internal sealed class OOPCreateComponentCodeActionResolver(LanguageServerFeatureOptions languageServerFeatureOptions) : CreateComponentCodeActionResolver(languageServerFeatureOptions);
+
+[Export(typeof(IRazorCodeActionResolver)), Shared]
+internal sealed class OOPAddUsingsCodeActionResolver : AddUsingsCodeActionResolver;
+
+[Export(typeof(IRazorCodeActionResolver)), Shared]
+[method: ImportingConstructor]
+internal sealed class OOPGenerateMethodCodeActionResolver(
+    IRoslynCodeActionHelpers roslynCodeActionHelpers,
+    IDocumentMappingService documentMappingService,
+    IRazorFormattingService razorFormattingService)
+    : GenerateMethodCodeActionResolver(roslynCodeActionHelpers, documentMappingService, razorFormattingService);
+
+[Export(typeof(ICSharpCodeActionResolver)), Shared]
+[method: ImportingConstructor]
+internal sealed class OOPCSharpCodeActionResolver(IRazorFormattingService razorFormattingService) : CSharpCodeActionResolver(razorFormattingService);
+
+[Export(typeof(ICSharpCodeActionResolver)), Shared]
+[method: ImportingConstructor]
+internal sealed class OOPUnformattedRemappingCSharpCodeActionResolver(IDocumentMappingService documentMappingService) : UnformattedRemappingCSharpCodeActionResolver(documentMappingService);
+
+[Export(typeof(IHtmlCodeActionResolver)), Shared]
+[method: ImportingConstructor]
+internal sealed class OOPHtmlCodeActionResolver(IEditMappingService editMappingService) : HtmlCodeActionResolver(editMappingService);
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RoslynCodeActionHelpers.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RoslynCodeActionHelpers.cs
new file mode 100644
index 00000000000..b0add9ea4b4
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RoslynCodeActionHelpers.cs
@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Composition;
+using System.Diagnostics;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.Razor.CodeActions;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Remote.Razor.ProjectSystem;
+using Microsoft.VisualStudio.LanguageServer.Protocol;
+using ExternalHandlers = Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost.Handlers;
+using RoslynTextEdit = Roslyn.LanguageServer.Protocol.TextEdit;
+
+namespace Microsoft.CodeAnalysis.Remote.Razor;
+
+[Export(typeof(IRoslynCodeActionHelpers)), Shared]
+internal sealed class RoslynCodeActionHelpers : IRoslynCodeActionHelpers
+{
+    public Task<string> GetFormattedNewFileContentsAsync(IProjectSnapshot projectSnapshot, Uri csharpFileUri, string newFileContent, CancellationToken cancellationToken)
+    {
+        Debug.Assert(projectSnapshot is RemoteProjectSnapshot);
+        var project = ((RemoteProjectSnapshot)projectSnapshot).Project;
+
+        var document = project.AddDocument(RazorUri.GetDocumentFilePathFromUri(csharpFileUri), newFileContent);
+
+        return ExternalHandlers.CodeActions.GetFormattedNewFileContentAsync(document, cancellationToken);
+    }
+
+    public async Task<TextEdit[]?> GetSimplifiedTextEditsAsync(DocumentContext documentContext, Uri? codeBehindUri, TextEdit edit, CancellationToken cancellationToken)
+    {
+        Debug.Assert(documentContext is RemoteDocumentContext);
+        var context = (RemoteDocumentContext)documentContext;
+
+        Document document;
+        if (codeBehindUri is null)
+        {
+            // Edit is for inserting into the generated document
+            document = await context.Snapshot.GetGeneratedDocumentAsync(cancellationToken).ConfigureAwait(false);
+        }
+        else
+        {
+            // Edit is for inserting into a C# document
+            var solution = context.TextDocument.Project.Solution;
+            var documentIds = solution.GetDocumentIdsWithUri(codeBehindUri);
+            if (documentIds.Length == 0)
+            {
+                return null;
+            }
+
+            document = solution.GetRequiredDocument(documentIds.First(d => d.ProjectId == context.TextDocument.Project.Id));
+        }
+
+        var options = new JsonSerializerOptions();
+        foreach (var converter in RazorServiceDescriptorsWrapper.GetLspConverters())
+        {
+            options.Converters.Add(converter);
+        }
+
+        var convertedEdit = JsonSerializer.Deserialize<RoslynTextEdit>(JsonSerializer.SerializeToDocument(edit, options), options).AssumeNotNull();
+
+        var edits = await ExternalHandlers.CodeActions.GetSimplifiedEditsAsync(document, convertedEdit, cancellationToken).ConfigureAwait(false);
+
+        return JsonSerializer.Deserialize<TextEdit[]>(JsonSerializer.SerializeToDocument(edits, options), options);
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Initialization/RemoteLanguageServerFeatureOptions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Initialization/RemoteLanguageServerFeatureOptions.cs
index ed6b2ddb602..c4fe60491a6 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Initialization/RemoteLanguageServerFeatureOptions.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Initialization/RemoteLanguageServerFeatureOptions.cs
@@ -17,7 +17,7 @@ internal class RemoteLanguageServerFeatureOptions : LanguageServerFeatureOptions
 
     public void SetOptions(RemoteClientInitializationOptions options) => _options = options;
 
-    public override bool SupportsFileManipulation => throw new InvalidOperationException("This option has not been synced to OOP.");
+    public override bool SupportsFileManipulation => _options.SupportsFileManipulation;
 
     public override string CSharpVirtualDocumentSuffix => _options.CSharpVirtualDocumentSuffix;
 
@@ -29,7 +29,7 @@ internal class RemoteLanguageServerFeatureOptions : LanguageServerFeatureOptions
 
     public override bool UsePreciseSemanticTokenRanges => _options.UsePreciseSemanticTokenRanges;
 
-    public override bool ShowAllCSharpCodeActions => throw new InvalidOperationException("This option has not been synced to OOP.");
+    public override bool ShowAllCSharpCodeActions => _options.ShowAllCSharpCodeActions;
 
     public override bool UpdateBuffersForClosedDocuments => throw new InvalidOperationException("This option has not been synced to OOP.");
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteProjectSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteProjectSnapshot.cs
index 1720c1a09be..82461bc1c54 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteProjectSnapshot.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteProjectSnapshot.cs
@@ -84,6 +84,8 @@ public IEnumerable<string> DocumentFilePaths
 
     public VersionStamp Version => _project.Version;
 
+    public Project Project => _project;
+
     public LanguageVersion CSharpLanguageVersion => ((CSharpParseOptions)_project.ParseOptions.AssumeNotNull()).LanguageVersion;
 
     public ValueTask<ImmutableArray<TagHelperDescriptor>> GetTagHelpersAsync(CancellationToken cancellationToken)
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostCodeActionsEndpoint.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostCodeActionsEndpoint.cs
new file mode 100644
index 00000000000..496124067d5
--- /dev/null
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostCodeActionsEndpoint.cs
@@ -0,0 +1,193 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor;
+using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
+using Microsoft.AspNetCore.Razor.Telemetry;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost.Handlers;
+using Microsoft.CodeAnalysis.Razor.CodeActions.Models;
+using Microsoft.CodeAnalysis.Razor.Protocol;
+using Microsoft.CodeAnalysis.Razor.Protocol.CodeActions;
+using Microsoft.CodeAnalysis.Razor.Remote;
+using Microsoft.CodeAnalysis.Razor.Workspaces.Telemetry;
+using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
+using Microsoft.VisualStudio.LanguageServer.Protocol;
+
+namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
+
+#pragma warning disable RS0030 // Do not use banned APIs
+[Shared]
+[CohostEndpoint(Methods.TextDocumentCodeActionName)]
+[Export(typeof(IDynamicRegistrationProvider))]
+[ExportCohostStatelessLspService(typeof(CohostCodeActionsEndpoint))]
+[method: ImportingConstructor]
+#pragma warning restore RS0030 // Do not use banned APIs
+internal sealed class CohostCodeActionsEndpoint(
+    IRemoteServiceInvoker remoteServiceInvoker,
+    IClientCapabilitiesService clientCapabilitiesService,
+    IHtmlDocumentSynchronizer htmlDocumentSynchronizer,
+    LSPRequestInvoker requestInvoker,
+    ITelemetryReporter telemetryReporter)
+    : AbstractRazorCohostDocumentRequestHandler<VSCodeActionParams, SumType<Command, CodeAction>[]?>, IDynamicRegistrationProvider
+{
+    private readonly IRemoteServiceInvoker _remoteServiceInvoker = remoteServiceInvoker;
+    private readonly IClientCapabilitiesService _clientCapabilitiesService = clientCapabilitiesService;
+    private readonly IHtmlDocumentSynchronizer _htmlDocumentSynchronizer = htmlDocumentSynchronizer;
+    private readonly LSPRequestInvoker _requestInvoker = requestInvoker;
+    private readonly ITelemetryReporter _telemetryReporter = telemetryReporter;
+
+    protected override bool MutatesSolutionState => false;
+
+    protected override bool RequiresLSPSolution => true;
+
+    public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilities clientCapabilities, RazorCohostRequestContext requestContext)
+    {
+        if (clientCapabilities.TextDocument?.CodeAction?.DynamicRegistration == true)
+        {
+            return [new Registration
+            {
+                Method = Methods.TextDocumentCodeActionName,
+                RegisterOptions = new CodeActionRegistrationOptions().EnableCodeActions()
+            }];
+        }
+
+        return [];
+    }
+
+    protected override RazorTextDocumentIdentifier? GetRazorTextDocumentIdentifier(VSCodeActionParams request)
+        => request.TextDocument.ToRazorTextDocumentIdentifier();
+
+    protected override Task<SumType<Command, CodeAction>[]?> HandleRequestAsync(VSCodeActionParams request, RazorCohostRequestContext context, CancellationToken cancellationToken)
+        => HandleRequestAsync(context.TextDocument.AssumeNotNull(), request, cancellationToken);
+
+    private async Task<SumType<Command, CodeAction>[]?> HandleRequestAsync(TextDocument razorDocument, VSCodeActionParams request, CancellationToken cancellationToken)
+    {
+        var correlationId = Guid.NewGuid();
+        using var _ = _telemetryReporter.TrackLspRequest(Methods.TextDocumentCodeActionName, LanguageServerConstants.RazorLanguageServerName, TelemetryThresholds.CodeActionRazorTelemetryThreshold, correlationId);
+
+        // VS Provides `CodeActionParams.Context.SelectionRange` in addition to
+        // `CodeActionParams.Range`. The `SelectionRange` is relative to where the
+        // code action was invoked (ex. line 14, char 3) whereas the `Range` is
+        // always at the start of the line (ex. line 14, char 0). We want to utilize
+        // the relative positioning to ensure we provide code actions for the appropriate
+        // context.
+        //
+        // Note: VS Code doesn't provide a `SelectionRange`.
+        var vsCodeActionContext = request.Context;
+        if (vsCodeActionContext.SelectionRange != null)
+        {
+            request.Range = vsCodeActionContext.SelectionRange;
+        }
+
+        var requestInfo = await _remoteServiceInvoker.TryInvokeAsync<IRemoteCodeActionsService, CodeActionRequestInfo>(
+            razorDocument.Project.Solution,
+            (service, solutionInfo, cancellationToken) => service.GetCodeActionRequestInfoAsync(solutionInfo, razorDocument.Id, request, cancellationToken),
+            cancellationToken).ConfigureAwait(false);
+
+        if (requestInfo is null ||
+            requestInfo.LanguageKind == RazorLanguageKind.CSharp && requestInfo.CSharpRequest is null)
+        {
+            return null;
+        }
+
+        var delegatedCodeActions = requestInfo.LanguageKind switch
+        {
+            RazorLanguageKind.Html => await GetHtmlCodeActionsAsync(razorDocument, request, correlationId, cancellationToken).ConfigureAwait(false),
+            RazorLanguageKind.CSharp => await GetCSharpCodeActionsAsync(razorDocument, requestInfo.CSharpRequest.AssumeNotNull(), correlationId, cancellationToken).ConfigureAwait(false),
+            _ => []
+        };
+
+        return await _remoteServiceInvoker.TryInvokeAsync<IRemoteCodeActionsService, SumType<Command, CodeAction>[]?>(
+            razorDocument.Project.Solution,
+            (service, solutionInfo, cancellationToken) => service.GetCodeActionsAsync(solutionInfo, razorDocument.Id, request, delegatedCodeActions, cancellationToken),
+            cancellationToken).ConfigureAwait(false);
+    }
+
+    private async Task<RazorVSInternalCodeAction[]> GetCSharpCodeActionsAsync(TextDocument razorDocument, VSCodeActionParams request, Guid correlationId, CancellationToken cancellationToken)
+    {
+        var generatedDocumentIds = razorDocument.Project.Solution.GetDocumentIdsWithUri(request.TextDocument.Uri);
+        var generatedDocumentId = generatedDocumentIds.FirstOrDefault(d => d.ProjectId == razorDocument.Project.Id);
+        if (generatedDocumentId is null)
+        {
+            return [];
+        }
+
+        if (razorDocument.Project.GetDocument(generatedDocumentId) is not { } generatedDocument)
+        {
+            return [];
+        }
+
+        var options = new JsonSerializerOptions();
+        foreach (var converter in RazorServiceDescriptorsWrapper.GetLspConverters())
+        {
+            options.Converters.Add(converter);
+        }
+
+        var csharpRequest = JsonSerializer.Deserialize<Roslyn.LanguageServer.Protocol.CodeActionParams>(JsonSerializer.SerializeToDocument(request, options), options).AssumeNotNull();
+
+        using var _ = _telemetryReporter.TrackLspRequest(Methods.TextDocumentCodeActionName, "Razor.ExternalAccess", TelemetryThresholds.CodeActionSubLSPTelemetryThreshold, correlationId);
+        var csharpCodeActions = await CodeActions.GetCodeActionsAsync(generatedDocument, csharpRequest, _clientCapabilitiesService.ClientCapabilities.SupportsVisualStudioExtensions, cancellationToken).ConfigureAwait(false);
+
+        return JsonSerializer.Deserialize<RazorVSInternalCodeAction[]>(JsonSerializer.SerializeToDocument(csharpCodeActions, options), options).AssumeNotNull();
+    }
+
+    private async Task<RazorVSInternalCodeAction[]> GetHtmlCodeActionsAsync(TextDocument razorDocument, VSCodeActionParams request, Guid correlationId, CancellationToken cancellationToken)
+    {
+        var htmlDocument = await _htmlDocumentSynchronizer.TryGetSynchronizedHtmlDocumentAsync(razorDocument, cancellationToken).ConfigureAwait(false);
+        if (htmlDocument is null)
+        {
+            return [];
+        }
+
+        // We don't want to create a new request, and risk losing data, so we just tweak the Uri and
+        // set it back again at the end
+        var oldTdi = request.TextDocument;
+        try
+        {
+            request.TextDocument = new VSTextDocumentIdentifier { Uri = htmlDocument.Uri };
+
+            using var _ = _telemetryReporter.TrackLspRequest(Methods.TextDocumentCodeActionName, RazorLSPConstants.HtmlLanguageServerName, TelemetryThresholds.CodeActionSubLSPTelemetryThreshold, correlationId);
+            var result = await _requestInvoker.ReinvokeRequestOnServerAsync<VSCodeActionParams, RazorVSInternalCodeAction[]?>(
+                htmlDocument.Buffer,
+                Methods.TextDocumentCodeActionName,
+                RazorLSPConstants.HtmlLanguageServerName,
+                request,
+                cancellationToken).ConfigureAwait(false);
+
+            if (result?.Response is null)
+            {
+                return [];
+            }
+
+            // WebTools is still using Newtonsoft, so we have to convert to STJ
+            foreach (var codeAction in result.Response)
+            {
+                codeAction.Data = JsonHelpers.TryConvertFromJObject(codeAction.Data);
+            }
+
+            return result.Response;
+        }
+        finally
+        {
+            request.TextDocument = oldTdi;
+        }
+    }
+
+    internal TestAccessor GetTestAccessor() => new(this);
+
+    internal readonly struct TestAccessor(CohostCodeActionsEndpoint instance)
+    {
+        public Task<SumType<Command, CodeAction>[]?> HandleRequestAsync(TextDocument razorDocument, VSCodeActionParams request, CancellationToken cancellationToken)
+            => instance.HandleRequestAsync(razorDocument, request, cancellationToken);
+    }
+}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostCodeActionsResolveEndpoint.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostCodeActionsResolveEndpoint.cs
new file mode 100644
index 00000000000..e0d857042ce
--- /dev/null
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostCodeActionsResolveEndpoint.cs
@@ -0,0 +1,181 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor;
+using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost.Handlers;
+using Microsoft.CodeAnalysis.Razor.CodeActions;
+using Microsoft.CodeAnalysis.Razor.CodeActions.Models;
+using Microsoft.CodeAnalysis.Razor.Formatting;
+using Microsoft.CodeAnalysis.Razor.Protocol;
+using Microsoft.CodeAnalysis.Razor.Remote;
+using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
+using Microsoft.VisualStudio.LanguageServer.Protocol;
+using Microsoft.VisualStudio.Razor.Settings;
+
+namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
+
+#pragma warning disable RS0030 // Do not use banned APIs
+[Shared]
+[CohostEndpoint(Methods.CodeActionResolveName)]
+[Export(typeof(IDynamicRegistrationProvider))]
+[ExportCohostStatelessLspService(typeof(CohostCodeActionsResolveEndpoint))]
+[method: ImportingConstructor]
+#pragma warning restore RS0030 // Do not use banned APIs
+internal sealed class CohostCodeActionsResolveEndpoint(
+    IRemoteServiceInvoker remoteServiceInvoker,
+    IClientCapabilitiesService clientCapabilitiesService,
+    IClientSettingsManager clientSettingsManager,
+    IHtmlDocumentSynchronizer htmlDocumentSynchronizer,
+    LSPRequestInvoker requestInvoker)
+    : AbstractRazorCohostDocumentRequestHandler<CodeAction, CodeAction?>, IDynamicRegistrationProvider
+{
+    private readonly IRemoteServiceInvoker _remoteServiceInvoker = remoteServiceInvoker;
+    private readonly IClientCapabilitiesService _clientCapabilitiesService = clientCapabilitiesService;
+    private readonly IClientSettingsManager _clientSettingsManager = clientSettingsManager;
+    private readonly IHtmlDocumentSynchronizer _htmlDocumentSynchronizer = htmlDocumentSynchronizer;
+    private readonly LSPRequestInvoker _requestInvoker = requestInvoker;
+
+    protected override bool MutatesSolutionState => false;
+
+    protected override bool RequiresLSPSolution => true;
+
+    public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilities clientCapabilities, RazorCohostRequestContext requestContext)
+    {
+        if (clientCapabilities.TextDocument?.CodeAction?.DynamicRegistration == true)
+        {
+            return [new Registration
+            {
+                Method = Methods.CodeActionResolveName,
+                RegisterOptions = new CodeActionRegistrationOptions().EnableCodeActions()
+            }];
+        }
+
+        return [];
+    }
+
+    protected override RazorTextDocumentIdentifier? GetRazorTextDocumentIdentifier(CodeAction request)
+    {
+        var resolveParams = CodeActionResolveService.GetRazorCodeActionResolutionParams(request);
+        return resolveParams.TextDocument.ToRazorTextDocumentIdentifier();
+    }
+
+    protected override Task<CodeAction?> HandleRequestAsync(CodeAction request, RazorCohostRequestContext context, CancellationToken cancellationToken)
+        => HandleRequestAsync(context.TextDocument.AssumeNotNull(), request, cancellationToken);
+
+    private async Task<CodeAction?> HandleRequestAsync(TextDocument razorDocument, CodeAction request, CancellationToken cancellationToken)
+    {
+        var resolveParams = CodeActionResolveService.GetRazorCodeActionResolutionParams(request);
+
+        var resolvedDelegatedCodeAction = resolveParams.Language switch
+        {
+            RazorLanguageKind.Html => await ResolvedHtmlCodeActionAsync(razorDocument, request, resolveParams, cancellationToken).ConfigureAwait(false),
+            RazorLanguageKind.CSharp => await ResolveCSharpCodeActionAsync(razorDocument, request, resolveParams, cancellationToken).ConfigureAwait(false),
+            _ => null
+        };
+
+        var clientSettings = _clientSettingsManager.GetClientSettings();
+        var formattingOptions = new RazorFormattingOptions()
+        {
+            InsertSpaces = !clientSettings.ClientSpaceSettings.IndentWithTabs,
+            TabSize = clientSettings.ClientSpaceSettings.IndentSize,
+            CodeBlockBraceOnNextLine = clientSettings.AdvancedSettings.CodeBlockBraceOnNextLine
+        };
+
+        return await _remoteServiceInvoker.TryInvokeAsync<IRemoteCodeActionsService, CodeAction>(
+            razorDocument.Project.Solution,
+            (service, solutionInfo, cancellationToken) => service.ResolveCodeActionAsync(solutionInfo, razorDocument.Id, request, resolvedDelegatedCodeAction, formattingOptions, cancellationToken),
+            cancellationToken).ConfigureAwait(false);
+    }
+
+    private async Task<CodeAction> ResolveCSharpCodeActionAsync(TextDocument razorDocument, CodeAction codeAction, RazorCodeActionResolutionParams resolveParams, CancellationToken cancellationToken)
+    {
+        var originalData = codeAction.Data;
+        try
+        {
+            codeAction.Data = resolveParams.Data;
+
+            var uri = resolveParams.DelegatedDocumentUri.AssumeNotNull();
+
+            var generatedDocumentIds = razorDocument.Project.Solution.GetDocumentIdsWithUri(uri);
+            var generatedDocumentId = generatedDocumentIds.FirstOrDefault(d => d.ProjectId == razorDocument.Project.Id);
+            if (generatedDocumentId is null)
+            {
+                return codeAction;
+            }
+
+            if (razorDocument.Project.GetDocument(generatedDocumentId) is not { } generatedDocument)
+            {
+                return codeAction;
+            }
+
+            var options = new JsonSerializerOptions();
+            foreach (var converter in RazorServiceDescriptorsWrapper.GetLspConverters())
+            {
+                options.Converters.Add(converter);
+            }
+
+            var resourceOptions = _clientCapabilitiesService.ClientCapabilities.Workspace?.WorkspaceEdit?.ResourceOperations ?? [];
+            var roslynCodeAction = JsonSerializer.Deserialize<Roslyn.LanguageServer.Protocol.VSInternalCodeAction>(JsonSerializer.SerializeToDocument(codeAction, options), options).AssumeNotNull();
+            var roslynResourceOptions = JsonSerializer.Deserialize<Roslyn.LanguageServer.Protocol.ResourceOperationKind[]>(JsonSerializer.SerializeToDocument(resourceOptions, options), options).AssumeNotNull();
+
+            var resolvedCodeAction = await CodeActions.ResolveCodeActionAsync(generatedDocument, roslynCodeAction, roslynResourceOptions, cancellationToken).ConfigureAwait(false);
+
+            return JsonSerializer.Deserialize<RazorVSInternalCodeAction>(JsonSerializer.SerializeToDocument(resolvedCodeAction, options), options).AssumeNotNull();
+        }
+        finally
+        {
+            codeAction.Data = originalData;
+        }
+    }
+
+    private async Task<CodeAction> ResolvedHtmlCodeActionAsync(TextDocument razorDocument, CodeAction codeAction, RazorCodeActionResolutionParams resolveParams, CancellationToken cancellationToken)
+    {
+        var originalData = codeAction.Data;
+        codeAction.Data = resolveParams.Data;
+
+        try
+        {
+            var htmlDocument = await _htmlDocumentSynchronizer.TryGetSynchronizedHtmlDocumentAsync(razorDocument, cancellationToken).ConfigureAwait(false);
+            if (htmlDocument is null)
+            {
+                return codeAction;
+            }
+
+            var result = await _requestInvoker.ReinvokeRequestOnServerAsync<CodeAction, CodeAction>(
+                htmlDocument.Buffer,
+                Methods.CodeActionResolveName,
+                RazorLSPConstants.HtmlLanguageServerName,
+                codeAction,
+                cancellationToken).ConfigureAwait(false);
+
+            if (result?.Response is null)
+            {
+                return codeAction;
+            }
+
+            return result.Response;
+        }
+        finally
+        {
+            codeAction.Data = originalData;
+        }
+    }
+
+    internal TestAccessor GetTestAccessor() => new(this);
+
+    internal readonly struct TestAccessor(CohostCodeActionsResolveEndpoint instance)
+    {
+        public Task<CodeAction?> HandleRequestAsync(TextDocument razorDocument, CodeAction request, CancellationToken cancellationToken)
+            => instance.HandleRequestAsync(razorDocument, request, cancellationToken);
+    }
+}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Remote/RemoteServiceInvoker.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Remote/RemoteServiceInvoker.cs
index 02ed22ce44a..214463e6bd7 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Remote/RemoteServiceInvoker.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Remote/RemoteServiceInvoker.cs
@@ -138,7 +138,9 @@ private async Task InitializeRemoteClientAsync(RazorRemoteHostClient remoteClien
                     HtmlVirtualDocumentSuffix = _languageServerFeatureOptions.HtmlVirtualDocumentSuffix,
                     IncludeProjectKeyInGeneratedFilePath = _languageServerFeatureOptions.IncludeProjectKeyInGeneratedFilePath,
                     ReturnCodeActionAndRenamePathsWithPrefixedSlash = _languageServerFeatureOptions.ReturnCodeActionAndRenamePathsWithPrefixedSlash,
-                    ForceRuntimeCodeGeneration = _languageServerFeatureOptions.ForceRuntimeCodeGeneration
+                    ForceRuntimeCodeGeneration = _languageServerFeatureOptions.ForceRuntimeCodeGeneration,
+                    SupportsFileManipulation = _languageServerFeatureOptions.SupportsFileManipulation,
+                    ShowAllCSharpCodeActions = _languageServerFeatureOptions.ShowAllCSharpCodeActions,
                 };
 
                 _logger.LogDebug($"First OOP call, so initializing OOP service.");
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/AddUsingsCodeActionResolverTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/AddUsingsCodeActionResolverTest.cs
index 43f70862743..029d576ccd4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/AddUsingsCodeActionResolverTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/AddUsingsCodeActionResolverTest.cs
@@ -53,7 +53,7 @@ public void TryCreateAddUsingResolutionParams_CreatesResolutionParams()
         var docUri = new VSTextDocumentIdentifier { Uri = new Uri("c:/path") };
 
         // Act
-        var result = AddUsingsCodeActionResolver.TryCreateAddUsingResolutionParams(fqn, docUri, additionalEdit: null, out var @namespace, out var resolutionParams);
+        var result = AddUsingsCodeActionResolver.TryCreateAddUsingResolutionParams(fqn, docUri, additionalEdit: null, delegatedDocumentUri: null, out var @namespace, out var resolutionParams);
 
         // Assert
         Assert.True(result);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/CSharpCodeActionProviderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/CSharpCodeActionProviderTest.cs
index c1049113d4e..46073b4d8ad 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/CSharpCodeActionProviderTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/CSharpCodeActionProviderTest.cs
@@ -347,6 +347,7 @@ private static RazorCodeActionContext CreateRazorCodeActionContext(
             request,
             documentSnapshotMock.Object,
             codeDocument,
+            DelegatedDocumentUri: null,
             StartAbsoluteIndex: absoluteIndex,
             EndAbsoluteIndex: absoluteIndex,
             RazorLanguageKind.CSharp,
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/TypeAccessibilityCodeActionProviderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/TypeAccessibilityCodeActionProviderTest.cs
index 844e4466b4b..00d808d5996 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/TypeAccessibilityCodeActionProviderTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/TypeAccessibilityCodeActionProviderTest.cs
@@ -474,6 +474,7 @@ private static RazorCodeActionContext CreateRazorCodeActionContext(
             request,
             documentSnapshotMock.Object,
             codeDocument,
+            DelegatedDocumentUri: null,
             StartAbsoluteIndex: absoluteIndex,
             EndAbsoluteIndex: absoluteIndex,
             RazorLanguageKind.Razor,
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionResolutionEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionResolutionEndpointTest.cs
index 1ca861a9f41..20cad36827a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionResolutionEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionResolutionEndpointTest.cs
@@ -40,6 +40,7 @@ public async Task Handle_Valid_RazorCodeAction_WithResolver()
             TextDocument = (VSTextDocumentIdentifier)documentContext.GetTextDocumentIdentifier(),
             Action = "Test",
             Language = RazorLanguageKind.Razor,
+            DelegatedDocumentUri = null,
             Data = new AddUsingsCodeActionParams()
             {
                 Namespace = "Test",
@@ -78,6 +79,7 @@ [new MockCSharpCodeActionResolver("Test")],
             TextDocument = (VSTextDocumentIdentifier)documentContext.GetTextDocumentIdentifier(),
             Action = "Test",
             Language = RazorLanguageKind.CSharp,
+            DelegatedDocumentUri = null,
         };
         var request = new CodeAction()
         {
@@ -112,6 +114,7 @@ public async Task Handle_Valid_CSharpCodeAction_WithMultipleLanguageResolvers()
             TextDocument = (VSTextDocumentIdentifier)documentContext.GetTextDocumentIdentifier(),
             Action = "TestCSharp",
             Language = RazorLanguageKind.CSharp,
+            DelegatedDocumentUri = null,
         };
         var request = new CodeAction()
         {
@@ -146,6 +149,7 @@ public async Task Handle_Valid_RazorCodeAction_WithoutResolver()
             TextDocument = (VSTextDocumentIdentifier)documentContext.GetTextDocumentIdentifier(),
             Action = "Test",
             Language = RazorLanguageKind.Razor,
+            DelegatedDocumentUri = null,
             Data = new AddUsingsCodeActionParams()
             {
                 Namespace = "Test",
@@ -189,6 +193,7 @@ public async Task Handle_Valid_CSharpCodeAction_WithoutResolver()
             TextDocument = (VSTextDocumentIdentifier)documentContext.GetTextDocumentIdentifier(),
             Action = "Test",
             Language = RazorLanguageKind.CSharp,
+            DelegatedDocumentUri = null,
         };
         var request = new CodeAction()
         {
@@ -228,6 +233,7 @@ public async Task Handle_Valid_RazorCodeAction_WithCSharpResolver_ResolvesNull()
             TextDocument = (VSTextDocumentIdentifier)documentContext.GetTextDocumentIdentifier(),
             Action = "Test",
             Language = RazorLanguageKind.Razor,
+            DelegatedDocumentUri = null,
             Data = new AddUsingsCodeActionParams()
             {
                 Namespace = "Test",
@@ -271,6 +277,7 @@ public async Task Handle_Valid_CSharpCodeAction_WithRazorResolver_ResolvesNull()
             TextDocument = (VSTextDocumentIdentifier)documentContext.GetTextDocumentIdentifier(),
             Action = "Test",
             Language = RazorLanguageKind.CSharp,
+            DelegatedDocumentUri = null,
         };
         var request = new CodeAction()
         {
@@ -310,6 +317,7 @@ public async Task ResolveRazorCodeAction_ResolveMultipleRazorProviders_FirstMatc
             TextDocument = (VSTextDocumentIdentifier)documentContext.GetTextDocumentIdentifier(),
             Action = "A",
             Language = RazorLanguageKind.Razor,
+            DelegatedDocumentUri = null,
             Data = JsonSerializer.SerializeToElement(new AddUsingsCodeActionParams()
             {
                 Namespace = "Test",
@@ -342,6 +350,7 @@ public async Task ResolveRazorCodeAction_ResolveMultipleRazorProviders_SecondMat
             TextDocument = (VSTextDocumentIdentifier)documentContext.GetTextDocumentIdentifier(),
             Action = "B",
             Language = RazorLanguageKind.Razor,
+            DelegatedDocumentUri = null,
             Data = JsonSerializer.SerializeToElement(new AddUsingsCodeActionParams()
             {
                 Namespace = "Test",
@@ -374,6 +383,7 @@ public async Task ResolveCSharpCodeAction_ResolveMultipleCSharpProviders_FirstMa
             TextDocument = (VSTextDocumentIdentifier)documentContext.GetTextDocumentIdentifier(),
             Action = "A",
             Language = RazorLanguageKind.CSharp,
+            DelegatedDocumentUri = null,
         };
 
         // Act
@@ -402,6 +412,7 @@ public async Task ResolveCSharpCodeAction_ResolveMultipleCSharpProviders_SecondM
             TextDocument = (VSTextDocumentIdentifier)documentContext.GetTextDocumentIdentifier(),
             Action = "B",
             Language = RazorLanguageKind.Razor,
+            DelegatedDocumentUri = null,
         };
 
         // Act
@@ -433,6 +444,7 @@ public async Task ResolveCSharpCodeAction_ResolveMultipleLanguageProviders()
             TextDocument = (VSTextDocumentIdentifier)documentContext.GetTextDocumentIdentifier(),
             Action = "D",
             Language = RazorLanguageKind.CSharp,
+            DelegatedDocumentUri = null,
         };
 
         // Act
@@ -461,6 +473,7 @@ public async Task Handle_ResolveEditBasedCodeActionCommand()
             TextDocument = (VSTextDocumentIdentifier)documentContext.GetTextDocumentIdentifier(),
             Action = LanguageServerConstants.CodeActions.EditBasedCodeActionCommand,
             Language = RazorLanguageKind.Razor,
+            DelegatedDocumentUri = null,
             Data = JsonSerializer.SerializeToElement(new WorkspaceEdit())
         };
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/HtmlCodeActionProviderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/HtmlCodeActionProviderTest.cs
index b5ac4f5fe5e..28fdb0d0765 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/HtmlCodeActionProviderTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/HtmlCodeActionProviderTest.cs
@@ -171,6 +171,7 @@ private static RazorCodeActionContext CreateRazorCodeActionContext(
             request,
             documentSnapshotMock.Object,
             codeDocument,
+            DelegatedDocumentUri: null,
             StartAbsoluteIndex: absoluteIndex,
             EndAbsoluteIndex: absoluteIndex,
             RazorLanguageKind.Html,
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ComponentAccessibilityCodeActionProviderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ComponentAccessibilityCodeActionProviderTest.cs
index e19cedfc98d..64e460ec0e1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ComponentAccessibilityCodeActionProviderTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ComponentAccessibilityCodeActionProviderTest.cs
@@ -475,6 +475,7 @@ private static RazorCodeActionContext CreateRazorCodeActionContext(VSCodeActionP
             request,
             documentSnapshotMock.Object,
             codeDocument,
+            DelegatedDocumentUri: null,
             StartAbsoluteIndex: absoluteIndex,
             EndAbsoluteIndex: absoluteIndex,
             RazorLanguageKind.Razor,
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToCodeBehindCodeActionProviderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToCodeBehindCodeActionProviderTest.cs
index 21629cc364f..f1431272433 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToCodeBehindCodeActionProviderTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToCodeBehindCodeActionProviderTest.cs
@@ -401,6 +401,7 @@ private static RazorCodeActionContext CreateRazorCodeActionContext(VSCodeActionP
             request,
             documentSnapshotMock.Object,
             codeDocument,
+            DelegatedDocumentUri: null,
             StartAbsoluteIndex: absoluteIndex,
             EndAbsoluteIndex: absoluteIndex,
             RazorLanguageKind.Razor,
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToComponentCodeActionProviderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToComponentCodeActionProviderTest.cs
index c2878822322..18fed216463 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToComponentCodeActionProviderTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToComponentCodeActionProviderTest.cs
@@ -502,6 +502,7 @@ private static RazorCodeActionContext CreateRazorCodeActionContext(
             request,
             documentSnapshot.Object,
             codeDocument,
+            DelegatedDocumentUri: null,
             selectionSpan.Start,
             selectionSpan.End,
             RazorLanguageKind.Razor,
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostCodeActionsEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostCodeActionsEndpointTest.cs
new file mode 100644
index 00000000000..a986d07dc2f
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostCodeActionsEndpointTest.cs
@@ -0,0 +1,708 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor;
+using Microsoft.AspNetCore.Razor.PooledObjects;
+using Microsoft.AspNetCore.Razor.Telemetry;
+using Microsoft.AspNetCore.Razor.Test.Common;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.Razor.CodeActions.Models;
+using Microsoft.CodeAnalysis.Razor.Protocol.CodeActions;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.VisualStudio.LanguageServer.Protocol;
+using Microsoft.VisualStudio.Razor.Settings;
+using Roslyn.Test.Utilities;
+using Xunit;
+using Xunit.Abstractions;
+using WorkspacesSR = Microsoft.CodeAnalysis.Razor.Workspaces.Resources.SR;
+
+namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
+
+public class CohostCodeActionsEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper)
+{
+    [Fact]
+    public async Task GenerateConstructor()
+    {
+        var input = """
+
+            <div></div>
+
+            @code
+            {
+                public class [||]Goo
+                {
+                }
+            }
+
+            """;
+
+        var expected = """
+            
+            <div></div>
+            
+            @code
+            {
+                public class Goo
+                {
+                    public Goo()
+                    {
+                    }
+                }
+            }
+
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.GenerateDefaultConstructors);
+    }
+
+    [Fact]
+    public async Task UseExpressionBodiedMember()
+    {
+        var input = """
+            @using System.Linq
+
+            <div></div>
+
+            @code
+            {
+                [|{|selection:|}void M(string[] args)|]
+                {
+                    args.ToString();
+                }
+            }
+
+            """;
+
+        var expected = """
+            @using System.Linq
+
+            <div></div>
+            
+            @code
+            {
+                void M(string[] args) => args.ToString();
+            }
+
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.UseExpressionBody);
+    }
+
+    [Fact]
+    public async Task IntroduceLocal()
+    {
+        var input = """
+            @using System.Linq
+
+            <div></div>
+
+            @code
+            {
+                void M(string[] args)
+                {
+                    if ([|args.First()|].Length > 0)
+                    {
+                    }
+                    if (args.First().Length > 0)
+                    {
+                    }
+                }
+            }
+
+            """;
+
+        var expected = """
+            @using System.Linq
+
+            <div></div>
+            
+            @code
+            {
+                void M(string[] args)
+                {
+                    string v = args.First();
+                    if (v.Length > 0)
+                    {
+                    }
+                    if (args.First().Length > 0)
+                    {
+                    }
+                }
+            }
+
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.IntroduceVariable);
+    }
+
+    [Fact]
+    public async Task IntroduceLocal_All()
+    {
+        var input = """
+            @using System.Linq
+
+            <div></div>
+
+            @code
+            {
+                void M(string[] args)
+                {
+                    if ([|args.First()|].Length > 0)
+                    {
+                    }
+                    if (args.First().Length > 0)
+                    {
+                    }
+                }
+            }
+
+            """;
+
+        var expected = """
+            @using System.Linq
+
+            <div></div>
+            
+            @code
+            {
+                void M(string[] args)
+                {
+                    string v = args.First();
+                    if (v.Length > 0)
+                    {
+                    }
+                    if (v.Length > 0)
+                    {
+                    }
+                }
+            }
+
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.IntroduceVariable, childActionIndex: 1);
+    }
+
+    [Fact]
+    public async Task ConvertConcatenationToInterpolatedString_CSharpStatement()
+    {
+        var input = """
+            @{
+                var x = "he[||]l" + "lo" + Environment.NewLine + "world";
+            }
+            """;
+
+        var expected = """
+            @{
+                var x = $"hello{Environment.NewLine}world";
+            }
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertConcatenationToInterpolatedString);
+    }
+
+    [Fact]
+    public async Task ConvertConcatenationToInterpolatedString_ExplicitExpression()
+    {
+        var input = """
+            @("he[||]l" + "lo" + Environment.NewLine + "world")
+            """;
+
+        var expected = """
+            @($"hello{Environment.NewLine}world")
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertConcatenationToInterpolatedString);
+    }
+
+    [Fact]
+    public async Task ConvertConcatenationToInterpolatedString_CodeBlock()
+    {
+        var input = """
+            @code
+            {
+                private string _x = "he[||]l" + "lo" + Environment.NewLine + "world";
+            }
+            """;
+
+        var expected = """
+            @code
+            {
+                private string _x = $"hello{Environment.NewLine}world";
+            }
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertConcatenationToInterpolatedString);
+    }
+
+    [Fact]
+    public async Task ConvertBetweenRegularAndVerbatimInterpolatedString_CodeBlock()
+    {
+        var input = """
+            @code
+            {
+                private string _x = $@"h[||]ello world";
+            }
+            """;
+
+        var expected = """
+            @code
+            {
+                private string _x = $"hello world";
+            }
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertBetweenRegularAndVerbatimInterpolatedString);
+    }
+
+    [Fact]
+    public async Task ConvertBetweenRegularAndVerbatimInterpolatedString_CodeBlock2()
+    {
+        var input = """
+            @code
+            {
+                private string _x = $"h[||]ello\\nworld";
+            }
+            """;
+
+        var expected = """
+            @code
+            {
+                private string _x = $@"hello\nworld";
+            }
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertBetweenRegularAndVerbatimInterpolatedString);
+    }
+
+    [Fact]
+    public async Task ConvertBetweenRegularAndVerbatimString_CodeBlock()
+    {
+        var input = """
+            @code
+            {
+                private string _x = @"h[||]ello world";
+            }
+            """;
+
+        var expected = """
+            @code
+            {
+                private string _x = "hello world";
+            }
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertBetweenRegularAndVerbatimString);
+    }
+
+    [Fact]
+    public async Task ConvertBetweenRegularAndVerbatimString_CodeBlock2()
+    {
+        var input = """
+            @code
+            {
+                private string _x = "h[||]ello\\nworld";
+            }
+            """;
+
+        var expected = """
+            @code
+            {
+                private string _x = @"hello\nworld";
+            }
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertBetweenRegularAndVerbatimString);
+    }
+
+    [Fact]
+    public async Task ConvertPlaceholderToInterpolatedString_CodeBlock()
+    {
+        var input = """
+            @code
+            {
+                private string _x = [|string.Format("hello{0}world", Environment.NewLine)|];
+            }
+            """;
+
+        var expected = """
+            @code
+            {
+                private string _x = $"hello{Environment.NewLine}world";
+            }
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertPlaceholderToInterpolatedString);
+    }
+
+    [Fact]
+    public async Task ConvertToInterpolatedString_CodeBlock()
+    {
+        var input = """
+            @code
+            {
+                private string _x = [||]"hello {";
+            }
+            """;
+
+        var expected = """
+            @code
+            {
+                private string _x = $"hello {{";
+            }
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.ConvertToInterpolatedString);
+    }
+
+    [Fact]
+    public async Task AddDebuggerDisplay()
+    {
+        var input = """
+            @code {
+                class Goo[||]
+                {
+                    
+                }
+            }
+            """;
+
+        var expected = """
+            @using System.Diagnostics
+            @code {
+                [DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
+                class Goo
+                {
+                    private string GetDebuggerDisplay()
+                    {
+                        return ToString();
+                    }
+                }
+            }
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeRefactoringProviderNames.AddDebuggerDisplay);
+    }
+
+    [Fact]
+    public async Task AddUsing()
+    {
+        var input = """
+            @code
+            {
+                private [||]StringBuilder _x = new StringBuilder();
+            }
+            """;
+
+        var expected = """
+            @using System.Text
+            @code
+            {
+                private StringBuilder _x = new StringBuilder();
+            }
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeFixProviderNames.AddImport);
+    }
+
+    [Fact]
+    public async Task AddUsing_WithExisting()
+    {
+        var input = """
+            @using System
+            @using System.Collections.Generic
+
+            @code
+            {
+                private [||]StringBuilder _x = new StringBuilder();
+            }
+            """;
+
+        var expected = """
+            @using System
+            @using System.Collections.Generic
+            @using System.Text
+
+            @code
+            {
+                private StringBuilder _x = new StringBuilder();
+            }
+            """;
+
+        await VerifyCodeActionAsync(input, expected, RazorPredefinedCodeFixProviderNames.AddImport);
+    }
+
+    [Fact]
+    public async Task GenerateEventHandler_NoCodeBlock()
+    {
+        var input = """
+            <button @onclick="{|CS0103:Does[||]NotExist|}"></button>
+            """;
+
+        var expected = """
+            <button @onclick="DoesNotExist"></button>
+            @code {
+                private void DoesNotExist(MouseEventArgs e)
+                {
+                    throw new NotImplementedException();
+                }
+            }
+            """;
+
+        await VerifyCodeActionAsync(input, expected, WorkspacesSR.FormatGenerate_Event_Handler_Title("DoesNotExist"));
+    }
+
+    [Fact]
+    public async Task GenerateEventHandler_CodeBlock()
+    {
+        var input = """
+            <button @onclick="{|CS0103:Does[||]NotExist|}"></button>
+
+            @code
+            {
+            }
+            """;
+
+        var expected = """
+            <button @onclick="DoesNotExist"></button>
+
+            @code
+            {
+                private void DoesNotExist(MouseEventArgs e)
+                {
+                    throw new NotImplementedException();
+                }
+            }
+            """;
+
+        await VerifyCodeActionAsync(input, expected, WorkspacesSR.FormatGenerate_Event_Handler_Title("DoesNotExist"));
+    }
+
+    [Fact]
+    public async Task GenerateAsyncEventHandler_NoCodeBlock()
+    {
+        var input = """
+            <button @onclick="{|CS0103:Does[||]NotExist|}"></button>
+            """;
+
+        var expected = """
+            <button @onclick="DoesNotExist"></button>
+            @code {
+                private Task DoesNotExist(MouseEventArgs e)
+                {
+                    throw new NotImplementedException();
+                }
+            }
+            """;
+
+        await VerifyCodeActionAsync(input, expected, WorkspacesSR.FormatGenerate_Async_Event_Handler_Title("DoesNotExist"));
+    }
+
+    [Fact]
+    public async Task GenerateAsyncEventHandler_CodeBlock()
+    {
+        var input = """
+            <button @onclick="{|CS0103:Does[||]NotExist|}"></button>
+
+            @code
+            {
+            }
+            """;
+
+        var expected = """
+            <button @onclick="DoesNotExist"></button>
+
+            @code
+            {
+                private Task DoesNotExist(MouseEventArgs e)
+                {
+                    throw new NotImplementedException();
+                }
+            }
+            """;
+
+        await VerifyCodeActionAsync(input, expected, WorkspacesSR.FormatGenerate_Async_Event_Handler_Title("DoesNotExist"));
+    }
+
+    [Fact]
+    public async Task ExtractToCodeBehind()
+    {
+        await VerifyCodeActionAsync(
+            input: """
+                <div></div>
+
+                @co[||]de
+                {
+                    private int x = 1;
+                }
+                """,
+            expected: """
+                <div></div>
+
+
+                """,
+            codeActionName: WorkspacesSR.ExtractTo_CodeBehind_Title,
+            additionalExpectedFiles: [
+                (FileUri("File1.razor.cs"), """
+                    namespace SomeProject
+                    {
+                        public partial class File1
+                        {
+                            private int x = 1;
+                        }
+                    }
+                    """)]);
+    }
+
+    [Fact]
+    public async Task ExtractToComponent()
+    {
+        await VerifyCodeActionAsync(
+            input: """
+                <div></div>
+
+                [|<div>
+                    Hello World
+                </div>|]
+
+                <div></div>
+                """,
+            expected: """
+                <div></div>
+
+                <Component />
+
+                <div></div>
+                """,
+            codeActionName: WorkspacesSR.ExtractTo_Component_Title,
+            additionalExpectedFiles: [
+                (FileUri("Component.razor"), """
+                    <div>
+                        Hello World
+                    </div>
+                    """)]);
+    }
+
+    private async Task VerifyCodeActionAsync(TestCode input, string? expected, string codeActionName, int childActionIndex = 0, string? fileKind = null, (Uri fileUri, string contents)[]? additionalExpectedFiles = null)
+    {
+        UpdateClientLSPInitializationOptions(options =>
+        {
+            options.ClientCapabilities.TextDocument = new()
+            {
+                CodeAction = new()
+                {
+                    ResolveSupport = new()
+                }
+            };
+
+            return options;
+        });
+
+        var document = await CreateProjectAndRazorDocumentAsync(input.Text, fileKind, createSeparateRemoteAndLocalWorkspaces: true);
+
+        var codeAction = await VerifyCodeActionRequestAsync(document, input, codeActionName, childActionIndex);
+
+        if (codeAction is null)
+        {
+            Assert.Null(expected);
+            return;
+        }
+
+        await VerifyCodeActionResolveAsync(document, codeAction, expected, additionalExpectedFiles);
+    }
+
+    private async Task<CodeAction?> VerifyCodeActionRequestAsync(CodeAnalysis.TextDocument document, TestCode input, string codeActionName, int childActionIndex)
+    {
+        var requestInvoker = new TestLSPRequestInvoker();
+        var endpoint = new CohostCodeActionsEndpoint(RemoteServiceInvoker, ClientCapabilitiesService, TestHtmlDocumentSynchronizer.Instance, requestInvoker, NoOpTelemetryReporter.Instance);
+        var inputText = await document.GetTextAsync(DisposalToken);
+
+        using var diagnostics = new PooledArrayBuilder<Diagnostic>();
+        foreach (var (code, spans) in input.NamedSpans)
+        {
+            if (code.Length == 0)
+            {
+                continue;
+            }
+
+            foreach (var diagnosticSpan in spans)
+            {
+                diagnostics.Add(new Diagnostic
+                {
+                    Code = code,
+                    Range = inputText.GetRange(diagnosticSpan)
+                });
+            }
+        }
+
+        var request = new VSCodeActionParams
+        {
+            TextDocument = new VSTextDocumentIdentifier { Uri = document.CreateUri() },
+            Range = inputText.GetRange(input.Span),
+            Context = new VSInternalCodeActionContext() { Diagnostics = diagnostics.ToArray() }
+        };
+
+        if (input.TryGetNamedSpans("selection", out var selectionSpans))
+        {
+            // Simulate VS range vs selection range
+            request.Context.SelectionRange = inputText.GetRange(selectionSpans.Single());
+        }
+
+        var result = await endpoint.GetTestAccessor().HandleRequestAsync(document, request, DisposalToken);
+
+        if (result is null)
+        {
+            return null;
+        }
+
+        Assert.NotNull(result);
+        Assert.NotEmpty(result);
+
+        var codeActionToRun = (VSInternalCodeAction?)result.SingleOrDefault(e => ((RazorVSInternalCodeAction)e.Value!).Name == codeActionName || ((RazorVSInternalCodeAction)e.Value!).Title == codeActionName).Value;
+        Assert.NotNull(codeActionToRun);
+
+        if (codeActionToRun.Children?.Length > 0)
+        {
+            codeActionToRun = codeActionToRun.Children[childActionIndex];
+        }
+
+        Assert.NotNull(codeActionToRun);
+        return codeActionToRun;
+    }
+
+    private async Task VerifyCodeActionResolveAsync(CodeAnalysis.TextDocument document, CodeAction codeAction, string? expected, (Uri fileUri, string contents)[]? additionalExpectedFiles = null)
+    {
+        var requestInvoker = new TestLSPRequestInvoker();
+        var clientSettingsManager = new ClientSettingsManager(changeTriggers: []);
+
+        var endpoint = new CohostCodeActionsResolveEndpoint(RemoteServiceInvoker, ClientCapabilitiesService, clientSettingsManager, TestHtmlDocumentSynchronizer.Instance, requestInvoker);
+
+        var result = await endpoint.GetTestAccessor().HandleRequestAsync(document, codeAction, DisposalToken);
+
+        Assert.NotNull(result?.Edit);
+
+        var workspaceEdit = result.Edit;
+        Assert.True(workspaceEdit.TryGetTextDocumentEdits(out var documentEdits));
+
+        var documentUri = document.CreateUri();
+        var sourceText = await document.GetTextAsync(DisposalToken).ConfigureAwait(false);
+
+        foreach (var edit in documentEdits)
+        {
+            if (edit.TextDocument.Uri == documentUri)
+            {
+                sourceText = sourceText.WithChanges(edit.Edits.Select(sourceText.GetTextChange));
+            }
+            else
+            {
+                var contents = Assert.Single(additionalExpectedFiles.AssumeNotNull(), f => f.fileUri == edit.TextDocument.Uri).contents;
+                AssertEx.EqualOrDiff(contents, Assert.Single(edit.Edits).NewText);
+            }
+        }
+
+        AssertEx.EqualOrDiff(expected, sourceText.ToString());
+    }
+}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTest.cs
index f25bf85c9c2..51093a9d438 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTest.cs
@@ -16,15 +16,13 @@
 using Microsoft.VisualStudio.LanguageServer.Client;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor;
-using Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Threading;
 using Newtonsoft.Json.Linq;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace Microsoft.VisualStudio.LanguageServices.Razor.Test.Cohost;
+namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
 
 public class CohostEndpointTest(ITestOutputHelper testOutputHelper) : ToolingTestBase(testOutputHelper)
 {
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTestBase.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTestBase.cs
index 2324705db0f..ee6e6d60775 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTestBase.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTestBase.cs
@@ -20,6 +20,7 @@
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Composition;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
@@ -36,7 +37,7 @@ public abstract class CohostEndpointTestBase(ITestOutputHelper testOutputHelper)
     private protected TestRemoteServiceInvoker RemoteServiceInvoker => _remoteServiceInvoker.AssumeNotNull();
     private protected IFilePathService FilePathService => _filePathService.AssumeNotNull();
     private protected RemoteLanguageServerFeatureOptions FeatureOptions => OOPExportProvider.GetExportedValue<RemoteLanguageServerFeatureOptions>();
-    private protected RemoteClientCapabilitiesService ClientCapabilities => OOPExportProvider.GetExportedValue<RemoteClientCapabilitiesService>();
+    private protected RemoteClientCapabilitiesService ClientCapabilitiesService => OOPExportProvider.GetExportedValue<RemoteClientCapabilitiesService>();
     private protected RemoteSemanticTokensLegendService SemanticTokensLegendService => OOPExportProvider.GetExportedValue<RemoteSemanticTokensLegendService>();
 
     /// <summary>
@@ -50,7 +51,19 @@ protected override async Task InitializeAsync()
 
         // Create a new isolated MEF composition.
         // Note that this uses a cached catalog and configuration for performance.
-        _exportProvider = await RemoteMefComposition.CreateExportProviderAsync(DisposalToken);
+        try
+        {
+            _exportProvider = await RemoteMefComposition.CreateExportProviderAsync(DisposalToken);
+        }
+        catch (CompositionFailedException ex) when (ex.Errors is not null)
+        {
+            Assert.Fail($"""
+                Errors in the Remote MEF composition:
+
+                {string.Join(Environment.NewLine, ex.Errors.SelectMany(e => e).Select(e => e.Message))}
+                """);
+        }
+
         AddDisposable(_exportProvider);
 
         _remoteServiceInvoker = new TestRemoteServiceInvoker(JoinableTaskContext, _exportProvider, LoggerFactory);
@@ -64,7 +77,9 @@ protected override async Task InitializeAsync()
             UsePreciseSemanticTokenRanges = false,
             UseRazorCohostServer = true,
             ReturnCodeActionAndRenamePathsWithPrefixedSlash = false,
-            ForceRuntimeCodeGeneration = false
+            ForceRuntimeCodeGeneration = false,
+            SupportsFileManipulation = true,
+            ShowAllCSharpCodeActions = false,
         };
         UpdateClientInitializationOptions(c => c);
 
@@ -110,7 +125,7 @@ private protected void UpdateClientInitializationOptions(Func<RemoteClientInitia
     private protected void UpdateClientLSPInitializationOptions(Func<RemoteClientLSPInitializationOptions, RemoteClientLSPInitializationOptions> mutation)
     {
         _clientLSPInitializationOptions = mutation(_clientLSPInitializationOptions);
-        ClientCapabilities.SetCapabilities(_clientLSPInitializationOptions.ClientCapabilities);
+        ClientCapabilitiesService.SetCapabilities(_clientLSPInitializationOptions.ClientCapabilities);
         SemanticTokensLegendService.SetLegend(_clientLSPInitializationOptions.TokenTypes, _clientLSPInitializationOptions.TokenModifiers);
     }
 
@@ -251,4 +266,10 @@ @using Microsoft.AspNetCore.Components.Web
 
         return solution.GetAdditionalDocument(documentId).AssumeNotNull();
     }
+
+    protected static Uri FileUri(string projectRelativeFileName)
+        => new(FilePath(projectRelativeFileName));
+
+    protected static string FilePath(string projectRelativeFileName)
+        => Path.Combine(TestProjectData.SomeProjectPath, projectRelativeFileName);
 }
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs
index 6e1af1d4f06..978461b744c 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs
@@ -2,11 +2,9 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System;
-using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Testing;
@@ -81,7 +79,7 @@ The end.
                 """,
             additionalFiles: [
                 // The source generator isn't hooked up to our test project, so we have to manually "compile" the razor file
-                (File("Component.cs"), """
+                (FilePath("Component.cs"), """
                     namespace SomeProject;
 
                     public class Component : Microsoft.AspNetCore.Components.ComponentBase
@@ -89,7 +87,7 @@ public class Component : Microsoft.AspNetCore.Components.ComponentBase
                     }
                     """),
                 // The above will make the component exist, but the .razor file needs to exist too for Uri presentation
-                (File("Component.razor"), "")
+                (FilePath("Component.razor"), "")
             ],
             newName: "DifferentName",
             expected: """
@@ -138,7 +136,7 @@ The end.
                 """,
             additionalFiles: [
                 // The source generator isn't hooked up to our test project, so we have to manually "compile" the razor file
-                (File("Component.cs"), """
+                (FilePath("Component.cs"), """
                     namespace SomeProject;
 
                     public class Component : Microsoft.AspNetCore.Components.ComponentBase
@@ -146,7 +144,7 @@ public class Component : Microsoft.AspNetCore.Components.ComponentBase
                     }
                     """),
                 // The above will make the component exist, but the .razor file needs to exist too for Uri presentation
-                (File("Component.razor"), "")
+                (FilePath("Component.razor"), "")
             ],
             newName: "DifferentName",
             expected: """
@@ -181,7 +179,7 @@ The end.
                 """,
            additionalFiles: [
                // The source generator isn't hooked up to our test project, so we have to manually "compile" the razor file
-               (File("Component.cs"), """
+               (FilePath("Component.cs"), """
                     namespace SomeProject;
 
                     public class Component : Microsoft.AspNetCore.Components.ComponentBase
@@ -189,7 +187,7 @@ public class Component : Microsoft.AspNetCore.Components.ComponentBase
                     }
                     """),
                 // The above will make the component exist, but the .razor file needs to exist too for Uri presentation
-                (File("Component.razor"), "")
+                (FilePath("Component.razor"), "")
            ],
            newName: "DifferentName",
            expected: "",
@@ -260,7 +258,4 @@ private static string ProcessRazorDocumentEdits(SourceText inputText, Uri razorD
 
         return inputText.ToString();
     }
-
-    private static string File(string projectRelativeFileName)
-        => Path.Combine(TestProjectData.SomeProjectPath, projectRelativeFileName);
 }
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs
index be4fe9f5f05..2b7e7a4ee0d 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs
@@ -8,9 +8,7 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.Semantic;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.AspNetCore.Razor.Telemetry;
-using Microsoft.CodeAnalysis.Razor.SemanticTokens;
 using Microsoft.CodeAnalysis.Razor.Settings;
-using Microsoft.CodeAnalysis.Remote.Razor.SemanticTokens;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Razor.Settings;
 using Microsoft.VisualStudio.Utilities;
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostTextPresentationEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostTextPresentationEndpointTest.cs
index f2a4acc5b67..ea74eafd7f7 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostTextPresentationEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostTextPresentationEndpointTest.cs
@@ -1,10 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-using System;
-using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 using Microsoft.CodeAnalysis.Testing;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
@@ -46,12 +43,6 @@ The end.
             expected: "Hello World");
     }
 
-    private static Uri FileUri(string projectRelativeFileName)
-        => new(File(projectRelativeFileName));
-
-    private static string File(string projectRelativeFileName)
-        => Path.Combine(TestProjectData.SomeProjectPath, projectRelativeFileName);
-
     private async Task VerifyUriPresentationAsync(string input, string text, string? expected, WorkspaceEdit? htmlResponse = null)
     {
         TestFileMarkupParser.GetSpan(input, out input, out var span);
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs
index 68b3be9565a..b2dfa448899 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs
@@ -2,9 +2,7 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System;
-using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 using Microsoft.CodeAnalysis.Testing;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
@@ -83,7 +81,7 @@ The end.
                 """,
             additionalFiles: [
                 // The source generator isn't hooked up to our test project, so we have to manually "compile" the razor file
-                (File("Component.cs"), """
+                (FilePath("Component.cs"), """
                     namespace SomeProject;
 
                     public class Component : Microsoft.AspNetCore.Components.ComponentBase
@@ -91,7 +89,7 @@ public class Component : Microsoft.AspNetCore.Components.ComponentBase
                     }
                     """),
                 // The above will make the component exist, but the .razor file needs to exist too for Uri presentation
-                (File("Component.razor"), "")
+                (FilePath("Component.razor"), "")
             ],
             uris: [FileUri("Component.razor")],
             expected: "<Component />");
@@ -111,7 +109,7 @@ This is a Razor document.
                 The end.
                 """,
             additionalFiles: [
-                (File("_Imports.razor"), "")
+                (FilePath("_Imports.razor"), "")
             ],
             uris: [FileUri("_Imports.razor")],
             expected: null);
@@ -167,14 +165,14 @@ This is a Razor document.
                 }
                 """,
             additionalFiles: [
-                (File("Component.cs"), """
+                (FilePath("Component.cs"), """
                     namespace SomeProject;
 
                     public class Component : Microsoft.AspNetCore.Components.ComponentBase
                     {
                     }
                     """),
-                (File("Component.razor"), "")
+                (FilePath("Component.razor"), "")
             ],
             uris: [FileUri("Component.razor")],
             expected: null);
@@ -194,14 +192,14 @@ This is a Razor document.
                 The end.
                 """,
             additionalFiles: [
-                (File("Component.cs"), """
+                (FilePath("Component.cs"), """
                     namespace SomeProject;
 
                     public class Component : Microsoft.AspNetCore.Components.ComponentBase
                     {
                     }
                     """),
-                (File("Component.razor"), "")
+                (FilePath("Component.razor"), "")
             ],
             uris: [
                 FileUri("Component.razor"),
@@ -225,14 +223,14 @@ This is a Razor document.
                 The end.
                 """,
             additionalFiles: [
-                (File("Component.cs"), """
+                (FilePath("Component.cs"), """
                     namespace SomeProject;
 
                     public class Component : Microsoft.AspNetCore.Components.ComponentBase
                     {
                     }
                     """),
-                (File("Component.razor"), "")
+                (FilePath("Component.razor"), "")
             ],
             uris: [
                 FileUri("Component.razor.css"),
@@ -256,7 +254,7 @@ This is a Razor document.
                 The end.
                 """,
             additionalFiles: [
-                (File("Component.cs"), """
+                (FilePath("Component.cs"), """
                     using Microsoft.AspNetCore.Components;
 
                     namespace SomeProject;
@@ -271,18 +269,12 @@ public class Component : ComponentBase
                         public string NormalParameter { get; set; }
                     }
                     """),
-                (File("Component.razor"), "")
+                (FilePath("Component.razor"), "")
             ],
             uris: [FileUri("Component.razor")],
             expected: """<Component RequiredParameter="" />""");
     }
 
-    private static Uri FileUri(string projectRelativeFileName)
-        => new(File(projectRelativeFileName));
-
-    private static string File(string projectRelativeFileName)
-        => Path.Combine(TestProjectData.SomeProjectPath, projectRelativeFileName);
-
     private async Task VerifyUriPresentationAsync(string input, Uri[] uris, string? expected, WorkspaceEdit? htmlResponse = null, (string fileName, string contents)[]? additionalFiles = null)
     {
         TestFileMarkupParser.GetSpan(input, out input, out var span);