From 7ba0689f60d588f3574c22346ca649768b8a9903 Mon Sep 17 00:00:00 2001
From: Tomas Matousek <tomat@microsoft.com>
Date: Tue, 14 Jan 2025 13:14:36 -0800
Subject: [PATCH 1/3] IServiceBrokerProvider

---
 ...crosoft.CodeAnalysis.EditorFeatures.csproj |  5 +++-
 .../ServiceBrokerProvider.cs                  |  7 ++---
 ...isualStudio.LanguageServices.DevKit.csproj |  6 -----
 .../Remote/Core/IServiceBrokerProvider.cs     | 12 +++++++++
 ...oker.cs => RemoteServiceBrokerProvider.cs} | 26 ++++++-------------
 ...soft.CodeAnalysis.Remote.ServiceHub.csproj |  4 ---
 .../BrokeredServiceBase.FactoryBase.cs        |  2 +-
 7 files changed, 27 insertions(+), 35 deletions(-)
 rename src/{Workspaces/Remote/Core => LanguageServer/Microsoft.CodeAnalysis.LanguageServer/BrokeredServices}/ServiceBrokerProvider.cs (91%)
 create mode 100644 src/Workspaces/Remote/Core/IServiceBrokerProvider.cs
 rename src/Workspaces/Remote/ServiceHub/Host/{IGlobalServiceBroker.cs => RemoteServiceBrokerProvider.cs} (53%)

diff --git a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
index 4c73a2c02380e..0d1bf87e852d7 100644
--- a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
+++ b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
@@ -31,11 +31,11 @@
     <PackageReference Include="Microsoft.VisualStudio.ImageCatalog" />
     <PackageReference Include="Microsoft.VisualStudio.Language" />
     <PackageReference Include="Microsoft.VisualStudio.LanguageServer.Client" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.ServiceHub.Client" />
     <PackageReference Include="Microsoft.VisualStudio.Debugger.Contracts" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\Compilers\Core\Portable\InternalUtilities\IsExternalInit.cs" Link="Utilities\IsExternalInit.cs" />
+    <Compile Include="..\..\LanguageServer\Microsoft.CodeAnalysis.LanguageServer\BrokeredServices\ServiceBrokerProvider.cs" Link="BrokeredServices\ServiceBrokerProvider.cs" />
   </ItemGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)" LoadsWithinVisualStudio="false" />
@@ -101,4 +101,7 @@
     <PublicAPI Include="PublicAPI.Shipped.txt" />
     <PublicAPI Include="PublicAPI.Unshipped.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="BrokeredServices\" />
+  </ItemGroup>
 </Project>
diff --git a/src/Workspaces/Remote/Core/ServiceBrokerProvider.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/BrokeredServices/ServiceBrokerProvider.cs
similarity index 91%
rename from src/Workspaces/Remote/Core/ServiceBrokerProvider.cs
rename to src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/BrokeredServices/ServiceBrokerProvider.cs
index 474f047ac9dbe..3714f03a9e03d 100644
--- a/src/Workspaces/Remote/Core/ServiceBrokerProvider.cs
+++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/BrokeredServices/ServiceBrokerProvider.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#pragma warning disable RS0030 // Do not use banned APIs (MEFv1)
+
 using System;
 using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Host.Mef;
@@ -10,11 +12,6 @@
 
 namespace Microsoft.CodeAnalysis.BrokeredServices;
 
-internal interface IServiceBrokerProvider
-{
-    IServiceBroker ServiceBroker { get; }
-}
-
 /// <summary>
 /// MEF service that can be used to fetch an <see cref="IServiceBroker"/> instance without having to use legacy MEF imports.
 /// </summary>
diff --git a/src/VisualStudio/DevKit/Impl/Microsoft.VisualStudio.LanguageServices.DevKit.csproj b/src/VisualStudio/DevKit/Impl/Microsoft.VisualStudio.LanguageServices.DevKit.csproj
index 4c7df6f74a51e..6a3b2eae473fa 100644
--- a/src/VisualStudio/DevKit/Impl/Microsoft.VisualStudio.LanguageServices.DevKit.csproj
+++ b/src/VisualStudio/DevKit/Impl/Microsoft.VisualStudio.LanguageServices.DevKit.csproj
@@ -22,15 +22,9 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\LanguageServer\Microsoft.CodeAnalysis.LanguageServer\Microsoft.CodeAnalysis.LanguageServer.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\..\..\Workspaces\Remote\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Composition" />
-    <PackageReference Include="Microsoft.ServiceHub.Framework" />
-
     <!-- 
     Additional runtime dependencies that we must include in the NuGet package as they are not a part of the main language server package.
     Do not remove GeneratePathProperty="True" as it is required below to add the package to the package we generate.
diff --git a/src/Workspaces/Remote/Core/IServiceBrokerProvider.cs b/src/Workspaces/Remote/Core/IServiceBrokerProvider.cs
new file mode 100644
index 0000000000000..35337a264bb10
--- /dev/null
+++ b/src/Workspaces/Remote/Core/IServiceBrokerProvider.cs
@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.ServiceHub.Framework;
+
+namespace Microsoft.CodeAnalysis.BrokeredServices;
+
+internal interface IServiceBrokerProvider
+{
+    IServiceBroker ServiceBroker { get; }
+}
diff --git a/src/Workspaces/Remote/ServiceHub/Host/IGlobalServiceBroker.cs b/src/Workspaces/Remote/ServiceHub/Host/RemoteServiceBrokerProvider.cs
similarity index 53%
rename from src/Workspaces/Remote/ServiceHub/Host/IGlobalServiceBroker.cs
rename to src/Workspaces/Remote/ServiceHub/Host/RemoteServiceBrokerProvider.cs
index 5015459c30384..0a77ef7d1abfb 100644
--- a/src/Workspaces/Remote/ServiceHub/Host/IGlobalServiceBroker.cs
+++ b/src/Workspaces/Remote/ServiceHub/Host/RemoteServiceBrokerProvider.cs
@@ -5,40 +5,30 @@
 using System;
 using System.Composition;
 using System.Threading;
+using Microsoft.CodeAnalysis.BrokeredServices;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.ServiceHub.Framework;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Remote.Host;
 
-internal interface IGlobalServiceBroker
-{
-    IServiceBroker Instance { get; }
-}
-
 /// <summary>
-/// Hacky way to expose a <see cref="IServiceBroker"/> to workspace services that expect there to be a global
-/// singleton (like in visual studio).  Effectively the first service that gets called into will record its
-/// broker here for these services to use.
+/// Exposes a <see cref="IServiceBroker"/> to services that expect there to be a global singleton.
+/// The first remote service that gets called into will record its broker here.
 /// </summary>
-// Note: this Export is only so MEF picks up the exported member internally.
-[Export(typeof(IGlobalServiceBroker)), Shared]
-internal class GlobalServiceBroker : IGlobalServiceBroker
+[Export(typeof(IServiceBrokerProvider)), Shared]
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal sealed class RemoteServiceBrokerProvider() : IServiceBrokerProvider
 {
     private static IServiceBroker? s_instance;
 
-    [ImportingConstructor]
-    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public GlobalServiceBroker()
-    {
-    }
-
     public static void RegisterServiceBroker(IServiceBroker serviceBroker)
     {
         Interlocked.CompareExchange(ref s_instance, serviceBroker, null);
     }
 
-    public IServiceBroker Instance
+    public IServiceBroker ServiceBroker
     {
         get
         {
diff --git a/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj b/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj
index 0e4ce0cb1d1ac..10b5b49c28122 100644
--- a/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj
+++ b/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj
@@ -23,10 +23,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Telemetry" />
     <PackageReference Include="Microsoft.VisualStudio.RpcContracts" />
-
-    <!-- TODO: remove https://github.com/dotnet/roslyn/issues/71374 -->
-    <PackageReference Include="Microsoft.ServiceHub.Framework" />
-    <PackageReference Include="Microsoft.ServiceHub.Client" />
   </ItemGroup>
   <ItemGroup>
     <PublicAPI Include="PublicAPI.Shipped.txt" />
diff --git a/src/Workspaces/Remote/ServiceHub/Services/BrokeredServiceBase.FactoryBase.cs b/src/Workspaces/Remote/ServiceHub/Services/BrokeredServiceBase.FactoryBase.cs
index 905ef1fcd1120..acea0f21b289f 100644
--- a/src/Workspaces/Remote/ServiceHub/Services/BrokeredServiceBase.FactoryBase.cs
+++ b/src/Workspaces/Remote/ServiceHub/Services/BrokeredServiceBase.FactoryBase.cs
@@ -94,7 +94,7 @@ internal TService Create(
         {
             // Register this service broker globally (if it's the first we encounter) so it can be used by other
             // global services that need it.
-            GlobalServiceBroker.RegisterServiceBroker(serviceBroker);
+            RemoteServiceBrokerProvider.RegisterServiceBroker(serviceBroker);
 
             var descriptor = ServiceDescriptors.Instance.GetServiceDescriptorForServiceFactory(typeof(TService));
             var serviceHubTraceSource = (TraceSource?)hostProvidedServices.GetService(typeof(TraceSource));

From c90a3d03326f1c613b7d15377d69673c2932a815 Mon Sep 17 00:00:00 2001
From: tmat <tomas.matousek@microsoft.com>
Date: Wed, 15 Jan 2025 18:57:32 -0800
Subject: [PATCH 2/3] FIx

---
 .../EditAndContinueLanguageServiceTests.cs               | 5 ++++-
 .../BrokeredServices/ServiceBrokerProvider.cs            | 9 +++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/EditorFeatures/Test/EditAndContinue/EditAndContinueLanguageServiceTests.cs b/src/EditorFeatures/Test/EditAndContinue/EditAndContinueLanguageServiceTests.cs
index eaf50833afbf7..8398039f50f26 100644
--- a/src/EditorFeatures/Test/EditAndContinue/EditAndContinueLanguageServiceTests.cs
+++ b/src/EditorFeatures/Test/EditAndContinue/EditAndContinueLanguageServiceTests.cs
@@ -46,6 +46,7 @@ private static string Inspect(DebuggerContracts.ManagedHotReloadDiagnostic d)
     private TestWorkspace CreateEditorWorkspace(out Solution solution, out EditAndContinueService service, out EditAndContinueLanguageService languageService, Type[] additionalParts = null)
     {
         var composition = EditorTestCompositions.EditorFeatures
+            .AddExcludedPartTypes(typeof(ServiceBrokerProvider))
             .AddParts(
                 typeof(MockHostWorkspaceProvider),
                 typeof(MockManagedHotReloadService),
@@ -87,7 +88,9 @@ private class TestSourceTextContainer : SourceTextContainer
     public async Task Test(bool commitChanges)
     {
         var localComposition = EditorTestCompositions.LanguageServerProtocolEditorFeatures
-            .AddExcludedPartTypes(typeof(EditAndContinueService))
+            .AddExcludedPartTypes(
+                typeof(EditAndContinueService),
+                typeof(ServiceBrokerProvider))
             .AddParts(
                 typeof(NoCompilationLanguageService),
                 typeof(MockHostWorkspaceProvider),
diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/BrokeredServices/ServiceBrokerProvider.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/BrokeredServices/ServiceBrokerProvider.cs
index 3714f03a9e03d..e66f12ddd7826 100644
--- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/BrokeredServices/ServiceBrokerProvider.cs
+++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/BrokeredServices/ServiceBrokerProvider.cs
@@ -2,23 +2,20 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#pragma warning disable RS0030 // Do not use banned APIs (MEFv1)
-
 using System;
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.ServiceHub.Framework;
-using Microsoft.VisualStudio.Shell.ServiceBroker;
 
 namespace Microsoft.CodeAnalysis.BrokeredServices;
 
 /// <summary>
 /// MEF service that can be used to fetch an <see cref="IServiceBroker"/> instance without having to use legacy MEF imports.
 /// </summary>
-[Export(typeof(IServiceBrokerProvider))]
+[Export(typeof(IServiceBrokerProvider)), Shared]
 [method: ImportingConstructor]
 [method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-internal sealed class ServiceBrokerProvider([Import(typeof(SVsFullAccessServiceBroker))] IServiceBroker serviceBroker) : IServiceBrokerProvider
+internal sealed class ServiceBrokerProvider([Import("Microsoft.VisualStudio.Shell.ServiceBroker.SVsFullAccessServiceBroker")] IServiceBroker serviceBroker) : IServiceBrokerProvider
 {
     public IServiceBroker ServiceBroker { get; } = serviceBroker;
 }

From 26256f5b758bfad1cddf909838831deb49f6122e Mon Sep 17 00:00:00 2001
From: Tomas Matousek <tomat@microsoft.com>
Date: Thu, 16 Jan 2025 10:56:33 -0800
Subject: [PATCH 3/3] MEFV1

---
 .../BrokeredServices/ServiceBrokerProvider.cs            | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/BrokeredServices/ServiceBrokerProvider.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/BrokeredServices/ServiceBrokerProvider.cs
index e66f12ddd7826..3714f03a9e03d 100644
--- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/BrokeredServices/ServiceBrokerProvider.cs
+++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/BrokeredServices/ServiceBrokerProvider.cs
@@ -2,20 +2,23 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#pragma warning disable RS0030 // Do not use banned APIs (MEFv1)
+
 using System;
-using System.Composition;
+using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.ServiceHub.Framework;
+using Microsoft.VisualStudio.Shell.ServiceBroker;
 
 namespace Microsoft.CodeAnalysis.BrokeredServices;
 
 /// <summary>
 /// MEF service that can be used to fetch an <see cref="IServiceBroker"/> instance without having to use legacy MEF imports.
 /// </summary>
-[Export(typeof(IServiceBrokerProvider)), Shared]
+[Export(typeof(IServiceBrokerProvider))]
 [method: ImportingConstructor]
 [method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-internal sealed class ServiceBrokerProvider([Import("Microsoft.VisualStudio.Shell.ServiceBroker.SVsFullAccessServiceBroker")] IServiceBroker serviceBroker) : IServiceBrokerProvider
+internal sealed class ServiceBrokerProvider([Import(typeof(SVsFullAccessServiceBroker))] IServiceBroker serviceBroker) : IServiceBrokerProvider
 {
     public IServiceBroker ServiceBroker { get; } = serviceBroker;
 }