React to UsePerRequestServices

samples/MvcSample.Web/Startup.cs

@@ -31,7 +31,7 @@ namespace MvcSample.Web
             {
                 app.UseMiddleware<MonitoringMiddlware>();
 
-                app.UseServices(services =>
+                app.UsePerRequestServices(services =>
                 {
                     services.AddMvc();
                     services.AddSingleton<PassThroughAttribute>();
@@ -72,7 +72,7 @@ namespace MvcSample.Web
             else
 #endif
             {
-                app.UseServices(services =>
+                app.UsePerRequestServices(services =>
                 {
                     services.AddMvc();
                     services.AddSingleton<PassThroughAttribute>();

src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs

@@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Mvc.Internal
             {
                 throw new InvalidOperationException(Resources.FormatUnableToFindServices(
                     "IServiceCollection.AddMvc()",
-                    "IApplicationBuilder.UseServices(...)",
+                    "IApplicationBuilder.UsePerRequestServices(...)",
                     "IApplicationBuilder.UseMvc(...)"));
             }
         }

src/Microsoft.AspNet.Mvc/Properties/Resources.Designer.cs

@@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Mvc
             = new ResourceManager("Microsoft.AspNet.Mvc.Resources", typeof(Resources).GetTypeInfo().Assembly);
 
         /// <summary>
-        /// Unable to find the required services. Please add all the required services by calling AddMvc() before calling UseMvc()/UseServices() in the Application Startup.
+        /// Unable to find the required services. Please add all the required services by calling AddMvc() before calling UseMvc()/UsePerRequestServices() in the Application Startup.
         /// </summary>
         internal static string UnableToFindServices
         {
@@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Mvc
         }
 
         /// <summary>
-        /// Unable to find the required services. Please add all the required services by calling AddMvc() before calling UseMvc()/UseServices() in the Application Startup.
+        /// Unable to find the required services. Please add all the required services by calling AddMvc() before calling UseMvc()/UsePerRequestServices() in the Application Startup.
         /// </summary>
         internal static string FormatUnableToFindServices()
         {

test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs

@@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Mvc
             services.Setup(o => o.GetService(typeof(IEnumerable<MvcMarkerService>)))
                 .Returns(new List<MvcMarkerService>());
             var expectedMessage = "Unable to find the required services. Please add all the required " +
-                "services by calling 'IServiceCollection.AddMvc()' inside the call to 'IApplicationBuilder.UseServices(...)' " +
+                "services by calling 'IServiceCollection.AddMvc()' inside the call to 'IApplicationBuilder.UsePerRequestServices(...)' " +
                 "or 'IApplicationBuilder.UseMvc(...)' in the application startup code.";
 
             // Act & Assert

test/Microsoft.AspNet.Mvc.FunctionalTests/MvcStartupTests.cs

@@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
         {
             // Arrange
             var expectedMessage = "Unable to find the required services. Please add all the required " +
-                "services by calling 'IServiceCollection.AddMvc()' inside the call to 'IApplicationBuilder.UseServices(...)' " +
+                "services by calling 'IServiceCollection.AddMvc()' inside the call to 'IApplicationBuilder.UsePerRequestServices(...)' " +
                 "or 'IApplicationBuilder.UseMvc(...)' in the application startup code.";
 
             // Act & Assert

test/WebSites/ActivatorWebSite/Startup.cs

@@ -14,7 +14,7 @@ namespace ActivatorWebSite
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);

test/WebSites/AntiForgeryWebSite/Startup.cs

@@ -9,7 +9,7 @@ namespace AntiForgeryWebSite
         public void Configure(IApplicationBuilder app)
         {
             var configuration = app.GetTestConfiguration();
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.AddMvc(configuration);
             });

test/WebSites/ApiExplorerWebSite/Startup.cs

@@ -14,7 +14,7 @@ namespace ApiExplorer
         {
             var configuration = app.GetTestConfiguration();
 
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.AddMvc(configuration);
                 services.AddSingleton<ApiExplorerDataFilter>();

test/WebSites/ApplicationModelWebSite/Startup.cs

@@ -12,7 +12,7 @@ namespace ApplicationModelWebSite
         {
             var configuration = app.GetTestConfiguration();
 
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.AddMvc(configuration);
             });

test/WebSites/AutofacWebSite/Startup.cs

@@ -13,7 +13,7 @@ namespace AutofacWebSite
         {
             var configuration = app.GetTestConfiguration();
 
-            app.UseServices(services => {
+            app.UsePerRequestServices(services => {
                 services.AddMvc(configuration);
                 services.AddTransient<HelloWorldBuilder>();
 

test/WebSites/BasicWebSite/Startup.cs

@@ -13,7 +13,7 @@ namespace BasicWebSite
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);

test/WebSites/CompositeViewEngine/Startup.cs

@@ -14,7 +14,7 @@ namespace CompositeViewEngine
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add a view engine as the first one in the list.
                 services.AddMvc(configuration)

test/WebSites/ConnegWebSite/Startup.cs

@@ -14,7 +14,7 @@ namespace ConnegWebsite
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);

test/WebSites/FilesWebSite/Startup.cs

@@ -13,7 +13,7 @@ namespace FilesWebSite
         {
             var configuration = app.GetTestConfiguration();
 
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.AddMvc(configuration);
             });

test/WebSites/FiltersWebSite/Startup.cs

@@ -15,7 +15,7 @@ namespace FiltersWebSite
         {
             var configuration = app.GetTestConfiguration();
 
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.AddMvc(configuration);
 

test/WebSites/FormatterWebSite/Startup.cs

@@ -14,7 +14,7 @@ namespace FormatterWebSite
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);

test/WebSites/InlineConstraintsWebSite/Startup.cs

@@ -38,7 +38,7 @@ namespace InlineConstraints
             }
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);

test/WebSites/ModelBindingWebSite/Startup.cs

@@ -15,7 +15,7 @@ namespace ModelBindingWebSite
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration)

test/WebSites/RazorInstrumentationWebsite/Startup.cs

@@ -17,7 +17,7 @@ namespace RazorInstrumentationWebSite
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);

test/WebSites/RazorWebSite/Startup.cs

@@ -12,7 +12,7 @@ namespace RazorWebSite
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);

test/WebSites/RoutingWebSite/Startup.cs

@@ -13,7 +13,7 @@ namespace RoutingWebSite
         {
             var configuration = app.GetTestConfiguration();
 
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.AddMvc(configuration);
 

test/WebSites/UrlHelperWebSite/Startup.cs

@@ -15,7 +15,7 @@ namespace UrlHelperWebSite
             configuration.AddJsonFile("config.json");
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.ConfigureOptions<AppOptions>(optionsSetup =>
                 {

test/WebSites/ValueProvidersSite/Startup.cs

@@ -14,7 +14,7 @@ namespace ValueProvidersSite
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration)

test/WebSites/VersioningWebSite/Startup.cs

@@ -12,7 +12,7 @@ namespace VersioningWebSite
         {
             var configuration = app.GetTestConfiguration();
 
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.AddMvc(configuration);
 

test/WebSites/XmlSerializerWebSite/Startup.cs

@@ -15,7 +15,7 @@ namespace XmlSerializerWebSite
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);