diff --git a/src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptor.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptor.cs index c6d5fb03a7..6676fb25f4 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptor.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptor.cs @@ -1,4 +1,6 @@ -namespace Microsoft.AspNet.Mvc +using System; + +namespace Microsoft.AspNet.Mvc { public class FilterDescriptor { diff --git a/src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorComparer.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorOrderComparer.cs similarity index 60% rename from src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorComparer.cs rename to src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorOrderComparer.cs index a1261e7f0d..aa8e4287d0 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorComparer.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorOrderComparer.cs @@ -2,11 +2,11 @@ namespace Microsoft.AspNet.Mvc { - public class FilterDescriptorComparer : IComparer + public class FilterDescriptorOrderComparer : IComparer { - private static readonly FilterDescriptorComparer _comparer = new FilterDescriptorComparer(); + private static readonly FilterDescriptorOrderComparer _comparer = new FilterDescriptorOrderComparer(); - public static FilterDescriptorComparer Comparer { get { return _comparer; } } + public static FilterDescriptorOrderComparer Comparer { get { return _comparer; } } public int Compare([NotNull]FilterDescriptor x, [NotNull]FilterDescriptor y) { diff --git a/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs index 7ab772e011..0120bad716 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs @@ -53,7 +53,7 @@ namespace Microsoft.AspNet.Mvc controllerAttributes.OfType() .Select(filter => new FilterDescriptor(filter, FilterOrigin.Controller)) .Concat(_globalFilters) - .OrderBy(d => d, FilterDescriptorComparer.Comparer) + .OrderBy(d => d, FilterDescriptorOrderComparer.Comparer) .ToArray(); foreach (var methodInfo in cd.ControllerTypeInfo.DeclaredMethods) @@ -116,7 +116,7 @@ namespace Microsoft.AspNet.Mvc var filtersFromAction = attributes.OfType().Select(filter => new FilterDescriptor(filter, FilterOrigin.Action)); ad.FilterDescriptors = filtersFromAction.Concat(globalAndControllerFilters) - .OrderBy(d => d, FilterDescriptorComparer.Comparer) + .OrderBy(d => d, FilterDescriptorOrderComparer.Comparer) .ToList(); return ad;