Merge pull request #222 from sunnamed434/bump_asmresolver_version

Bump asmresolver version, and other fixes

Author: sunnamed434

props/SharedPackages.props

@@ -1,9 +1,9 @@
 <Project>
 
   <ItemGroup>
-    <PackageReference Include="AsmResolver" Version="6.0.0-beta.2" />
-    <PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.2" />
-    <PackageReference Include="AsmResolver.PE" Version="6.0.0-beta.2" />
+    <PackageReference Include="AsmResolver" Version="6.0.0-beta.3" />
+    <PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.3" />
+    <PackageReference Include="AsmResolver.PE" Version="6.0.0-beta.3" />
     <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
   </ItemGroup>
 

src/BitMono.Protections/BitMethodDotnet.cs

@@ -23,21 +23,19 @@ public override Task ExecuteAsync()
                 continue;
             }
 
-            var randomMethodBodyIndex = 0;
-            if (body.Instructions.Count >= 3)
-            {
-                randomMethodBodyIndex = _randomNext(0, body.Instructions.Count);
-            }
-
+            const int firstInstruction = 0;
             var instruction = GetRandomInstruction();
-            var label = body.Instructions[randomMethodBodyIndex].CreateLabel();
-            body.Instructions.Insert(randomMethodBodyIndex, new CilInstruction(CilOpCodes.Br_S));
-            body.Instructions.Insert(randomMethodBodyIndex + 1, instruction);
-            body.Instructions[randomMethodBodyIndex].Operand = label;
+            var label = body.Instructions[firstInstruction].CreateLabel();
+            body.Instructions.Insert(firstInstruction, new CilInstruction(CilOpCodes.Br_S));
+            body.Instructions.Insert(firstInstruction + 1, instruction);
+            body.Instructions[firstInstruction].Operand = label;
         }
         return Task.CompletedTask;
     }
 
+    /// <summary>
+    /// Get the random instruction that breaks the decompiler method.
+    /// </summary>
     private CilInstruction GetRandomInstruction()
     {
         var randomValue = _randomNext(0, 3);

src/BitMono.Protections/FullRenamer.cs

@@ -10,39 +10,59 @@ public FullRenamer(Renamer renamer, IServiceProvider serviceProvider) : base(ser
         _renamer = renamer;
     }
 
-    [SuppressMessage("ReSharper", "InvertIf")]
     public override Task ExecuteAsync()
     {
         foreach (var method in Context.Parameters.Members.OfType<MethodDefinition>())
         {
-            if (method.DeclaringType?.IsModuleType == false && method is { IsConstructor: false, IsVirtual: false })
+            if (method.DeclaringType?.IsModuleType == true)
             {
-                _renamer.Rename(method);
-                if (method.HasParameters())
+                continue;
+            }
+            if (method.IsConstructor || method.IsVirtual)
+            {
+                continue;
+            }
+            if (method.IsCompilerGenerated())
+            {
+                continue;
+            }
+            _renamer.Rename(method);
+            if (!method.HasParameters())
+            {
+                continue;
+            }
+            foreach (var parameter in method.Parameters)
+            {
+                if (parameter.Definition == null)
                 {
-                    foreach (var parameter in method.Parameters)
-                    {
-                        if (parameter.Definition != null)
-                        {
-                            _renamer.Rename(parameter.Definition);
-                        }
-                    }
+                    continue;
                 }
+                _renamer.Rename(parameter.Definition);
             }
         }
         foreach (var type in Context.Parameters.Members.OfType<TypeDefinition>())
         {
-            if (type.IsModuleType == false)
+            if (type.IsModuleType)
+            {
+                continue;
+            }
+            if (type.IsCompilerGenerated())
             {
-                _renamer.Rename(type);
+                continue;
             }
+            _renamer.Rename(type);
         }
         foreach (var field in Context.Parameters.Members.OfType<FieldDefinition>())
         {
-            if (field.DeclaringType?.IsModuleType == false)
+            if (field.DeclaringType?.IsModuleType == true)
+            {
+                continue;
+            }
+            if (field.IsCompilerGenerated())
             {
-                _renamer.Rename(field);
+                continue;
             }
+            _renamer.Rename(field);
         }
         return Task.CompletedTask;
     }

src/BitMono.Protections/UnmanagedString.cs

@@ -13,13 +13,13 @@ public override Task ExecuteAsync()
     {
         var moduleImporter = Context.ModuleImporter;
         var stringSbytePointerCtor =
-            moduleImporter.ImportMethod(typeof(string).GetConstructor(new[] { typeof(sbyte*) })!);
+            moduleImporter.ImportMethod(typeof(string).GetConstructor([typeof(sbyte*)])!);
         var stringCharPointerCtor =
-            moduleImporter.ImportMethod(typeof(string).GetConstructor(new[] { typeof(char*) })!);
+            moduleImporter.ImportMethod(typeof(string).GetConstructor([typeof(char*)])!);
         var stringSbytePointerWithLengthCtor =
-            moduleImporter.ImportMethod(typeof(string).GetConstructor(new[] { typeof(sbyte*), typeof(int), typeof(int) })!);
+            moduleImporter.ImportMethod(typeof(string).GetConstructor([typeof(sbyte*), typeof(int), typeof(int)])!);
         var stringCharPointerWithLengthCtor =
-            moduleImporter.ImportMethod(typeof(string).GetConstructor(new[] { typeof(char*), typeof(int), typeof(int) })!);
+            moduleImporter.ImportMethod(typeof(string).GetConstructor([typeof(char*), typeof(int), typeof(int)])!);
         var encodedStrings = new Dictionary<string, MethodDefinition>();
         foreach (var method in Context.Parameters.Members.OfType<MethodDefinition>())
         {