Merge fixup

dotnet · Nov 20, 2020 · 26e90ce · 26e90ce
1 parent d917fb2
commit 26e90ce
Showing 1 changed file with 4 additions and 21 deletions.
diff --git a/src/Compilers/Server/VBCSCompiler/AnalyzerConsistencyChecker.cs b/src/Compilers/Server/VBCSCompiler/AnalyzerConsistencyChecker.cs
@@ -15,50 +15,33 @@ namespace Microsoft.CodeAnalysis.CompilerServer
 {
     internal static class AnalyzerConsistencyChecker
     {
-        public static bool Check(string baseDirectory, IEnumerable<CommandLineAnalyzerReference> analyzerReferences, IAnalyzerAssemblyLoader loader);
-
         public static bool Check(
             string baseDirectory,
             IEnumerable<CommandLineAnalyzerReference> analyzerReferences,
             IAnalyzerAssemblyLoader loader,
-<<<<<<< HEAD
             ICompilerServerLogger? logger = null)
-=======
-            ICompilerServerLogger logger,
-            IEnumerable<string>? ignorableReferenceNames = null)
->>>>>>> ab545692f94... PR feedback
         {
             try
             {
-<<<<<<< HEAD
-                CompilerServerLogger.Log("Begin Analyzer Consistency Check");
+                logger?.Log("Begin Analyzer Consistency Check");
                 return CheckCore(baseDirectory, analyzerReferences, loader, logger);
-=======
-                logger.Log("Begin Analyzer Consistency Check");
-                return CheckCore(baseDirectory, analyzerReferences, loader, ignorableReferenceNames, logger);
->>>>>>> ab545692f94... PR feedback
             }
             catch (Exception e)
             {
-                logger.LogException(e, "Analyzer Consistency Check");
+                logger?.LogException(e, "Analyzer Consistency Check");
                 return false;
             }
             finally
             {
-                logger.Log("End Analyzer Consistency Check");
+                logger?.Log("End Analyzer Consistency Check");
             }
         }
 
         private static bool CheckCore(
             string baseDirectory,
             IEnumerable<CommandLineAnalyzerReference> analyzerReferences,
             IAnalyzerAssemblyLoader loader,
-<<<<<<< HEAD
             ICompilerServerLogger? logger)
-=======
-            IEnumerable<string> ignorableReferenceNames,
-            ICompilerServerLogger logger)
->>>>>>> ab545692f94... PR feedback
         {
             var resolvedPaths = new List<string>();
 
@@ -101,7 +84,7 @@ private static bool CheckCore(
 
                 if (resolvedPathMvid != loadedAssemblyMvid)
                 {
-                    logger.LogError($"Analyzer assembly {resolvedPath} has MVID '{resolvedPathMvid}' but loaded assembly '{loadedAssembly.FullName}' has MVID '{loadedAssemblyMvid}'.");
+                    logger?.LogError($"Analyzer assembly {resolvedPath} has MVID '{resolvedPathMvid}' but loaded assembly '{loadedAssembly.FullName}' has MVID '{loadedAssemblyMvid}'.");
                     return false;
                 }
             }