Merge branch 'dev' into skia-native-arm

4 files changed, 6 insertions, 41 deletions

diff --git a/MediaBrowser.Model/Entities/MBRegistrationRecord.cs b/MediaBrowser.Model/Entities/MBRegistrationRecord.cs
deleted file mode 100644
index 00176fb344..0000000000
--- a/MediaBrowser.Model/Entities/MBRegistrationRecord.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-
-namespace MediaBrowser.Model.Entities
-{
-    public class MBRegistrationRecord
-    {
-        public DateTime ExpirationDate { get; set; }
-        public bool IsRegistered { get; set; }
-        public bool RegChecked { get; set; }
-        public bool RegError { get; set; }
-        public bool TrialVersion { get; set; }
-        public bool IsValid { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 35369fbbb9..454e6ff162 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -420,7 +420,7 @@ namespace MediaBrowser.Model.Entities
 
             var fromCodec = Codec;
 
-            // Can't convert from this 
+            // Can't convert from this
             if (StringHelper.EqualsIgnoreCase(fromCodec, "ass"))
             {
                 return false;
@@ -430,7 +430,7 @@ namespace MediaBrowser.Model.Entities
                 return false;
             }
 
-            // Can't convert to this 
+            // Can't convert to this
             if (StringHelper.EqualsIgnoreCase(toCodec, "ass"))
             {
                 return false;
diff --git a/MediaBrowser.Model/Entities/PluginSecurityInfo.cs b/MediaBrowser.Model/Entities/PluginSecurityInfo.cs
deleted file mode 100644
index 5cab55013e..0000000000
--- a/MediaBrowser.Model/Entities/PluginSecurityInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-
-namespace MediaBrowser.Model.Entities
-{
-    /// <summary>
-    /// Class PluginSecurityInfo
-    /// </summary>
-    public class PluginSecurityInfo
-    {
-        /// <summary>
-        /// Gets or sets the supporter key.
-        /// </summary>
-        /// <value>The supporter key.</value>
-        public string SupporterKey { get; set; }
-
-        /// <summary>
-        /// Gets or sets 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>
-        public bool IsMBSupporter { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs b/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
index e10232baa9..3f88737988 100644
--- a/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
+++ b/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
@@ -18,7 +18,7 @@ namespace MediaBrowser.Model.Entities
         {
             return !string.IsNullOrEmpty(instance.GetProviderId(provider.ToString()));
         }
-        
+
         /// <summary>
         /// Gets a provider id
         /// </summary>
@@ -40,7 +40,7 @@ namespace MediaBrowser.Model.Entities
         {
             if (instance == null)
             {
-                throw new ArgumentNullException("instance");
+                throw new ArgumentNullException(nameof(instance));
             }
 
             if (instance.ProviderIds == null)
@@ -63,9 +63,9 @@ namespace MediaBrowser.Model.Entities
         {
             if (instance == null)
             {
-                throw new ArgumentNullException("instance");
+                throw new ArgumentNullException(nameof(instance));
             }
-            
+
             // If it's null remove the key from the dictionary
             if (string.IsNullOrEmpty(value))
             {