diff --git a/src/Microsoft.AspNet.Mvc.Core/Filters/ActionFilterEndPoint.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/ActionFilterEndPoint.cs index bdc141be8b..d14b40273c 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Filters/ActionFilterEndPoint.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Filters/ActionFilterEndPoint.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; namespace Microsoft.AspNet.Mvc.Filters { - // This one lives in the FilterDescriptors namespace, and only intended to be consumed by folks that rewrite the action invoker. + // This one lives in the Filters namespace, and only intended to be consumed by folks that rewrite the action invoker. public class ReflectedActionFilterEndPoint : IActionFilter { private readonly Func> _coreMethodInvoker; diff --git a/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs index 53c285becc..e1908fce94 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs @@ -55,8 +55,7 @@ namespace Microsoft.AspNet.Mvc.Filters if (typeFilterSignature != null) { // TODO: How do we pass extra parameters - var typeFilter = - ServiceProvider.GetService().CreateInstance(typeFilterSignature.ImplementationType); + var typeFilter = ActivatorUtilities.CreateInstance(ServiceProvider, typeFilterSignature.ImplementationType); AddFilters(context, typeFilter, true); failIfNotFilter = false; diff --git a/src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorComparer.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorComparer.cs index 4f5817b0d7..a1261e7f0d 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorComparer.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorComparer.cs @@ -4,7 +4,7 @@ namespace Microsoft.AspNet.Mvc { public class FilterDescriptorComparer : IComparer { - private static FilterDescriptorComparer _comparer = new FilterDescriptorComparer(); + private static readonly FilterDescriptorComparer _comparer = new FilterDescriptorComparer(); public static FilterDescriptorComparer Comparer { get { return _comparer; } } diff --git a/src/Microsoft.AspNet.Mvc.Core/Filters/FilterOrigin.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterOrigin.cs index 416fc51f4f..f632b40e10 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Filters/FilterOrigin.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterOrigin.cs @@ -3,7 +3,7 @@ public static class FilterOrigin { public static readonly int Action = 100; - public static readonly int Controlller = 200; + public static readonly int Controller = 200; public static readonly int Global = 300; } } diff --git a/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs index a890b965d4..7ab772e011 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs @@ -51,7 +51,7 @@ namespace Microsoft.AspNet.Mvc var controllerAttributes = cd.ControllerTypeInfo.GetCustomAttributes(inherit: true).ToArray(); var globalAndControllerFilters = controllerAttributes.OfType() - .Select(filter => new FilterDescriptor(filter, FilterOrigin.Controlller)) + .Select(filter => new FilterDescriptor(filter, FilterOrigin.Controller)) .Concat(_globalFilters) .OrderBy(d => d, FilterDescriptorComparer.Comparer) .ToArray();