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

Add compiler configuration to services and another overload for test server creation 

.. to alow host service configuration
This commit is contained in:
Pavel Krymets 2015-10-21 14:12:23 -07:00
parent 99f5febc3b
commit 7cc3e11a9e
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Microsoft.AspNet.Hosting/WebHostBuilder.cs
View File

@ -101,6 +101,7 @@ namespace Microsoft.AspNet.Hosting
services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.AssemblyLoaderContainer)); services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.AssemblyLoaderContainer));
services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.LibraryManager)); services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.LibraryManager));
services.TryAdd(ServiceDescriptor.Instance(CompilationServices.Default.LibraryExporter)); services.TryAdd(ServiceDescriptor.Instance(CompilationServices.Default.LibraryExporter));
services.TryAdd(ServiceDescriptor.Instance(CompilationServices.Default.CompilerOptionsProvider));
return services; return services;
} }

16
src/Microsoft.AspNet.TestHost/TestServer.cs
View File

@ -48,7 +48,11 @@ namespace Microsoft.AspNet.TestHost
public static TestServer Create(Action<IApplicationBuilder> configureApp, Func<IServiceCollection, IServiceProvider> configureServices) public static TestServer Create(Action<IApplicationBuilder> configureApp, Func<IServiceCollection, IServiceProvider> configureServices)
{ {
return new TestServer(CreateBuilder(config: null, configureApp: configureApp, configureServices: configureServices)); return new TestServer(CreateBuilder(config: null, configureApp: configureApp, configureServices: configureServices, configureHostServices: null));
}
public static TestServer Create(Action<IApplicationBuilder> configureApp, Func<IServiceCollection, IServiceProvider> configureServices, Action<IServiceCollection> configureHostServices)
{
return new TestServer(CreateBuilder(config: null, configureApp: configureApp, configureServices: configureServices, configureHostServices: configureHostServices));
} }
public static TestServer Create(IConfiguration config, Action<IApplicationBuilder> configureApp, Action<IServiceCollection> configureServices) public static TestServer Create(IConfiguration config, Action<IApplicationBuilder> configureApp, Action<IServiceCollection> configureServices)
@ -66,12 +70,16 @@ namespace Microsoft.AspNet.TestHost
configureServices(s); configureServices(s);
} }
return s.BuildServiceProvider(); return s.BuildServiceProvider();
}); }, null);
} }
public static WebHostBuilder CreateBuilder(IConfiguration config, Action<IApplicationBuilder> configureApp, Func<IServiceCollection, IServiceProvider> configureServices) public static WebHostBuilder CreateBuilder(IConfiguration config, Action<IApplicationBuilder> configureApp, Func<IServiceCollection, IServiceProvider> configureServices)
{ {
return CreateBuilder(config).UseStartup(configureApp, configureServices); return CreateBuilder(config, configureApp, configureServices, null);
}
public static WebHostBuilder CreateBuilder(IConfiguration config, Action<IApplicationBuilder> configureApp, Func<IServiceCollection, IServiceProvider> configureServices, Action<IServiceCollection> configureHostServices)
{
return CreateBuilder(config).UseStartup(configureApp, configureServices).UseServices(configureHostServices);
} }
public static WebHostBuilder CreateBuilder(IConfiguration config) public static WebHostBuilder CreateBuilder(IConfiguration config)