Merge branch 'main' into fix/base-types

Author: sunnamed434

src/BitMono.Core/Analyzing/SpecificNamespaceCriticalAnalyzer.cs

@@ -1,6 +1,5 @@
 namespace BitMono.Core.Analyzing;
 
-[SuppressMessage("ReSharper", "ConvertIfStatementToSwitchStatement")]
 public class SpecificNamespaceCriticalAnalyzer : ICriticalAnalyzer<IMetadataMember>
 {
     private readonly ObfuscationSettings _obfuscationSettings;
@@ -10,35 +9,32 @@ public SpecificNamespaceCriticalAnalyzer(IOptions<ObfuscationSettings> obfuscati
         _obfuscationSettings = obfuscation.Value;
     }
 
-    public bool NotCriticalToMakeChanges(IMetadataMember member)
+    private static string? GetNamespace(IMetadataMember member)
     {
-        if (_obfuscationSettings.SpecificNamespacesObfuscationOnly == false)
+        if (member is TypeDefinition type)
         {
-            return true;
+            return type.Namespace?.Value;
         }
-
-        var specificNamespaces = _obfuscationSettings.SpecificNamespaces!;
-        if (member is TypeDefinition type && type.HasNamespace())
+        if (member is MethodDefinition method)
         {
-            if (specificNamespaces.Any(s => s.Equals(type.Namespace?.Value)) == false)
-            {
-                return false;
-            }
+            return method.DeclaringType?.Namespace?.Value;
         }
-        if (member is MethodDefinition method && method.DeclaringType?.HasNamespace() == true)
+        if (member is FieldDefinition field)
         {
-            if (specificNamespaces.Any(s => s.Equals(method.DeclaringType.Namespace?.Value)) == false)
-            {
-                return false;
-            }
+            return field.DeclaringType?.Namespace?.Value;
         }
-        if (member is FieldDefinition field && field.DeclaringType?.HasNamespace() == true)
+        return null;
+    }
+
+    public bool NotCriticalToMakeChanges(IMetadataMember member)
+    {
+        if (!_obfuscationSettings.SpecificNamespacesObfuscationOnly)
         {
-            if (specificNamespaces.Any(s => s.Equals(field.DeclaringType.Namespace?.Value)) == false)
-            {
-                return false;
-            }
+            return true;
         }
-        return true;
+
+        string[] specificNamespaces = _obfuscationSettings.SpecificNamespaces!;
+        string ns = GetNamespace(member) ?? string.Empty;
+        return Array.IndexOf(specificNamespaces, ns) != -1;
     }
 }

src/BitMono.Core/Renaming/Renamer.cs

@@ -28,38 +28,52 @@ public string RenameUnsafely()
         var randomStringThree = strings[_randomNext(0, strings.Length - 1)];
         return $"{randomStringTwo} {randomStringOne}.{randomStringThree}";
     }
+
+    private bool ShouldRenameType(TypeDefinition? typeDefinition)
+    {
+        return typeDefinition == null || (_nameCriticalAnalyzer.NotCriticalToMakeChanges(typeDefinition) && !typeDefinition.IsExplicitLayout);
+    }
+
     public void Rename(IMetadataMember member)
     {
         if (member is TypeDefinition type)
         {
-            if (_nameCriticalAnalyzer.NotCriticalToMakeChanges(type))
+            if (ShouldRenameType(type) && ShouldRenameType(type.DeclaringType))
             {
                 type.Name = RenameUnsafely();
             }
         }
         if (member is MethodDefinition method)
         {
-            if (_nameCriticalAnalyzer.NotCriticalToMakeChanges(method))
+            if (_nameCriticalAnalyzer.NotCriticalToMakeChanges(method) && ShouldRenameType(method.DeclaringType))
             {
                 method.Name = RenameUnsafely();
             }
         }
         if (member is FieldDefinition field)
+        {
+            if (!field.IsCompilerGenerated() && ShouldRenameType(field.DeclaringType))
         {
             field.Name = RenameUnsafely();
+            }
         }
         if (member is ParameterDefinition parameter)
+        {
+            if (!parameter.IsCompilerGenerated())
         {
             parameter.Name = RenameUnsafely();
+            }
         }
     }
+
     public void Rename(params IMetadataMember[] members)
     {
         for (var i = 0; i < members.Length; i++)
         {
             Rename(members[i]);
         }
     }
+
     public void RemoveNamespace(IMetadataMember member)
     {
         if (member is TypeDefinition type)
@@ -87,8 +101,9 @@ public void RemoveNamespace(IMetadataMember member)
             }
         }
     }
+
     public void RemoveNamespace(params IMetadataMember[] members)
     {
         members.ForEach(RemoveNamespace);
     }
-}
+}