Rebase upstream to 2.3.6 #131
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ILRepack usually resolves framework assemblies from the dotnet SDK directories if the corresponding .NET Core version is installed. If it's not installed, let's download Microsoft.NetCore.App.Ref NuGet package (equivalent of Microsoft.NETFramework.ReferenceAssemblies but for Core) of the specified version and pass the path to ILRepack so it can find the .dlls there. Confirmed this fixes the build.
* Use the local ReleaseRef package for easier releasing * Using a local pakcage folder where all NuGet packages will be built * Added back NuGet zip
fix typo
Update patching-prefix.md
Remove non use using, add HarmonyPatchAttribute on other patchs, move snipet code exemple in the csharp file.
Add Code Matcher exemple to the documentation
revert pointless typo
repeat mutation to see effect fixed bind error restore missing test
update MonoMod.Core to 1.2.2 to address net9 issue
Fix #638 by preventing the NullReferenceException
MethodDelegate: allow for swapping value type with object, and allow ref for arg 0 on value type
…n't try searching for it with AccessTools
Allows empty string for targeting special MethodType options and doesn't try searching for it with AccessTools
…erent when using Assembly.GetType()
# Conflicts: # .github/workflows/test-build.yml # .github/workflows/test-unix-mono.yml # .github/workflows/test.yml # Directory.Build.props # Harmony.sln # Harmony/Documentation/Documentation.csproj # Harmony/Documentation/GlobalSuppressions.cs # Harmony/Documentation/api/index.md # Harmony/Documentation/articles/patching-prefix.md # Harmony/Documentation/articles/toc.md # Harmony/Documentation/examples/reverse-patching.cs # Harmony/Documentation/filterConfig.yml # Harmony/Harmony.csproj # Harmony/Internal/CodeTranspiler.cs # Harmony/Internal/Emitter.cs # Harmony/Internal/InlineSignatureParser.cs # Harmony/Internal/MethodCopier.cs # Harmony/Internal/MethodPatcher.cs # Harmony/Internal/PatchModels.cs # Harmony/Internal/PatchSorter.cs # Harmony/Internal/PatchTools.cs # Harmony/Public/CodeInstruction.cs # Harmony/Public/ExceptionBlock.cs # Harmony/Public/HarmonyException.cs # Harmony/Public/Patch.cs # Harmony/Public/PatchProcessor.cs # Harmony/Public/ReversePatcher.cs # Harmony/Tools/AccessTools.cs # Harmony/Tools/CodeMatcher.cs # Harmony/Tools/CodeMatcher/Code.cs # Harmony/Tools/Traverse.cs # HarmonyTests/HarmonyTests.csproj # HarmonyTests/IL/TestMethodBodyReader.cs # HarmonyTests/Patching/Assets/PatchClasses.cs # HarmonyTests/Tools/Assets/CodeMatcherClass.cs # HarmonyTests/Tools/TestCodeMatcher.cs # ILRepack.targets # README.md # TestLibrary/TestLibrary.csproj # docs/api/HarmonyLib.AccessTools.FieldRef-1.html # docs/api/HarmonyLib.AccessTools.FieldRef-2.html # docs/api/HarmonyLib.AccessTools.StructFieldRef-2.html # docs/api/HarmonyLib.AccessTools.html # docs/api/HarmonyLib.Break_.html # docs/api/HarmonyLib.Code.html # docs/api/HarmonyLib.CodeInstruction.html # docs/api/HarmonyLib.CodeInstructionExtensions.html # docs/api/HarmonyLib.CodeInstructionsExtensions.html # docs/api/HarmonyLib.CodeMatch.html # docs/api/HarmonyLib.CodeMatcher.html # docs/api/HarmonyLib.CollectionExtensions.html # docs/api/HarmonyLib.ExceptionBlock.html # docs/api/HarmonyLib.FastAccess.html # docs/api/HarmonyLib.FileLog.html # docs/api/HarmonyLib.HarmonyMethod.html # docs/api/HarmonyLib.HarmonyMethodExtensions.html # docs/api/HarmonyLib.InstantiationHandler-1.html # docs/api/HarmonyLib.MethodBaseExtensions.html # docs/api/HarmonyLib.Patch.html # docs/api/HarmonyLib.PatchInfo.html # docs/api/HarmonyLib.PatchProcessor.html # docs/api/HarmonyLib.ReversePatcher.html # docs/api/HarmonyLib.Traverse.html # docs/api/HarmonyLib.html # docs/api/index.html # docs/api/toc.html # docs/articles/patching-prefix.html # docs/articles/reverse-patching.html # docs/articles/toc.html # docs/manifest.json # docs/xrefmap.yml
c97cc6a to
df0f977
Compare
dd0d10f to
c236d6e
Compare
ManlyMarco
approved these changes
Aug 22, 2025
# Conflicts: # Directory.Build.props
This was referenced Sep 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Includes a monomod update to 25.2.3 which is the version 2.3.6 used. A separate PR will be opened to upgrade it to 25.3.0 so ARM support can be tested independently from this.
Other than that, it's relatively straight forward since the previous base was 2.3.3. So this mostly includes minor features and bugfixes. Rebasing to 2.4.0 is much more complicated and since it's not necessary on its own to gain ARM support, it can be defered (I'm not experienced enough to do this myself, it's a very large rebase with some big features such as infixes).