React to UsePerRequestServices

HaoK · HaoK · commit b6bd7f5d7887 · 2014-10-09T14:17:04.000-07:00
diff --git a/samples/MvcSample.Web/Startup.cs b/samples/MvcSample.Web/Startup.cs
@@ -31,7 +31,7 @@ public void Configure(IApplicationBuilder app)
             {
                 app.UseMiddleware<MonitoringMiddlware>();
 
-                app.UseServices(services =>
+                app.UsePerRequestServices(services =>
                 {
                     services.AddMvc();
                     services.AddSingleton<PassThroughAttribute>();
@@ -72,7 +72,7 @@ public void Configure(IApplicationBuilder app)
             else
 #endif
             {
-                app.UseServices(services =>
+                app.UsePerRequestServices(services =>
                 {
                     services.AddMvc();
                     services.AddSingleton<PassThroughAttribute>();
diff --git a/src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs b/src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs
@@ -24,7 +24,7 @@ public static void ThrowIfMvcNotRegistered(IServiceProvider services)
             {
                 throw new InvalidOperationException(Resources.FormatUnableToFindServices(
                     "IServiceCollection.AddMvc()",
-                    "IApplicationBuilder.UseServices(...)",
+                    "IApplicationBuilder.UsePerRequestServices(...)",
                     "IApplicationBuilder.UseMvc(...)"));
             }
         }
diff --git a/src/Microsoft.AspNet.Mvc/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc/Properties/Resources.Designer.cs
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs
@@ -19,7 +19,7 @@ public void MvcServicesHelperThrowsIfServiceIsAbsent()
             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
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcStartupTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcStartupTests.cs
@@ -18,7 +18,7 @@ public void MvcThrowsWhenRequiredServicesAreNotAdded()
         {
             // 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
diff --git a/test/WebSites/ActivatorWebSite/Startup.cs b/test/WebSites/ActivatorWebSite/Startup.cs
@@ -14,7 +14,7 @@ public void Configure(IApplicationBuilder app)
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);
diff --git a/test/WebSites/AntiForgeryWebSite/Startup.cs b/test/WebSites/AntiForgeryWebSite/Startup.cs
@@ -9,7 +9,7 @@ public class Startup
         public void Configure(IApplicationBuilder app)
         {
             var configuration = app.GetTestConfiguration();
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.AddMvc(configuration);
             });
diff --git a/test/WebSites/ApiExplorerWebSite/Startup.cs b/test/WebSites/ApiExplorerWebSite/Startup.cs
@@ -14,7 +14,7 @@ public void Configure(IApplicationBuilder app)
         {
             var configuration = app.GetTestConfiguration();
 
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.AddMvc(configuration);
                 services.AddSingleton<ApiExplorerDataFilter>();
diff --git a/test/WebSites/ApplicationModelWebSite/Startup.cs b/test/WebSites/ApplicationModelWebSite/Startup.cs
@@ -12,7 +12,7 @@ public void Configure(IApplicationBuilder app)
         {
             var configuration = app.GetTestConfiguration();
 
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.AddMvc(configuration);
             });
diff --git a/test/WebSites/AutofacWebSite/Startup.cs b/test/WebSites/AutofacWebSite/Startup.cs
@@ -13,7 +13,7 @@ public void Configure(IApplicationBuilder app)
         {
             var configuration = app.GetTestConfiguration();
 
-            app.UseServices(services => {
+            app.UsePerRequestServices(services => {
                 services.AddMvc(configuration);
                 services.AddTransient<HelloWorldBuilder>();
 
diff --git a/test/WebSites/BasicWebSite/Startup.cs b/test/WebSites/BasicWebSite/Startup.cs
@@ -13,7 +13,7 @@ public void Configure(IApplicationBuilder app)
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);
diff --git a/test/WebSites/CompositeViewEngine/Startup.cs b/test/WebSites/CompositeViewEngine/Startup.cs
@@ -14,7 +14,7 @@ public void Configure(IApplicationBuilder app)
             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)
diff --git a/test/WebSites/ConnegWebSite/Startup.cs b/test/WebSites/ConnegWebSite/Startup.cs
@@ -14,7 +14,7 @@ public void Configure(IApplicationBuilder app)
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);
diff --git a/test/WebSites/FilesWebSite/Startup.cs b/test/WebSites/FilesWebSite/Startup.cs
@@ -13,7 +13,7 @@ public void Configure(IApplicationBuilder app)
         {
             var configuration = app.GetTestConfiguration();
 
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.AddMvc(configuration);
             });
diff --git a/test/WebSites/FiltersWebSite/Startup.cs b/test/WebSites/FiltersWebSite/Startup.cs
@@ -15,7 +15,7 @@ public void Configure(IApplicationBuilder app)
         {
             var configuration = app.GetTestConfiguration();
 
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.AddMvc(configuration);
 
diff --git a/test/WebSites/FormatterWebSite/Startup.cs b/test/WebSites/FormatterWebSite/Startup.cs
@@ -14,7 +14,7 @@ public void Configure(IApplicationBuilder app)
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);
diff --git a/test/WebSites/InlineConstraintsWebSite/Startup.cs b/test/WebSites/InlineConstraintsWebSite/Startup.cs
@@ -38,7 +38,7 @@ public void Configure(IApplicationBuilder app)
             }
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);
diff --git a/test/WebSites/ModelBindingWebSite/Startup.cs b/test/WebSites/ModelBindingWebSite/Startup.cs
@@ -15,7 +15,7 @@ public void Configure(IApplicationBuilder app)
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration)
diff --git a/test/WebSites/RazorInstrumentationWebsite/Startup.cs b/test/WebSites/RazorInstrumentationWebsite/Startup.cs
@@ -17,7 +17,7 @@ public void Configure(IApplicationBuilder app)
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);
diff --git a/test/WebSites/RazorWebSite/Startup.cs b/test/WebSites/RazorWebSite/Startup.cs
@@ -12,7 +12,7 @@ public void Configure(IApplicationBuilder app)
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);
diff --git a/test/WebSites/RoutingWebSite/Startup.cs b/test/WebSites/RoutingWebSite/Startup.cs
@@ -13,7 +13,7 @@ public void Configure(IApplicationBuilder app)
         {
             var configuration = app.GetTestConfiguration();
 
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.AddMvc(configuration);
 
diff --git a/test/WebSites/UrlHelperWebSite/Startup.cs b/test/WebSites/UrlHelperWebSite/Startup.cs
@@ -15,7 +15,7 @@ public void Configure(IApplicationBuilder app)
             configuration.AddJsonFile("config.json");
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.ConfigureOptions<AppOptions>(optionsSetup =>
                 {
diff --git a/test/WebSites/ValueProvidersSite/Startup.cs b/test/WebSites/ValueProvidersSite/Startup.cs
@@ -14,7 +14,7 @@ public void Configure(IApplicationBuilder app)
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration)
diff --git a/test/WebSites/VersioningWebSite/Startup.cs b/test/WebSites/VersioningWebSite/Startup.cs
@@ -12,7 +12,7 @@ public void Configure(IApplicationBuilder app)
         {
             var configuration = app.GetTestConfiguration();
 
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 services.AddMvc(configuration);
 
diff --git a/test/WebSites/XmlSerializerWebSite/Startup.cs b/test/WebSites/XmlSerializerWebSite/Startup.cs
@@ -15,7 +15,7 @@ public void Configure(IApplicationBuilder app)
             var configuration = app.GetTestConfiguration();
 
             // Set up application services
-            app.UseServices(services =>
+            app.UsePerRequestServices(services =>
             {
                 // Add MVC services to the services container
                 services.AddMvc(configuration);

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public void Configure(IApplicationBuilder app)`
`31`	`31`	`{`
`32`	`32`	`app.UseMiddleware<MonitoringMiddlware>();`
`33`	`33`
`34`		`- app.UseServices(services =>`
	`34`	`+ app.UsePerRequestServices(services =>`
`35`	`35`	`{`
`36`	`36`	`services.AddMvc();`
`37`	`37`	`services.AddSingleton<PassThroughAttribute>();`
`@@ -72,7 +72,7 @@ public void Configure(IApplicationBuilder app)`
`72`	`72`	`else`
`73`	`73`	`#endif`
`74`	`74`	`{`
`75`		`- app.UseServices(services =>`
	`75`	`+ app.UsePerRequestServices(services =>`
`76`	`76`	`{`
`77`	`77`	`services.AddMvc();`
`78`	`78`	`services.AddSingleton<PassThroughAttribute>();`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public static void ThrowIfMvcNotRegistered(IServiceProvider services)`
`24`	`24`	`{`
`25`	`25`	`throw new InvalidOperationException(Resources.FormatUnableToFindServices(`
`26`	`26`	`"IServiceCollection.AddMvc()",`
`27`		`- "IApplicationBuilder.UseServices(...)",`
	`27`	`+ "IApplicationBuilder.UsePerRequestServices(...)",`
`28`	`28`	`"IApplicationBuilder.UseMvc(...)"));`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public void MvcThrowsWhenRequiredServicesAreNotAdded()`
`18`	`18`	`{`
`19`	`19`	`// Arrange`
`20`	`20`	`var expectedMessage = "Unable to find the required services. Please add all the required " +`
`21`		`- "services by calling 'IServiceCollection.AddMvc()' inside the call to 'IApplicationBuilder.UseServices(...)' " +`
	`21`	`+ "services by calling 'IServiceCollection.AddMvc()' inside the call to 'IApplicationBuilder.UsePerRequestServices(...)' " +`
`22`	`22`	`"or 'IApplicationBuilder.UseMvc(...)' in the application startup code.";`
`23`	`23`
`24`	`24`	`// Act & Assert`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public void Configure(IApplicationBuilder app)`
`14`	`14`	`var configuration = app.GetTestConfiguration();`
`15`	`15`
`16`	`16`	`// Set up application services`
`17`		`- app.UseServices(services =>`
	`17`	`+ app.UsePerRequestServices(services =>`
`18`	`18`	`{`
`19`	`19`	`// Add MVC services to the services container`
`20`	`20`	`services.AddMvc(configuration);`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class Startup`
`9`	`9`	`public void Configure(IApplicationBuilder app)`
`10`	`10`	`{`
`11`	`11`	`var configuration = app.GetTestConfiguration();`
`12`		`- app.UseServices(services =>`
	`12`	`+ app.UsePerRequestServices(services =>`
`13`	`13`	`{`
`14`	`14`	`services.AddMvc(configuration);`
`15`	`15`	`});`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public void Configure(IApplicationBuilder app)`
`12`	`12`	`{`
`13`	`13`	`var configuration = app.GetTestConfiguration();`
`14`	`14`
`15`		`- app.UseServices(services =>`
	`15`	`+ app.UsePerRequestServices(services =>`
`16`	`16`	`{`
`17`	`17`	`services.AddMvc(configuration);`
`18`	`18`	`});`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public void Configure(IApplicationBuilder app)`
`13`	`13`	`{`
`14`	`14`	`var configuration = app.GetTestConfiguration();`
`15`	`15`
`16`		`- app.UseServices(services => {`
	`16`	`+ app.UsePerRequestServices(services => {`
`17`	`17`	`services.AddMvc(configuration);`
`18`	`18`	`services.AddTransient<HelloWorldBuilder>();`
`19`	`19`