Update to latest AsmResolver version

sunnamed434 · sunnamed434 · commit c29ad7d6577e · 2025-09-11T20:52:58.000+03:00
diff --git a/props/SharedPackages.props b/props/SharedPackages.props
@@ -1,7 +1,7 @@
 ﻿<Project>
 
   <ItemGroup>
-    <PackageReference Include="AsmResolver" Version="6.0.0-beta.3" />
+    <PackageReference Include="AsmResolver" Version="6.0.0-beta.4" />
     <PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.4" />
     <PackageReference Include="AsmResolver.PE" Version="6.0.0-beta.4" />
     <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
diff --git a/src/BitMono.Core/Analyzing/ReflectionCriticalAnalyzer.cs b/src/BitMono.Core/Analyzing/ReflectionCriticalAnalyzer.cs
@@ -49,7 +49,7 @@ public bool NotCriticalToMakeChanges(MethodDefinition method)
                             var traceArgument = TraceLdstrArgument(body, instruction);
                             if (traceArgument?.Operand is string traceMethodName)
                             {
-                                foreach (var possibleMethod in method.Module
+                                foreach (var possibleMethod in method.DeclaringModule
                                              .FindMembers()
                                              .OfType<MethodDefinition>()
                                              .Where(x => x.Name.Equals(traceMethodName)))
diff --git a/src/BitMono.Protections/BillionNops.cs b/src/BitMono.Protections/BillionNops.cs
@@ -17,7 +17,7 @@ public override Task ExecuteAsync()
         var method = new MethodDefinition(_renamer.RenameUnsafely(), MethodAttributes.Public | MethodAttributes.Static,
             MethodSignature.CreateStatic(factory.Void));
         moduleType.Methods.Add(method);
-        var body = method.CilMethodBody = new CilMethodBody(method);
+        var body = method.CilMethodBody = new CilMethodBody();
         for (var i = 0; i < 100000; i++)
         {
             Context.ThrowIfCancellationTokenRequested();
diff --git a/src/BitMono.Protections/DotNetHook.cs b/src/BitMono.Protections/DotNetHook.cs
@@ -76,25 +76,24 @@ public override Task ExecuteAsync()
                         actualParameter.Name, actualParameter.Attributes);
                     dummyMethod.ParameterDefinitions.Add(parameter);
                 }
-                var dummyMethodBody = dummyMethod.CilMethodBody = new CilMethodBody(dummyMethod);
+                var dummyMethodBody = dummyMethod.CilMethodBody = new CilMethodBody();
                 if (callingMethod.Signature.ReturnsValue)
                 {
                     dummyMethodBody.Instructions.Add(new CilInstruction(CilOpCodes.Ldnull));
                 }
                 dummyMethodBody.Instructions.Add(new CilInstruction(CilOpCodes.Ret));
                 var signature = MethodSignature.CreateStatic(systemVoid);
-                var initializationMethod = new MethodDefinition(
-                    _renamer.RenameUnsafely(),
-                    MethodAttributes.Assembly | MethodAttributes.Static,
-                    signature);
-                initializationMethod.CilMethodBody = new CilMethodBody(initializationMethod)
+                var initializationMethod = new MethodDefinition( _renamer.RenameUnsafely(), MethodAttributes.Assembly | MethodAttributes.Static, signature)
                 {
-                    Instructions =
+                    CilMethodBody = new CilMethodBody
                     {
-                        new CilInstruction(CilOpCodes.Ldc_I4, dummyMethod.MetadataToken.ToInt32()),
-                        new CilInstruction(CilOpCodes.Ldc_I4, callingMethodMetadata.MetadataToken.ToInt32()),
-                        new CilInstruction(CilOpCodes.Call, redirectStubMethod),
-                        new CilInstruction(CilOpCodes.Ret)
+                        Instructions =
+                        {
+                            new CilInstruction(CilOpCodes.Ldc_I4, dummyMethod.MetadataToken.ToInt32()),
+                            new CilInstruction(CilOpCodes.Ldc_I4, callingMethodMetadata.MetadataToken.ToInt32()),
+                            new CilInstruction(CilOpCodes.Call, redirectStubMethod),
+                            new CilInstruction(CilOpCodes.Ret)
+                        }
                     }
                 };
                 moduleType.Methods.Add(initializationMethod);
diff --git a/src/BitMono.Protections/UnmanagedString.cs b/src/BitMono.Protections/UnmanagedString.cs
@@ -118,10 +118,7 @@ private static MethodDefinition CreateNativeMethod(string content, ModuleDefinit
         }
         code = code.Concat(stringBytes);
 
-        var body = new NativeMethodBody(method)
-        {
-            Code = code.ToArray()
-        };
+        var body = new NativeMethodBody(code.ToArray());
         method.NativeMethodBody = body;
         return method;
     }
diff --git a/src/BitMono.Utilities/AsmResolver/MethodDefinitionExtensions.cs b/src/BitMono.Utilities/AsmResolver/MethodDefinitionExtensions.cs
@@ -4,7 +4,7 @@ public static class MethodDefinitionExtensions
 {
     public static bool IsAsync(this MethodDefinition source)
     {
-        foreach (var type in source.Module.GetAllTypes())
+        foreach (var type in source.DeclaringModule.GetAllTypes())
         {
             foreach (var nestedType in type.NestedTypes.Where(x => x.Name.StartsWith("<")))
             {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public bool NotCriticalToMakeChanges(MethodDefinition method)`
`49`	`49`	`var traceArgument = TraceLdstrArgument(body, instruction);`
`50`	`50`	`if (traceArgument?.Operand is string traceMethodName)`
`51`	`51`	`{`
`52`		`- foreach (var possibleMethod in method.Module`
	`52`	`+ foreach (var possibleMethod in method.DeclaringModule`
`53`	`53`	`.FindMembers()`
`54`	`54`	`.OfType<MethodDefinition>()`
`55`	`55`	`.Where(x => x.Name.Equals(traceMethodName)))`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public override Task ExecuteAsync()`
`17`	`17`	`var method = new MethodDefinition(_renamer.RenameUnsafely(), MethodAttributes.Public \| MethodAttributes.Static,`
`18`	`18`	`MethodSignature.CreateStatic(factory.Void));`
`19`	`19`	`moduleType.Methods.Add(method);`
`20`		`- var body = method.CilMethodBody = new CilMethodBody(method);`
	`20`	`+ var body = method.CilMethodBody = new CilMethodBody();`
`21`	`21`	`for (var i = 0; i < 100000; i++)`
`22`	`22`	`{`
`23`	`23`	`Context.ThrowIfCancellationTokenRequested();`
Original file line number	Diff line number	Diff line change
`@@ -118,10 +118,7 @@ private static MethodDefinition CreateNativeMethod(string content, ModuleDefinit`
`118`	`118`	`}`
`119`	`119`	`code = code.Concat(stringBytes);`
`120`	`120`
`121`		`- var body = new NativeMethodBody(method)`
`122`		`- {`
`123`		`- Code = code.ToArray()`
`124`		`- };`
	`121`	`+ var body = new NativeMethodBody(code.ToArray());`
`125`	`122`	`method.NativeMethodBody = body;`
`126`	`123`	`return method;`
`127`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ public static class MethodDefinitionExtensions`
`4`	`4`	`{`
`5`	`5`	`public static bool IsAsync(this MethodDefinition source)`
`6`	`6`	`{`
`7`		`- foreach (var type in source.Module.GetAllTypes())`
	`7`	`+ foreach (var type in source.DeclaringModule.GetAllTypes())`
`8`	`8`	`{`
`9`	`9`	`foreach (var nestedType in type.NestedTypes.Where(x => x.Name.StartsWith("<")))`
`10`	`10`	`{`