Fixed crash when multiple cache properties present

Author: pergerch

src/SpatialFocus.MethodCache.Fody/Extensions/TypeDefinitionExtension.cs

@@ -5,6 +5,7 @@
 namespace SpatialFocus.MethodCache.Fody.Extensions
 {
 	using System;
+	using System.Collections.Generic;
 	using System.Linq;
 	using Mono.Cecil;
 
@@ -39,12 +40,12 @@ public static bool IsEligibleForWeaving(this TypeDefinition typeDefinition, Refe
 				throw new ArgumentNullException(nameof(references));
 			}
 
-			bool isEligibleForWeaving = typeDefinition.TryGetCacheGetterProperty(references) != null;
+			bool isEligibleForWeaving = typeDefinition.TryGetCacheGetterProperty(references)?.Count == 1;
 
 			return isEligibleForWeaving;
 		}
 
-		public static PropertyDefinition TryGetCacheGetterProperty(this TypeDefinition typeDefinition, References references)
+		public static List<PropertyDefinition> TryGetCacheGetterProperty(this TypeDefinition typeDefinition, References references)
 		{
 			if (typeDefinition == null)
 			{
@@ -56,7 +57,7 @@ public static PropertyDefinition TryGetCacheGetterProperty(this TypeDefinition t
 				throw new ArgumentNullException(nameof(references));
 			}
 
-			PropertyDefinition property = typeDefinition.Properties.Where(propertyDefinition =>
+			List<PropertyDefinition> properties = typeDefinition.Properties.Where(propertyDefinition =>
 				{
 					TypeDefinition propertyTypeDefinition = propertyDefinition.PropertyType.Resolve();
 					TypeDefinition memoryCacheInterface = references.MemoryCacheInterface.Resolve();
@@ -78,15 +79,15 @@ public static PropertyDefinition TryGetCacheGetterProperty(this TypeDefinition t
 
 					return false;
 				})
-				.SingleOrDefault();
+				.ToList();
 
-			if (property == null && typeDefinition.BaseType != null)
+			if (!properties.Any() && typeDefinition.BaseType != null)
 			{
 				TypeDefinition baseTypeDefinition = typeDefinition.BaseType.Resolve();
-				property = baseTypeDefinition.TryGetCacheGetterProperty(references);
+				properties = baseTypeDefinition.TryGetCacheGetterProperty(references);
 			}
 
-			return property;
+			return properties;
 		}
 
 		public static CustomAttribute TryGetCacheAttribute(this TypeDefinition typeDefinition, References references)

src/SpatialFocus.MethodCache.Fody/MemoryCache.cs

@@ -51,16 +51,16 @@ public static MethodReference GetCacheGetterMethod(ClassWeavingContext classWeav
 			}
 
 			// TODO: Check if this can be inherited, extract to class level
-			PropertyDefinition propertyDefinition =
+			List<PropertyDefinition> propertyDefinitions =
 				classWeavingContext.TypeDefinition.TryGetCacheGetterProperty(classWeavingContext.References);
 
 			// TODO: Also check fields
-			if (propertyDefinition == null)
+			if (propertyDefinitions == null || propertyDefinitions.Count != 1)
 			{
-				throw new WeavingException("Property not found");
+				throw new WeavingException("Cache Property not found or multiple properties found.");
 			}
 
-			MethodDefinition methodDefinition = propertyDefinition.GetMethod;
+			MethodDefinition methodDefinition = propertyDefinitions.Single().GetMethod;
 
 			if (methodDefinition.DeclaringType.GenericParameters.Any())
 			{

src/SpatialFocus.MethodCache.Fody/ModuleWeaver.cs

@@ -32,7 +32,7 @@ public override void Execute()
 				if (!weavingCandidate.ClassDefinition.IsEligibleForWeaving(references))
 				{
 					WriteWarning(
-						$"Class {weavingCandidate.ClassDefinition.Name} contains [Cache] attribute but does not contain a single non-inherited property implementing IMemoryCache interface");
+						$"Class {weavingCandidate.ClassDefinition.Name} contains [Cache] attribute but does not contain a single property implementing IMemoryCache interface");
 					continue;
 				}