Merge branch 'dev' into reformat

# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
#	Emby.Server.Implementations/LiveTv/LiveTvManager.cs
#	Emby.Server.Implementations/Security/MBLicenseFile.cs
#	Emby.Server.Implementations/Security/PluginSecurityManager.cs
#	Emby.Server.Implementations/Security/RegRecord.cs
#	MediaBrowser.Api/PluginService.cs
#	MediaBrowser.Api/System/SystemService.cs
#	MediaBrowser.Common/Security/IRequiresRegistration.cs
#	MediaBrowser.Common/Security/ISecurityManager.cs
#	MediaBrowser.Common/Security/PaymentRequiredException.cs
#	MediaBrowser.Model/Entities/MBRegistrationRecord.cs
#	MediaBrowser.Model/Entities/PluginSecurityInfo.cs
#	deployment/win-generic/build-jellyfin.ps1

4 files changed, 1 insertions, 58 deletions

diff --git a/MediaBrowser.Common/Security/IRequiresRegistration.cs b/MediaBrowser.Common/Security/IRequiresRegistration.cs
deleted file mode 100644
index 0e5448579..000000000
--- a/MediaBrowser.Common/Security/IRequiresRegistration.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Common.Security
-{
-    public interface IRequiresRegistration
-    {
-        /// <summary>
-        /// Load all registration information required for this entity.
-        /// Your class should re-load all MBRegistrationRecords when this is called even if they were
-        /// previously loaded.
-        /// </summary>
-        /// <returns></returns>
-        Task LoadRegistrationInfoAsync();
-    }
-}
diff --git a/MediaBrowser.Common/Security/ISecurityManager.cs b/MediaBrowser.Common/Security/ISecurityManager.cs
deleted file mode 100644
index c76f71687..000000000
--- a/MediaBrowser.Common/Security/ISecurityManager.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Threading.Tasks;
-using MediaBrowser.Model.Entities;
-
-namespace MediaBrowser.Common.Security
-{
-    public interface ISecurityManager
-    {
-        /// <summary>
-        /// Gets a value indicating whether this instance is MB supporter.
-        /// </summary>
-        /// <value><c>true</c> if this instance is MB supporter; otherwise, <c>false</c>.</value>
-        Task<bool> IsSupporter();
-
-        /// <summary>
-        /// Gets or sets the supporter key.
-        /// </summary>
-        /// <value>The supporter key.</value>
-        string SupporterKey { get; }
-
-        /// <summary>
-        /// Gets the registration status. Overload to support existing plug-ins.
-        /// </summary>
-        Task<MBRegistrationRecord> GetRegistrationStatus(string feature);
-
-        /// <summary>
-        /// Register and app store sale with our back-end
-        /// </summary>
-        /// <param name="parameters">Json parameters to pass to admin server</param>
-        Task RegisterAppStoreSale(string parameters);
-        Task UpdateSupporterKey(string newValue);
-    }
-}
diff --git a/MediaBrowser.Common/Security/PaymentRequiredException.cs b/MediaBrowser.Common/Security/PaymentRequiredException.cs
deleted file mode 100644
index 7ea0bd342..000000000
--- a/MediaBrowser.Common/Security/PaymentRequiredException.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace MediaBrowser.Common.Security
-{
-    public class PaymentRequiredException : Exception
-    {
-    }
-}
diff --git a/MediaBrowser.Common/Updates/IInstallationManager.cs b/MediaBrowser.Common/Updates/IInstallationManager.cs
index 8bef78400..a263be35f 100644
--- a/MediaBrowser.Common/Updates/IInstallationManager.cs
+++ b/MediaBrowser.Common/Updates/IInstallationManager.cs
@@ -49,9 +49,7 @@ namespace MediaBrowser.Common.Updates
         /// <param name="applicationVersion">The application version.</param>
         /// <returns>Task{List{PackageInfo}}.</returns>
         Task<List<PackageInfo>> GetAvailablePackages(CancellationToken cancellationToken,
-            bool withRegistration = true,
-                                                                                  string packageType = null,
-                                                                                  Version applicationVersion = null);
+            bool withRegistration = true, string packageType = null, Version applicationVersion = null);
 
         /// <summary>
         /// Gets all available packages from a static resource.