Merge pull request #15475 from Bond-009/net10

Update to .NET 10.0

1 files changed, 4 insertions, 7 deletions

diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index 8373fd50fd..9df24fa0d7 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -174,7 +174,7 @@ namespace Jellyfin.Server.Extensions
             if (config.KnownProxies.Length == 0)
             {
                 options.ForwardedHeaders = ForwardedHeaders.None;
-                options.KnownNetworks.Clear();
+                options.KnownIPNetworks.Clear();
                 options.KnownProxies.Clear();
             }
             else
@@ -184,7 +184,7 @@ namespace Jellyfin.Server.Extensions
             }
 
             // Only set forward limit if we have some known proxies or some known networks.
-            if (options.KnownProxies.Count != 0 || options.KnownNetworks.Count != 0)
+            if (options.KnownProxies.Count != 0 || options.KnownIPNetworks.Count != 0)
             {
                 options.ForwardLimit = null;
             }
@@ -290,10 +290,7 @@ namespace Jellyfin.Server.Extensions
                 }
                 else if (NetworkUtils.TryParseToSubnet(allowedProxies[i], out var subnet))
                 {
-                    if (subnet is not null)
-                    {
-                        AddIPAddress(config, options, subnet.Prefix, subnet.PrefixLength);
-                    }
+                    AddIPAddress(config, options, subnet.Address, subnet.Subnet.PrefixLength);
                 }
                 else if (NetworkUtils.TryParseHost(allowedProxies[i], out var addresses, config.EnableIPv4, config.EnableIPv6))
                 {
@@ -323,7 +320,7 @@ namespace Jellyfin.Server.Extensions
             }
             else
             {
-                options.KnownNetworks.Add(new Microsoft.AspNetCore.HttpOverrides.IPNetwork(addr, prefixLength));
+                options.KnownIPNetworks.Add(new System.Net.IPNetwork(addr, prefixLength));
             }
         }