Correctly import nested non-generic types inside generic containers u…

…sed within same generic container. Fixes #13549

mcs/mcs/import.cs

@@ -324,10 +324,9 @@ TypeSpec[] CreateGenericArguments (int first, MetaType[] tparams, DynamicTypeRea
 					//    IFoo<A<T>> foo;	// A<T> is definition in this case
 					// }
 					//
-					// TODO: Is full logic from CreateType needed here as well?
-					//
 					if (!IsMissingType (type) && type.IsGenericTypeDefinition) {
-						var targs = CreateGenericArguments (0, type.GetGenericArguments (), dtype);
+						var start_pos = spec.DeclaringType == null ? 0 : spec.DeclaringType.MemberDefinition.TypeParametersCount;
+						var targs = CreateGenericArguments (start_pos, type.GetGenericArguments (), dtype);
 						spec = spec.MakeGenericType (module, targs);
 					}
 				}

mcs/tests/gtest-591-lib.cs

@@ -0,0 +1,14 @@
+// Compiler options: -target:library
+
+using System;
+
+namespace A
+{
+	public class B<T>
+	{
+		public abstract class C : System.IEquatable<C>
+		{
+			public abstract bool Equals (C other);
+		}
+	}
+}

mcs/tests/gtest-591.cs

@@ -0,0 +1,13 @@
+// Compiler options: -r:gtest-591-lib.dll
+
+using System;
+
+public class E
+{
+	public System.Collections.Generic.Dictionary<int, A.B<int>.C> F;
+	public static void Main ()
+	{
+		var e = new E ();
+		Console.WriteLine (e.F);
+	}
+}

mcs/tests/ver-il-net_4_5.xml

@@ -18388,6 +18388,16 @@
       </method>
     </type>
   </test>
+  <test name="gtest-591.cs">
+    <type name="E">
+      <method name="Void Main()" attrs="150">
+        <size>19</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
   <test name="gtest-anontype-01.cs">
     <type name="Test">
       <method name="Int32 Main()" attrs="150">