From d2a7c26309192ff42d7b80717609cb95f633aae3 Mon Sep 17 00:00:00 2001
From: Heejae Chang <heejaechang@outlook.com>
Date: Wed, 24 Jan 2018 16:31:58 -0800
Subject: [PATCH] Renamed roslyn servicehub service names (#24392)

* changed our service name to include roslyn.

it is asked from service hub team so that they can more easily identify which team owns which service.

* update devdiv insertion tool for the renames.
---
 .../BuildDevDivInsertionFiles.vb                 | 16 ++++++++--------
 src/VisualStudio/Setup/VisualStudioSetup.csproj  | 16 ++++++++--------
 ...> roslynCodeAnalysis.servicehub.service.json} |  0
 ...roslynCodeAnalysis64.servicehub.service.json} |  0
 ... => roslynRemoteHost.servicehub.service.json} |  0
 ...> roslynRemoteHost64.servicehub.service.json} |  0
 ...olSearchUpdateEngine.servicehub.service.json} |  0
 ...SearchUpdateEngine64.servicehub.service.json} |  0
 ...on => roslynSnapshot.servicehub.service.json} |  0
 ... => roslynSnapshot64.servicehub.service.json} |  0
 .../Setup/source.extension.vsixmanifest          | 16 ++++++++--------
 .../Remote/WellKnownRemoteHostServices.cs        |  4 ++--
 .../Remote/WellKnownServiceHubServices.cs        | 12 ++++++------
 13 files changed, 32 insertions(+), 32 deletions(-)
 rename src/VisualStudio/Setup/{codeAnalysisService.servicehub.service.json => roslynCodeAnalysis.servicehub.service.json} (100%)
 rename src/VisualStudio/Setup/{codeAnalysisService64.servicehub.service.json => roslynCodeAnalysis64.servicehub.service.json} (100%)
 rename src/VisualStudio/Setup/{remoteHostService.servicehub.service.json => roslynRemoteHost.servicehub.service.json} (100%)
 rename src/VisualStudio/Setup/{remoteHostService64.servicehub.service.json => roslynRemoteHost64.servicehub.service.json} (100%)
 rename src/VisualStudio/Setup/{remoteSymbolSearchUpdateEngine.servicehub.service.json => roslynRemoteSymbolSearchUpdateEngine.servicehub.service.json} (100%)
 rename src/VisualStudio/Setup/{remoteSymbolSearchUpdateEngine64.servicehub.service.json => roslynRemoteSymbolSearchUpdateEngine64.servicehub.service.json} (100%)
 rename src/VisualStudio/Setup/{snapshotService.servicehub.service.json => roslynSnapshot.servicehub.service.json} (100%)
 rename src/VisualStudio/Setup/{snapshotService64.servicehub.service.json => roslynSnapshot64.servicehub.service.json} (100%)

diff --git a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
index 37985f27f54..80ee78debd7 100644
--- a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
+++ b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
@@ -74,14 +74,14 @@ Public Class BuildDevDivInsertionFiles
         "Newtonsoft.Json.dll",
         "StreamJsonRpc.dll",
         "StreamJsonRpc.resources.dll",
-        "codeAnalysisService.servicehub.service.json",
-        "remoteHostService.servicehub.service.json",
-        "snapshotService.servicehub.service.json",
-        "remoteSymbolSearchUpdateEngine.servicehub.service.json",
-        "codeAnalysisService64.servicehub.service.json",
-        "remoteHostService64.servicehub.service.json",
-        "snapshotService64.servicehub.service.json",
-        "remoteSymbolSearchUpdateEngine64.servicehub.service.json",
+        "roslynCodeAnalysis.servicehub.service.json",
+        "roslynRemoteHost.servicehub.service.json",
+        "roslynSnapshot.servicehub.service.json",
+        "roslynRemoteSymbolSearchUpdateEngine.servicehub.service.json",
+        "roslynCodeAnalysis64.servicehub.service.json",
+        "roslynRemoteHost64.servicehub.service.json",
+        "roslynSnapshot64.servicehub.service.json",
+        "roslynRemoteSymbolSearchUpdateEngine64.servicehub.service.json",
         "Microsoft.Build.Conversion.Core.dll",
         "Microsoft.Build.dll",
         "Microsoft.Build.Engine.dll",
diff --git a/src/VisualStudio/Setup/VisualStudioSetup.csproj b/src/VisualStudio/Setup/VisualStudioSetup.csproj
index 56173edc60b..d77e43f38a3 100644
--- a/src/VisualStudio/Setup/VisualStudioSetup.csproj
+++ b/src/VisualStudio/Setup/VisualStudioSetup.csproj
@@ -246,35 +246,35 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="codeAnalysisService.servicehub.service.json">
+    <Content Include="roslynCodeAnalysis.servicehub.service.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="remoteHostService.servicehub.service.json">
+    <Content Include="roslynRemoteHost.servicehub.service.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="remoteSymbolSearchUpdateEngine.servicehub.service.json">
+    <Content Include="roslynRemoteSymbolSearchUpdateEngine.servicehub.service.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="snapshotService.servicehub.service.json">
+    <Content Include="roslynSnapshot.servicehub.service.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="snapshotService64.servicehub.service.json">
+    <Content Include="roslynSnapshot64.servicehub.service.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="codeAnalysisService64.servicehub.service.json">
+    <Content Include="roslynCodeAnalysis64.servicehub.service.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="remoteHostService64.servicehub.service.json">
+    <Content Include="roslynRemoteHost64.servicehub.service.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="remoteSymbolSearchUpdateEngine64.servicehub.service.json">
+    <Content Include="roslynRemoteSymbolSearchUpdateEngine64.servicehub.service.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
diff --git a/src/VisualStudio/Setup/codeAnalysisService.servicehub.service.json b/src/VisualStudio/Setup/roslynCodeAnalysis.servicehub.service.json
similarity index 100%
rename from src/VisualStudio/Setup/codeAnalysisService.servicehub.service.json
rename to src/VisualStudio/Setup/roslynCodeAnalysis.servicehub.service.json
diff --git a/src/VisualStudio/Setup/codeAnalysisService64.servicehub.service.json b/src/VisualStudio/Setup/roslynCodeAnalysis64.servicehub.service.json
similarity index 100%
rename from src/VisualStudio/Setup/codeAnalysisService64.servicehub.service.json
rename to src/VisualStudio/Setup/roslynCodeAnalysis64.servicehub.service.json
diff --git a/src/VisualStudio/Setup/remoteHostService.servicehub.service.json b/src/VisualStudio/Setup/roslynRemoteHost.servicehub.service.json
similarity index 100%
rename from src/VisualStudio/Setup/remoteHostService.servicehub.service.json
rename to src/VisualStudio/Setup/roslynRemoteHost.servicehub.service.json
diff --git a/src/VisualStudio/Setup/remoteHostService64.servicehub.service.json b/src/VisualStudio/Setup/roslynRemoteHost64.servicehub.service.json
similarity index 100%
rename from src/VisualStudio/Setup/remoteHostService64.servicehub.service.json
rename to src/VisualStudio/Setup/roslynRemoteHost64.servicehub.service.json
diff --git a/src/VisualStudio/Setup/remoteSymbolSearchUpdateEngine.servicehub.service.json b/src/VisualStudio/Setup/roslynRemoteSymbolSearchUpdateEngine.servicehub.service.json
similarity index 100%
rename from src/VisualStudio/Setup/remoteSymbolSearchUpdateEngine.servicehub.service.json
rename to src/VisualStudio/Setup/roslynRemoteSymbolSearchUpdateEngine.servicehub.service.json
diff --git a/src/VisualStudio/Setup/remoteSymbolSearchUpdateEngine64.servicehub.service.json b/src/VisualStudio/Setup/roslynRemoteSymbolSearchUpdateEngine64.servicehub.service.json
similarity index 100%
rename from src/VisualStudio/Setup/remoteSymbolSearchUpdateEngine64.servicehub.service.json
rename to src/VisualStudio/Setup/roslynRemoteSymbolSearchUpdateEngine64.servicehub.service.json
diff --git a/src/VisualStudio/Setup/snapshotService.servicehub.service.json b/src/VisualStudio/Setup/roslynSnapshot.servicehub.service.json
similarity index 100%
rename from src/VisualStudio/Setup/snapshotService.servicehub.service.json
rename to src/VisualStudio/Setup/roslynSnapshot.servicehub.service.json
diff --git a/src/VisualStudio/Setup/snapshotService64.servicehub.service.json b/src/VisualStudio/Setup/roslynSnapshot64.servicehub.service.json
similarity index 100%
rename from src/VisualStudio/Setup/snapshotService64.servicehub.service.json
rename to src/VisualStudio/Setup/roslynSnapshot64.servicehub.service.json
diff --git a/src/VisualStudio/Setup/source.extension.vsixmanifest b/src/VisualStudio/Setup/source.extension.vsixmanifest
index 3c166348723..a798a7f6583 100644
--- a/src/VisualStudio/Setup/source.extension.vsixmanifest
+++ b/src/VisualStudio/Setup/source.extension.vsixmanifest
@@ -30,14 +30,14 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.EditorFeatures.Text.dll" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.VisualStudio.LanguageServices.dll" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="XamlVisualStudio" Path="|XamlVisualStudio|" />
-    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="remoteHostService.servicehub.service.json" />
-    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="snapshotService.servicehub.service.json" />
-    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="codeAnalysisService.servicehub.service.json" />
-    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="remoteSymbolSearchUpdateEngine.servicehub.service.json" />
-    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="remoteHostService64.servicehub.service.json" />
-    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="snapshotService64.servicehub.service.json" />
-    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="codeAnalysisService64.servicehub.service.json" />
-    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="remoteSymbolSearchUpdateEngine64.servicehub.service.json" />
+    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="roslynRemoteHost.servicehub.service.json" />
+    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="roslynSnapshot.servicehub.service.json" />
+    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="roslynCodeAnalysis.servicehub.service.json" />
+    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="roslynRemoteSymbolSearchUpdateEngine.servicehub.service.json" />
+    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="roslynRemoteHost64.servicehub.service.json" />
+    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="roslynSnapshot64.servicehub.service.json" />
+    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="roslynCodeAnalysis64.servicehub.service.json" />
+    <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="roslynRemoteSymbolSearchUpdateEngine64.servicehub.service.json" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="BasicVisualStudio" Path="|BasicVisualStudio|" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="CSharpVisualStudio" Path="|CSharpVisualStudio|" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="SolutionExplorerShim" Path="|SolutionExplorerShim|" />
diff --git a/src/Workspaces/Core/Portable/Remote/WellKnownRemoteHostServices.cs b/src/Workspaces/Core/Portable/Remote/WellKnownRemoteHostServices.cs
index fabdef5a595..eff97f0203c 100644
--- a/src/Workspaces/Core/Portable/Remote/WellKnownRemoteHostServices.cs
+++ b/src/Workspaces/Core/Portable/Remote/WellKnownRemoteHostServices.cs
@@ -6,9 +6,9 @@ internal static class WellKnownRemoteHostServices
     {
         public static void Set64bit(bool x64)
         {
-            RemoteHostService = "remoteHostService" + (x64 ? "64" : "");
+            RemoteHostService = "roslynRemoteHost" + (x64 ? "64" : "");
         }
 
-        public static string RemoteHostService { get; private set; } = "remoteHostService";
+        public static string RemoteHostService { get; private set; } = "roslynRemoteHost";
     }
 }
diff --git a/src/Workspaces/Core/Portable/Remote/WellKnownServiceHubServices.cs b/src/Workspaces/Core/Portable/Remote/WellKnownServiceHubServices.cs
index 028b367f808..9a21a9118ac 100644
--- a/src/Workspaces/Core/Portable/Remote/WellKnownServiceHubServices.cs
+++ b/src/Workspaces/Core/Portable/Remote/WellKnownServiceHubServices.cs
@@ -8,14 +8,14 @@ public static void Set64bit(bool x64)
         {
             var bit = x64 ? "64" : "";
 
-            SnapshotService = "snapshotService" + bit;
-            CodeAnalysisService = "codeAnalysisService" + bit;
-            RemoteSymbolSearchUpdateEngine = "remoteSymbolSearchUpdateEngine" + bit;
+            SnapshotService = "roslynSnapshot" + bit;
+            CodeAnalysisService = "roslynCodeAnalysis" + bit;
+            RemoteSymbolSearchUpdateEngine = "roslynRemoteSymbolSearchUpdateEngine" + bit;
         }
 
-        public static string SnapshotService { get; private set; } = "snapshotService";
-        public static string CodeAnalysisService { get; private set; } = "codeAnalysisService";
-        public static string RemoteSymbolSearchUpdateEngine { get; private set; } = "remoteSymbolSearchUpdateEngine";
+        public static string SnapshotService { get; private set; } = "roslynSnapshot";
+        public static string CodeAnalysisService { get; private set; } = "roslynCodeAnalysis";
+        public static string RemoteSymbolSearchUpdateEngine { get; private set; } = "roslynRemoteSymbolSearchUpdateEngine";
 
         // CodeLens methods.
         public const string CodeAnalysisService_GetReferenceCountAsync = "GetReferenceCountAsync";
-- 
GitLab