Merge pull request #2897 from MediaBrowser/beta

Beta

5 files changed, 15 insertions, 6 deletions

diff --git a/MediaBrowser.Common/IApplicationHost.cs b/MediaBrowser.Common/IApplicationHost.cs
index 2b5ae6799..dc0c9ac9b 100644
--- a/MediaBrowser.Common/IApplicationHost.cs
+++ b/MediaBrowser.Common/IApplicationHost.cs
@@ -42,6 +42,8 @@ namespace MediaBrowser.Common
         /// <value><c>true</c> if this instance has pending kernel reload; otherwise, <c>false</c>.</value>
         bool HasPendingRestart { get; }
 
+        bool IsShuttingDown { get; }
+
         /// <summary>
         /// Gets a value indicating whether this instance can self restart.
         /// </summary>
@@ -57,11 +59,11 @@ namespace MediaBrowser.Common
         /// Notifies the pending restart.
         /// </summary>
         void NotifyPendingRestart();
-        
+
         /// <summary>
         /// Restarts this instance.
         /// </summary>
-        Task Restart();
+        void Restart();
 
         /// <summary>
         /// Gets the application version.
diff --git a/MediaBrowser.Common/Net/HttpResponseInfo.cs b/MediaBrowser.Common/Net/HttpResponseInfo.cs
index ed941a447..0d7fb69cb 100644
--- a/MediaBrowser.Common/Net/HttpResponseInfo.cs
+++ b/MediaBrowser.Common/Net/HttpResponseInfo.cs
@@ -70,6 +70,7 @@ namespace MediaBrowser.Common.Net
             {
                 _disposable.Dispose();
             }
+            GC.SuppressFinalize(this);
         }
     }
 }
diff --git a/MediaBrowser.Common/Net/IHttpClient.cs b/MediaBrowser.Common/Net/IHttpClient.cs
index 4eabbc803..15257715f 100644
--- a/MediaBrowser.Common/Net/IHttpClient.cs
+++ b/MediaBrowser.Common/Net/IHttpClient.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Common.Net
     /// <summary>
     /// Interface IHttpClient
     /// </summary>
-    public interface IHttpClient : IDisposable
+    public interface IHttpClient
     {
         /// <summary>
         /// Gets the response.
diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs
index 95e076096..73be04ac8 100644
--- a/MediaBrowser.Common/Plugins/BasePlugin.cs
+++ b/MediaBrowser.Common/Plugins/BasePlugin.cs
@@ -55,11 +55,15 @@ namespace MediaBrowser.Common.Plugins
             get { return typeof(TConfigurationType); }
         }
 
-        public void SetAttributes(string assemblyFilePath, string assemblyFileName, Version assemblyVersion, Guid assemblyId)
+        public void SetAttributes(string assemblyFilePath, string assemblyFileName, Version assemblyVersion)
         {
             AssemblyFilePath = assemblyFilePath;
             AssemblyFileName = assemblyFileName;
             Version = assemblyVersion;
+        }
+
+        public void SetId(Guid assemblyId)
+        {
             Id = assemblyId;
         }
 
@@ -78,7 +82,7 @@ namespace MediaBrowser.Common.Plugins
         /// Gets the unique id.
         /// </summary>
         /// <value>The unique id.</value>
-        public Guid Id { get; private set; }
+        public virtual Guid Id { get; private set; }
 
         /// <summary>
         /// Gets the plugin version
@@ -284,6 +288,7 @@ namespace MediaBrowser.Common.Plugins
 
     public interface IPluginAssembly
     {
-        void SetAttributes(string assemblyFilePath, string assemblyFileName, Version assemblyVersion, Guid assemblyId);
+        void SetAttributes(string assemblyFilePath, string assemblyFileName, Version assemblyVersion);
+        void SetId(Guid assemblyId);
     }
 }
diff --git a/MediaBrowser.Common/Progress/ActionableProgress.cs b/MediaBrowser.Common/Progress/ActionableProgress.cs
index 503f3f407..5b318c6a7 100644
--- a/MediaBrowser.Common/Progress/ActionableProgress.cs
+++ b/MediaBrowser.Common/Progress/ActionableProgress.cs
@@ -30,6 +30,7 @@ namespace MediaBrowser.Common.Progress
         public void Dispose()
         {
             Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
         /// <summary>