Merge pull request #1768 from MediaBrowser/dev

Dev
8 years ago · ab6b7c75f0
parent 6ac2678d52 5433ebb5cf
commit ab6b7c75f0
5 changed files with 8 additions and 8 deletions
--- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
+++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
@ -65,8 +65,8 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\ThirdParty\SharpCompress\SharpCompress.dll</HintPath>
    </Reference>
-    <Reference Include="SimpleInjector, Version=3.1.4.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
-      <HintPath>..\packages\SimpleInjector.3.1.4\lib\net45\SimpleInjector.dll</HintPath>
+    <Reference Include="SimpleInjector, Version=3.1.5.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
+      <HintPath>..\packages\SimpleInjector.3.1.5\lib\net45\SimpleInjector.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
--- a/MediaBrowser.Common.Implementations/ScheduledTasks/TaskManager.cs
+++ b/MediaBrowser.Common.Implementations/ScheduledTasks/TaskManager.cs
@ -88,8 +88,6 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
            _fileSystem = fileSystem;

            ScheduledTasks = new IScheduledTaskWorker[] { };
-
-            BindToSystemEvent();
        }

        private void BindToSystemEvent()
@ -259,6 +257,8 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
            myTasks.AddRange(list.Select(t => new ScheduledTaskWorker(t, ApplicationPaths, this, JsonSerializer, Logger, _fileSystem)));

            ScheduledTasks = myTasks.ToArray();
+
+            BindToSystemEvent();
        }

        /// <summary>
--- a/MediaBrowser.Common.Implementations/packages.config
+++ b/MediaBrowser.Common.Implementations/packages.config
@ -4,5 +4,5 @@
  <package id="morelinq" version="1.4.0" targetFramework="net45" />
  <package id="NLog" version="4.3.4" targetFramework="net45" />
  <package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
-  <package id="SimpleInjector" version="3.1.4" targetFramework="net45" />
+  <package id="SimpleInjector" version="3.1.5" targetFramework="net45" />
 </packages>
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@ -68,8 +68,8 @@
    <Reference Include="ServiceStack.Api.Swagger">
      <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Api.Swagger.dll</HintPath>
    </Reference>
-    <Reference Include="SimpleInjector, Version=3.1.4.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
-      <HintPath>..\packages\SimpleInjector.3.1.4\lib\net45\SimpleInjector.dll</HintPath>
+    <Reference Include="SimpleInjector, Version=3.1.5.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
+      <HintPath>..\packages\SimpleInjector.3.1.5\lib\net45\SimpleInjector.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="SocketHttpListener, Version=1.0.5955.1537, Culture=neutral, processorArchitecture=MSIL">
--- a/MediaBrowser.Server.Implementations/packages.config
+++ b/MediaBrowser.Server.Implementations/packages.config
@ -8,6 +8,6 @@
  <package id="Mono.Nat" version="1.2.24.0" targetFramework="net45" />
  <package id="morelinq" version="1.4.0" targetFramework="net45" />
  <package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
-  <package id="SimpleInjector" version="3.1.4" targetFramework="net45" />
+  <package id="SimpleInjector" version="3.1.5" targetFramework="net45" />
  <package id="SocketHttpListener" version="1.0.0.30" targetFramework="net45" />
 </packages>