Upgrade to .NET 10

Author: hhvrc

.github/workflows/ci-build.yml

@@ -33,7 +33,7 @@ name: ci-build
 
 env:
   REGISTRY: ghcr.io
-  DOTNET_VERSION: 9.0.x
+  DOTNET_VERSION: 10.0.x
 
 jobs:
 
@@ -60,7 +60,7 @@ jobs:
       - name: Run ${{ matrix.name }} tests
         run: |
           set -euo pipefail
-          dotnet test -c Release ${{ matrix.project }}
+          dotnet test -c Release --project ${{ matrix.project }}
 
   build:
     name: Build (${{ matrix.image }})

.github/workflows/ci-tag.yml

@@ -7,7 +7,7 @@ on:
 name: ci-tag
 
 env:
-  DOTNET_VERSION: 9.0.x
+  DOTNET_VERSION: 10.0.x
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository_owner }}/api
 

.github/workflows/codeql.yml

@@ -9,7 +9,7 @@ on:
     - cron: '0 6 * * 1'
 
 env:
-  DOTNET_VERSION: 9.x.x
+  DOTNET_VERSION: 10.x.x
 
 jobs:
   analyze:

API.IntegrationTests/Tests/LcgAssignmentTests.cs

@@ -66,7 +66,7 @@ public async Task Teardown()
         await db.Devices.Where(x => x.Id == _hubId).ExecuteDeleteAsync();
         await db.Users.Where(x => x.Id == _userId).ExecuteDeleteAsync();
 
-        var allLcg = await lcgNodesCollection.ToArrayAsync();
+        var allLcg = await lcgNodesCollection.ToListAsync();
         await lcgNodesCollection.DeleteAsync(allLcg);
     }
 

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

@@ -1,5 +1,4 @@
 using System.Net.Mime;
-using System.Runtime.CompilerServices;
 using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Models.Response;
 
@@ -9,11 +8,9 @@ public sealed partial class SessionsController
 {
     [HttpGet]
     [ProducesResponseType<LoginSessionResponse[]>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
-    public async IAsyncEnumerable<LoginSessionResponse> ListSessions([EnumeratorCancellation] CancellationToken cancellationToken)
+    public IAsyncEnumerable<LoginSessionResponse> ListSessions()
     {
-        await foreach (var session in _sessionService.ListSessionsByUserIdAsync(CurrentUser.Id).WithCancellation(cancellationToken))
-        {
-            yield return LoginSessionResponse.MapFrom(session);
-        }
+        return _sessionService.ListSessionsByUserIdAsync(CurrentUser.Id)
+            .Select(LoginSessionResponse.MapFrom);
     }
 }

API/Services/LCGNodeProvisioner/LCGNodeProvisioner.cs

@@ -44,9 +44,9 @@ public LCGNodeProvisioner(IRedisConnectionProvider redisConnectionProvider, IWeb
         // Load all nodes for our environment
         var nodes = await _lcgNodes
             .Where(x => x.Environment == _environmentName)
-            .ToArrayAsync();
+            .ToListAsync();
 
-        if(nodes.Length < 1)
+        if(nodes.Count < 1)
         {
             _logger.LogWarning("No LCG nodes available after filtering by environment [{Environment}]!", _environmentName);
             return null;

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/Session/SessionService.cs

@@ -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)