Fixed getting ClassProperty type.

Author: LuukN2

src/Common.OData.ApiExplorer/AspNet.OData/ClassProperty.cs

@@ -38,17 +38,8 @@ internal ClassProperty( IEnumerable<Assembly> assemblies, IEdmOperationParameter
 
         public override int GetHashCode() => ( Name.GetHashCode() * 397 ) ^ type.GetHashCode();
 
-        public Type GetType( Type declaringType )
+        public Type GetPropertyType()
         {
-            Contract.Requires( declaringType != null );
-            Contract.Ensures( Contract.Result<Type>() != null );
-
-            if ( type.IsGenericType )
-            {
-                var typeArgs = type.GetGenericArguments();
-                return type.GetGenericTypeDefinition().MakeGenericType( declaringType );
-            }
-
             return type;
         }
 

src/Common.OData.ApiExplorer/AspNet.OData/DefaultModelTypeBuilder.cs

@@ -113,6 +113,7 @@ public Type NewStructuredType( IEdmStructuredType structuredType, Type clrType,
                         if ( !itemType.Equals( newItemType ) )
                         {
                             propertyType = IEnumerableOfT.MakeGenericType( newItemType );
+                            clrTypeMatchesEdmType = false;
                         }
                     }
                 }
@@ -201,7 +202,7 @@ TypeBuilder CreateTypeBuilderFromSignature( ClassSignature @class )
 
             foreach ( var property in @class.Properties )
             {
-                var type = property.GetType( typeBuilder );
+                var type = property.GetPropertyType();
                 var name = property.Name;
                 var propertyBuilder = AddProperty( typeBuilder, type, name );