From 3f43feb2d0e59e06e4c64ed37070b548fc0d9cf0 Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Fri, 1 May 2020 12:54:22 -0700
Subject: [PATCH] Rename IntegrationTestTraceListener to WatsonTraceListener

---
 .../TestSetup/IntegrationTestServiceCommands.cs               | 2 +-
 .../Microsoft.VisualStudio.IntegrationTest.Setup.csproj       | 2 +-
 .../Microsoft.CodeAnalysis.Remote.Razor.ServiceHub.csproj     | 2 +-
 src/Workspaces/Remote/ServiceHub/Shared/ServiceBase.cs        | 2 +-
 ...IntegrationTestTraceListener.cs => WatsonTraceListener.cs} | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename src/Workspaces/Remote/ServiceHub/{IntegrationTestTraceListener.cs => WatsonTraceListener.cs} (95%)

diff --git a/src/VisualStudio/IntegrationTest/TestSetup/IntegrationTestServiceCommands.cs b/src/VisualStudio/IntegrationTest/TestSetup/IntegrationTestServiceCommands.cs
index ce11c131eee..e434ba50aa0 100644
--- a/src/VisualStudio/IntegrationTest/TestSetup/IntegrationTestServiceCommands.cs
+++ b/src/VisualStudio/IntegrationTest/TestSetup/IntegrationTestServiceCommands.cs
@@ -99,7 +99,7 @@ private void StartServiceCallback(object sender, EventArgs e)
             {
                 AppDomain.CurrentDomain.AssemblyResolve += CurrentDomainAssemblyResolve;
 
-                IntegrationTestTraceListener.Install();
+                WatsonTraceListener.Install();
 
                 _service = new IntegrationService();
 
diff --git a/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj b/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj
index 72068f65d1c..eb5454dfaa1 100644
--- a/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj
+++ b/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj
@@ -15,7 +15,7 @@
     <IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Workspaces\Remote\ServiceHub\IntegrationTestTraceListener.cs" Link="IntegrationTestTraceListener.cs" />
+    <Compile Include="..\..\..\Workspaces\Remote\ServiceHub\WatsonTraceListener.cs" Link="WatsonTraceListener.cs" />
   </ItemGroup>
   <ItemGroup Label="PkgDef">
     <PkgDefPackageRegistration Include="{d02dac01-ddd0-4ecc-8687-79a554852b14}"
diff --git a/src/Workspaces/Remote/Razor/Microsoft.CodeAnalysis.Remote.Razor.ServiceHub.csproj b/src/Workspaces/Remote/Razor/Microsoft.CodeAnalysis.Remote.Razor.ServiceHub.csproj
index 4378ab4d9e1..2207a059a65 100644
--- a/src/Workspaces/Remote/Razor/Microsoft.CodeAnalysis.Remote.Razor.ServiceHub.csproj
+++ b/src/Workspaces/Remote/Razor/Microsoft.CodeAnalysis.Remote.Razor.ServiceHub.csproj
@@ -31,7 +31,6 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Remote.Razor" Key="$(RazorKey)" WorkItem="https://github.com/dotnet/roslyn/issues/35079" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\ServiceHub\IntegrationTestTraceListener.cs" Link="Shared\IntegrationTestTraceListener.cs" />
     <Compile Include="..\ServiceHub\Shared\RoslynJsonConverter.cs">
       <Link>Shared\RoslynJsonConverter.cs</Link>
     </Compile>
@@ -44,5 +43,6 @@
     <Compile Include="..\ServiceHub\Shared\RemoteEndPoint.cs">
       <Link>Shared\RemoteEndPoint.cs</Link>
     </Compile>
+    <Compile Include="..\ServiceHub\WatsonTraceListener.cs" Link="Shared\WatsonTraceListener.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Workspaces/Remote/ServiceHub/Shared/ServiceBase.cs b/src/Workspaces/Remote/ServiceHub/Shared/ServiceBase.cs
index 447b1b13c02..04df547161f 100644
--- a/src/Workspaces/Remote/ServiceHub/Shared/ServiceBase.cs
+++ b/src/Workspaces/Remote/ServiceHub/Shared/ServiceBase.cs
@@ -39,7 +39,7 @@ internal abstract class ServiceBase : IDisposable
         static ServiceBase()
         {
             // Use a TraceListener hook to intercept assertion failures and report them through FatalError.
-            IntegrationTestTraceListener.Install();
+            WatsonTraceListener.Install();
         }
 
         protected ServiceBase(IServiceProvider serviceProvider, Stream stream, IEnumerable<JsonConverter>? jsonConverters = null)
diff --git a/src/Workspaces/Remote/ServiceHub/IntegrationTestTraceListener.cs b/src/Workspaces/Remote/ServiceHub/WatsonTraceListener.cs
similarity index 95%
rename from src/Workspaces/Remote/ServiceHub/IntegrationTestTraceListener.cs
rename to src/Workspaces/Remote/ServiceHub/WatsonTraceListener.cs
index 08b39edaf5b..124cb967041 100644
--- a/src/Workspaces/Remote/ServiceHub/IntegrationTestTraceListener.cs
+++ b/src/Workspaces/Remote/ServiceHub/WatsonTraceListener.cs
@@ -10,7 +10,7 @@ namespace Microsoft.CodeAnalysis.Remote
 {
     using Debugger = System.Diagnostics.Debugger;
 
-    internal class IntegrationTestTraceListener : TraceListener
+    internal class WatsonTraceListener : TraceListener
     {
         public override void Fail(string message, string detailMessage)
         {
@@ -96,7 +96,7 @@ private static void Exit(string message)
         internal static void Install()
         {
             Trace.Listeners.Clear();
-            Trace.Listeners.Add(new IntegrationTestTraceListener());
+            Trace.Listeners.Add(new WatsonTraceListener());
         }
     }
 }
-- 
GitLab