Fix compilation & running issues from rebase

BepInEx.Core/BepInEx.Core.csproj

@@ -98,7 +98,7 @@
       <Version>0.10.4</Version>
     </PackageReference>
     <PackageReference Include="MonoMod.Utils">
-      <Version>20.8.3.5</Version>
+      <Version>20.11.5.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup />

BepInEx.Core/Console/ConsoleManager.cs

@@ -32,7 +32,7 @@ namespace BepInEx
 
 		public static void Initialize(bool alreadyActive)
 		{
-			switch (Utility.CurrentPlatform)
+			switch (Utility.CurrentPlatform & ~Platform.Bits64)
 			{
 				case Platform.MacOS:
 				case Platform.Linux:
@@ -46,6 +46,11 @@ namespace BepInEx
 					Driver = new WindowsConsoleDriver();
 					break;
 				}
+
+				default:
+				{
+					throw new PlatformNotSupportedException("Was unable to determine console driver for platform " + Utility.CurrentPlatform);
+				}
 			}
 
 			Driver.Initialize(alreadyActive);
@@ -70,6 +75,7 @@ namespace BepInEx
 			var codepage = ConfigConsoleShiftJis.Value ? SHIFT_JIS_CP: (uint)Encoding.UTF8.CodePage;
 			
 			Driver.CreateConsole(codepage);
+			Console.SetOut(ConsoleStream);
 		}
 
 		public static void DetachConsole()

BepInEx.Core/Logging/StdOutLogListener.cs

@@ -12,7 +12,7 @@ namespace BepInEx.Core.Logging
 		{
 			string log = $"[{eventArgs.Level,-7}:{((ILogSource)sender).SourceName,10}] {eventArgs.Data}\r\n";
 
-			ConsoleWindow.OriginalOut?.Write(log);
+			ConsoleManager.StandardOutStream?.Write(log);
 		}
 
 		public void Dispose() { }

BepInEx.Core/Properties/AssemblyInfo.cs

@@ -26,6 +26,7 @@ using BepInEx;
 
 [assembly: InternalsVisibleTo("BepInEx.Preloader.Core")]
 [assembly: InternalsVisibleTo("BepInEx.Unity")]
+[assembly: InternalsVisibleTo("BepInEx.NetLauncher")]
 [assembly: InternalsVisibleTo("BepInExTests")]
 
 // Version information for an assembly consists of the following four values:

BepInEx.IL2CPP/BepInEx.IL2CPP.csproj

@@ -98,7 +98,7 @@
       <Version>1.6.0</Version>
     </PackageReference>
     <PackageReference Include="MonoMod.RuntimeDetour">
-      <Version>20.8.3.5</Version>
+      <Version>20.11.5.1</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

BepInEx.IL2CPP/Preloader.cs

@@ -21,12 +21,14 @@ namespace BepInEx.IL2CPP
 		{
 			try
 			{
+				ConsoleManager.Initialize(false);
+
 				PreloaderLog = new PreloaderConsoleListener();
 				Logger.Listeners.Add(PreloaderLog);
 
 
 
-				if (ConsoleManager.ConfigConsoleEnabled.Value && !ConsoleManager.ConsoleActive)
+				if (ConsoleManager.ConfigConsoleEnabled.Value)
 				{
 					ConsoleManager.CreateConsole();
 					Logger.Listeners.Add(new ConsoleLogListener());

BepInEx.NetLauncher/Program.cs

@@ -15,7 +15,7 @@ namespace BepInEx.NetLauncher
 		{
 			Logger.Listeners.Add(new ConsoleLogListener());
 
-			ConsoleManager.ForceSetActive(true);
+			ConsoleManager.Initialize(true);
 
 			NetPreloader.Start(args);
 		}

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

@@ -58,10 +58,10 @@
       <Version>0.10.4</Version>
     </PackageReference>
     <PackageReference Include="MonoMod.RuntimeDetour">
-      <Version>20.8.3.5</Version>
+      <Version>20.11.5.1</Version>
     </PackageReference>
     <PackageReference Include="MonoMod.Utils">
-      <Version>20.8.3.5</Version>
+      <Version>20.11.5.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup />