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

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

1 files changed, 4 insertions, 32 deletions

diff --git a/MediaBrowser.Common/Updates/IPackageManager.cs b/MediaBrowser.Common/Updates/IPackageManager.cs
index 1db5ea706..ecaf9cef8 100644
--- a/MediaBrowser.Common/Updates/IPackageManager.cs
+++ b/MediaBrowser.Common/Updates/IPackageManager.cs
@@ -1,16 +1,8 @@
-using System;
+using MediaBrowser.Model.Updates;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common.Kernel;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Common.Security;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Updates;
 
 namespace MediaBrowser.Common.Updates
 {
@@ -19,37 +11,17 @@ namespace MediaBrowser.Common.Updates
         /// <summary>
         /// Gets all available packages.
         /// </summary>
-        /// <param name="client"></param>
-        /// <param name="networkManager"></param>
-        /// <param name="securityManager"></param>
-        /// <param name="resourcePool"></param>
-        /// <param name="serializer"></param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{List{PackageInfo}}.</returns>
-        Task<IEnumerable<PackageInfo>> GetAvailablePackages(IHttpClient client,
-                                                            INetworkManager networkManager,
-                                                            ISecurityManager securityManager,
-                                                            ResourcePool resourcePool,
-                                                            IJsonSerializer serializer,
-                                                            CancellationToken cancellationToken);
+        Task<IEnumerable<PackageInfo>> GetAvailablePackages(CancellationToken cancellationToken);
 
         /// <summary>
         /// Installs a package.
         /// </summary>
-        /// <param name="client"></param>
-        /// <param name="logger"></param>
-        /// <param name="resourcePool"></param>
         /// <param name="progress"></param>
-        /// <param name="appPaths"></param>
         /// <param name="package">The package.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task InstallPackage(IHttpClient client,
-                            ILogger logger,
-                            ResourcePool resourcePool,
-                            IProgress<double> progress,
-                            IApplicationPaths appPaths,
-                            PackageVersionInfo package,
-                            CancellationToken cancellationToken);
+        Task InstallPackage(IProgress<double> progress, PackageVersionInfo package, CancellationToken cancellationToken);
     }
 }