From 47a3aee2c152b44bb75075e1f7494ba2124c82fa Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Mon, 4 Jan 2016 11:19:23 -0800
Subject: [PATCH] [Fixes #3361] Changed the value provider preference to be
 backwards compatible

---
 .../Internal/MvcCoreMvcOptionsSetup.cs                          | 2 +-
 test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.AspNet.Mvc.Core/Internal/MvcCoreMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Core/Internal/MvcCoreMvcOptionsSetup.cs
index 7fb6a96f1c..b2c9a58e95 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Internal/MvcCoreMvcOptionsSetup.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Internal/MvcCoreMvcOptionsSetup.cs
@@ -51,9 +51,9 @@ namespace Microsoft.AspNet.Mvc.Internal
             options.OutputFormatters.Add(new StreamOutputFormatter());
 
             // Set up ValueProviders
+            options.ValueProviderFactories.Add(new FormValueProviderFactory());
             options.ValueProviderFactories.Add(new RouteValueProviderFactory());
             options.ValueProviderFactories.Add(new QueryStringValueProviderFactory());
-            options.ValueProviderFactories.Add(new FormValueProviderFactory());
             options.ValueProviderFactories.Add(new JQueryFormValueProviderFactory());
 
             // Set up metadata providers
diff --git a/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs b/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs
index 49e1c5dcaf..10dac9c03d 100644
--- a/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs
@@ -69,9 +69,9 @@ namespace Microsoft.AspNet.Mvc
             // Assert
             var valueProviders = options.ValueProviderFactories;
             Assert.Collection(valueProviders,
+                provider => Assert.IsType<FormValueProviderFactory>(provider),
                 provider => Assert.IsType<RouteValueProviderFactory>(provider),
                 provider => Assert.IsType<QueryStringValueProviderFactory>(provider),
-                provider => Assert.IsType<FormValueProviderFactory>(provider),
                 provider => Assert.IsType<JQueryFormValueProviderFactory>(provider));
         }