diff options
| -rw-r--r-- | MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj | 3 | ||||
| -rw-r--r-- | MediaBrowser.Common/Kernel/BaseKernel.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Common/Kernel/IKernel.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Common/Kernel/ResourcePool.cs (renamed from MediaBrowser.Controller/Library/ResourcePool.cs) | 4 | ||||
| -rw-r--r-- | MediaBrowser.Common/MediaBrowser.Common.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Kernel.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Controller/MediaBrowser.Controller.csproj | 1 |
7 files changed, 19 insertions, 9 deletions
diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj index 44b4e7df7..6f28a6c9a 100644 --- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj +++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj @@ -162,6 +162,9 @@ <Content Include="swagger-ui\swagger-ui.js" /> <Content Include="swagger-ui\swagger-ui.min.js" /> </ItemGroup> + <ItemGroup> + <Folder Include="Updates\" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(SolutionDir)\.nuget\nuget.targets" /> <PropertyGroup> diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index 184cef98b..962c740c3 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -455,5 +455,12 @@ namespace MediaBrowser.Common.Kernel { return GetXmlConfiguration(typeof(T), path) as T; } + + /// <summary> + /// Limits simultaneous access to various resources + /// </summary> + /// <value>The resource pools.</value> + public ResourcePool ResourcePools { get; set; } + } } diff --git a/MediaBrowser.Common/Kernel/IKernel.cs b/MediaBrowser.Common/Kernel/IKernel.cs index a4ff16afb..dce744c0a 100644 --- a/MediaBrowser.Common/Kernel/IKernel.cs +++ b/MediaBrowser.Common/Kernel/IKernel.cs @@ -117,5 +117,11 @@ namespace MediaBrowser.Common.Kernel /// <param name="path">The path.</param> /// <returns>System.Object.</returns> object GetXmlConfiguration(Type type, string path); + + /// <summary> + /// Limits simultaneous access to various resources + /// </summary> + /// <value>The resource pools.</value> + ResourcePool ResourcePools { get; set; } } } diff --git a/MediaBrowser.Controller/Library/ResourcePool.cs b/MediaBrowser.Common/Kernel/ResourcePool.cs index 3e4d53204..8a2ab8af8 100644 --- a/MediaBrowser.Controller/Library/ResourcePool.cs +++ b/MediaBrowser.Common/Kernel/ResourcePool.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Threading; -namespace MediaBrowser.Controller.Library +namespace MediaBrowser.Common.Kernel { /// <summary> /// This is just a collection of semaphores to control the number of concurrent executions of various resources diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index a10f36da0..709d6c016 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -95,6 +95,7 @@ <Compile Include="Kernel\IWebSocketListener.cs" /> <Compile Include="Kernel\IApplicationHost.cs" /> <Compile Include="Kernel\IKernel.cs" /> + <Compile Include="Kernel\ResourcePool.cs" /> <Compile Include="Net\Handlers\IHttpServerHandler.cs" /> <Compile Include="Net\Handlers\StaticFileHandler.cs" /> <Compile Include="Net\IHttpClient.cs" /> diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index a4af76805..521bf92c6 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -279,12 +279,6 @@ namespace MediaBrowser.Controller public IUserDataRepository UserDataRepository { get; private set; } /// <summary> - /// Limits simultaneous access to various resources - /// </summary> - /// <value>The resource pools.</value> - public ResourcePool ResourcePools { get; set; } - - /// <summary> /// Gets the UDP server port number. /// </summary> /// <value>The UDP server port number.</value> diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index ff2bcb213..6ab70f47c 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -177,7 +177,6 @@ <Compile Include="Resolvers\TV\SeasonResolver.cs" /> <Compile Include="Resolvers\TV\SeriesResolver.cs" /> <Compile Include="Resolvers\TV\TVUtils.cs" /> - <Compile Include="Library\ResourcePool.cs" /> <Compile Include="ScheduledTasks\PeopleValidationTask.cs" /> <Compile Include="ScheduledTasks\RefreshMediaLibraryTask.cs" /> <Compile Include="Library\ItemResolveArgs.cs" /> |