From f364c4b01faff6c731e96cfd81a909ac7d7bc889 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Fri, 13 Nov 2020 01:51:42 +0100 Subject: [PATCH] Fix .NET 5 warnings in admin code. --- Content.Server/Database/ServerDbPostgres.cs | 2 +- Content.Server/Database/ServerDbSqlite.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Database/ServerDbPostgres.cs b/Content.Server/Database/ServerDbPostgres.cs index b57e557832..21b36a4c9a 100644 --- a/Content.Server/Database/ServerDbPostgres.cs +++ b/Content.Server/Database/ServerDbPostgres.cs @@ -207,7 +207,7 @@ namespace Content.Server.Database var admins = await db.PgDbContext.Admin .Include(a => a.Flags) .GroupJoin(db.PgDbContext.Player, a => a.UserId, p => p.UserId, (a, grouping) => new {a, grouping}) - .SelectMany(t => t.grouping.DefaultIfEmpty(), (t, p) => new {t.a, p.LastSeenUserName}) + .SelectMany(t => t.grouping.DefaultIfEmpty(), (t, p) => new {t.a, p!.LastSeenUserName}) .ToArrayAsync(cancel); var adminRanks = await db.DbContext.AdminRank.Include(a => a.Flags).ToArrayAsync(cancel); diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs index f8c654c95a..23433c9257 100644 --- a/Content.Server/Database/ServerDbSqlite.cs +++ b/Content.Server/Database/ServerDbSqlite.cs @@ -203,7 +203,7 @@ namespace Content.Server.Database var admins = await db.SqliteDbContext.Admin .Include(a => a.Flags) .GroupJoin(db.SqliteDbContext.Player, a => a.UserId, p => p.UserId, (a, grouping) => new {a, grouping}) - .SelectMany(t => t.grouping.DefaultIfEmpty(), (t, p) => new {t.a, p.LastSeenUserName}) + .SelectMany(t => t.grouping.DefaultIfEmpty(), (t, p) => new {t.a, p!.LastSeenUserName}) .ToArrayAsync(cancel); var adminRanks = await db.DbContext.AdminRank.Include(a => a.Flags).ToArrayAsync(cancel);