Browse Source

Merge pull request #75 from ErisApps/feature/HarmonyX_upgrade

HarmonyX upgrade
pull/84/head
Anairkoen Schno 2 years ago
committed by GitHub
parent
commit
5a3ea4097e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 8 deletions
  1. +2
    -2
      IPA.Loader/IPA.Loader.csproj
  2. +0
    -1
      IPA.Loader/Loader/HarmonyProtector.cs
  3. +0
    -4
      IPA.Loader/Loader/PluginLoader.cs
  4. +2
    -1
      IPA.Loader/Logging/StdoutInterceptor.cs

+ 2
- 2
IPA.Loader/IPA.Loader.csproj View File

@ -57,8 +57,8 @@
</PackageReference>--> </PackageReference>-->
<PackageReference Include="Mono.Cecil" Version="0.11.4" /> <PackageReference Include="Mono.Cecil" Version="0.11.4" />
<PackageReference Include="HarmonyX" Version="2.6.1" />
<PackageReference Include="MonoMod.RuntimeDetour" Version="21.11.1.1" />
<PackageReference Include="HarmonyX" Version="2.7.0" />
<PackageReference Include="MonoMod.RuntimeDetour" Version="21.12.13.1" />
<PackageReference Include="Hive.Versioning.Standalone" Version="0.1.0-gh846.1" /> <PackageReference Include="Hive.Versioning.Standalone" Version="0.1.0-gh846.1" />
<ProjectReference Include="..\SemVer\SemVer.csproj" /> <ProjectReference Include="..\SemVer\SemVer.csproj" />


+ 0
- 1
IPA.Loader/Loader/HarmonyProtector.cs View File

@ -1,5 +1,4 @@
using HarmonyLib; using HarmonyLib;
using System.Collections.Generic;
using System.Reflection; using System.Reflection;
namespace IPA.Loader namespace IPA.Loader


+ 0
- 4
IPA.Loader/Loader/PluginLoader.cs View File

@ -11,11 +11,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Version = SemVer.Version;
using SemVer;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using HarmonyLib;
using System.Diagnostics; using System.Diagnostics;
using IPA.AntiMalware; using IPA.AntiMalware;
using Hive.Versioning; using Hive.Versioning;


+ 2
- 1
IPA.Loader/Logging/StdoutInterceptor.cs View File

@ -192,9 +192,10 @@ namespace IPA.Logging
EnsureHarmonyLogging(); EnsureHarmonyLogging();
HarmonyGlobalSettings.DisallowLegacyGlobalUnpatchAll = true;
harmony ??= new Harmony("BSIPA Console Redirector Patcher"); harmony ??= new Harmony("BSIPA Console Redirector Patcher");
stdoutInterceptor ??= new StdoutInterceptor(); stdoutInterceptor ??= new StdoutInterceptor();
stderrInterceptor ??= new StdoutInterceptor() { isStdErr = true };
stderrInterceptor ??= new StdoutInterceptor { isStdErr = true };
RedirectConsole(); RedirectConsole();
ConsoleHarmonyPatches.Patch(harmony); ConsoleHarmonyPatches.Patch(harmony);


Loading…
Cancel
Save