Merge pull request #22 from sunnamed434/dev

Bug fixes, code refactoring

Author: sunnamed434

BitMono/BitMono.API/Protecting/Analyzing/ICriticalAnalyzer.cs

@@ -1,4 +1,4 @@
-using BitMono.API.Protecting.Contexts;
+using BitMono.API.Protecting.Context;
 
 namespace BitMono.API.Protecting.Analyzing
 {

BitMono/BitMono.API/Protecting/Context/BitMonoContext.cs

@@ -1,4 +1,4 @@
-namespace BitMono.API.Protecting.Contexts
+namespace BitMono.API.Protecting.Context
 {
     public class BitMonoContext
     {

BitMono/BitMono.API/Protecting/Context/ProtectionContext.cs

@@ -1,9 +1,8 @@
 using dnlib.DotNet;
 using dnlib.DotNet.Writer;
 using NullGuard;
-using System.Reflection;
 
-namespace BitMono.API.Protecting.Contexts
+namespace BitMono.API.Protecting.Context
 {
     public class ProtectionContext
     {
@@ -14,7 +13,6 @@ public class ProtectionContext
         [AllowNull] public ModuleDefMD ExternalComponentsModuleDefMD { get; set; }
         [AllowNull] public Importer Importer { get; set; }
         [AllowNull] public Importer ExternalComponentsImporter { get; set; }
-        [AllowNull] public Assembly Assembly { get; set; }
         [AllowNull] public BitMonoContext BitMonoContext { get; set; }
 
         [AllowNull] public ModuleContext ModuleContext => ModuleCreationOptions.Context;

BitMono/BitMono.API/Protecting/IProtection.cs

@@ -1,4 +1,4 @@
-using BitMono.API.Protecting.Contexts;
+using BitMono.API.Protecting.Context;
 using System.Threading;
 using System.Threading.Tasks;
 

BitMono/BitMono.API/Protecting/Renaming/IRenamer.cs

@@ -1,4 +1,4 @@
-using BitMono.API.Protecting.Contexts;
+using BitMono.API.Protecting.Context;
 using dnlib.DotNet;
 
 namespace BitMono.API.Protecting.Renaming

BitMono/BitMono.API/Protecting/Resolvers/IAttemptAttributeResolver.cs

@@ -1,12 +1,11 @@
-using BitMono.API.Protecting.Contexts;
-using dnlib.DotNet;
+using dnlib.DotNet;
 using System;
 
 namespace BitMono.API.Protecting.Resolvers
 {
     public interface IAttemptAttributeResolver
     {
-        bool TryResolve<TAttribute>(ProtectionContext context, IDnlibDef dnlibDef, Predicate<TAttribute> review, Func<TAttribute, bool> predicate, out TAttribute attribute, bool inherit = false)
+        bool TryResolve<TAttribute>(IHasCustomAttribute from, Predicate<TAttribute> review, Func<TAttribute, bool> predicate, Func<TAttribute, bool> strip, out TAttribute attribute)
             where TAttribute : Attribute;
     }
 }

BitMono/BitMono.API/Protecting/Resolvers/ICustomAttributesResolver.cs

@@ -0,0 +1,11 @@
+using dnlib.DotNet;
+using System;
+using System.Collections.Generic;
+
+namespace BitMono.API.Protecting.Resolvers
+{
+    public interface ICustomAttributesResolver
+    {
+        IEnumerable<TAttribute> Resolve<TAttribute>(IHasCustomAttribute from, Func<TAttribute, bool> strip) where TAttribute : Attribute;
+    }
+}

BitMono/BitMono.API/Protecting/Resolvers/IDnlibDefAttributeResolver.cs

@@ -1,11 +1,10 @@
-using BitMono.API.Protecting.Contexts;
-using dnlib.DotNet;
+using dnlib.DotNet;
 using System.Runtime.CompilerServices;
 
 namespace BitMono.API.Protecting.Resolvers
 {
     public interface IMethodImplAttributeExcludingResolver
     {
-        bool TryResolve(ProtectionContext context, IDnlibDef dnlibDef, out MethodImplAttribute obfuscationAttribute, bool inherit = false);
+        bool TryResolve(IHasCustomAttribute from, out MethodImplAttribute obfuscationAttribute);
     }
 }

BitMono/BitMono.API/Protecting/Resolvers/IMethodImplAttributeExcludingResolver.cs

@@ -1,11 +1,10 @@
-using BitMono.API.Protecting.Contexts;
-using dnlib.DotNet;
+using dnlib.DotNet;
 using System.Reflection;
 
 namespace BitMono.API.Protecting.Resolvers
 {
     public interface IObfuscationAttributeExcludingResolver
     {
-        bool TryResolve(ProtectionContext context, IDnlibDef dnlibDef, string feature, out ObfuscationAttribute obfuscationAttribute, bool inherit = false);
+        bool TryResolve(IHasCustomAttribute from, string feature, out ObfuscationAttribute obfuscationAttribute);
     }
 }