Use `ClosedGenericMatcher.ExtractGenericInterface()` from Common repo

- added in aspnet/Common@aae8e6e

nits:
- reorder dependencies alphabetically
- avoid `GetGenericArguments()` extension method with `ExtractGenericInterface()` return value
 - use `GenericTypeArguments`
- usual trailing whitespace auto-removals

src/Microsoft.AspNet.Mvc.Common/TypeExtensions.cs

@@ -45,15 +45,6 @@ namespace Microsoft.AspNet.Mvc
             return type.GetTypeInfo().BaseType;
         }
 
-        public static Type ExtractGenericInterface([NotNull] this Type queryType, Type interfaceType)
-        {
-            Func<Type, bool> matchesInterface =
-                t => t.IsGenericType() && t.GetGenericTypeDefinition() == interfaceType;
-            return (matchesInterface(queryType)) ?
-                queryType :
-                queryType.GetInterfaces().FirstOrDefault(matchesInterface);
-        }
-
 #if NETFX_CORE || DNXCORE50
         public static Type[] GetGenericArguments([NotNull] this Type type)
         {

src/Microsoft.AspNet.Mvc.Core/DefaultControllerActionArgumentBinder.cs

@@ -151,8 +151,9 @@ namespace Microsoft.AspNet.Mvc
                 }
 
                 // Determine T if this is an ICollection<T> property.
-                var collectionTypeArguments = propertyType
+                var collectionTypeArguments = ClosedGenericMatcher.ExtractGenericInterface(
-                    .ExtractGenericInterface(typeof(ICollection<>))
+                        propertyType,
+                        typeof(ICollection<>))
                     ?.GenericTypeArguments;
                 if (collectionTypeArguments == null)
                 {

src/Microsoft.AspNet.Mvc.Core/ModelBinding/MutableObjectModelBinder.cs

@@ -555,8 +555,9 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
             // Determine T if this is an ICollection<T> property. No need for a T[] case because CanUpdateProperty()
             // ensures property is either settable or not an array. Underlying assumption is that CanUpdateProperty()
             // and SetProperty() are overridden together.
-            var collectionTypeArguments = propertyExplorer.ModelType
+            var collectionTypeArguments = ClosedGenericMatcher.ExtractGenericInterface(
-                .ExtractGenericInterface(typeof(ICollection<>))
+                    propertyExplorer.ModelType,
+                    typeof(ICollection<>))
                 ?.GenericTypeArguments;
             if (collectionTypeArguments == null)
             {

src/Microsoft.AspNet.Mvc.Core/Rendering/Expressions/TryGetValueProvider.cs

@@ -38,13 +38,13 @@ namespace Microsoft.AspNet.Mvc.Rendering.Expressions
                 _tryGetValueDelegateCacheLock.ExitReadLock();
             }
 
-            var dictionaryType = targetType.ExtractGenericInterface(typeof(IDictionary<,>));
+            var dictionaryType = ClosedGenericMatcher.ExtractGenericInterface(targetType, typeof(IDictionary<,>));
 
             // Just wrap a call to the underlying IDictionary<TKey, TValue>.TryGetValue() where string can be cast to
             // TKey.
             if (dictionaryType != null)
             {
-                var typeArguments = dictionaryType.GetGenericArguments();
+                var typeArguments = dictionaryType.GenericTypeArguments;
                 var keyType = typeArguments[0];
                 var returnType = typeArguments[1];
 

src/Microsoft.AspNet.Mvc.Core/Rendering/Html/DefaultDisplayTemplates.cs

@@ -10,6 +10,7 @@ using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering.Internal;
 using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc.Rendering
 {
@@ -106,10 +107,12 @@ namespace Microsoft.AspNet.Mvc.Rendering
             }
 
             var typeInCollection = typeof(string);
-            var genericEnumerableType = collection.GetType().ExtractGenericInterface(typeof(IEnumerable<>));
+            var genericEnumerableType = ClosedGenericMatcher.ExtractGenericInterface(
+                collection.GetType(),
+                typeof(IEnumerable<>));
             if (genericEnumerableType != null)
             {
-                typeInCollection = genericEnumerableType.GetGenericArguments()[0];
+                typeInCollection = genericEnumerableType.GenericTypeArguments[0];
             }
 
             var typeInCollectionIsNullableValueType = typeInCollection.IsNullableValueType();

src/Microsoft.AspNet.Mvc.Core/Rendering/Html/DefaultEditorTemplates.cs

@@ -68,10 +68,12 @@ namespace Microsoft.AspNet.Mvc.Rendering
             }
 
             var typeInCollection = typeof(string);
-            var genericEnumerableType = collection.GetType().ExtractGenericInterface(typeof(IEnumerable<>));
+            var genericEnumerableType = ClosedGenericMatcher.ExtractGenericInterface(
+                collection.GetType(),
+                typeof(IEnumerable<>));
             if (genericEnumerableType != null)
             {
-                typeInCollection = genericEnumerableType.GetGenericArguments()[0];
+                typeInCollection = genericEnumerableType.GenericTypeArguments[0];
             }
 
             var typeInCollectionIsNullableValueType = typeInCollection.IsNullableValueType();

src/Microsoft.AspNet.Mvc.Core/SessionStateTempDataProvider.cs

@@ -161,10 +161,12 @@ namespace Microsoft.AspNet.Mvc
                 var session = context.Session;
 
                 using (var memoryStream = new MemoryStream())
-                using (var writer = new BsonWriter(memoryStream))
                 {
-                    _jsonSerializer.Serialize(writer, values);
+                    using (var writer = new BsonWriter(memoryStream))
-                    session[TempDataSessionStateKey] = memoryStream.ToArray();
+                    {
+                        _jsonSerializer.Serialize(writer, values);
+                        session[TempDataSessionStateKey] = memoryStream.ToArray();
+                    }
                 }
             }
             else if (IsSessionEnabled(context))
@@ -190,16 +192,19 @@ namespace Microsoft.AspNet.Mvc
             }
             else if (itemType.GetTypeInfo().IsGenericType)
             {
-                if (itemType.ExtractGenericInterface(typeof(IList<>)) != null)
+                if (ClosedGenericMatcher.ExtractGenericInterface(itemType, typeof(IList<>)) != null)
                 {
-                    var genericTypeArguments = itemType.GetGenericArguments();
+                    var genericTypeArguments = itemType.GenericTypeArguments;
                     Debug.Assert(genericTypeArguments.Length == 1, "IList<T> has one generic argument");
                     actualType = genericTypeArguments[0];
                 }
-                else if (itemType.ExtractGenericInterface(typeof(IDictionary<,>)) != null)
+                else if (ClosedGenericMatcher.ExtractGenericInterface(itemType, typeof(IDictionary<,>)) != null)
                 {
-                    var genericTypeArguments = itemType.GetGenericArguments();
+                    var genericTypeArguments = itemType.GenericTypeArguments;
-                    Debug.Assert(genericTypeArguments.Length == 2, "IDictionary<TKey, TValue> has two generic arguments");
+                    Debug.Assert(
+                        genericTypeArguments.Length == 2,
+                        "IDictionary<TKey, TValue> has two generic arguments");
+
                     // Throw if the key type of the dictionary is not string.
                     if (genericTypeArguments[0] != typeof(string))
                     {

src/Microsoft.AspNet.Mvc.Core/project.json

@@ -13,18 +13,19 @@
         "Microsoft.AspNet.FileProviders.Abstractions": "1.0.0-*",
         "Microsoft.AspNet.Hosting.Abstractions": "1.0.0-*",
         "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
+        "Microsoft.AspNet.JsonPatch": "1.0.0-*",
         "Microsoft.AspNet.Mvc.Abstractions": "6.0.0-*",
         "Microsoft.AspNet.Mvc.Common": { "version": "6.0.0-*", "type": "build" },
         "Microsoft.AspNet.Routing": "1.0.0-*",
         "Microsoft.Framework.BufferEntryCollection.Sources": { "version": "1.0.0-*", "type": "build" },
+        "Microsoft.Framework.ClosedGenericMatcher.Sources": { "version": "1.0.0-*", "type": "build" },
         "Microsoft.Framework.CopyOnWriteDictionary.Sources": { "version": "1.0.0-*", "type": "build" },
         "Microsoft.Framework.Logging.Abstractions": "1.0.0-*",
         "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" },
         "Microsoft.Framework.PropertyActivator.Sources": { "version": "1.0.0-*", "type": "build" },
         "Microsoft.Framework.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" },
         "Microsoft.Framework.Runtime.Abstractions": "1.0.0-*",
-        "Microsoft.Framework.WebEncoders": "1.0.0-*",
+        "Microsoft.Framework.WebEncoders": "1.0.0-*"
-        "Microsoft.AspNet.JsonPatch": "1.0.0-*"
     },
     "frameworks": {
         "dnx451": {

src/Microsoft.AspNet.Mvc.Xml/EnumerableWrapperProvider.cs

@@ -28,7 +28,9 @@ namespace Microsoft.AspNet.Mvc.Xml
             [NotNull] Type sourceEnumerableOfT,
             IWrapperProvider elementWrapperProvider)
         {
-            var enumerableOfT = sourceEnumerableOfT.ExtractGenericInterface(typeof(IEnumerable<>));
+            var enumerableOfT = ClosedGenericMatcher.ExtractGenericInterface(
+                sourceEnumerableOfT,
+                typeof(IEnumerable<>));
             if (!sourceEnumerableOfT.IsInterface() || enumerableOfT == null)
             {
                 throw new ArgumentException(
@@ -38,7 +40,7 @@ namespace Microsoft.AspNet.Mvc.Xml
 
             _wrapperProvider = elementWrapperProvider;
 
-            var declaredElementType = enumerableOfT.GetGenericArguments()[0];
+            var declaredElementType = enumerableOfT.GenericTypeArguments[0];
             var wrappedElementType = elementWrapperProvider?.WrappingType ?? declaredElementType;
             WrappingType = typeof(DelegatingEnumerable<,>).MakeGenericType(wrappedElementType, declaredElementType);
 

src/Microsoft.AspNet.Mvc.Xml/EnumerableWrapperProviderFactory.cs

@@ -42,16 +42,16 @@ namespace Microsoft.AspNet.Mvc.Xml
                 // concrete types like List<T>, Collection<T> which implement IEnumerable<T>.
                 if (declaredType != null && declaredType.IsInterface() && declaredType.IsGenericType())
                 {
-                    var enumerableOfT = declaredType.ExtractGenericInterface(typeof(IEnumerable<>));
+                    var enumerableOfT = ClosedGenericMatcher.ExtractGenericInterface(
+                        declaredType,
+                        typeof(IEnumerable<>));
                     if (enumerableOfT != null)
                     {
-                        var elementType = enumerableOfT.GetGenericArguments()[0];
+                        var elementType = enumerableOfT.GenericTypeArguments[0];
+                        var wrapperProviderContext = new WrapperProviderContext(elementType, context.IsSerialization);
 
-                        var wrapperProviderContext = new WrapperProviderContext(
+                        var elementWrapperProvider =
-                                                                    elementType,
+                            _wrapperProviderFactories.GetWrapperProvider(wrapperProviderContext);
-                                                                    context.IsSerialization);
-
-                        var elementWrapperProvider = _wrapperProviderFactories.GetWrapperProvider(wrapperProviderContext);
 
                         return new EnumerableWrapperProvider(enumerableOfT, elementWrapperProvider);
                     }

src/Microsoft.AspNet.Mvc.Xml/RequiredValidationHelper.cs

@@ -89,10 +89,10 @@ namespace Microsoft.AspNet.Mvc.Xml
             // which would also be probed for Required attribute validation.
             if (modelType.IsGenericType())
             {
-                var enumerableOfT = modelType.ExtractGenericInterface(typeof(IEnumerable<>));
+                var enumerableOfT = ClosedGenericMatcher.ExtractGenericInterface(modelType, typeof(IEnumerable<>));
                 if (enumerableOfT != null)
                 {
-                    modelType = enumerableOfT.GetGenericArguments()[0];
+                    modelType = enumerableOfT.GenericTypeArguments[0];
                 }
             }
 

src/Microsoft.AspNet.Mvc.Xml/project.json

@@ -7,14 +7,15 @@
     "dependencies": {
         "Microsoft.AspNet.Mvc.Common": { "version": "6.0.0-*", "type": "build" },
         "Microsoft.AspNet.Mvc.Core": "6.0.0-*",
-        "Microsoft.Framework.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" },
+        "Microsoft.Framework.ClosedGenericMatcher.Sources": { "version": "1.0.0-*", "type": "build" },
-        "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" }
+        "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" },
+        "Microsoft.Framework.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" }
     },
     "frameworks": {
         "dnx451": {
             "frameworkAssemblies": {
-                "System.Xml": "",
+                "System.Runtime.Serialization": "",
-                "System.Runtime.Serialization": ""
+                "System.Xml": ""
             }
         },
         "dnxcore50": {