Minimal bugfix (draft)

castleproject · May 13, 2022 · 16bf56b · 16bf56b
1 parent 50241be
commit 16bf56b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Castle.Core/DynamicProxy/Generators/MethodSignatureComparer.cs b/src/Castle.Core/DynamicProxy/Generators/MethodSignatureComparer.cs
@@ -77,7 +77,7 @@ public bool EqualParameters(MethodInfo x, MethodInfo y)
 			return true;
 		}
 
-		public bool EqualSignatureTypes(Type x, Type y)
+		public bool EqualSignatureTypes(Type x, Type y, bool precise = true)
 		{
 			if (x.IsGenericParameter != y.IsGenericParameter)
 			{
@@ -122,6 +122,11 @@ public bool EqualSignatureTypes(Type x, Type y)
 			{
 				if (!x.Equals(y))
 				{
+					if (!precise && y.IsAssignableFrom(x))  // covariant returns in .NET 6+
+					{
+						return true;
+					}
+
 					return false;
 				}
 			}
@@ -142,7 +147,7 @@ public bool Equals(MethodInfo x, MethodInfo y)
 
 			return EqualNames(x, y) &&
 				   EqualGenericParameters(x, y) &&
-				   EqualSignatureTypes(x.ReturnType, y.ReturnType) &&
+				   EqualSignatureTypes(x.ReturnType, y.ReturnType, precise: false) &&
 				   EqualParameters(x, y);
 		}