From fb6b1748a614e2e13a8a3809bdf12030f9bfe917 Mon Sep 17 00:00:00 2001
From: NTaylorMullen <nimullen@microsoft.com>
Date: Fri, 10 Oct 2014 00:45:06 -0700
Subject: [PATCH] Move ITagHelperActivator DI registration.

- Moved the ITagHelperActivator registration in MvcServices to sit with the RazorPage pieces (it's used on the RazorPage).
---
 src/Microsoft.AspNet.Mvc/MvcServices.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.AspNet.Mvc/MvcServices.cs b/src/Microsoft.AspNet.Mvc/MvcServices.cs
index 16f81c8cb7..802650cb8d 100644
--- a/src/Microsoft.AspNet.Mvc/MvcServices.cs
+++ b/src/Microsoft.AspNet.Mvc/MvcServices.cs
@@ -33,9 +33,6 @@ namespace Microsoft.AspNet.Mvc
 
             yield return describe.Transient<IOptionsAction<MvcOptions>, MvcOptionsSetup>();
 
-            // Only want one ITagHelperActivator so it can cache Type activation information. Types won't conflict.
-            yield return describe.Singleton<ITagHelperActivator, DefaultTagHelperActivator>();
-
             yield return describe.Transient<IControllerFactory, DefaultControllerFactory>();
             yield return describe.Singleton<IControllerActivator, DefaultControllerActivator>();
 
@@ -69,6 +66,9 @@ namespace Microsoft.AspNet.Mvc
             // Caches view locations that are valid for the lifetime of the application.
             yield return describe.Singleton<IViewLocationCache, DefaultViewLocationCache>();
 
+            // Only want one ITagHelperActivator so it can cache Type activation information. Types won't conflict.
+            yield return describe.Singleton<ITagHelperActivator, DefaultTagHelperActivator>();
+
             yield return describe.Singleton<IRazorPageActivator, RazorPageActivator>();
             // Virtual path view factory needs to stay scoped so views can get get scoped services.
             yield return describe.Scoped<IRazorPageFactory, VirtualPathRazorPageFactory>();