Fix #207

Author: sunnamed434

src/BitMono.Protections/DotNetHook.cs

@@ -20,7 +20,7 @@ public override Task ExecuteAsync()
         var listener = new ModifyInjectTypeClonerListener(ModifyFlags.All, _renamer, module);
         var memberCloneResult = new MemberCloner(module, listener)
             .Include(runtimeHookingType)
-            .Clone();
+            .CloneSafely(module, runtimeModule);
         var redirectStubMethod = memberCloneResult.GetClonedMember(runtimeRedirectStubMethod);
 
         var factory = module.CorLibTypeFactory;

src/BitMono.Protections/StringsEncryption.cs

@@ -10,20 +10,21 @@ public StringsEncryption(Renamer renamer, IServiceProvider serviceProvider) : ba
         _renamer = renamer;
     }
 
-    [SuppressMessage("ReSharper", "InvertIf")]
     public override Task ExecuteAsync()
     {
-        var globalModuleType = Context.Module.GetOrCreateModuleType();
-        MscorlibInjector.InjectCompilerGeneratedValueType(Context.Module, globalModuleType, _renamer.RenameUnsafely());
-        var cryptKeyField = MscorlibInjector.InjectCompilerGeneratedArray(Context.Module, globalModuleType, Data.CryptKeyBytes, _renamer.RenameUnsafely());
-        var saltBytesField = MscorlibInjector.InjectCompilerGeneratedArray(Context.Module, globalModuleType, Data.SaltBytes, _renamer.RenameUnsafely());
+        var module = Context.Module;
+        var globalModuleType = module.GetOrCreateModuleType();
+        MscorlibInjector.InjectCompilerGeneratedValueType(module, globalModuleType, _renamer.RenameUnsafely());
+        var cryptKeyField = MscorlibInjector.InjectCompilerGeneratedArray(module, globalModuleType, Data.CryptKeyBytes, _renamer.RenameUnsafely());
+        var saltBytesField = MscorlibInjector.InjectCompilerGeneratedArray(module, globalModuleType, Data.SaltBytes, _renamer.RenameUnsafely());
 
-        var runtimeDecryptorType = Context.RuntimeModule.ResolveOrThrow<TypeDefinition>(typeof(Decryptor));
+        var runtimeModule = Context.RuntimeModule;
+        var runtimeDecryptorType = runtimeModule.ResolveOrThrow<TypeDefinition>(typeof(Decryptor));
         var runtimeDecryptMethod = runtimeDecryptorType.Methods.Single(x => x.Name!.Equals(nameof(Decryptor.Decrypt)));
-        var listener = new ModifyInjectTypeClonerListener(ModifyFlags.All, _renamer, Context.Module);
-        var memberCloneResult = new MemberCloner(Context.Module, listener)
+        var listener = new ModifyInjectTypeClonerListener(ModifyFlags.All, _renamer, module);
+        var memberCloneResult = new MemberCloner(module, listener)
             .Include(runtimeDecryptorType)
-            .Clone();
+            .CloneSafely(module, runtimeModule);
 
         var decryptMethod = memberCloneResult.GetClonedMember(runtimeDecryptMethod);
 
@@ -49,7 +50,7 @@ public override Task ExecuteAsync()
 
                 var data = Encryptor.EncryptContent(content, Data.SaltBytes, Data.CryptKeyBytes);
                 var arrayName = _renamer.RenameUnsafely();
-                var encryptedDataFieldDef = MscorlibInjector.InjectCompilerGeneratedArray(Context.Module, globalModuleType, data, arrayName);
+                var encryptedDataFieldDef = MscorlibInjector.InjectCompilerGeneratedArray(module, globalModuleType, data, arrayName);
 
                 instruction.ReplaceWith(CilOpCodes.Ldsfld, encryptedDataFieldDef);
                 instructions.InsertRange(i + 1,

src/BitMono.Utilities/AsmResolver/CloneHelper.cs

@@ -0,0 +1,33 @@
+namespace BitMono.Utilities.AsmResolver;
+
+public static class CloneHelper
+{
+    /// <summary>
+    /// Clones via AsmResolver's API,
+    /// but removes the <see cref="cloningModule"/> assembly reference from <see cref="sourceModule"/>.
+    /// This is needed as a workaround, because sometimes AsmResolver adds
+    /// a reference of the included item to a <see cref="sourceModule"/>.
+    /// See here more details about that problem: https://github.com/sunnamed434/BitMono/issues/207
+    /// </summary>
+    /// <param name="cloner">The cloner.</param>
+    /// <param name="sourceModule">The source module.</param>
+    /// <param name="cloningModule">The cloning module.</param>
+    /// <returns>The clone result.</returns>
+    public static MemberCloneResult CloneSafely(this MemberCloner cloner,
+        ModuleDefinition sourceModule, ModuleDefinition cloningModule)
+    {
+        var cloningModuleAssembly = cloningModule.Assembly
+                                    ?? throw new InvalidOperationException($"{nameof(cloningModule)} assembly was null");
+
+        var result = cloner.Clone();
+
+        var fullName = cloningModuleAssembly.FullName;
+        if (sourceModule.AssemblyReferences.FirstOrDefault(
+                x => x.FullName == fullName) is { } assembly)
+        {
+            sourceModule.AssemblyReferences.Remove(assembly);
+        }
+
+        return result;
+    }
+}

src/BitMono.Utilities/GlobalUsings.cs

@@ -16,6 +16,7 @@
 global using System.Runtime.InteropServices;
 global using System.Runtime.Versioning;
 global using System.Text;
+global using AsmResolver.DotNet.Cloning;
 global using AsmResolver.DotNet.Signatures;
 global using AsmResolver.DotNet.Signatures.Parsing;
 global using TypeAttributes = AsmResolver.PE.DotNet.Metadata.Tables.TypeAttributes;