From a2feeab545398995c43cfbce78cbe9638d690cd0 Mon Sep 17 00:00:00 2001
From: Kiran Challa <kichalla@microsoft.com>
Date: Fri, 10 Jun 2016 09:55:22 -0700
Subject: [PATCH] Changed the form tag helpers execution order to be more
 explicit. [Fixes #4824] Fix Travis failure for test
 Microsoft.AspNetCore.Mvc.FunctionalTests.TagHelpersTest.ReregisteringAntiforgeryTokenInsideFormTagHelper_DoesNotAddDuplicateAntiforgeryTokenFields

---
 .../FormTagHelper.cs                                   | 10 +++-------
 .../RenderAtEndOfFormTagHelper.cs                      |  5 ++++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormTagHelper.cs
index 5f1d538705..0b8d6e92fa 100644
--- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormTagHelper.cs
+++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormTagHelper.cs
@@ -41,14 +41,10 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
             Generator = generator;
         }
 
+        // This TagHelper's order must be lower than the RenderAtEndOfFormTagHelper. I.e it must be executed before
+        // RenderAtEndOfFormTagHelper does.
         /// <inheritdoc />
-        public override int Order
-        {
-            get
-            {
-                return -1000;
-            }
-        }
+        public override int Order => -1000;
 
         [HtmlAttributeNotBound]
         [ViewContext]
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs
index 92870e8320..d1e2537044 100644
--- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs
+++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs
@@ -18,7 +18,10 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
     [HtmlTargetElement("form")]
     public class RenderAtEndOfFormTagHelper : TagHelper
     {
-        public override int Order => -1000;
+        // This TagHelper's order must be greater than the FormTagHelper's. I.e it must be executed after
+        // FormTaghelper does.
+        /// <inheritdoc />
+        public override int Order => -900;
 
         [HtmlAttributeNotBound]
         [ViewContext]