Merge pull request #2 from autofac/develop

Update code
autofac · Jul 30, 2019 · 9b784b6 · 9b784b6
2 parents 9f51225 + 3595bf9
commit 9b784b6
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/src/Autofac/Util/TypeExtensions.cs b/src/Autofac/Util/TypeExtensions.cs
@@ -191,8 +191,9 @@ private static bool ParameterCompatibleWithTypeConstraint(Type parameter, Type c
                 {
                     var paramArg = baseType.GenericTypeArguments[i];
                     var constraintArg = constraint.GenericTypeArguments[i];
+                    var constraintArgIsGeneric = constraintArg.GetTypeInfo().IsGenericType;
 
-                    allGenericParametersMatch &= paramArg.IsClosedTypeOf(constraintArg.GetGenericTypeDefinition());
+                    allGenericParametersMatch &= paramArg.IsClosedTypeOf(constraintArgIsGeneric ? constraintArg.GetGenericTypeDefinition() : constraintArg);
                 }
             }
 

diff --git a/test/Autofac.Test/Features/OpenGenerics/ComplexGenericsTests.cs b/test/Autofac.Test/Features/OpenGenerics/ComplexGenericsTests.cs
@@ -320,6 +320,16 @@ public void WhenTheSameTypeAppearsMultipleTimesInTheImplementationMappingItMustA
                 container.Resolve<IDouble<decimal, INested<IDouble<string, int>>>>());
         }
 
+        [Fact]
+        public void TestSelfReferentialGeneric()
+        {
+            var cb = new ContainerBuilder();
+            cb.RegisterGeneric(typeof(SelfReferenceConsumer<>)).As(typeof(IBaseGeneric<>));
+            var container = cb.Build();
+
+            var instance = container.Resolve<IBaseGeneric<DerivedSelfReferencing>>();
+        }
+
         public class C<T> : I1<T>, I2<T>
         {
         }
@@ -410,5 +420,24 @@ public class SameTypes<TA, TB, TC> : IDouble<INested<TA>, INested<IDouble<TB, TC
         public class Wrapper<T>
         {
         }
+
+        public interface IBaseGeneric<TDerived>
+            where TDerived : BaseGenericImplementation<TDerived>, new()
+        {
+        }
+
+        public class SelfReferenceConsumer<TSource> : IBaseGeneric<TSource>
+            where TSource : BaseGenericImplementation<TSource>, new()
+        {
+        }
+
+        public abstract class BaseGenericImplementation<TDerived>
+        {
+        }
+
+        public class DerivedSelfReferencing : BaseGenericImplementation<DerivedSelfReferencing>
+        {
+        }
+
     }
 }