Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Conflicts:
	MediaBrowser.Controller/Providers/FanartBaseProvider.cs
	MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs

1 files changed, 2 insertions, 44 deletions

diff --git a/MediaBrowser.Common/Kernel/IKernel.cs b/MediaBrowser.Common/Kernel/IKernel.cs
index 1a2d86d7f..51677677a 100644
--- a/MediaBrowser.Common/Kernel/IKernel.cs
+++ b/MediaBrowser.Common/Kernel/IKernel.cs
@@ -1,17 +1,12 @@
-using MediaBrowser.Common.Plugins;
-using MediaBrowser.Common.Security;
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.System;
+using MediaBrowser.Model.System;
 using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace MediaBrowser.Common.Kernel
 {
     /// <summary>
     /// Interface IKernel
     /// </summary>
-    public interface IKernel : IDisposable
+    public interface IKernel
     {
         /// <summary>
         /// Occurs when [has pending restart changed].
@@ -19,18 +14,6 @@ namespace MediaBrowser.Common.Kernel
         event EventHandler HasPendingRestartChanged;
 
         /// <summary>
-        /// Gets the application paths.
-        /// </summary>
-        /// <value>The application paths.</value>
-        IApplicationPaths ApplicationPaths { get; }
-
-        /// <summary>
-        /// Gets the configuration.
-        /// </summary>
-        /// <value>The configuration.</value>
-        BaseApplicationConfiguration Configuration { get; }
-
-        /// <summary>
         /// Gets the kernel context.
         /// </summary>
         /// <value>The kernel context.</value>
@@ -84,33 +67,8 @@ namespace MediaBrowser.Common.Kernel
         string HttpServerUrlPrefix { get; }
 
         /// <summary>
-        /// Gets the plug-in security manager.
-        /// </summary>
-        /// <value>The plug-in security manager.</value>
-        ISecurityManager SecurityManager { get; set; }
-
-        /// <summary>
-        /// Occurs when [configuration updated].
-        /// </summary>
-        event EventHandler<EventArgs> ConfigurationUpdated;
-
-        /// <summary>
         /// Notifies the pending restart.
         /// </summary>
         void NotifyPendingRestart();
-
-        /// <summary>
-        /// Gets the XML configuration.
-        /// </summary>
-        /// <param name="type">The type.</param>
-        /// <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; }
     }
 }