huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

React to UsePerRequestServices

This commit is contained in:
Hao Kung 2014-10-09 14:16:17 -07:00
parent c87de5a0fc
commit b6bd7f5d78
25 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/MvcSample.Web/Startup.cs
View File

@ -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>();

2
src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs
View File

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

4
src/Microsoft.AspNet.Mvc/Properties/Resources.Designer.cs generated
View File

@ -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()
{

2
test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs
View File

@ -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

2
test/Microsoft.AspNet.Mvc.FunctionalTests/MvcStartupTests.cs
View File

@ -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

2
test/WebSites/ActivatorWebSite/Startup.cs
View File

@ -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);

2
test/WebSites/AntiForgeryWebSite/Startup.cs
View File

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

2
test/WebSites/ApiExplorerWebSite/Startup.cs
View File

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

2
test/WebSites/ApplicationModelWebSite/Startup.cs
View File

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

2
test/WebSites/AutofacWebSite/Startup.cs
View File

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

2
test/WebSites/BasicWebSite/Startup.cs
View File

@ -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);

2
test/WebSites/CompositeViewEngine/Startup.cs
View File

@ -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)

2
test/WebSites/ConnegWebSite/Startup.cs
View File

@ -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);

2
test/WebSites/FilesWebSite/Startup.cs
View File

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

2
test/WebSites/FiltersWebSite/Startup.cs
View File

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

2
test/WebSites/FormatterWebSite/Startup.cs
View File

@ -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);

2
test/WebSites/InlineConstraintsWebSite/Startup.cs
View File

@ -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);

2
test/WebSites/ModelBindingWebSite/Startup.cs
View File

@ -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)

2
test/WebSites/RazorInstrumentationWebsite/Startup.cs
View File

@ -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);

2
test/WebSites/RazorWebSite/Startup.cs
View File

@ -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);

2
test/WebSites/RoutingWebSite/Startup.cs
View File

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

2
test/WebSites/UrlHelperWebSite/Startup.cs
View File

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

2
test/WebSites/ValueProvidersSite/Startup.cs
View File

@ -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)

2
test/WebSites/VersioningWebSite/Startup.cs
View File

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

2
test/WebSites/XmlSerializerWebSite/Startup.cs
View File

@ -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);