Merge pull request #53 from sunnamed434/dev

Bump new version 0.5.0-alpha.14

CHANGELOG.md

@@ -1,5 +1,6 @@
 | Versions: |
 | - |
+| [v0.5.0-alpha](#v050-alpha14) |
 | [v0.4.4-alpha](#v044-alpha13) |
 | [v0.4.3-alpha](#v043-alpha12) |
 | [v0.4.2-alpha](#v042-alpha11) |
@@ -16,6 +17,15 @@
 | [v0.1.0](#v010) |
 
 ---
+### v0.5.0-alpha.14:
+#### Added:
+* Before obfuscation optmizes all method bodies (macros)
+
+#### Fixed: 
+* BitMethodDotnet Protection
+* StringsEncryption Protection
+
+
 ### v0.4.4-alpha.13:
 #### Fixed:
 * DotNetHook Protection

README.md

@@ -64,8 +64,10 @@ Credits
 
 **[Gazzi](https://github.com/GazziFX)** for his help that [me](https://github.com/sunnamed434) asked a lot!
 
-**[Elliesaur](https://github.com/Elliesaur)** for his acquaintance in **[DotNetHook](https://github.com/Elliesaur/DotNetHook)** that hides methods execution.
+**[Elliesaur](https://github.com/Elliesaur)** for his acquaintance in **[DotNetHook](https://github.com/Elliesaur/DotNetHook)** that hooks methods.
 
-**[Weka](https://github.com/sasharumega)** for his advices, help and motivation 
+**[Weka](https://github.com/sasharumega)** for his advices, help and motivation. 
 
-**[ConfuserEx and their Forks](https://github.com/yck1509/ConfuserEx)** for most things that I watched for the architecture of BitMono and the obfuscator engine as an application and solving plenty of User solutions which I would be knew in the very long future after much fail usage of BitMono and reports by other Users. Day-by-day I'm looking for something interesting there to improve myself in knowledge and BitMono also.
+**[ConfuserEx and their Forks](https://github.com/yck1509/ConfuserEx)** for most things that I watched for the architecture of BitMono and the obfuscator engine as an application and solving plenty of User solutions which I would be knew in the very long future after much fail usage of BitMono and reports by other Users. Day-by-day I'm looking for something interesting there to improve myself in knowledge and BitMono also.
+
+**[Kao and his blogs](https://lifeinhex.com/) thanks a lot of these blogs.

src/BitMono.API/Protecting/Contexts/ProtectionContext.cs

@@ -13,10 +13,4 @@ public class ProtectionContext
 
     [AllowNull] public ModuleContext ModuleContext => ModuleCreationOptions.Context;
     [AllowNull] public AssemblyResolver AssemblyResolver => (AssemblyResolver)ModuleContext.AssemblyResolver;
-
-    public void ReloadModule()
-    {
-        ModuleDefMD = ModuleDefMD.Load(ModuleDefMDOutput);
-        Importer = new Importer(ModuleDefMD);
-    }
 }

src/BitMono.CLI/GlobalUsings.cs

@@ -2,14 +2,13 @@
 global using BitMono.API.Configuration;
 global using BitMono.API.Protecting;
 global using BitMono.API.Protecting.Resolvers;
-global using BitMono.API.Protecting.Writers;
 global using BitMono.CLI.Modules;
 global using BitMono.Core.Extensions.Configuration;
 global using BitMono.Host;
 global using BitMono.Host.Modules;
 global using BitMono.Obfuscation;
+global using BitMono.Obfuscation.API;
 global using BitMono.Shared.Models;
-global using dnlib.DotNet;
 global using Microsoft.Extensions.Configuration;
 global using NullGuard;
 global using Serilog;

src/BitMono.CLI/Program.cs

@@ -83,7 +83,7 @@ private static async Task Main(string[] args)
             }
 
             new TipsNotifier(appSettingsConfiguration, logger).Notify();
-            //await serviceProvider.DisposeAsync();
+            await serviceProvider.DisposeAsync();
         }
         catch (Exception ex)
         {

src/BitMono.Core/GlobalUsings.cs

@@ -3,9 +3,6 @@
 global using BitMono.API.Protecting.Analyzing;
 global using BitMono.API.Protecting.Contexts;
 global using BitMono.API.Protecting.Injection;
-global using BitMono.API.Protecting.Injection.FieldDefs;
-global using BitMono.API.Protecting.Injection.MethodDefs;
-global using BitMono.API.Protecting.Injection.TypeDefs;
 global using BitMono.API.Protecting.Renaming;
 global using BitMono.API.Protecting.Resolvers;
 global using BitMono.Core.Extensions.Configuration;
@@ -27,7 +24,6 @@
 global using System.Reflection;
 global using System.Runtime.CompilerServices;
 global using System.Threading;
-global using System.Threading.Tasks;
 global using System.Xml.Serialization;
 global using FieldAttributes = dnlib.DotNet.FieldAttributes;
 global using TypeAttributes = dnlib.DotNet.TypeAttributes;

src/BitMono.Core/Protecting/Analyzing/TypeDefs/TypeDefModelCriticalAnalyzer.cs → src/BitMono.Core/Protecting/Analyzing/TypeDefs/TypeDefAttributeCriticalAnalyzer.cs

@@ -1,29 +1,29 @@
 namespace BitMono.Core.Protecting.Analyzing.TypeDefs;
 
-public class TypeDefModelCriticalAnalyzer : ICriticalAnalyzer<IHasCustomAttribute>
+public class TypeDefAttributeCriticalAnalyzer : ICriticalAnalyzer<IHasCustomAttribute>
 {
     private readonly IAttemptAttributeResolver m_AttemptAttributeResolver;
 
-    public TypeDefModelCriticalAnalyzer(IAttemptAttributeResolver attemptAttributeResolver)
+    public TypeDefAttributeCriticalAnalyzer(IAttemptAttributeResolver attemptAttributeResolver)
     {
         m_AttemptAttributeResolver = attemptAttributeResolver;
     }
 
-    public bool NotCriticalToMakeChanges(IHasCustomAttribute from)
+    public bool NotCriticalToMakeChanges(IHasCustomAttribute customAttribute)
     {
-        if (m_AttemptAttributeResolver.TryResolve<SerializableAttribute>(from, null, null, out _))
+        if (m_AttemptAttributeResolver.TryResolve<SerializableAttribute>(customAttribute, null, null, out _))
         {
             return false;
         }
-        if (m_AttemptAttributeResolver.TryResolve<XmlAttributeAttribute>(from, null, null, out _))
+        if (m_AttemptAttributeResolver.TryResolve<XmlAttributeAttribute>(customAttribute, null, null, out _))
         {
             return false;
         }
-        if (m_AttemptAttributeResolver.TryResolve<XmlArrayItemAttribute>(from, null, null, out _))
+        if (m_AttemptAttributeResolver.TryResolve<XmlArrayItemAttribute>(customAttribute, null, null, out _))
         {
             return false;
         }
-        if (m_AttemptAttributeResolver.TryResolve<JsonPropertyAttribute>(from, null, null, out _))
+        if (m_AttemptAttributeResolver.TryResolve<JsonPropertyAttribute>(customAttribute, null, null, out _))
         {
             return false;
         }

src/BitMono.Core/Protecting/Attributes/ProtectionNameAttribute.cs

@@ -1,6 +1,6 @@
 namespace BitMono.Core.Protecting.Attributes;
 
-[AttributeUsage(AttributeTargets.Class)]
+[AttributeUsage(AttributeTargets.Class, Inherited = false)]
 public class ProtectionNameAttribute : Attribute
 {
     public ProtectionNameAttribute(string name)