Revert and comment

dotnet · Jul 17, 2024 · 7fc8a12 · 7fc8a12
1 parent d0142ac
commit 7fc8a12
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/...Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Workspaces/WorkspaceTestBase.cs b/...Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Workspaces/WorkspaceTestBase.cs
@@ -88,17 +88,7 @@ private void EnsureInitialized()
             Configure = ConfigureProjectEngine,
         };
 
-        var assemblies = MefHostServices.DefaultAssemblies
-            // Uncomment to fail on JoinableTaskContext instead of a Lazy<IPythia...>!
-                //.AddRange(
-                //    Assembly.LoadFrom("Microsoft.CodeAnalysis.dll"),
-                //    Assembly.LoadFrom("Microsoft.CodeAnalysis.CSharp.EditorFeatures.dll"),
-                //    Assembly.LoadFrom("Microsoft.CodeAnalysis.EditorFeatures.dll"),
-                //    Assembly.LoadFrom("Microsoft.CodeAnalysis.ExternalAccess.Razor.dll"),
-                //    Assembly.LoadFrom("Microsoft.CodeAnalysis.LanguageServer.Protocol.dll"))
-            ;
-
-        _hostServices = MefHostServices.Create(assemblies);
+        _hostServices = MefHostServices.DefaultHost;
         _workspace = TestWorkspace.Create(_hostServices, ConfigureWorkspace);
         AddDisposable(_workspace);
         _workspaceProvider = new TestWorkspaceProvider(_workspace);

diff --git a/.../test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTestBase.cs b/.../test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTestBase.cs
@@ -86,7 +86,10 @@ protected TextDocument CreateProjectAndRazorDocument(string contents, string? fi
                 documentFilePath)
             .WithMetadataReferences(AspNet80.ReferenceInfos.All.Select(r => r.Reference));
 
-        var solution = RemoteWorkspaceAccessor.GetWorkspace().CurrentSolution.AddProject(projectInfo);
+        // Importantly, we use Roslyns remote workspace here so that when our OOP services call into Roslyn, their code
+        // will be able to access their services.
+        var workspace = RemoteWorkspaceAccessor.GetWorkspace();
+        var solution = workspace.CurrentSolution.AddProject(projectInfo);
 
         solution = solution
             .AddAdditionalDocument(