diff options
| author | Greenback <jimcartlidge@yahoo.co.uk> | 2020-11-16 17:17:49 +0000 |
|---|---|---|
| committer | Greenback <jimcartlidge@yahoo.co.uk> | 2020-11-16 17:17:49 +0000 |
| commit | 9481fd07476a99c30a0db99f4c6171e2fbc84a8f (patch) | |
| tree | 8e6a610f3b96ede9c689f3b69dfdb77a475f8bb8 | |
| parent | d66f88672cdc21376b5ff5105e7d18b25d549879 (diff) | |
Upgraded to .Net5
| -rw-r--r-- | MediaBrowser.Common/Configuration/IConfigurationManager.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Common/Net/IPNetAddress.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Common/Net/IPObject.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/IServerApplicationHost.cs | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/MediaBrowser.Common/Configuration/IConfigurationManager.cs b/MediaBrowser.Common/Configuration/IConfigurationManager.cs index 4c2b3a742..790121274 100644 --- a/MediaBrowser.Common/Configuration/IConfigurationManager.cs +++ b/MediaBrowser.Common/Configuration/IConfigurationManager.cs @@ -56,6 +56,8 @@ namespace MediaBrowser.Common.Configuration /// <summary> /// Gets the configuration. /// </summary> + /// /// <param name="key">The key.</param> + /// <returns>System.Object.</returns> object GetConfiguration(string key); /// <summary> diff --git a/MediaBrowser.Common/Net/IPNetAddress.cs b/MediaBrowser.Common/Net/IPNetAddress.cs index bcd049f3d..0d28c35cb 100644 --- a/MediaBrowser.Common/Net/IPNetAddress.cs +++ b/MediaBrowser.Common/Net/IPNetAddress.cs @@ -106,7 +106,7 @@ namespace MediaBrowser.Common.Net addr = addr.Trim(); // Try to parse it as is. - if (IPAddress.TryParse(addr, out IPAddress res)) + if (IPAddress.TryParse(addr, out IPAddress? res)) { ip = new IPNetAddress(res); return true; @@ -130,7 +130,7 @@ namespace MediaBrowser.Common.Net } // Is the subnet in x.y.a.b form? - if (IPAddress.TryParse(tokens[1], out IPAddress mask)) + if (IPAddress.TryParse(tokens[1], out IPAddress? mask)) { ip = new IPNetAddress(res, MaskToCidr(mask)); return true; diff --git a/MediaBrowser.Common/Net/IPObject.cs b/MediaBrowser.Common/Net/IPObject.cs index a08694c26..36f3357cc 100644 --- a/MediaBrowser.Common/Net/IPObject.cs +++ b/MediaBrowser.Common/Net/IPObject.cs @@ -381,7 +381,7 @@ namespace MediaBrowser.Common.Net } /// <inheritdoc/> - public override bool Equals(object obj) + public override bool Equals(object? obj) { return Equals(obj as IPObject); } diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs index eced9bf69..2456da826 100644 --- a/MediaBrowser.Controller/IServerApplicationHost.cs +++ b/MediaBrowser.Controller/IServerApplicationHost.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using MediaBrowser.Common; using MediaBrowser.Common.Plugins; using MediaBrowser.Model.System; +using Microsoft.AspNetCore.Http; namespace MediaBrowser.Controller { |