diff --git a/BepInEx.Preloader/BepInEx.Preloader.csproj b/BepInEx.Preloader/BepInEx.Preloader.csproj index b98ed29..b589fc1 100644 --- a/BepInEx.Preloader/BepInEx.Preloader.csproj +++ b/BepInEx.Preloader/BepInEx.Preloader.csproj @@ -23,8 +23,8 @@ ..\bin\BepInEx.Preloader.xml - - ..\packages\HarmonyX.2.0.6\lib\net35\0Harmony.dll + + ..\packages\HarmonyX.2.1.0-beta.4\lib\net35\0Harmony.dll True @@ -68,9 +68,9 @@ {4ffba620-f5ed-47f9-b90c-dad1316fd9b9} BepInEx - - {54161cfe-ff42-4dde-b161-3a49545db5cd} - BepInEx.Harmony + + {160f7fe0-288d-435c-9e7e-497d3e0de3a6} + HarmonyXInterop diff --git a/BepInEx.Preloader/Entrypoint.cs b/BepInEx.Preloader/Entrypoint.cs index 30fcbfa..1aab3ab 100644 --- a/BepInEx.Preloader/Entrypoint.cs +++ b/BepInEx.Preloader/Entrypoint.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; using System.Reflection; using BepInEx.Preloader.RuntimeFixes; +using HarmonyXInterop; namespace BepInEx.Preloader { @@ -13,6 +14,7 @@ namespace BepInEx.Preloader string bepinPath = Utility.ParentDirectory(Path.GetFullPath(EnvVars.DOORSTOP_INVOKE_DLL_PATH), 2); Paths.SetExecutablePath(EnvVars.DOORSTOP_PROCESS_PATH, bepinPath, EnvVars.DOORSTOP_MANAGED_FOLDER_DIR); + HarmonyInterop.Initialize(); AppDomain.CurrentDomain.AssemblyResolve += LocalResolve; PreloaderMain(); diff --git a/BepInEx.Preloader/packages.config b/BepInEx.Preloader/packages.config index 7cbc8db..d9f0a5c 100644 --- a/BepInEx.Preloader/packages.config +++ b/BepInEx.Preloader/packages.config @@ -1,6 +1,6 @@  - + diff --git a/BepInEx.sln b/BepInEx.sln index fc5f004..ddef28b 100644 --- a/BepInEx.sln +++ b/BepInEx.sln @@ -26,6 +26,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BepInExTests", "BepInExTest {4FFBA620-F5ED-47F9-B90C-DAD1316FD9B9} = {4FFBA620-F5ED-47F9-B90C-DAD1316FD9B9} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarmonyXInterop", "submodules\BepInEx.Harmony\HarmonyXInterop\HarmonyXInterop.csproj", "{160F7FE0-288D-435C-9E7E-497D3E0DE3A6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarmonyX2Interop", "submodules\BepInEx.Harmony\HarmonyX2Interop\HarmonyX2Interop.csproj", "{69F6541D-A0F5-419D-B0EE-F5017F1D34F3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -55,6 +59,14 @@ Global {E7CD429A-D057-48E3-8C51-E5C934E8E07B}.Debug|Any CPU.ActiveCfg = Debug|x86 {E7CD429A-D057-48E3-8C51-E5C934E8E07B}.Debug|Any CPU.Build.0 = Debug|x86 {E7CD429A-D057-48E3-8C51-E5C934E8E07B}.Release|Any CPU.ActiveCfg = Release|x86 + {160F7FE0-288D-435C-9E7E-497D3E0DE3A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {160F7FE0-288D-435C-9E7E-497D3E0DE3A6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {160F7FE0-288D-435C-9E7E-497D3E0DE3A6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {160F7FE0-288D-435C-9E7E-497D3E0DE3A6}.Release|Any CPU.Build.0 = Release|Any CPU + {69F6541D-A0F5-419D-B0EE-F5017F1D34F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {69F6541D-A0F5-419D-B0EE-F5017F1D34F3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {69F6541D-A0F5-419D-B0EE-F5017F1D34F3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {69F6541D-A0F5-419D-B0EE-F5017F1D34F3}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -63,6 +75,8 @@ Global {DC89F18B-235B-4C01-AB31-AF40DCE5C4C7} = {A9071994-3533-4C1B-89DC-D817B676AB41} {6E6BC1E5-5BE8-4566-B3AE-52C4CB218AEB} = {A9071994-3533-4C1B-89DC-D817B676AB41} {54161CFE-FF42-4DDE-B161-3A49545DB5CD} = {BAC58F7E-AAD8-4D0C-9490-9765ACBBA6FB} + {160F7FE0-288D-435C-9E7E-497D3E0DE3A6} = {BAC58F7E-AAD8-4D0C-9490-9765ACBBA6FB} + {69F6541D-A0F5-419D-B0EE-F5017F1D34F3} = {BAC58F7E-AAD8-4D0C-9490-9765ACBBA6FB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {55AC11EF-F568-4C79-A356-7ED9510145B1} diff --git a/BepInEx/BepInEx.csproj b/BepInEx/BepInEx.csproj index 54a7296..af4f1d5 100644 --- a/BepInEx/BepInEx.csproj +++ b/BepInEx/BepInEx.csproj @@ -41,8 +41,8 @@ true - - ..\packages\HarmonyX.2.0.6\lib\net35\0Harmony.dll + + ..\packages\HarmonyX.2.1.0-beta.4\lib\net35\0Harmony.dll True diff --git a/BepInEx/packages.config b/BepInEx/packages.config index 7cbc8db..d9f0a5c 100644 --- a/BepInEx/packages.config +++ b/BepInEx/packages.config @@ -1,6 +1,6 @@  - +