From 1ae1cdb10b111993ce458d76072d0de9c9ae674a Mon Sep 17 00:00:00 2001
From: ryanbrandenburg <rybrande@microsoft.com>
Date: Mon, 14 Mar 2016 17:05:41 -0700
Subject: [PATCH]  * Remove ServiceProvider

---
 .../ControllerBase.cs                         | 19 ++++---------------
 .../Controller.cs                             |  2 +-
 .../ControllerBaseTest.cs                     |  2 +-
 .../Controllers/OrderController.cs            |  2 +-
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs b/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
index e60e2d2fa6..7257402dcc 100644
--- a/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
@@ -30,17 +30,6 @@ public abstract class ControllerBase
         private IObjectModelValidator _objectValidator;
         private IUrlHelper _url;
 
-        /// <summary>
-        /// Gets the request-specific <see cref="IServiceProvider"/>.
-        /// </summary>
-        public IServiceProvider Resolver
-        {
-            get
-            {
-                return HttpContext?.RequestServices;
-            }
-        }
-
         /// <summary>
         /// Gets the <see cref="Http.HttpContext"/> for the executing action.
         /// </summary>
@@ -136,7 +125,7 @@ public IModelMetadataProvider MetadataProvider
             {
                 if (_metadataProvider == null)
                 {
-                    _metadataProvider = Resolver?.GetRequiredService<IModelMetadataProvider>();
+                    _metadataProvider = HttpContext?.RequestServices?.GetRequiredService<IModelMetadataProvider>();
                 }
 
                 return _metadataProvider;
@@ -161,7 +150,7 @@ public IUrlHelper Url
             {
                 if (_url == null)
                 {
-                    var factory = Resolver?.GetRequiredService<IUrlHelperFactory>();
+                    var factory = HttpContext?.RequestServices?.GetRequiredService<IUrlHelperFactory>();
                     _url = factory?.GetUrlHelper(ControllerContext);
                 }
 
@@ -187,7 +176,7 @@ public IObjectModelValidator ObjectValidator
             {
                 if (_objectValidator == null)
                 {
-                    _objectValidator = Resolver?.GetRequiredService<IObjectModelValidator>();
+                    _objectValidator = HttpContext?.RequestServices?.GetRequiredService<IObjectModelValidator>();
                 }
 
                 return _objectValidator;
@@ -1429,7 +1418,7 @@ public virtual bool TryValidateModel(
             {
                 throw new ArgumentNullException(nameof(model));
             }
-            
+
             ObjectValidator.Validate(
                 ControllerContext,
                 new CompositeModelValidatorProvider(ControllerContext.ValidatorProviders),
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs
index 907fa4b4aa..726657c8a5 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs
@@ -62,7 +62,7 @@ public ITempDataDictionary TempData
             {
                 if (_tempData == null)
                 {
-                    var factory = Resolver?.GetRequiredService<ITempDataDictionaryFactory>();
+                    var factory = HttpContext?.RequestServices?.GetRequiredService<ITempDataDictionaryFactory>();
                     _tempData = factory?.GetTempData(HttpContext);
                 }
 
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs
index 4a242750de..37235898da 100644
--- a/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs
@@ -1409,7 +1409,7 @@ public void ControllerExposes_RequestServices()
             controller.ControllerContext.HttpContext = httpContext.Object;
 
             // Act
-            var innerServiceProvider = controller.Resolver;
+            var innerServiceProvider = controller.HttpContext?.RequestServices;
 
             // Assert
             Assert.Same(serviceProvider, innerServiceProvider);
diff --git a/test/WebSites/BasicWebSite/Controllers/OrderController.cs b/test/WebSites/BasicWebSite/Controllers/OrderController.cs
index de0d2334ee..f781568b38 100644
--- a/test/WebSites/BasicWebSite/Controllers/OrderController.cs
+++ b/test/WebSites/BasicWebSite/Controllers/OrderController.cs
@@ -16,7 +16,7 @@ public int GetServiceOrder(string serviceType, string actualType)
 
             var queryType = typeof(IEnumerable<>).MakeGenericType(elementType);
 
-            var services = (IEnumerable<object>)Resolver.GetService(queryType);
+            var services = (IEnumerable<object>)HttpContext?.RequestServices.GetService(queryType);
             foreach (var service in services)
             {
                 if (actualType != null && service.GetType().AssemblyQualifiedName == actualType)