From 56c960238a50b9613d094f25810b07853bf1baaf Mon Sep 17 00:00:00 2001
From: Tomas Matousek <tomat@microsoft.com>
Date: Tue, 8 Sep 2020 16:29:36 -0700
Subject: [PATCH] Rename brokered services

---
 eng/targets/Services.props | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/eng/targets/Services.props b/eng/targets/Services.props
index 776bb5b795f48..40ae7454315c9 100644
--- a/eng/targets/Services.props
+++ b/eng/targets/Services.props
@@ -7,17 +7,19 @@
     Used to generate 
     1) {service-name}.servicehub.service.json files included in Roslyn setup VSIX and in ServiceHub install directory.
     2) ServiceHub brokered service registrations in pkgdef file.
+
+    Note that brokered services must be defined in Microsoft.VisualStudio service namespace in order to be considered first party.
   -->
   <ItemGroup>
     <ServiceHubService Include="roslynCodeAnalysis" ClassName="Microsoft.CodeAnalysis.Remote.CodeAnalysisService" />
     <ServiceHubService Include="roslynRemoteHost" ClassName="Microsoft.CodeAnalysis.Remote.RemoteHostService" />
-    <ServiceHubService Include="roslynRemoteDiagnosticAnalyzerService" ClassName="Microsoft.CodeAnalysis.Remote.RemoteDiagnosticAnalyzerService+Factory" IsBrokered="true" />
-    <ServiceHubService Include="roslynRemoteSemanticClassificationService" ClassName="Microsoft.CodeAnalysis.Remote.RemoteSemanticClassificationService+Factory" IsBrokered="true" />
-    <ServiceHubService Include="roslynRemoteSemanticClassificationCacheService" ClassName="Microsoft.CodeAnalysis.Remote.RemoteSemanticClassificationCacheService+Factory" IsBrokered="true" />
-    <ServiceHubService Include="roslynRemoteDesignerAttributeService" ClassName="Microsoft.CodeAnalysis.Remote.RemoteDesignerAttributeService+Factory" IsBrokered="true" />
-    <ServiceHubService Include="roslynRemoteProjectTelemetryService" ClassName="Microsoft.CodeAnalysis.Remote.RemoteProjectTelemetryService+Factory" IsBrokered="true" />
+    <ServiceHubService Include="Microsoft.VisualStudio.DiagnosticAnalyzer" ClassName="Microsoft.CodeAnalysis.Remote.RemoteDiagnosticAnalyzerService+Factory" IsBrokered="true" />
+    <ServiceHubService Include="Microsoft.VisualStudio.SemanticClassification" ClassName="Microsoft.CodeAnalysis.Remote.RemoteSemanticClassificationService+Factory" IsBrokered="true" />
+    <ServiceHubService Include="Microsoft.VisualStudio.SemanticClassificationCache" ClassName="Microsoft.CodeAnalysis.Remote.RemoteSemanticClassificationCacheService+Factory" IsBrokered="true" />
+    <ServiceHubService Include="Microsoft.VisualStudio.DesignerAttribute" ClassName="Microsoft.CodeAnalysis.Remote.RemoteDesignerAttributeService+Factory" IsBrokered="true" />
+    <ServiceHubService Include="Microsoft.VisualStudio.ProjectTelemetry" ClassName="Microsoft.CodeAnalysis.Remote.RemoteProjectTelemetryService+Factory" IsBrokered="true" />
     <ServiceHubService Include="roslynRemoteSymbolSearchUpdateEngine" ClassName="Microsoft.CodeAnalysis.Remote.RemoteSymbolSearchUpdateEngine" />
-    <ServiceHubService Include="roslynRemoteTodoCommentsService" ClassName="Microsoft.CodeAnalysis.Remote.RemoteTodoCommentsService+Factory" IsBrokered="true" />
+    <ServiceHubService Include="Microsoft.VisualStudio.TodoComments" ClassName="Microsoft.CodeAnalysis.Remote.RemoteTodoCommentsService+Factory" IsBrokered="true" />
     <ServiceHubService Include="roslynLanguageServer" ClassName="Microsoft.CodeAnalysis.Remote.LanguageServer" />
   </ItemGroup>