aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShadowghost <Ghost_of_Stone@web.de>2022-12-07 17:41:32 +0100
committerShadowghost <Ghost_of_Stone@web.de>2022-12-07 17:41:32 +0100
commit3f6354cdb832560ec811f1766666dd9ca1f2a208 (patch)
tree7586da49dd054c59a2d86270238f787d9a822349
parent2c86bd1875e6e85d5867618e992d850453dae663 (diff)
Fix .NET 7 compatibility
-rw-r--r--Emby.Server.Implementations/ApplicationHost.cs2
-rw-r--r--MediaBrowser.Common/Net/NetworkExtensions.cs10
-rw-r--r--tests/Jellyfin.Networking.Tests/NetworkParseTests.cs4
3 files changed, 8 insertions, 8 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 4733b39ab..df4f3e676 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1094,7 +1094,7 @@ namespace Emby.Server.Implementations
{
int? requestPort = request.Host.Port;
if (requestPort == null
- || (requestPort == 80 && string.Equals(request.Scheme, "http", StringComparison.OrdinalIgnoreCase))
+ || (requestPort == 80 && string.Equals(request.Scheme, "http", StringComparison.OrdinalIgnoreCase))
|| (requestPort == 443 && string.Equals(request.Scheme, "https", StringComparison.OrdinalIgnoreCase)))
{
requestPort = -1;
diff --git a/MediaBrowser.Common/Net/NetworkExtensions.cs b/MediaBrowser.Common/Net/NetworkExtensions.cs
index e37a5dc6b..97f0abbb5 100644
--- a/MediaBrowser.Common/Net/NetworkExtensions.cs
+++ b/MediaBrowser.Common/Net/NetworkExtensions.cs
@@ -1,10 +1,10 @@
-using Microsoft.AspNetCore.HttpOverrides;
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Net;
using System.Net.Sockets;
using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.HttpOverrides;
namespace MediaBrowser.Common.Net
{
@@ -131,7 +131,7 @@ namespace MediaBrowser.Common.Net
/// <returns>URI safe conversion of the address.</returns>
public static string FormatIpString(IPAddress? address)
{
- if (address == null)
+ if (address is null)
{
return string.Empty;
}
@@ -163,7 +163,7 @@ namespace MediaBrowser.Common.Net
{
result = new List<IPNetwork>();
- if (values == null || values.Length == 0)
+ if (values is null || values.Length == 0)
{
return false;
}
@@ -182,7 +182,7 @@ namespace MediaBrowser.Common.Net
_ = IPAddress.TryParse(v[0][0..], out address);
}
- if (address != IPAddress.None && address != null)
+ if (address != IPAddress.None && address is not null)
{
if (v.Length > 1 && int.TryParse(v[1], out var netmask))
{
@@ -240,7 +240,7 @@ namespace MediaBrowser.Common.Net
_ = IPAddress.TryParse(v[0][0..], out address);
}
- if (address != IPAddress.None && address != null)
+ if (address != IPAddress.None && address is not null)
{
if (v.Length > 1 && int.TryParse(v[1], out var netmask))
{
diff --git a/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs b/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
index 86b2ab21a..241d2314b 100644
--- a/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
+++ b/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
@@ -207,7 +207,7 @@ namespace Jellyfin.Networking.Tests
// Check to see if dns resolution is working. If not, skip test.
_ = NetworkExtensions.TryParseHost(source, out var host);
- if (resultObj != null && host.Length > 0)
+ if (resultObj is not null && host.Length > 0)
{
result = resultObj.First().Address.ToString();
var intf = nm.GetBindInterface(source, out _);
@@ -265,7 +265,7 @@ namespace Jellyfin.Networking.Tests
using var nm = new NetworkManager(GetMockConfig(conf), new NullLogger<NetworkManager>());
NetworkManager.MockNetworkSettings = string.Empty;
- if (nm.TryParseInterface(result, out List<IPData>? resultObj) && resultObj != null)
+ if (nm.TryParseInterface(result, out List<IPData>? resultObj) && resultObj is not null)
{
// Parse out IPAddresses so we can do a string comparison (ignore subnet masks).
result = resultObj.First().Address.ToString();