Merge pull request #2263 from MediaBrowser/dev

Dev

1 files changed, 14 insertions, 0 deletions

diff --git a/Emby.Common.Implementations/BaseApplicationHost.cs b/Emby.Common.Implementations/BaseApplicationHost.cs
index 2fe82e5a4..897557efd 100644
--- a/Emby.Common.Implementations/BaseApplicationHost.cs
+++ b/Emby.Common.Implementations/BaseApplicationHost.cs
@@ -27,11 +27,16 @@ using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Extensions;
 using Emby.Common.Implementations.Cryptography;
+using Emby.Common.Implementations.Diagnostics;
+using Emby.Common.Implementations.Threading;
 using MediaBrowser.Common;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Model.Cryptography;
+using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.Tasks;
+using MediaBrowser.Model.Threading;
+
 #if NETSTANDARD1_6
 using System.Runtime.Loader;
 #endif
@@ -146,6 +151,9 @@ namespace Emby.Common.Implementations
 
         protected ISystemEvents SystemEvents { get; private set; }
 
+        protected IProcessFactory ProcessFactory { get; private set; }
+        protected ITimerFactory TimerFactory { get; private set; }
+
         /// <summary>
         /// Gets the name.
         /// </summary>
@@ -535,6 +543,12 @@ return null;
             IsoManager = new IsoManager();
             RegisterSingleInstance(IsoManager);
 
+            ProcessFactory = new ProcessFactory();
+            RegisterSingleInstance(ProcessFactory);
+
+            TimerFactory = new TimerFactory();
+            RegisterSingleInstance(TimerFactory);
+
             return Task.FromResult(true);
         }