feat: .NET 10

API/Controller/Admin/GetOnlineDevices.cs

@@ -22,7 +22,7 @@ public async Task<IActionResult> GetOnlineDevices()
     {
         var devicesOnline = _redis.RedisCollection<DeviceOnline>(false);
 
-        var allOnlineDevices = await devicesOnline.ToArrayAsync();
+        var allOnlineDevices = await devicesOnline.ToListAsync();
         var dbLookup = await _db.Devices
             .Where(x => allOnlineDevices.Select(y => y.Id).Contains(x.Id))
             .Select(x => new

API/Controller/Sessions/ListSessions.cs

@@ -6,10 +6,9 @@ namespace OpenShock.API.Controller.Sessions;
 public sealed partial class SessionsController
 {
     [HttpGet]
-    public async Task<IEnumerable<LoginSessionResponse>> ListSessions()
+    public IAsyncEnumerable<LoginSessionResponse> ListSessions()
     {
-        var sessions = await _sessionService.ListSessionsByUserIdAsync(CurrentUser.Id);
-
-        return sessions.Select(LoginSessionResponse.MapFrom);
+        return _sessionService.ListSessionsByUserIdAsync(CurrentUser.Id)
+            .Select(LoginSessionResponse.MapFrom);
     }
 }

Common/Hubs/UserHub.cs

@@ -47,7 +47,7 @@ public override async Task OnConnectedAsync()
             .Where(x => x.Shockers.Any(y => y.UserShares.Any(z => z.SharedWithUserId == UserId)))
             .Select(x => x.Id.ToString()).ToArrayAsync();
 
-        var own = devicesOnline.Where(x => x.Owner == UserId).ToArrayAsync();
+        var own = devicesOnline.Where(x => x.Owner == UserId).ToListAsync();
         var shared = devicesOnline.FindByIdsAsync(sharedDevices);
         await Task.WhenAll(own, shared);
 

Common/OpenShockMiddlewareHelper.cs

@@ -8,6 +8,7 @@
 using Redis.OM.Contracts;
 using Scalar.AspNetCore;
 using Serilog;
+using IPNetwork = System.Net.IPNetwork;
 
 namespace OpenShock.Common;
 
@@ -24,11 +25,11 @@ public static class OpenShockMiddlewareHelper
     public static async Task<IApplicationBuilder> UseCommonOpenShockMiddleware(this WebApplication app)
     {
         var metricsOptions = app.Services.GetRequiredService<MetricsOptions>();
-        var metricsAllowedIpNetworks = metricsOptions.AllowedNetworks.Select(x => IPNetwork.Parse(x)).ToArray();
+        var metricsAllowedIpNetworks = metricsOptions.AllowedNetworks.Select(IPNetwork.Parse).ToArray();
 
         foreach (var proxy in await TrustedProxiesFetcher.GetTrustedNetworksAsync())
         {
-            ForwardedSettings.KnownNetworks.Add(proxy);
+            ForwardedSettings.KnownIPNetworks.Add(proxy);
         }
 
         app.UseForwardedHeaders(ForwardedSettings);

Common/Services/LCGNodeProvisioner/LCGNodeProvisioner.cs

@@ -43,7 +43,7 @@ public LCGNodeProvisioner(IRedisConnectionProvider redisConnectionProvider, IWeb
 
         var nodes = await _lcgNodes
             .Where(x => x.Environment == _environmentName)
-            .ToArrayAsync();
+            .ToListAsync();
 
         var node = nodes
             .OrderBy(x => DistanceLookup.TryGetDistanceBetween(x.Country, countryCode, out float distance) ? distance : Distance.DistanceToAndromedaGalaxyInKm) // Just a large number :3

Common/Services/Session/ISessionService.cs

@@ -6,7 +6,7 @@ public interface ISessionService
 {
     public Task<CreateSessionResult> CreateSessionAsync(Guid userId, string userAgent, string ipAddress);
 
-    public Task<IReadOnlyList<LoginSession>> ListSessionsByUserIdAsync(Guid userId);
+    public IAsyncEnumerable<LoginSession> ListSessionsByUserIdAsync(Guid userId);
 
     public Task<LoginSession?> GetSessionByTokenAsync(string sessionToken);
 

Common/Services/Session/SessionService.cs

@@ -43,9 +43,9 @@ await _loginSessions.InsertAsync(new LoginSession
         return new CreateSessionResult(id, token);
     }
 
-    public async Task<IReadOnlyList<LoginSession>> ListSessionsByUserIdAsync(Guid userId)
+    public IAsyncEnumerable<LoginSession> ListSessionsByUserIdAsync(Guid userId)
     {
-        return await _loginSessions.Where(x => x.UserId == userId).ToArrayAsync();
+        return _loginSessions.Where(x => x.UserId == userId);
     }
 
     public async Task<LoginSession?> GetSessionByTokenAsync(string sessionToken)
@@ -95,11 +95,11 @@ public async Task<bool> DeleteSessionByIdAsync(Guid sessionId)
 
     public async Task<int> DeleteSessionsByUserIdAsync(Guid userId)
     {
-        var sessions = await _loginSessions.Where(x => x.UserId == userId).ToArrayAsync();
+        var sessions = await _loginSessions.Where(x => x.UserId == userId).ToListAsync();
 
         await _loginSessions.DeleteAsync(sessions);
 
-        return sessions.Length;
+        return sessions.Count;
     }
 
     public async Task DeleteSessionAsync(LoginSession loginSession)

Common/Utils/TrustedProxiesFetcher.cs

@@ -1,4 +1,4 @@
-using IPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork;
+using System.Net;
 
 namespace OpenShock.Common.Utils;
 
@@ -23,7 +23,7 @@ public static class TrustedProxiesFetcher
         "fe80::/10",
     ];
 
-    private static readonly IPNetwork[] PrivateNetworksParsed = [.. PrivateNetworks.Select(x => IPNetwork.Parse(x))];
+    private static readonly IPNetwork[] PrivateNetworksParsed = [.. PrivateNetworks.Select(IPNetwork.Parse)];
 
     private static readonly char[] NewLineSeperators = ['\r', '\n', '\t'];
 

Directory.Build.props

@@ -22,12 +22,12 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
-    <LangVersion>Latest</LangVersion>
+    <LangVersion>Preview</LangVersion>
     <Nullable>enable</Nullable>
     <AssemblyName>$(Product)</AssemblyName>
     <RootNamespace>$(Product.Replace(" ", "_"))</RootNamespace>

Directory.Packages.props

@@ -14,16 +14,16 @@
     <PackageVersion Include="IDisposableAnalyzers" Version="4.0.8" />
     <PackageVersion Include="MailKit" Version="4.14.1" />
     <PackageVersion Include="MessagePack" Version="3.1.4" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.0-rc.2.25502.107" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="10.0.0-rc.2.25502.107" />
+    <PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.0-rc.2.25502.107" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-rc.2.25502.107" />
+    <PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="10.0.0-rc.2.25502.107" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0-rc.2.25502.107" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0-rc.2.25502.107" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.10.0" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
-    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0-rc.2" />
     <PackageVersion Include="NRedisStack" Version="1.1.1" />
     <PackageVersion Include="OneOf" Version="3.0.271" />
     <PackageVersion Include="OpenShock.Serialization.Flatbuffers" Version="2.0.0-preview.5" />
@@ -41,6 +41,6 @@
     <PackageVersion Include="Testcontainers.PostgreSql" Version="4.8.1" />
     <PackageVersion Include="Testcontainers.Redis" Version="4.8.1" />
     <PackageVersion Include="TUnit" Version="0.77.3" />
-    <PackageVersion Include="Z.EntityFramework.Plus.EFCore" Version="9.104.0.1" />
+    <PackageVersion Include="Z.EntityFramework.Plus.EFCore" Version="10.0.0-rc.2.25502.107-01" />
   </ItemGroup>
 </Project>

LiveControlGateway/Controllers/HubControllerBase.cs

@@ -1,4 +1,5 @@
-using FlatSharp;
+using System.Diagnostics.CodeAnalysis;
+using FlatSharp;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using OneOf;
@@ -37,17 +38,16 @@ public abstract class HubControllerBase<TIn, TOut> : FlatbuffersWebsocketBaseCon
     /// Service provider
     /// </summary>
     protected readonly IServiceProvider ServiceProvider;
-
-    private HubLifetime? _hubLifetime;
-
+
     /// <summary>
     /// Hub lifetime
     /// </summary>
     /// <exception cref="InvalidOperationException"></exception>
+    [field: AllowNull, MaybeNull]
     protected HubLifetime HubLifetime
     {
-        get => _hubLifetime ?? throw new InvalidOperationException("Hub lifetime is null but was tried to access");
-        private set => _hubLifetime = value;
+        get => field ?? throw new InvalidOperationException("Hub lifetime is null but was tried to access");
+        private set;
     }
 
     private readonly LcgOptions _options;

global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "9.0.0",
-    "rollForward": "latestMinor",
+    "version": "10.0.0",
+    "rollForward": "latestFeature",
     "allowPrerelease": false
   }
-}
+}