mirror of
https://github.com/jellyfin/jellyfin
synced 2024-09-06 16:14:18 +00:00
Upgraded to .Net5
This commit is contained in:
parent
d66f88672c
commit
9481fd0747
|
@ -56,6 +56,8 @@ namespace MediaBrowser.Common.Configuration
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the configuration.
|
/// Gets the configuration.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// /// <param name="key">The key.</param>
|
||||||
|
/// <returns>System.Object.</returns>
|
||||||
object GetConfiguration(string key);
|
object GetConfiguration(string key);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -106,7 +106,7 @@ namespace MediaBrowser.Common.Net
|
||||||
addr = addr.Trim();
|
addr = addr.Trim();
|
||||||
|
|
||||||
// Try to parse it as is.
|
// Try to parse it as is.
|
||||||
if (IPAddress.TryParse(addr, out IPAddress res))
|
if (IPAddress.TryParse(addr, out IPAddress? res))
|
||||||
{
|
{
|
||||||
ip = new IPNetAddress(res);
|
ip = new IPNetAddress(res);
|
||||||
return true;
|
return true;
|
||||||
|
@ -130,7 +130,7 @@ namespace MediaBrowser.Common.Net
|
||||||
}
|
}
|
||||||
|
|
||||||
// Is the subnet in x.y.a.b form?
|
// 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));
|
ip = new IPNetAddress(res, MaskToCidr(mask));
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -381,7 +381,7 @@ namespace MediaBrowser.Common.Net
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public override bool Equals(object obj)
|
public override bool Equals(object? obj)
|
||||||
{
|
{
|
||||||
return Equals(obj as IPObject);
|
return Equals(obj as IPObject);
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,7 @@ using System.Threading.Tasks;
|
||||||
using MediaBrowser.Common;
|
using MediaBrowser.Common;
|
||||||
using MediaBrowser.Common.Plugins;
|
using MediaBrowser.Common.Plugins;
|
||||||
using MediaBrowser.Model.System;
|
using MediaBrowser.Model.System;
|
||||||
|
using Microsoft.AspNetCore.Http;
|
||||||
|
|
||||||
namespace MediaBrowser.Controller
|
namespace MediaBrowser.Controller
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue