diff options
| author | Claus Vium <clausvium@gmail.com> | 2019-07-02 18:26:23 +0200 |
|---|---|---|
| committer | Claus Vium <clausvium@gmail.com> | 2019-11-19 21:49:20 +0100 |
| commit | c011fa2ea80a5f7f994649e6257bccf572f299e1 (patch) | |
| tree | a03d4c861259b868a5366205008eba05c3be1124 /Emby.Server.Implementations/ApplicationHost.cs | |
| parent | e5d57bd82f9a089b7c19ea357efd2b8b34fd418b (diff) | |
Remove old instantiation of serviceProvider in app host
Diffstat (limited to 'Emby.Server.Implementations/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index a9c4e1fdc..11ee6d2d2 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -663,6 +663,7 @@ namespace Emby.Server.Implementations .SetCompatibilityVersion(CompatibilityVersion.Version_2_2) .AddApplicationPart(Assembly.Load("Jellyfin.Api")); services.AddApiVersioning(opt => opt.ReportApiVersions = true); + // Merge the external ServiceCollection into ASP.NET DI services.TryAdd(serviceCollection); }) .Configure(app => @@ -929,8 +930,6 @@ namespace Emby.Server.Implementations ((UserDataManager)UserDataManager).Repository = userDataRepo; ItemRepository.Initialize(userDataRepo, UserManager); ((LibraryManager)LibraryManager).ItemRepository = ItemRepository; - - _serviceProvider = serviceCollection.BuildServiceProvider(); } public static void LogEnvironmentInfo(ILogger logger, IApplicationPaths appPaths) |