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

[Fixes #2156] Remove IConfiguration from AddMvc

This commit is contained in:
Kiran Challa 2015-03-12 16:44:30 -07:00 committed by Kiran Challa
parent 9a44e3e08b
commit f06007d428
42 changed files with 41 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs
View File

@ -7,7 +7,6 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc;
using Microsoft.AspNet.Routing; using Microsoft.AspNet.Routing;
using Microsoft.Framework.ConfigurationModel;
using Microsoft.Framework.Internal; using Microsoft.Framework.Internal;
using Microsoft.Framework.Logging; using Microsoft.Framework.Logging;
@ -15,11 +14,6 @@ namespace Microsoft.Framework.DependencyInjection
{ {
public static class MvcServiceCollectionExtensions public static class MvcServiceCollectionExtensions
{ {
public static IServiceCollection AddMvc([NotNull] this IServiceCollection services, IConfiguration config)
{
return services.AddMvc();
}
public static IServiceCollection AddMvc([NotNull] this IServiceCollection services) public static IServiceCollection AddMvc([NotNull] this IServiceCollection services)
{ {
ConfigureDefaultServices(services); ConfigureDefaultServices(services);

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

@ -15,7 +15,7 @@ namespace ActionConstraintsWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.Configure<MvcOptions>(options => services.Configure<MvcOptions>(options =>
{ {
options.AddXmlDataContractSerializerFormatter(); options.AddXmlDataContractSerializerFormatter();

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

@ -15,7 +15,7 @@ namespace ActionResultsWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.Configure<MvcOptions>(options => services.Configure<MvcOptions>(options =>
{ {

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

@ -16,7 +16,7 @@ namespace ActivatorWebSite
app.UseServices(services => app.UseServices(services =>
{ {
// Add MVC services to the services container // Add MVC services to the services container
services.AddMvc(configuration); services.AddMvc();
services.AddInstance(new MyService()); services.AddInstance(new MyService());
services.AddScoped<ViewService, ViewService>(); services.AddScoped<ViewService, ViewService>();
}); });

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

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

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

@ -16,7 +16,7 @@ namespace ApiExplorerWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.AddSingleton<ApiExplorerDataFilter>(); services.AddSingleton<ApiExplorerDataFilter>();
services.Configure<MvcOptions>(options => services.Configure<MvcOptions>(options =>

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

@ -15,7 +15,7 @@ namespace ApplicationModelWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.Configure<MvcOptions>(options => services.Configure<MvcOptions>(options =>
{ {

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

@ -17,7 +17,7 @@ namespace AutofacWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.AddTransient<HelloWorldBuilder>(); services.AddTransient<HelloWorldBuilder>();
var builder = new ContainerBuilder(); var builder = new ContainerBuilder();

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

@ -18,7 +18,7 @@ namespace BasicWebSite
app.UseServices(services => app.UseServices(services =>
{ {
// Add MVC services to the services container // Add MVC services to the services container
services.AddMvc(configuration); services.AddMvc();
services.AddSingleton<IActionDescriptorProvider, ActionDescriptorCreationCounter>(); services.AddSingleton<IActionDescriptorProvider, ActionDescriptorCreationCounter>();

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

@ -15,7 +15,7 @@ namespace BestEffortLinkGenerationWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.Configure<RouteOptions>((options) => services.Configure<RouteOptions>((options) =>
{ {
options.UseBestEffortLinkGeneration = true; options.UseBestEffortLinkGeneration = true;

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

@ -17,7 +17,7 @@ namespace CompositeViewEngineWebSite
app.UseServices(services => app.UseServices(services =>
{ {
// Add a view engine as the first one in the list. // Add a view engine as the first one in the list.
services.AddMvc(configuration) services.AddMvc()
.Configure<MvcOptions>(options => .Configure<MvcOptions>(options =>
{ {
options.ViewEngines.Insert(0, typeof(TestViewEngine)); options.ViewEngines.Insert(0, typeof(TestViewEngine));

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

@ -17,7 +17,7 @@ namespace ContentNegotiationWebSite
app.UseServices(services => app.UseServices(services =>
{ {
// Add MVC services to the services container // Add MVC services to the services container
services.AddMvc(configuration); services.AddMvc();
services.Configure<MvcOptions>(options => services.Configure<MvcOptions>(options =>
{ {

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

@ -14,7 +14,7 @@ namespace ControllerDiscoveryConventionsWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
}); });
app.UseMvc(routes => app.UseMvc(routes =>

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

@ -22,7 +22,7 @@ namespace ControllersFromServicesWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration) services.AddMvc()
.WithControllersAsServices( .WithControllersAsServices(
new[] new[]
{ {

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

@ -14,7 +14,7 @@ namespace CustomRouteWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
}); });
app.UseMvc(routes => app.UseMvc(routes =>

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

@ -14,7 +14,7 @@ namespace ErrorPageMiddlewareWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
}); });
app.UseErrorPage(); app.UseErrorPage();

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

@ -14,7 +14,7 @@ namespace FilesWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
}); });
app.UseMiddleware<SendFileMiddleware>(); app.UseMiddleware<SendFileMiddleware>();

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

@ -18,7 +18,7 @@ namespace FiltersWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.ConfigureAuthorization(options => services.ConfigureAuthorization(options =>
{ {
// This policy cannot succeed since it has no requirements // This policy cannot succeed since it has no requirements

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

@ -17,7 +17,7 @@ namespace FormatFilterWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.Configure<MvcOptions>(options => services.Configure<MvcOptions>(options =>
{ {
var formatFilter = new FormatFilterAttribute(); var formatFilter = new FormatFilterAttribute();

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

@ -17,7 +17,7 @@ namespace FormatterWebSite
app.UseServices(services => app.UseServices(services =>
{ {
// Add MVC services to the services container // Add MVC services to the services container
services.AddMvc(configuration); services.AddMvc();
services.Configure<MvcOptions>(options => services.Configure<MvcOptions>(options =>
{ {

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

@ -15,7 +15,7 @@ namespace InlineConstraints
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
}); });
app.UseErrorReporter(); app.UseErrorReporter();

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

@ -20,7 +20,7 @@ namespace LoggingWebSite
options.Filter = (loggerName, logLevel) => true; options.Filter = (loggerName, logLevel) => true;
}); });
services.AddMvc(configuration); services.AddMvc();
}); });
app.Map("/logs", (appBuilder) => app.Map("/logs", (appBuilder) =>

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

@ -18,7 +18,7 @@ namespace LowercaseUrlsWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.Configure<RouteOptions>(routeOptions => routeOptions.LowercaseUrls = true); services.Configure<RouteOptions>(routeOptions => routeOptions.LowercaseUrls = true);
}); });

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

@ -20,7 +20,7 @@ namespace ModelBindingWebSite
app.UseServices(services => app.UseServices(services =>
{ {
// Add MVC services to the services container // Add MVC services to the services container
services.AddMvc(configuration) services.AddMvc()
.Configure<MvcOptions>(m => .Configure<MvcOptions>(m =>
{ {
m.MaxModelValidationErrors = 8; m.MaxModelValidationErrors = 8;

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

@ -14,7 +14,7 @@ namespace MvcTagHelpersWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.AddSingleton<ProductsService>(); services.AddSingleton<ProductsService>();
}); });

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

@ -14,7 +14,7 @@ namespace PrecompilationWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
}); });
app.UseMvc(routes => app.UseMvc(routes =>

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

@ -15,7 +15,7 @@ namespace RazorCompilerCacheWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.AddSingleton<ICompilerCache, CustomCompilerCache>(); services.AddSingleton<ICompilerCache, CustomCompilerCache>();
services.AddSingleton<CompilerCacheInitialiedService>(); services.AddSingleton<CompilerCacheInitialiedService>();
}); });

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

@ -17,7 +17,7 @@ namespace RazorEmbeddedViewsWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.Configure<RazorViewEngineOptions>(options => services.Configure<RazorViewEngineOptions>(options =>
{ {

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

@ -20,7 +20,7 @@ namespace RazorPageExecutionInstrumentationWebSite
app.UseServices(services => app.UseServices(services =>
{ {
// Add MVC services to the services container // Add MVC services to the services container
services.AddMvc(configuration); services.AddMvc();
}); });
app.Use(async (HttpContext context, Func<Task> next) => app.Use(async (HttpContext context, Func<Task> next) =>

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

@ -18,7 +18,7 @@ namespace RazorWebSite
app.UseServices(services => app.UseServices(services =>
{ {
// Add MVC services to the services container // Add MVC services to the services container
services.AddMvc(configuration); services.AddMvc();
services.AddTransient<InjectedHelper>(); services.AddTransient<InjectedHelper>();
services.AddTransient<TaskReturningService>(); services.AddTransient<TaskReturningService>();
services.AddTransient<FrameworkSpecificHelper>(); services.AddTransient<FrameworkSpecificHelper>();

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

@ -14,7 +14,7 @@ namespace RequestServicesWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.AddScoped<RequestIdService>(); services.AddScoped<RequestIdService>();
}); });

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

@ -14,7 +14,7 @@ namespace ResponseCacheWebSite
var configuration = app.GetTestConfiguration(); var configuration = app.GetTestConfiguration();
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.Configure<MvcOptions>(options => services.Configure<MvcOptions>(options =>
{ {
options.CacheProfiles.Add( options.CacheProfiles.Add(

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

@ -14,7 +14,7 @@ namespace RoutingWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.AddScoped<TestResponseGenerator>(); services.AddScoped<TestResponseGenerator>();
}); });

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

@ -14,7 +14,7 @@ namespace TagHelpersWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
}); });
app.UseMvc(routes => app.UseMvc(routes =>

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

@ -16,7 +16,7 @@ namespace TempDataWebSite
{ {
services.AddCaching(); services.AddCaching();
services.AddSession(); services.AddSession();
services.AddMvc(configuration); services.AddMvc();
}); });
app.UseInMemorySession(); app.UseInMemorySession();

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

@ -24,7 +24,7 @@ namespace UrlHelperWebSite
}); });
// Add MVC services to the services container // Add MVC services to the services container
services.AddMvc(configuration); services.AddMvc();
services.AddScoped<IUrlHelper, CustomUrlHelper>(); services.AddScoped<IUrlHelper, CustomUrlHelper>();
}); });

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

@ -19,7 +19,7 @@ namespace ValidationWebSite
app.UseServices(services => app.UseServices(services =>
{ {
// Add MVC services to the services container // Add MVC services to the services container
services.AddMvc(configuration); services.AddMvc();
}); });
app.UseErrorReporter(); app.UseErrorReporter();

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

@ -17,7 +17,7 @@ namespace ValueProvidersWebSite
app.UseServices(services => app.UseServices(services =>
{ {
// Add MVC services to the services container // Add MVC services to the services container
services.AddMvc(configuration) services.AddMvc()
.Configure<MvcOptions>(options => .Configure<MvcOptions>(options =>
{ {
options.ValueProviderFactories.Insert(1, new CustomValueProviderFactory()); options.ValueProviderFactories.Insert(1, new CustomValueProviderFactory());

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

@ -14,7 +14,7 @@ namespace VersioningWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.AddScoped<TestResponseGenerator>(); services.AddScoped<TestResponseGenerator>();
}); });

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

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

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

@ -15,7 +15,7 @@ namespace WebApiCompatShimWebSite
app.UseServices(services => app.UseServices(services =>
{ {
services.AddMvc(configuration); services.AddMvc();
services.AddWebApiConventions(); services.AddWebApiConventions();
}); });

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

@ -20,7 +20,7 @@ namespace XmlFormattersWebSite
app.UseServices(services => app.UseServices(services =>
{ {
// Add MVC services to the services container // Add MVC services to the services container
services.AddMvc(configuration); services.AddMvc();
services.Configure<MvcOptions>(options => services.Configure<MvcOptions>(options =>
{ {