Merge branch 'jellyfin:master' into gzip

7 files changed, 34 insertions, 53 deletions

diff --git a/MediaBrowser.Common/Configuration/ConfigurationUpdateEventArgs.cs b/MediaBrowser.Common/Configuration/ConfigurationUpdateEventArgs.cs
index 2df87d8792..90b1ff70c2 100644
--- a/MediaBrowser.Common/Configuration/ConfigurationUpdateEventArgs.cs
+++ b/MediaBrowser.Common/Configuration/ConfigurationUpdateEventArgs.cs
@@ -1,22 +1,33 @@
-#nullable disable
-#pragma warning disable CS1591
-
 using System;
 
 namespace MediaBrowser.Common.Configuration
 {
+    /// <summary>
+    /// <see cref="EventArgs" /> for the ConfigurationUpdated event.
+    /// </summary>
     public class ConfigurationUpdateEventArgs : EventArgs
     {
         /// <summary>
-        /// Gets or sets the key.
+        /// Initializes a new instance of the <see cref="ConfigurationUpdateEventArgs"/> class.
+        /// </summary>
+        /// <param name="key">The configuration key.</param>
+        /// <param name="newConfiguration">The new configuration.</param>
+        public ConfigurationUpdateEventArgs(string key, object newConfiguration)
+        {
+            Key = key;
+            NewConfiguration = newConfiguration;
+        }
+
+        /// <summary>
+        /// Gets the key.
         /// </summary>
         /// <value>The key.</value>
-        public string Key { get; set; }
+        public string Key { get; }
 
         /// <summary>
-        /// Gets or sets the new configuration.
+        /// Gets the new configuration.
         /// </summary>
         /// <value>The new configuration.</value>
-        public object NewConfiguration { get; set; }
+        public object NewConfiguration { get; }
     }
 }
diff --git a/MediaBrowser.Common/Configuration/IApplicationPaths.cs b/MediaBrowser.Common/Configuration/IApplicationPaths.cs
index 1370e6d79e..57c6546675 100644
--- a/MediaBrowser.Common/Configuration/IApplicationPaths.cs
+++ b/MediaBrowser.Common/Configuration/IApplicationPaths.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace MediaBrowser.Common.Configuration
 {
     /// <summary>
diff --git a/MediaBrowser.Common/Net/IPNetAddress.cs b/MediaBrowser.Common/Net/IPNetAddress.cs
index f1428d4bef..98d1c2d97b 100644
--- a/MediaBrowser.Common/Net/IPNetAddress.cs
+++ b/MediaBrowser.Common/Net/IPNetAddress.cs
@@ -160,10 +160,7 @@ namespace MediaBrowser.Common.Net
         /// <inheritdoc/>
         public override bool Contains(IPAddress address)
         {
-            if (address == null)
-            {
-                throw new ArgumentNullException(nameof(address));
-            }
+            ArgumentNullException.ThrowIfNull(address);
 
             if (address.IsIPv4MappedToIPv6)
             {
diff --git a/MediaBrowser.Common/Net/IPObject.cs b/MediaBrowser.Common/Net/IPObject.cs
index 3a5187bc3d..37385972f7 100644
--- a/MediaBrowser.Common/Net/IPObject.cs
+++ b/MediaBrowser.Common/Net/IPObject.cs
@@ -55,10 +55,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>IPAddress.</returns>
         public static (IPAddress Address, byte PrefixLength) NetworkAddressOf(IPAddress address, byte prefixLength)
         {
-            if (address == null)
-            {
-                throw new ArgumentNullException(nameof(address));
-            }
+            ArgumentNullException.ThrowIfNull(address);
 
             if (address.IsIPv4MappedToIPv6)
             {
@@ -109,10 +106,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>True if it is.</returns>
         public static bool IsIP6(IPAddress address)
         {
-            if (address == null)
-            {
-                throw new ArgumentNullException(nameof(address));
-            }
+            ArgumentNullException.ThrowIfNull(address);
 
             if (address.IsIPv4MappedToIPv6)
             {
@@ -129,10 +123,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>True if it contains a private address.</returns>
         public static bool IsPrivateAddressRange(IPAddress address)
         {
-            if (address == null)
-            {
-                throw new ArgumentNullException(nameof(address));
-            }
+            ArgumentNullException.ThrowIfNull(address);
 
             if (!address.Equals(IPAddress.None))
             {
@@ -179,10 +170,7 @@ namespace MediaBrowser.Common.Net
         /// </remarks>
         public static bool IsIPv6LinkLocal(IPAddress address)
         {
-            if (address == null)
-            {
-                throw new ArgumentNullException(nameof(address));
-            }
+            ArgumentNullException.ThrowIfNull(address);
 
             if (address.IsIPv4MappedToIPv6)
             {
@@ -226,10 +214,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>Byte CIDR representing the mask.</returns>
         public static byte MaskToCidr(IPAddress mask)
         {
-            if (mask == null)
-            {
-                throw new ArgumentNullException(nameof(mask));
-            }
+            ArgumentNullException.ThrowIfNull(mask);
 
             byte cidrnet = 0;
             if (!mask.Equals(IPAddress.Any))
diff --git a/MediaBrowser.Common/Net/NamedClient.cs b/MediaBrowser.Common/Net/NamedClient.cs
index 0f6161c328..a6cacd4f17 100644
--- a/MediaBrowser.Common/Net/NamedClient.cs
+++ b/MediaBrowser.Common/Net/NamedClient.cs
@@ -14,5 +14,10 @@
         /// Gets the value for the MusicBrainz named http client.
         /// </summary>
         public const string MusicBrainz = nameof(MusicBrainz);
+
+        /// <summary>
+        /// Gets the value for the DLNA named http client.
+        /// </summary>
+        public const string Dlna = nameof(Dlna);
     }
 }
diff --git a/MediaBrowser.Common/Net/NetworkExtensions.cs b/MediaBrowser.Common/Net/NetworkExtensions.cs
index 264bfacb49..7ad0058540 100644
--- a/MediaBrowser.Common/Net/NetworkExtensions.cs
+++ b/MediaBrowser.Common/Net/NetworkExtensions.cs
@@ -61,10 +61,7 @@ namespace MediaBrowser.Common.Net
                 return false;
             }
 
-            if (item == null)
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
+            ArgumentNullException.ThrowIfNull(item);
 
             if (item.IsIPv4MappedToIPv6)
             {
@@ -96,10 +93,7 @@ namespace MediaBrowser.Common.Net
                 return false;
             }
 
-            if (item == null)
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
+            ArgumentNullException.ThrowIfNull(item);
 
             foreach (var i in source)
             {
@@ -153,10 +147,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>Collection{IPObject} object containing the subnets.</returns>
         public static Collection<IPObject> AsNetworks(this Collection<IPObject> source)
         {
-            if (source == null)
-            {
-                throw new ArgumentNullException(nameof(source));
-            }
+            ArgumentNullException.ThrowIfNull(source);
 
             Collection<IPObject> res = new Collection<IPObject>();
 
@@ -239,10 +230,7 @@ namespace MediaBrowser.Common.Net
                 return new Collection<IPObject>();
             }
 
-            if (target == null)
-            {
-                throw new ArgumentNullException(nameof(target));
-            }
+            ArgumentNullException.ThrowIfNull(target);
 
             Collection<IPObject> nc = new Collection<IPObject>();
 
diff --git a/MediaBrowser.Common/Plugins/BasePluginOfT.cs b/MediaBrowser.Common/Plugins/BasePluginOfT.cs
index afda83a7c5..0da5592d38 100644
--- a/MediaBrowser.Common/Plugins/BasePluginOfT.cs
+++ b/MediaBrowser.Common/Plugins/BasePluginOfT.cs
@@ -164,10 +164,7 @@ namespace MediaBrowser.Common.Plugins
         /// <inheritdoc />
         public virtual void UpdateConfiguration(BasePluginConfiguration configuration)
         {
-            if (configuration == null)
-            {
-                throw new ArgumentNullException(nameof(configuration));
-            }
+            ArgumentNullException.ThrowIfNull(configuration);
 
             Configuration = (TConfigurationType)configuration;