Skip to content

Commit f18ee5c

Browse files
hhvrchhvrc
committed
Create initial draft for .NET 10 changes
1 parent 67b1b8b commit f18ee5c

9 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎API/Controller/Admin/GetOnlineDevices.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public async Task<IActionResult> GetOnlineDevices()
2222
{
2323
var devicesOnline = _redis.RedisCollection<DeviceOnline>(false);
2424

25-
var allOnlineDevices = await devicesOnline.ToArrayAsync();
25+
var allOnlineDevices = await devicesOnline.ToListAsync();
2626
var dbLookup = await _db.Devices
2727
.Where(x => allOnlineDevices.Select(y => y.Id).Contains(x.Id))
2828
.Select(x => new

‎Common/Hubs/UserHub.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public override async Task OnConnectedAsync()
4747
.Where(x => x.Shockers.Any(y => y.UserShares.Any(z => z.SharedWithUserId == UserId)))
4848
.Select(x => x.Id.ToString()).ToArrayAsync();
4949

50-
var own = devicesOnline.Where(x => x.Owner == UserId).ToArrayAsync();
50+
var own = devicesOnline.Where(x => x.Owner == UserId).ToListAsync();
5151
var shared = devicesOnline.FindByIdsAsync(sharedDevices);
5252
await Task.WhenAll(own, shared);
5353

‎Common/OpenShockMiddlewareHelper.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using Microsoft.AspNetCore.HttpOverrides;
22
using Microsoft.EntityFrameworkCore;
3-
using Microsoft.Extensions.Logging;
4-
using Microsoft.Extensions.Options;
53
using OpenShock.Common.OpenShockDb;
64
using OpenShock.Common.Options;
75
using OpenShock.Common.Redis;
@@ -10,6 +8,7 @@
108
using Redis.OM.Contracts;
119
using Scalar.AspNetCore;
1210
using Serilog;
11+
using IPNetwork = System.Net.IPNetwork;
1312

1413
namespace OpenShock.Common;
1514

@@ -26,11 +25,11 @@ public static class OpenShockMiddlewareHelper
2625
public static async Task<IApplicationBuilder> UseCommonOpenShockMiddleware(this WebApplication app)
2726
{
2827
var metricsOptions = app.Services.GetRequiredService<MetricsOptions>();
29-
var metricsAllowedIpNetworks = metricsOptions.AllowedNetworks.Select(x => IPNetwork.Parse(x)).ToArray();
28+
var metricsAllowedIpNetworks = metricsOptions.AllowedNetworks.Select(IPNetwork.Parse).ToArray();
3029

3130
foreach (var proxy in await TrustedProxiesFetcher.GetTrustedNetworksAsync())
3231
{
33-
ForwardedSettings.KnownNetworks.Add(proxy);
32+
ForwardedSettings.KnownIPNetworks.Add(proxy);
3433
}
3534

3635
app.UseForwardedHeaders(ForwardedSettings);

‎Common/Services/LCGNodeProvisioner/LCGNodeProvisioner.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public LCGNodeProvisioner(IRedisConnectionProvider redisConnectionProvider, IWeb
4343

4444
var nodes = await _lcgNodes
4545
.Where(x => x.Environment == _environmentName)
46-
.ToArrayAsync();
46+
.ToListAsync();
4747

4848
var node = nodes
4949
.OrderBy(x => DistanceLookup.TryGetDistanceBetween(x.Country, countryCode, out float distance) ? distance : Distance.DistanceToAndromedaGalaxyInKm) // Just a large number :3

‎Common/Services/Session/SessionService.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ await _loginSessions.InsertAsync(new LoginSession
4545

4646
public async Task<IReadOnlyList<LoginSession>> ListSessionsByUserIdAsync(Guid userId)
4747
{
48-
return await _loginSessions.Where(x => x.UserId == userId).ToArrayAsync();
48+
var list = await _loginSessions.Where(x => x.UserId == userId).ToListAsync();
49+
return list.AsReadOnly();
4950
}
5051

5152
public async Task<LoginSession?> GetSessionByTokenAsync(string sessionToken)
@@ -95,11 +96,11 @@ public async Task<bool> DeleteSessionByIdAsync(Guid sessionId)
9596

9697
public async Task<int> DeleteSessionsByUserIdAsync(Guid userId)
9798
{
98-
var sessions = await _loginSessions.Where(x => x.UserId == userId).ToArrayAsync();
99+
var sessions = await _loginSessions.Where(x => x.UserId == userId).ToListAsync();
99100

100101
await _loginSessions.DeleteAsync(sessions);
101102

102-
return sessions.Length;
103+
return sessions.Count;
103104
}
104105

105106
public async Task DeleteSessionAsync(LoginSession loginSession)

‎Common/Utils/TrustedProxiesFetcher.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using IPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork;
1+
using System.Net;
22

33
namespace OpenShock.Common.Utils;
44

@@ -23,7 +23,7 @@ public static class TrustedProxiesFetcher
2323
"fe80::/10",
2424
];
2525

26-
private static readonly IPNetwork[] PrivateNetworksParsed = [.. PrivateNetworks.Select(x => IPNetwork.Parse(x))];
26+
private static readonly IPNetwork[] PrivateNetworksParsed = [.. PrivateNetworks.Select(IPNetwork.Parse)];
2727

2828
private static readonly char[] NewLineSeperators = ['\r', '\n', '\t'];
2929

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
</ItemGroup>
2323

2424
<PropertyGroup>
25-
<TargetFramework>net9.0</TargetFramework>
25+
<TargetFramework>net10.0</TargetFramework>
2626
</PropertyGroup>
2727

2828
<PropertyGroup>
2929
<ImplicitUsings>enable</ImplicitUsings>
30-
<LangVersion>Latest</LangVersion>
30+
<LangVersion>Preview</LangVersion>
3131
<Nullable>enable</Nullable>
3232
<AssemblyName>$(Product)</AssemblyName>
3333
<RootNamespace>$(Product.Replace(" ", "_"))</RootNamespace>

‎Directory.Packages.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
<PackageVersion Include="IDisposableAnalyzers" Version="4.0.8" />
1515
<PackageVersion Include="MailKit" Version="4.13.0" />
1616
<PackageVersion Include="MessagePack" Version="3.1.4" />
17-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.9" />
18-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="9.0.9" />
19-
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="9.0.9" />
20-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.9" />
21-
<PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.9" />
22-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9" />
23-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.9" />
17+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.0-rc.1.25451.107" />
18+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="10.0.0-rc.1.25451.107" />
19+
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.0-rc.1.25451.107" />
20+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-rc.1.25451.107" />
21+
<PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="10.0.0-rc.1.25451.107" />
22+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0-rc.1.25451.107" />
23+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0-rc.1.25451.107" />
2424
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.9.0" />
2525
<PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
26-
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
26+
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0-rc.1" />
2727
<PackageVersion Include="NRedisStack" Version="1.1.1" />
2828
<PackageVersion Include="OneOf" Version="3.0.271" />
2929
<PackageVersion Include="OpenShock.Serialization.Flatbuffers" Version="2.0.0-preview.5" />
@@ -41,6 +41,6 @@
4141
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.7.0" />
4242
<PackageVersion Include="Testcontainers.Redis" Version="4.7.0" />
4343
<PackageVersion Include="TUnit" Version="0.61.13" />
44-
<PackageVersion Include="Z.EntityFramework.Plus.EFCore" Version="9.104.0" />
44+
<PackageVersion Include="Z.EntityFramework.Plus.EFCore" Version="10.0.0-rc.1.25451.107-01" />
4545
</ItemGroup>
4646
</Project>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.0",
3+
"version": "10.0.100-rc.1",
44
"rollForward": "latestMinor",
55
"allowPrerelease": false
66
}

0 commit comments

Comments
 (0)