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

Remove compilation options from services. 

- This was a temporary work around to allow MVC to build.
- Reacts to aspnet/Mvc#3383
This commit is contained in:
N. Taylor Mullen 2015-10-22 11:01:51 -07:00
parent 4702752384
commit 8e946798a1
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Hosting
public const string OldServerKey = "server"; public const string OldServerKey = "server";
public const string ServerKey = "Hosting:Server"; public const string ServerKey = "Hosting:Server";
private readonly IHostingEnvironment _hostingEnvironment; private readonly IHostingEnvironment _hostingEnvironment;
private readonly ILoggerFactory _loggerFactory; private readonly ILoggerFactory _loggerFactory;
private readonly IConfiguration _config; private readonly IConfiguration _config;
@ -79,7 +79,7 @@ namespace Microsoft.AspNet.Hosting
services.AddTransient<IHttpContextFactory, HttpContextFactory>(); services.AddTransient<IHttpContextFactory, HttpContextFactory>();
services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>(); services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
services.AddLogging(); services.AddLogging();
var diagnosticSource = new DiagnosticListener("Microsoft.AspNet"); var diagnosticSource = new DiagnosticListener("Microsoft.AspNet");
services.AddInstance<DiagnosticSource>(diagnosticSource); services.AddInstance<DiagnosticSource>(diagnosticSource);
services.AddInstance<DiagnosticListener>(diagnosticSource); services.AddInstance<DiagnosticListener>(diagnosticSource);
@ -101,13 +101,6 @@ namespace Microsoft.AspNet.Hosting
services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.LibraryManager)); 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;
} }