Use FacadeLogger

Author: jjonescz

src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs

@@ -212,29 +212,26 @@ public override int Execute()
 
             // Set up MSBuild.
             ReadOnlySpan<ILogger> binaryLoggers = binaryLogger is null ? [] : [binaryLogger];
+            IEnumerable<ILogger> loggers = [.. binaryLoggers, consoleLogger];
             var projectCollection = new ProjectCollection(
                 MSBuildArgs.GlobalProperties,
-                [.. binaryLoggers, consoleLogger],
+                loggers,
                 ToolsetDefinitionLocations.Default);
             var parameters = new BuildParameters(projectCollection)
             {
-                Loggers = projectCollection.Loggers,
+                Loggers = loggers,
                 LogTaskInputs = binaryLoggers.Length != 0,
             };
 
-            // Projects need to be created before BeginBuild is called, otherwise binlog doesn't contain evaluation data.
-            var restoreProject = NoRestore ? null : CreateProjectInstance(projectCollection, addGlobalProperties: AddRestoreGlobalProperties(MSBuildArgs.RestoreGlobalProperties));
-            var buildProject = NoBuild ? null : CreateProjectInstance(projectCollection);
-
             BuildManager.DefaultBuildManager.BeginBuild(parameters);
 
             // Do a restore first (equivalent to MSBuild's "implicit restore", i.e., `/restore`).
             // See https://github.com/dotnet/msbuild/blob/a1c2e7402ef0abe36bf493e395b04dd2cb1b3540/src/MSBuild/XMake.cs#L1838
             // and https://github.com/dotnet/msbuild/issues/11519.
-            if (restoreProject != null)
+            if (!NoRestore)
             {
                 var restoreRequest = new BuildRequestData(
-                    restoreProject,
+                    CreateProjectInstance(projectCollection, addGlobalProperties: AddRestoreGlobalProperties(MSBuildArgs.RestoreGlobalProperties)),
                     targetsToBuild: ["Restore"],
                     hostServices: null,
                     BuildRequestDataFlags.ClearCachesAfterBuild | BuildRequestDataFlags.SkipNonexistentTargets | BuildRequestDataFlags.IgnoreMissingEmptyAndInvalidImports | BuildRequestDataFlags.FailOnUnresolvedSdk);
@@ -247,10 +244,10 @@ public override int Execute()
             }
 
             // Then do a build.
-            if (buildProject != null)
+            if (!NoBuild)
             {
                 var buildRequest = new BuildRequestData(
-                    buildProject,
+                    CreateProjectInstance(projectCollection),
                     targetsToBuild: MSBuildArgs.RequestedTargets ?? ["Build"]);
 
                 var buildResult = BuildManager.DefaultBuildManager.BuildRequest(buildRequest);
@@ -279,7 +276,7 @@ public override int Execute()
                 Environment.SetEnvironmentVariable(key, value);
             }
 
-            binaryLogger?.Shutdown();
+            binaryLogger?.ReallyShutdown();
             consoleLogger.Shutdown();
         }
 
@@ -307,7 +304,7 @@ static Action<IDictionary<string, string>> AddRestoreGlobalProperties(ReadOnlyDi
             };
         }
 
-        static ILogger? GetBinaryLogger(IReadOnlyList<string>? args)
+        static FacadeLogger? GetBinaryLogger(IReadOnlyList<string>? args)
         {
             if (args is null) return null;
             // Like in MSBuild, only the last binary logger is used.
@@ -316,12 +313,13 @@ static Action<IDictionary<string, string>> AddRestoreGlobalProperties(ReadOnlyDi
                 var arg = args[i];
                 if (LoggerUtility.IsBinLogArgument(arg))
                 {
-                    return new BinaryLogger
+                    var logger = new BinaryLogger
                     {
                         Parameters = arg.IndexOf(':') is >= 0 and var index
                             ? arg[(index + 1)..]
                             : "msbuild.binlog",
                     };
+                    return LoggerUtility.CreateFacadeLogger([logger]);
                 }
             }
 

src/Cli/dotnet/LoggerUtility.cs

@@ -48,14 +48,14 @@ internal static class LoggerUtility
         // We need a custom logger to handle this, because the MSBuild API for evaluation and execution calls logger Initialize and Shutdown methods, so will not allow us to do this.
         if (binaryLoggers.Count > 0)
         {
-            var fakeLogger = ConfigureDispatcher(binaryLoggers);
+            var fakeLogger = CreateFacadeLogger(binaryLoggers);
 
             return fakeLogger;
         }
         return null;
     }
 
-    private static FacadeLogger ConfigureDispatcher(List<BinaryLogger> binaryLoggers)
+    public static FacadeLogger CreateFacadeLogger(List<BinaryLogger> binaryLoggers)
     {
         var dispatcher = new PersistentDispatcher(binaryLoggers);
         return new FacadeLogger(dispatcher);