CompilerGeneratedAttribute are now resolved via ReferenceFinder

Author: Dresel

MethodCache.Fody/CecilHelper.cs

@@ -63,7 +63,7 @@ public static Instruction AppendStloc(this Instruction instruction, ILProcessor
 			return instruction.Append(processor.Create(OpCodes.Stloc, index), processor);
 		}
 
-		public static bool ContainsAttribute(this ICustomAttributeProvider methodDefinition, Type attributeType)
+		public static bool ContainsAttribute(this ICustomAttributeProvider methodDefinition, TypeDefinition attributeType)
 		{
 			return methodDefinition.CustomAttributes.Any(x => x.Constructor.DeclaringType.FullName == attributeType.FullName);
 		}
@@ -128,11 +128,6 @@ public static MethodReference ImportMethod(this ModuleDefinition module, MethodD
 			return module.Import(methodDefinition);
 		}
 
-		public static TypeReference ImportType(this ModuleDefinition module, Type type)
-		{
-			return module.Import(type);
-		}
-
 		public static VariableDefinition ImportVariable(this ModuleDefinition module, TypeReference typeReference)
 		{
 			return new VariableDefinition(module.Import(typeReference));

MethodCache.Fody/ModuleWeaver.cs

@@ -228,8 +228,6 @@ private Instruction InjectCacheKeyCreatedCode(MethodDefinition methodDefinition,
 			if (LogDebugOutput)
 			{
 				// Call Debug.WriteLine with CacheKey
-				TypeReference debug = methodDefinition.Module.TypeReferenceFromCorlib(typeof(Debug).FullName);
-
 				current =
 					current.AppendLdstr(processor, "CacheKey created: {0}")
 						.AppendLdcI4(processor, 1)
@@ -422,7 +420,7 @@ private bool ShouldWeaveMethod(MethodDefinition method)
 			bool hasMethodLevelCache = method.ContainsAttribute(CacheAttributeName);
 			bool hasNoCacheAttribute = method.ContainsAttribute(NoCacheAttributeName);
 			bool isSpecialName = method.IsSpecialName || method.IsGetter || method.IsSetter || method.IsConstructor;
-			bool isCompilerGenerated = method.ContainsAttribute(typeof(CompilerGeneratedAttribute));
+			bool isCompilerGenerated = method.ContainsAttribute(References.CompilerGeneratedAttribute);
 
 			if (hasNoCacheAttribute || isSpecialName || isCompilerGenerated)
 			{
@@ -455,10 +453,10 @@ private bool ShouldWeaveProperty(PropertyDefinition property)
 			bool hasNoCacheAttribute = property.ContainsAttribute(NoCacheAttributeName);
 			bool isCacheGetter = property.Name == CacheGetterName;
 			bool hasGetAccessor = property.GetMethod != null;
-			bool hasSetAccessor = property.GetMethod != null;
+			bool hasSetAccessor = property.SetMethod != null;
 			bool isAutoProperty = hasGetAccessor && hasSetAccessor &&
-				property.GetMethod.ContainsAttribute(typeof(CompilerGeneratedAttribute)) &&
-				property.SetMethod.ContainsAttribute(typeof(CompilerGeneratedAttribute));
+				property.GetMethod.ContainsAttribute(References.CompilerGeneratedAttribute) &&
+				property.SetMethod.ContainsAttribute(References.CompilerGeneratedAttribute);
 
 			if (hasNoCacheAttribute || isCacheGetter || isAutoProperty || !hasGetAccessor)
 			{
@@ -593,7 +591,7 @@ private void WeaveMethod(MethodDefinition methodDefinition)
 				return;
 			}
 
-			if (methodDefinition.ReturnType.FullName == methodDefinition.Module.ImportType(typeof(void)).FullName)
+			if (methodDefinition.ReturnType == methodDefinition.Module.TypeSystem.Void)
 			{
 				LogWarning(string.Format("Method {0} returns void. Skip weaving of method {0}.", methodDefinition.Name));
 

MethodCache.Fody/ReferenceFinder.cs

@@ -16,6 +16,8 @@ public class References
 
 		public MethodDefinition StringFormatMethod { get; set; }
 
+		public TypeDefinition CompilerGeneratedAttribute { get; set; }
+
 		public void LoadReferences()
 		{
 			var coreTypes = new List<TypeDefinition>();
@@ -39,6 +41,8 @@ public void LoadReferences()
 						method =>
 							method.Matches("Format", ModuleDefinition.TypeSystem.String,
 								new[] { ModuleDefinition.TypeSystem.String, ModuleDefinition.TypeSystem.Object.MakeArrayType() }));
+
+			CompilerGeneratedAttribute = coreTypes.First(t => t.Name == "CompilerGeneratedAttribute");
 		}
 
 		private void AppendTypes(string name, List<TypeDefinition> coreTypes)