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

Don't add platforms services if no available

This commit is contained in:
David Fowler 2015-10-22 06:13:25 -07:00
parent 10822b3b4f
commit f2e7c49c36
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,13 +92,21 @@ namespace Microsoft.AspNet.Hosting
_configureServices(services); _configureServices(services);
} }
services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.Application)); if (PlatformServices.Default != null)
services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.Runtime)); {
services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.AssemblyLoadContextAccessor)); services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.Application));
services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.AssemblyLoaderContainer)); services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.Runtime));
services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.LibraryManager)); services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.AssemblyLoadContextAccessor));
services.TryAdd(ServiceDescriptor.Instance(CompilationServices.Default.LibraryExporter)); services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.AssemblyLoaderContainer));
services.TryAdd(ServiceDescriptor.Instance(CompilationServices.Default.CompilerOptionsProvider)); services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.LibraryManager));
}
// TODO: Remove this
if (CompilationServices.Default != null)
{
services.TryAdd(ServiceDescriptor.Instance(CompilationServices.Default.LibraryExporter));
services.TryAdd(ServiceDescriptor.Instance(CompilationServices.Default.CompilerOptionsProvider));
}
return services; return services;
} }