Add runtime fix for console logging

Rebase of a00b095

BepInEx.Core/Logging/ConsoleLogListener.cs

@@ -14,7 +14,7 @@ namespace BepInEx.Logging
 				return;
 
 			ConsoleManager.SetConsoleColor(eventArgs.Level.GetConsoleColor());
-			ConsoleManager.ConsoleStream?.Write(eventArgs.ToStringLine());
+			Console.Write(eventArgs.ToStringLine());
 			ConsoleManager.SetConsoleColor(ConsoleColor.Gray);
 		}
 

BepInEx.Preloader.Core/BepInEx.Preloader.Core.csproj

@@ -37,11 +37,12 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Logging\ChainloaderLogHelper.cs" />
-    <Compile Include="Logging\PreloaderLogWriter.cs" />
+    <Compile Include="Logging\PreloaderConsoleListener.cs" />
     <Compile Include="Patching\AssemblyPatcher.cs" />
     <Compile Include="Patching\PatcherPlugin.cs" />
     <Compile Include="InternalPreloaderLogger.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RuntimeFixes\ConsoleSetOutFix.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BepInEx.Core\BepInEx.Core.csproj">

BepInEx.Preloader.Core/Logging/PreloaderConsoleListener.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using BepInEx.Configuration;
+using BepInEx.Logging;
+
+namespace BepInEx.Preloader.Core.Logging
+{
+	public class PreloaderConsoleListener : ILogListener
+	{
+		public static List<LogEventArgs> LogEvents { get; } = new List<LogEventArgs>();
+
+		public void LogEvent(object sender, LogEventArgs eventArgs)
+		{
+			if ((eventArgs.Level & ConfigConsoleDisplayedLevel.Value) == 0)
+				return;
+
+			LogEvents.Add(eventArgs);
+		}
+
+		private static readonly ConfigEntry<LogLevel> ConfigConsoleDisplayedLevel = ConfigFile.CoreConfig.Bind(
+			"Logging.Console", "LogLevels",
+			LogLevel.Fatal | LogLevel.Error | LogLevel.Message | LogLevel.Info,
+			"Which log levels to show in the console output.");
+
+		public void Dispose() { }
+	}
+}

BepInEx.Preloader.Core/Logging/PreloaderLogWriter.cs

@@ -1,87 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using BepInEx.Configuration;
-using BepInEx.Logging;
-
-namespace BepInEx.Preloader.Core.Logging
-{
-	public class PreloaderConsoleListener : ILogListener
-	{
-		public static List<LogEventArgs> LogEvents { get; } = new List<LogEventArgs>();
-
-		public static TextWriter StandardOut { get; set; }
-		protected PreloaderConsoleSource LoggerSource { get; set; }
-
-
-		public PreloaderConsoleListener(bool redirectConsole)
-		{
-			StandardOut = Console.Out;
-
-			if (redirectConsole)
-			{
-				LoggerSource = new PreloaderConsoleSource();
-
-				Logger.Sources.Add(LoggerSource);
-				Console.SetOut(LoggerSource);
-			}
-		}
-
-		public void LogEvent(object sender, LogEventArgs eventArgs)
-		{
-			if ((eventArgs.Level & ConsoleLogListener.ConfigConsoleDisplayedLevel.Value) == 0)
-				return;
-
-			LogEvents.Add(eventArgs);
-
-			ConsoleManager.SetConsoleColor(eventArgs.Level.GetConsoleColor());
-			ConsoleDirectWrite(eventArgs.ToStringLine());
-			ConsoleManager.SetConsoleColor(ConsoleColor.Gray);
-		}
-
-		public void ConsoleDirectWrite(string value)
-		{
-			StandardOut.Write(value);
-		}
-
-		public void ConsoleDirectWriteLine(string value)
-		{
-			StandardOut.WriteLine(value);
-		}
-
-		public void Dispose()
-		{
-			if (LoggerSource != null)
-			{
-				Console.SetOut(StandardOut);
-				Logger.Sources.Remove(LoggerSource);
-				LoggerSource.Dispose();
-				LoggerSource = null;
-			}
-		}
-	}
-
-	public class PreloaderConsoleSource : TextWriter, ILogSource
-	{
-		public override Encoding Encoding { get; } = Console.OutputEncoding;
-
-		public string SourceName { get; } = "BepInEx Preloader";
-
-		public event EventHandler<LogEventArgs> LogEvent;
-
-		public override void Write(object value)
-			=> LogEvent?.Invoke(this, new LogEventArgs(value, LogLevel.Info, this));
-
-		public override void Write(string value)
-			=> Write((object)value);
-
-		public override void WriteLine() { }
-
-		public override void WriteLine(object value)
-			=> Write(value);
-
-		public override void WriteLine(string value)
-			=> Write(value);
-	}
-}

BepInEx.Preloader.Core/RuntimeFixes/ConsoleSetOutFix.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using HarmonyLib;
+
+namespace BepInEx.Preloader.Core.RuntimeFixes
+{
+	public static class ConsoleSetOutFix
+	{
+		private static AggregatedTextWriter aggregatedTextWriter;
+
+		public static void Apply()
+		{
+			aggregatedTextWriter = new AggregatedTextWriter(Console.Out);
+			Console.SetOut(aggregatedTextWriter);
+			HarmonyLib.Harmony.CreateAndPatchAll(typeof(ConsoleSetOutFix));
+		}
+
+		[HarmonyPatch(typeof(Console), nameof(Console.SetOut))]
+		[HarmonyPrefix]
+		private static bool OnSetOut(TextWriter newOut)
+		{
+			aggregatedTextWriter.Add(newOut);
+			return false;
+		}
+	}
+
+	internal class AggregatedTextWriter : TextWriter
+	{
+		public override Encoding Encoding { get; } = Encoding.UTF8;
+
+		private List<TextWriter> writers = new List<TextWriter>();
+
+		public AggregatedTextWriter(params TextWriter[] initialWriters)
+		{
+			writers.AddRange(initialWriters.Where(w => w != null));
+		}
+
+		public void Add(TextWriter tw)
+		{
+			if (writers.Any(t => t == tw))
+				return;
+			writers.Add(tw);
+		}
+
+		public override void Flush() => writers.ForEach(w => w.Flush());
+
+		public override void Write(object value) => writers.ForEach(w => w.Write(value));
+		public override void Write(string value) => writers.ForEach(w => w.Write(value));
+		public override void Write(char value) => writers.ForEach(w => w.Write(value));
+
+		public override void WriteLine(object value) => writers.ForEach(w => w.WriteLine(value));
+		public override void WriteLine(string value) => writers.ForEach(w => w.WriteLine(value));
+		public override void WriteLine(char value) => writers.ForEach(w => w.WriteLine(value));
+	}
+}

BepInEx.Preloader.Unity/DoorstopEntrypoint.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using BepInEx.Preloader.Core.RuntimeFixes;
 using BepInEx.Preloader.RuntimeFixes;
 
 namespace BepInEx.Preloader.Unity
@@ -21,7 +22,10 @@ namespace BepInEx.Preloader.Unity
 		private static void PreloaderMain()
 		{
 			if (UnityPreloader.ConfigApplyRuntimePatches.Value)
+			{
 				XTermFix.Apply();
+				ConsoleSetOutFix.Apply();
+			}
 
 			UnityPreloader.Run(EnvVars.DOORSTOP_MANAGED_FOLDER_DIR);
 		}

BepInEx.Preloader.Unity/UnityPreloader.cs

@@ -53,7 +53,8 @@ namespace BepInEx.Preloader.Unity
 				Logger.Sources.Add(TraceLogSource.CreateSource());
 				Logger.Sources.Add(new HarmonyLogSource());
 
-				PreloaderLog = new PreloaderConsoleListener(ConfigPreloaderCOutLogging.Value);
+				Logger.Listeners.Add(new ConsoleLogListener());
+				PreloaderLog = new PreloaderConsoleListener();
 				Logger.Listeners.Add(PreloaderLog);
 
 				ChainloaderLogHelper.PrintLogInfo(Log);
@@ -97,7 +98,6 @@ namespace BepInEx.Preloader.Unity
 				Log.LogMessage("Preloader finished");
 
 				Logger.Listeners.Remove(PreloaderLog);
-				Logger.Listeners.Add(new ConsoleLogListener());
 
 				PreloaderLog.Dispose();