|
@ -30,7 +30,7 @@ namespace IPA.Injector |
|
|
{ |
|
|
{ |
|
|
private static Task pluginAsyncLoadTask; |
|
|
private static Task pluginAsyncLoadTask; |
|
|
private static Task permissionFixTask; |
|
|
private static Task permissionFixTask; |
|
|
private static string otherNewtonsoftJson = null; |
|
|
|
|
|
|
|
|
//private static string otherNewtonsoftJson = null;
|
|
|
|
|
|
|
|
|
// ReSharper disable once UnusedParameter.Global
|
|
|
// ReSharper disable once UnusedParameter.Global
|
|
|
internal static void Main(string[] args) |
|
|
internal static void Main(string[] args) |
|
@ -47,7 +47,7 @@ namespace IPA.Injector |
|
|
|
|
|
|
|
|
SetupLibraryLoading(); |
|
|
SetupLibraryLoading(); |
|
|
|
|
|
|
|
|
var otherNewtonsoft = Path.Combine( |
|
|
|
|
|
|
|
|
/*var otherNewtonsoft = Path.Combine( |
|
|
Directory.EnumerateDirectories(Environment.CurrentDirectory, "*_Data").First(), |
|
|
Directory.EnumerateDirectories(Environment.CurrentDirectory, "*_Data").First(), |
|
|
"Managed", |
|
|
"Managed", |
|
|
"Newtonsoft.Json.dll"); |
|
|
"Newtonsoft.Json.dll"); |
|
@ -55,7 +55,7 @@ namespace IPA.Injector |
|
|
{ // this game ships its own Newtonsoft; force load ours and flag loading theirs
|
|
|
{ // this game ships its own Newtonsoft; force load ours and flag loading theirs
|
|
|
LibLoader.LoadLibrary(new AssemblyName("Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed")); |
|
|
LibLoader.LoadLibrary(new AssemblyName("Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed")); |
|
|
otherNewtonsoftJson = otherNewtonsoft; |
|
|
otherNewtonsoftJson = otherNewtonsoft; |
|
|
} |
|
|
|
|
|
|
|
|
}*/ |
|
|
|
|
|
|
|
|
EnsureDirectories(); |
|
|
EnsureDirectories(); |
|
|
|
|
|
|
|
@ -271,8 +271,8 @@ namespace IPA.Injector |
|
|
if (bootstrapped) return; |
|
|
if (bootstrapped) return; |
|
|
bootstrapped = true; |
|
|
bootstrapped = true; |
|
|
|
|
|
|
|
|
if (otherNewtonsoftJson != null) |
|
|
|
|
|
Assembly.LoadFrom(otherNewtonsoftJson); |
|
|
|
|
|
|
|
|
/*if (otherNewtonsoftJson != null) |
|
|
|
|
|
Assembly.LoadFrom(otherNewtonsoftJson);*/ |
|
|
|
|
|
|
|
|
Application.logMessageReceived += delegate (string condition, string stackTrace, LogType type) |
|
|
Application.logMessageReceived += delegate (string condition, string stackTrace, LogType type) |
|
|
{ |
|
|
{ |
|
|