Merge remote-tracking branch 'upstream/master' into support-injecting-iconfiguration

This commit is contained in:
Mark Monteiro
2020-03-03 22:27:49 +01:00
27 changed files with 455 additions and 343 deletions

View File

@@ -666,9 +666,8 @@ namespace Emby.Server.Implementations
serviceCollection.AddSingleton(JsonSerializer);
serviceCollection.AddSingleton(LoggerFactory);
serviceCollection.AddLogging();
serviceCollection.AddSingleton(Logger);
// TODO: Support for injecting ILogger should be deprecated in favour of ILogger<T> and this removed
serviceCollection.AddSingleton<ILogger>(Logger);
serviceCollection.AddSingleton(FileSystemManager);
serviceCollection.AddSingleton<TvDbClientManager>();