Removed DeclaringType and references.

Author: LuukN2

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

@@ -43,18 +43,10 @@ public Type GetType( Type declaringType )
             Contract.Requires( declaringType != null );
             Contract.Ensures( Contract.Result<Type>() != null );
 
-            if ( type == DeclaringType.Value )
-            {
-                return declaringType;
-            }
-            else if ( type.IsGenericType )
+            if ( type.IsGenericType )
             {
                 var typeArgs = type.GetGenericArguments();
-
-                if ( typeArgs.Length == 1 && typeArgs[0] == DeclaringType.Value )
-                {
-                    return type.GetGenericTypeDefinition().MakeGenericType( declaringType );
-                }
+                return type.GetGenericTypeDefinition().MakeGenericType( declaringType );
             }
 
             return type;

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

@@ -136,7 +136,7 @@ public Type NewStructuredType( IEdmStructuredType structuredType, Type clrType,
                     }
                 }
 
-                clrTypeMatchesEdmType &= propertyType.IsDeclaringType() || property.PropertyType.Equals( propertyType );
+                clrTypeMatchesEdmType &= property.PropertyType.Equals( propertyType );
                 properties.Add( new ClassProperty( property, propertyType ) );
             }
 

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

@@ -82,25 +82,6 @@ internal static void Deconstruct<T1, T2>( this Tuple<T1, T2> tuple, out T1 item1
             item2 = tuple.Item2;
         }
 
-        internal static bool IsDeclaringType( this Type type )
-        {
-            Contract.Requires( type != null );
-
-            if ( type == DeclaringType.Value )
-            {
-                return true;
-            }
-
-            if ( !type.IsGenericType )
-            {
-                return false;
-            }
-
-            var typeArgs = type.GetGenericArguments();
-
-            return typeArgs.Length == 1 && typeArgs[0] == DeclaringType.Value;
-        }
-
         static bool IsSubstitutableGeneric( Type type, Stack<Type> openTypes, out Type innerType )
         {
             Contract.Requires( type != null );

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

@@ -11,7 +11,6 @@
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)AspNet.OData\ClassProperty.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)AspNet.OData\ClassSignature.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)AspNet.OData\DeclaringType.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)AspNet.OData\EdmTypeKey.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)AspNet.OData\IModelTypeBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)AspNet.OData\DefaultModelTypeBuilder.cs" />