From b6bd7f5d7887797712c1856640ce0e0d2357e7c4 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 9 Oct 2014 14:16:17 -0700 Subject: [PATCH] React to UsePerRequestServices --- samples/MvcSample.Web/Startup.cs | 4 ++-- src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs | 2 +- src/Microsoft.AspNet.Mvc/Properties/Resources.Designer.cs | 4 ++-- .../Internal/MvcServicesHelperTests.cs | 2 +- test/Microsoft.AspNet.Mvc.FunctionalTests/MvcStartupTests.cs | 2 +- test/WebSites/ActivatorWebSite/Startup.cs | 2 +- test/WebSites/AntiForgeryWebSite/Startup.cs | 2 +- test/WebSites/ApiExplorerWebSite/Startup.cs | 2 +- test/WebSites/ApplicationModelWebSite/Startup.cs | 2 +- test/WebSites/AutofacWebSite/Startup.cs | 2 +- test/WebSites/BasicWebSite/Startup.cs | 2 +- test/WebSites/CompositeViewEngine/Startup.cs | 2 +- test/WebSites/ConnegWebSite/Startup.cs | 2 +- test/WebSites/FilesWebSite/Startup.cs | 2 +- test/WebSites/FiltersWebSite/Startup.cs | 2 +- test/WebSites/FormatterWebSite/Startup.cs | 2 +- test/WebSites/InlineConstraintsWebSite/Startup.cs | 2 +- test/WebSites/ModelBindingWebSite/Startup.cs | 2 +- test/WebSites/RazorInstrumentationWebsite/Startup.cs | 2 +- test/WebSites/RazorWebSite/Startup.cs | 2 +- test/WebSites/RoutingWebSite/Startup.cs | 2 +- test/WebSites/UrlHelperWebSite/Startup.cs | 2 +- test/WebSites/ValueProvidersSite/Startup.cs | 2 +- test/WebSites/VersioningWebSite/Startup.cs | 2 +- test/WebSites/XmlSerializerWebSite/Startup.cs | 2 +- 25 files changed, 27 insertions(+), 27 deletions(-) diff --git a/samples/MvcSample.Web/Startup.cs b/samples/MvcSample.Web/Startup.cs index 6af40cad4d..9e40c3b1ed 100644 --- a/samples/MvcSample.Web/Startup.cs +++ b/samples/MvcSample.Web/Startup.cs @@ -31,7 +31,7 @@ namespace MvcSample.Web { app.UseMiddleware(); - app.UseServices(services => + app.UsePerRequestServices(services => { services.AddMvc(); services.AddSingleton(); @@ -72,7 +72,7 @@ namespace MvcSample.Web else #endif { - app.UseServices(services => + app.UsePerRequestServices(services => { services.AddMvc(); services.AddSingleton(); diff --git a/src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs b/src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs index aee7841999..2b52852bc0 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs +++ b/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(...)")); } } diff --git a/src/Microsoft.AspNet.Mvc/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc/Properties/Resources.Designer.cs index 3ee6068e7c..2f1beb64a2 100644 --- a/src/Microsoft.AspNet.Mvc/Properties/Resources.Designer.cs +++ b/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); /// - /// 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. /// internal static string UnableToFindServices { @@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Mvc } /// - /// 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. /// internal static string FormatUnableToFindServices() { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs index 551c74027b..07673d5692 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Mvc services.Setup(o => o.GetService(typeof(IEnumerable))) .Returns(new List()); 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 index deb39e1839..b701a69a26 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcStartupTests.cs +++ b/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 diff --git a/test/WebSites/ActivatorWebSite/Startup.cs b/test/WebSites/ActivatorWebSite/Startup.cs index dfc3a68168..f5061deec1 100644 --- a/test/WebSites/ActivatorWebSite/Startup.cs +++ b/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); diff --git a/test/WebSites/AntiForgeryWebSite/Startup.cs b/test/WebSites/AntiForgeryWebSite/Startup.cs index 9c0e4f3404..c31be230ad 100644 --- a/test/WebSites/AntiForgeryWebSite/Startup.cs +++ b/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); }); diff --git a/test/WebSites/ApiExplorerWebSite/Startup.cs b/test/WebSites/ApiExplorerWebSite/Startup.cs index e16fccf7ba..8152380607 100644 --- a/test/WebSites/ApiExplorerWebSite/Startup.cs +++ b/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(); diff --git a/test/WebSites/ApplicationModelWebSite/Startup.cs b/test/WebSites/ApplicationModelWebSite/Startup.cs index b736e8dc42..449aa49af2 100644 --- a/test/WebSites/ApplicationModelWebSite/Startup.cs +++ b/test/WebSites/ApplicationModelWebSite/Startup.cs @@ -12,7 +12,7 @@ namespace ApplicationModelWebSite { 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 index 77fb4b31e4..fcac5d1c72 100644 --- a/test/WebSites/AutofacWebSite/Startup.cs +++ b/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(); diff --git a/test/WebSites/BasicWebSite/Startup.cs b/test/WebSites/BasicWebSite/Startup.cs index 955d4378ec..9d1e6e53c7 100644 --- a/test/WebSites/BasicWebSite/Startup.cs +++ b/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); diff --git a/test/WebSites/CompositeViewEngine/Startup.cs b/test/WebSites/CompositeViewEngine/Startup.cs index cc0c198e0c..a0e7c5f003 100644 --- a/test/WebSites/CompositeViewEngine/Startup.cs +++ b/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) diff --git a/test/WebSites/ConnegWebSite/Startup.cs b/test/WebSites/ConnegWebSite/Startup.cs index 939707b984..5e862b944c 100644 --- a/test/WebSites/ConnegWebSite/Startup.cs +++ b/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); diff --git a/test/WebSites/FilesWebSite/Startup.cs b/test/WebSites/FilesWebSite/Startup.cs index 59c706ca1a..d993f70798 100644 --- a/test/WebSites/FilesWebSite/Startup.cs +++ b/test/WebSites/FilesWebSite/Startup.cs @@ -13,7 +13,7 @@ namespace FilesWebSite { 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 index 8498e242fe..80bc336def 100644 --- a/test/WebSites/FiltersWebSite/Startup.cs +++ b/test/WebSites/FiltersWebSite/Startup.cs @@ -15,7 +15,7 @@ namespace FiltersWebSite { 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 index 502301c7fb..4c6e99601c 100644 --- a/test/WebSites/FormatterWebSite/Startup.cs +++ b/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); diff --git a/test/WebSites/InlineConstraintsWebSite/Startup.cs b/test/WebSites/InlineConstraintsWebSite/Startup.cs index d1d8b181b1..c7acf97a1c 100644 --- a/test/WebSites/InlineConstraintsWebSite/Startup.cs +++ b/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); diff --git a/test/WebSites/ModelBindingWebSite/Startup.cs b/test/WebSites/ModelBindingWebSite/Startup.cs index 8cc537e171..fa4a212f93 100644 --- a/test/WebSites/ModelBindingWebSite/Startup.cs +++ b/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) diff --git a/test/WebSites/RazorInstrumentationWebsite/Startup.cs b/test/WebSites/RazorInstrumentationWebsite/Startup.cs index 4f8987bd3a..a55cd4152e 100644 --- a/test/WebSites/RazorInstrumentationWebsite/Startup.cs +++ b/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); diff --git a/test/WebSites/RazorWebSite/Startup.cs b/test/WebSites/RazorWebSite/Startup.cs index bcdc1e0ffa..61b8ae8285 100644 --- a/test/WebSites/RazorWebSite/Startup.cs +++ b/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); diff --git a/test/WebSites/RoutingWebSite/Startup.cs b/test/WebSites/RoutingWebSite/Startup.cs index c353939d84..f581ee78db 100644 --- a/test/WebSites/RoutingWebSite/Startup.cs +++ b/test/WebSites/RoutingWebSite/Startup.cs @@ -13,7 +13,7 @@ namespace RoutingWebSite { 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 index 8a088e4bc4..79c1565342 100644 --- a/test/WebSites/UrlHelperWebSite/Startup.cs +++ b/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(optionsSetup => { diff --git a/test/WebSites/ValueProvidersSite/Startup.cs b/test/WebSites/ValueProvidersSite/Startup.cs index e16ed6c481..51ead99313 100644 --- a/test/WebSites/ValueProvidersSite/Startup.cs +++ b/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) diff --git a/test/WebSites/VersioningWebSite/Startup.cs b/test/WebSites/VersioningWebSite/Startup.cs index a19a7ee669..4abbf72342 100644 --- a/test/WebSites/VersioningWebSite/Startup.cs +++ b/test/WebSites/VersioningWebSite/Startup.cs @@ -12,7 +12,7 @@ namespace VersioningWebSite { 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 index 0cc1592249..3df5f16ad1 100644 --- a/test/WebSites/XmlSerializerWebSite/Startup.cs +++ b/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);