diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs index 08f77368a9..f49e7c8805 100644 --- a/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs @@ -48,7 +48,7 @@ namespace Microsoft.AspNet.Mvc.ApiExplorer /// public int Order { - get { return DefaultOrder.DefaultFrameworkSortOrder; } + get { return -1000; } } /// diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionConstraints/DefaultActionConstraintProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ActionConstraints/DefaultActionConstraintProvider.cs index 541a9d2870..f5e046bccc 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionConstraints/DefaultActionConstraintProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionConstraints/DefaultActionConstraintProvider.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Mvc.ActionConstraints /// public int Order { - get { return DefaultOrder.DefaultFrameworkSortOrder; } + get { return -1000; } } /// diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorProvider.cs index b1efd5b344..f18b93c784 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorProvider.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Mvc.Actions public int Order { - get { return DefaultOrder.DefaultFrameworkSortOrder; } + get { return -1000; } } /// diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvokerProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvokerProvider.cs index 23d69e8a16..74288e63f3 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvokerProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvokerProvider.cs @@ -54,7 +54,7 @@ namespace Microsoft.AspNet.Mvc.Actions public int Order { - get { return DefaultOrder.DefaultFrameworkSortOrder; } + get { return -1000; } } /// diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs index 1b051bb8e2..568e7ef61b 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs @@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels _authorizationOptions = authorizationOptionsAccessor.Value; } - public int Order { get { return DefaultOrder.DefaultFrameworkSortOrder + 10; } } + public int Order { get { return -1000 + 10; } } public void OnProvidersExecuted([NotNull]ApplicationModelProviderContext context) { diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs index 58871aae9e..f799bd02c2 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs @@ -30,7 +30,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels { get { - return DefaultOrder.DefaultFrameworkSortOrder; + return -1000; } } diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultOrder.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultOrder.cs deleted file mode 100644 index 1f9d0b0fe6..0000000000 --- a/src/Microsoft.AspNet.Mvc.Core/DefaultOrder.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.AspNet.Mvc -{ - public static class DefaultOrder - { - /// - /// The default order for sorting is -1000. Other framework code - /// the depends on order should be ordered between -1 to -1999. - /// User code should order at bigger than 0 or smaller than -2000. - /// - public static readonly int DefaultFrameworkSortOrder = -1000; - - /// - /// The default order for CorsAuthorizationFilter, CorsAuthorizationFilterFactory - /// and DisableCorsAuthorizationFilter - /// - public static readonly int DefaultCorsSortOrder = int.MaxValue - 100; - } -} diff --git a/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs index f464be9145..bcb509675e 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs @@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Mvc.Filters { public int Order { - get { return DefaultOrder.DefaultFrameworkSortOrder; } + get { return -1000; } } /// diff --git a/src/Microsoft.AspNet.Mvc.Cors/CorsApplicationModelProvider.cs b/src/Microsoft.AspNet.Mvc.Cors/CorsApplicationModelProvider.cs index e37fab5b00..4e1aef1f43 100644 --- a/src/Microsoft.AspNet.Mvc.Cors/CorsApplicationModelProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Cors/CorsApplicationModelProvider.cs @@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Mvc.Cors { public class CorsApplicationModelProvider : IApplicationModelProvider { - public int Order { get { return DefaultOrder.DefaultFrameworkSortOrder + 10; } } + public int Order { get { return -1000 + 10; } } public void OnProvidersExecuted([NotNull]ApplicationModelProviderContext context) { diff --git a/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilter.cs b/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilter.cs index ce11a1b37e..2350b36c91 100644 --- a/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilter.cs +++ b/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilter.cs @@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Mvc.Cors { get { - return DefaultOrder.DefaultCorsSortOrder; + return int.MaxValue - 100; } } diff --git a/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilterFactory.cs b/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilterFactory.cs index dc9ca83024..282beb461f 100644 --- a/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilterFactory.cs +++ b/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilterFactory.cs @@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Mvc.Cors { get { - return DefaultOrder.DefaultCorsSortOrder; + return int.MaxValue - 100; } } diff --git a/src/Microsoft.AspNet.Mvc.Cors/DisableCorsAuthorizationFilter.cs b/src/Microsoft.AspNet.Mvc.Cors/DisableCorsAuthorizationFilter.cs index 1158f771f0..e21bb5f40e 100644 --- a/src/Microsoft.AspNet.Mvc.Cors/DisableCorsAuthorizationFilter.cs +++ b/src/Microsoft.AspNet.Mvc.Cors/DisableCorsAuthorizationFilter.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Mvc.Cors { get { - return DefaultOrder.DefaultCorsSortOrder; + return int.MaxValue - 100; } } diff --git a/src/Microsoft.AspNet.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs b/src/Microsoft.AspNet.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs index 9edbbdd850..3644f08a0f 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs @@ -97,7 +97,7 @@ namespace Microsoft.AspNet.Mvc.Razor.TagHelpers { get { - return DefaultOrder.DefaultFrameworkSortOrder - 999; + return -1000 - 999; } } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/AnchorTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/AnchorTagHelper.cs index 5faecb31e6..cbbfb4eca3 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/AnchorTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/AnchorTagHelper.cs @@ -47,7 +47,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { get { - return DefaultOrder.DefaultFrameworkSortOrder; + return -1000; } } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/CacheTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/CacheTagHelper.cs index d4682845e1..606c99ff3c 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/CacheTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/CacheTagHelper.cs @@ -52,7 +52,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { get { - return DefaultOrder.DefaultFrameworkSortOrder; + return -1000; } } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/EnvironmentTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/EnvironmentTagHelper.cs index 622c36c12a..8029209710 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/EnvironmentTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/EnvironmentTagHelper.cs @@ -30,7 +30,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { get { - return DefaultOrder.DefaultFrameworkSortOrder; + return -1000; } } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs index c69179368e..0f08b1b6a3 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs @@ -43,7 +43,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { get { - return DefaultOrder.DefaultFrameworkSortOrder; + return -1000; } } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ImageTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/ImageTagHelper.cs index 8aaa959264..4b5d766d16 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/ImageTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/ImageTagHelper.cs @@ -54,7 +54,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { get { - return DefaultOrder.DefaultFrameworkSortOrder; + return -1000; } } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs index 8e2068223e..4747348e25 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs @@ -77,7 +77,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { get { - return DefaultOrder.DefaultFrameworkSortOrder; + return -1000; } } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/LabelTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/LabelTagHelper.cs index 9065ee97b6..d6d7e4bbc7 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/LabelTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/LabelTagHelper.cs @@ -30,7 +30,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { get { - return DefaultOrder.DefaultFrameworkSortOrder; + return -1000; } } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs index 90ec5c70ae..b2adee0140 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs @@ -115,7 +115,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { get { - return DefaultOrder.DefaultFrameworkSortOrder; + return -1000; } } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/OptionTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/OptionTagHelper.cs index fe94d8b7fb..e6118e5330 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/OptionTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/OptionTagHelper.cs @@ -34,7 +34,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { get { - return DefaultOrder.DefaultFrameworkSortOrder; + return -1000; } } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs index c6a5998a11..b8315bae1c 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs @@ -101,7 +101,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { get { - return DefaultOrder.DefaultFrameworkSortOrder; + return -1000; } } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs index 455002fb99..5a858991e2 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs @@ -46,7 +46,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { get { - return DefaultOrder.DefaultFrameworkSortOrder; + return -1000; } } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs index cbafd721b3..19f771aa12 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs @@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { get { - return DefaultOrder.DefaultFrameworkSortOrder; + return -1000; } } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationMessageTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationMessageTagHelper.cs index 4d5b5ae0b6..7733c824f9 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationMessageTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationMessageTagHelper.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { get { - return DefaultOrder.DefaultFrameworkSortOrder; + return -1000; } } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummaryTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummaryTagHelper.cs index f8f89fa642..796222b6b7 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummaryTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummaryTagHelper.cs @@ -32,7 +32,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { get { - return DefaultOrder.DefaultFrameworkSortOrder; + return -1000; } } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs index e131afa4cd..7e2d723f03 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs @@ -2029,7 +2029,7 @@ namespace Microsoft.AspNet.Mvc.Actions .Verifiable(); filterProvider.SetupGet(fp => fp.Order) - .Returns(DefaultOrder.DefaultFrameworkSortOrder); + .Returns(-1000); var invoker = new TestControllerActionInvoker( actionContext, diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs index 2433538582..ce481972a4 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs @@ -156,7 +156,7 @@ namespace Microsoft.AspNet.Mvc.Routing actionProvider .SetupGet(p => p.Order) - .Returns(DefaultOrder.DefaultFrameworkSortOrder); + .Returns(-1000); actionProvider .Setup(p => p.OnProvidersExecuting(It.IsAny())) diff --git a/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs b/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs index 89418387ff..35808f7630 100644 --- a/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs +++ b/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs @@ -26,7 +26,7 @@ namespace BasicWebSite { get { - return DefaultOrder.DefaultFrameworkSortOrder - 100; + return -1000 - 100; } }