version bump

apply disableConsole state to harmony patch logging
DW2MC · Apr 8, 2022 · c4306e8 · c4306e8
1 parent 04eeb85
commit c4306e8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/DW2Net6Win/DW2Net6Win.csproj b/DW2Net6Win/DW2Net6Win.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Version>1.2.0</Version>
+        <Version>1.2.1</Version>
         <Product>Distant Worlds 2 .NET 6 Loader</Product>
         <Authors>Distant Worlds 2 Modification Community</Authors>
         <Company>Distant Worlds 2 Modification Community</Company>

diff --git a/DistantWorlds2.ModLoader.Patches/Patches.cs b/DistantWorlds2.ModLoader.Patches/Patches.cs
@@ -2,6 +2,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
+using System.Runtime.InteropServices;
 using System.Runtime.Remoting.Contexts;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -20,12 +21,18 @@ public void Run()
             return;
         }
 
-        PatchHarmonyLogging();
+        var disableConsole = Environment.GetEnvironmentVariable("DW2MC_NO_CONSOLE") == "1";
 
-        if (ModLoader.DebugMode)
+        if (!disableConsole)
         {
-            Environment.SetEnvironmentVariable("HARMONY_LOG_FILE", "CONOUT$");
-            Harmony.DEBUG = true;
+            if (Environment.Version.MajorRevision < 6)
+                PatchHarmonyLogging();
+
+            if (ModLoader.DebugMode)
+            {
+                Environment.SetEnvironmentVariable("HARMONY_LOG_FILE", "CONOUT$");
+                Harmony.DEBUG = true;
+            }
         }
 
         try

diff --git a/Version.proj b/Version.proj
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
 
-        <Version>1.2.0</Version>
+        <Version>1.2.1</Version>
         <Product>Distant Worlds 2 Mod Loader</Product>
         <Authors>Distant Worlds 2 Modification Community</Authors>
         <Company>Distant Worlds 2 Modification Community</Company>