Merge pull request #86 from Lorilatschki/master

fix: consider types referenced by non compiler generated fields inside ctor base calls

Author: BenMorris

src/NetArchTest.Rules/Dependencies/TypeDefinitionCheckingContext.cs

@@ -220,6 +220,12 @@ private void CheckMethodBodyInstructions(MethodDefinition methodToCheck)
                                 }
                             }
                             break;
+                        case FieldReference fieldReference:
+                            if (!fieldReference.Resolve().CustomAttributes.IsCompilerGenerated())
+                            {
+                                CheckTypeReference(fieldReference.DeclaringType);
+                            }
+                            break;
                         case MethodReference methodReference:
                             CheckTypeReference( methodReference.DeclaringType);
                             break;

src/NetArchTest.Rules/Extensions/TypeDefinitionExtensions.cs

@@ -5,6 +5,7 @@
     using System.Collections.Generic;
     using Mono.Cecil;
     using System.Runtime.CompilerServices;
+    using Mono.Collections.Generic;
 
     /// <summary>
     /// Extensions for the <see cref="TypeDefinition"/> class.
@@ -107,7 +108,12 @@ public static bool HasNullableMembers(this TypeDefinition typeDefinition)
 
         public static bool IsCompilerGenerated(this TypeDefinition typeDefinition)
         {
-            return typeDefinition.CustomAttributes.Any(x => x?.AttributeType?.FullName == typeof(CompilerGeneratedAttribute).FullName);
+            return typeDefinition.CustomAttributes.IsCompilerGenerated();
+        }
+
+        public static bool IsCompilerGenerated(this Collection<CustomAttribute> customAttributes)
+        {
+            return customAttributes.Any(x => x?.AttributeType?.FullName == typeof(CompilerGeneratedAttribute).FullName);
         }
 
         /// <summary>

src/NetArchTest.Rules/NetArchTest.Rules.xml

@@ -396,6 +396,12 @@ public void DependencySearch_VariableTupleNested_Found()
         public void DependencySearch_VariableTuple_NotFound()
         {
             Utils.RunDependencyTest(typeof(VariableTuple), typeof(Tuple<int, double>), false, true);
-        }        
+        }
+
+        [Fact(DisplayName = "Finds a dependency StaticType in BaseCtorCall.")]
+        public void DependencySearch_BaseCtorCall_Found()
+        {
+            Utils.RunDependencyTest(typeof(BaseCtorCall), typeof(StaticType), true, true);
+        }
     }
 }

test/NetArchTest.Rules.UnitTests/DependencySearch/DependencyTypeTests.cs

@@ -0,0 +1,28 @@
+namespace NetArchTest.TestStructure.Dependencies.Examples
+{
+    public struct Id
+    {
+    }
+
+    public static class StaticType
+    {
+        public static readonly Id SomeId;
+    }
+
+    public abstract class BaseCtorCallBase
+    {
+#pragma warning disable 219
+        protected BaseCtorCallBase(params Id[] ids)
+        {
+        }
+#pragma warning restore 219
+    }
+
+    public class BaseCtorCall : BaseCtorCallBase
+    {
+        public BaseCtorCall() :
+            base(StaticType.SomeId)
+        {
+        }
+    }
+}