feat: .NET 10 (#51)

hhvrc · Copilot · web-flow · commit beda7265797c · 2025-11-25T04:39:09.000+01:00
* Bump to .NET 10

* Some cleanup

* Update MessageHandler.cs

* Update Dockerfile

* Update DiscordBot/MessageHandler/MessageHandler.cs

Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;

---------

Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;
diff --git a/DiscordBot/Commands/Admin/AdminListCommand.cs b/DiscordBot/Commands/Admin/AdminListCommand.cs
@@ -1,5 +1,4 @@
 ﻿using Discord.Interactions;
-using Discord.WebSocket;
 
 namespace OpenShock.DiscordBot.Commands.Admin;
 
diff --git a/DiscordBot/Commands/ControlCommands.cs b/DiscordBot/Commands/ControlCommands.cs
@@ -8,7 +8,6 @@
 using OneOf.Types;
 using OpenShock.DiscordBot.OpenShockDiscordDb;
 using OpenShock.DiscordBot.Utils;
-using OpenShock.SDK.CSharp;
 using OpenShock.SDK.CSharp.Errors;
 using OpenShock.SDK.CSharp.Models;
 
diff --git a/DiscordBot/Commands/Profanity/ProfanityListCommand.cs b/DiscordBot/Commands/Profanity/ProfanityListCommand.cs
@@ -1,7 +1,6 @@
 ﻿using Discord;
 using Discord.Interactions;
 using Microsoft.EntityFrameworkCore;
-using OpenShock.DiscordBot.OpenShockDiscordDb;
 
 namespace OpenShock.DiscordBot.Commands.Profanity;
 
@@ -12,8 +11,8 @@ public async Task ProfanityListCommand()
     {
         await DeferAsync(ephemeral: true);
 
-        var rules = await Queryable
-            .OrderByDescending<ProfanityRule, DateTimeOffset>(_db.ProfanityRules, r => r.CreatedAt)
+        var rules = await _db.ProfanityRules
+            .OrderByDescending(r => r.CreatedAt)
             .Take(10)
             .ToListAsync();
 
diff --git a/DiscordBot/Commands/ProfanityAdmin/ProfanityRemoveCommand.cs b/DiscordBot/Commands/ProfanityAdmin/ProfanityRemoveCommand.cs
@@ -1,7 +1,6 @@
 ﻿using System.Text;
 using Discord.Interactions;
 using Microsoft.EntityFrameworkCore;
-using OpenShock.DiscordBot.OpenShockDiscordDb;
 
 namespace OpenShock.DiscordBot.Commands.ProfanityAdmin;
 
diff --git a/DiscordBot/Commands/ProfanityAdmin/ProfanitySuggestionListCommand.cs b/DiscordBot/Commands/ProfanityAdmin/ProfanitySuggestionListCommand.cs
@@ -2,7 +2,6 @@
 using Discord;
 using Discord.Interactions;
 using Microsoft.EntityFrameworkCore;
-using OpenShock.DiscordBot.OpenShockDiscordDb;
 
 namespace OpenShock.DiscordBot.Commands.ProfanityAdmin;
 
diff --git a/DiscordBot/Commands/Setup/SetupConnectionCommand.cs b/DiscordBot/Commands/Setup/SetupConnectionCommand.cs
@@ -30,7 +30,7 @@ public async Task ExecuteSetupCommand()
             ApiToken = user.ApiKey,
             ApiServer = user.ApiServer
         };
-        await Context.Interaction.RespondWithModalAsync<SetupModal>(SetupModalId, previousData);
+        await Context.Interaction.RespondWithModalAsync(SetupModalId, previousData);
     }
     
     // Responds to the modal.
diff --git a/DiscordBot/DiscordBot.csproj b/DiscordBot/DiscordBot.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Company>OpenShock</Company>
@@ -13,32 +13,31 @@
         <AssemblyName>OpenShock.DiscordBot</AssemblyName>
         <RootNamespace>OpenShock.DiscordBot</RootNamespace>
         <InvariantGlobalization>false</InvariantGlobalization>
-        <LangVersion>13</LangVersion>
       <UserSecretsId>05918ba7-2547-4661-9c92-1172d1441505</UserSecretsId>
   </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Discord.Addons.Hosting" Version="6.1.0" />
         <PackageReference Include="Discord.Net" Version="3.18.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.10" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.10">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
-        <PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="9.0.10">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0" />
+        <PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="10.0.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.10" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
-        <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.10" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.10" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.10" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.0" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
         <PackageReference Include="OneOf" Version="3.0.271" />
-        <PackageReference Include="OpenShock.SDK.CSharp" Version="0.0.39" />
+        <PackageReference Include="OpenShock.SDK.CSharp" Version="0.0.40" />
         <PackageReference Include="Serilog" Version="4.3.0" />
         <PackageReference Include="Serilog.Extensions.Autofac.DependencyInjection" Version="5.0.0" />
         <PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
@@ -49,7 +48,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
+      <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
       <None Remove="appsettings.json" />
       <Content Include="appsettings.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/DiscordBot/MessageHandler/MessageHandler.cs b/DiscordBot/MessageHandler/MessageHandler.cs
@@ -5,10 +5,9 @@
 using OpenShock.DiscordBot.OpenShockDiscordDb;
 using OpenShock.DiscordBot.Services;
 using OpenShock.DiscordBot.Services.ProfanityDetector;
-using OpenShock.DiscordBot.Utils;
 using OpenShock.SDK.CSharp.Models;
 
-namespace OpenShock.DiscordBot;
+namespace OpenShock.DiscordBot.MessageHandler;
 
 public sealed partial class MessageHandler
 {
@@ -77,9 +76,9 @@ public async Task HandleMessageAsync(SocketMessage message)
 
             // Send reaction and trigger shock
             await Task.WhenAll([
-                    message.AddReactionAsync(new Emoji("⚡")),
-                    ShockUserAsync(scope, authorDiscordId, intensityPercent)
-                ]);
+                message.AddReactionAsync(new Emoji("⚡")),
+                ShockUserAsync(scope, authorDiscordId, intensityPercent)
+            ]);
         }
     }
 }
diff --git a/DiscordBot/OpenShockDiscordDb/BotAdmin.cs b/DiscordBot/OpenShockDiscordDb/BotAdmin.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace OpenShock.DiscordBot.OpenShockDiscordDb;
+﻿namespace OpenShock.DiscordBot.OpenShockDiscordDb;
 
 public partial class BotAdmin
 {
diff --git a/DiscordBot/OpenShockDiscordDb/OpenShockDiscordContext.cs b/DiscordBot/OpenShockDiscordDb/OpenShockDiscordContext.cs
@@ -1,6 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore;
+﻿using Microsoft.EntityFrameworkCore;
 
 namespace OpenShock.DiscordBot.OpenShockDiscordDb;
 
diff --git a/DiscordBot/OpenShockDiscordDb/User.cs b/DiscordBot/OpenShockDiscordDb/User.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace OpenShock.DiscordBot.OpenShockDiscordDb;
+﻿namespace OpenShock.DiscordBot.OpenShockDiscordDb;
 
 public partial class User
 {
diff --git a/DiscordBot/OpenShockDiscordDb/UsersFriendwhitelist.cs b/DiscordBot/OpenShockDiscordDb/UsersFriendwhitelist.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace OpenShock.DiscordBot.OpenShockDiscordDb;
+﻿namespace OpenShock.DiscordBot.OpenShockDiscordDb;
 
 public partial class UsersFriendwhitelist
 {
diff --git a/DiscordBot/OpenShockDiscordDb/UsersShocker.cs b/DiscordBot/OpenShockDiscordDb/UsersShocker.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-
-namespace OpenShock.DiscordBot.OpenShockDiscordDb;
+﻿namespace OpenShock.DiscordBot.OpenShockDiscordDb;
 
 public partial class UsersShocker
 {
diff --git a/DiscordBot/Program.cs b/DiscordBot/Program.cs
@@ -1,5 +1,4 @@
-﻿using System.Diagnostics;
-using Discord;
+﻿using Discord;
 using Discord.Interactions;
 using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
@@ -13,6 +12,7 @@
 using OpenShock.DiscordBot.Utils;
 using Serilog;
 using System.Reflection;
+using OpenShock.DiscordBot.MessageHandler;
 using OpenShock.DiscordBot.Services.ProfanityDetector;
 
 try
diff --git a/DiscordBot/Services/InteractionHandler.cs b/DiscordBot/Services/InteractionHandler.cs
@@ -3,7 +3,6 @@
 using Discord.WebSocket;
 using Microsoft.Extensions.Logging;
 using OpenShock.DiscordBot.Utils;
-using Serilog;
 
 namespace OpenShock.DiscordBot.Services;
 
diff --git a/DiscordBot/Services/OpenShockBackendService.cs b/DiscordBot/Services/OpenShockBackendService.cs
@@ -1,8 +1,6 @@
-﻿using Discord;
-using Microsoft.EntityFrameworkCore;
+﻿using Microsoft.EntityFrameworkCore;
 using OpenShock.DiscordBot.OpenShockDiscordDb;
 using OpenShock.DiscordBot.Utils;
-using OpenShock.SDK.CSharp;
 using OpenShock.SDK.CSharp.Models;
 
 namespace OpenShock.DiscordBot.Services;
diff --git a/DiscordBot/Utils/ApiUtils.cs b/DiscordBot/Utils/ApiUtils.cs
@@ -1,5 +1,4 @@
-﻿using Discord;
-using OpenShock.DiscordBot.OpenShockDiscordDb;
+﻿using OpenShock.DiscordBot.OpenShockDiscordDb;
 using OpenShock.SDK.CSharp;
 
 namespace OpenShock.DiscordBot.Utils;
diff --git a/DiscordBot/Utils/DiscordUtils.cs b/DiscordBot/Utils/DiscordUtils.cs
@@ -1,5 +1,4 @@
 ﻿using Discord;
-using Discord.Interactions;
 
 namespace OpenShock.DiscordBot.Utils;
 
diff --git a/DiscordBot/Utils/Embeds.cs b/DiscordBot/Utils/Embeds.cs
@@ -1,6 +1,4 @@
-﻿using System.Globalization;
-using Discord;
-using OpenShock.DiscordBot.Commands;
+﻿using Discord;
 
 namespace OpenShock.DiscordBot.Utils;
 
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
 WORKDIR /src
 COPY *.slnx .
 COPY DiscordBot/*.csproj ./DiscordBot/
@@ -9,7 +9,7 @@ COPY . .
 RUN dotnet publish -c Release -o /publish --no-restore
 
 
-FROM mcr.microsoft.com/dotnet/runtime:9.0-alpine
+FROM mcr.microsoft.com/dotnet/runtime:10.0-alpine
 WORKDIR /app
 
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
diff --git a/MigrationHelper/MigrationHelper.csproj b/MigrationHelper/MigrationHelper.csproj
@@ -2,23 +2,23 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.10" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.10">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.10">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
     </ItemGroup>
     
     <ItemGroup>
diff --git a/global.json b/global.json
@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "10.0.0",
+    "rollForward": "latestMajor",
+    "allowPrerelease": false
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using Discord.Interactions;`
`2`		`-using Discord.WebSocket;`
`3`	`2`
`4`	`3`	`namespace OpenShock.DiscordBot.Commands.Admin;`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public async Task ExecuteSetupCommand()`
`30`	`30`	`ApiToken = user.ApiKey,`
`31`	`31`	`ApiServer = user.ApiServer`
`32`	`32`	`};`
`33`		`- await Context.Interaction.RespondWithModalAsync<SetupModal>(SetupModalId, previousData);`
	`33`	`+ await Context.Interaction.RespondWithModalAsync(SetupModalId, previousData);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`// Responds to the modal.`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,9 @@`
`5`	`5`	`using OpenShock.DiscordBot.OpenShockDiscordDb;`
`6`	`6`	`using OpenShock.DiscordBot.Services;`
`7`	`7`	`using OpenShock.DiscordBot.Services.ProfanityDetector;`
`8`		`-using OpenShock.DiscordBot.Utils;`
`9`	`8`	`using OpenShock.SDK.CSharp.Models;`
`10`	`9`
`11`		`-namespace OpenShock.DiscordBot;`
	`10`	`+namespace OpenShock.DiscordBot.MessageHandler;`
`12`	`11`
`13`	`12`	`public sealed partial class MessageHandler`
`14`	`13`	`{`
`@@ -77,9 +76,9 @@ public async Task HandleMessageAsync(SocketMessage message)`
`77`	`76`
`78`	`77`	`// Send reaction and trigger shock`
`79`	`78`	`await Task.WhenAll([`
`80`		`- message.AddReactionAsync(new Emoji("⚡")),`
`81`		`- ShockUserAsync(scope, authorDiscordId, intensityPercent)`
`82`		`- ]);`
	`79`	`+ message.AddReactionAsync(new Emoji("⚡")),`
	`80`	`+ ShockUserAsync(scope, authorDiscordId, intensityPercent)`
	`81`	`+ ]);`
`83`	`82`	`}`
`84`	`83`	`}`
`85`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-`
`4`		`-namespace OpenShock.DiscordBot.OpenShockDiscordDb;`
	`1`	`+namespace OpenShock.DiscordBot.OpenShockDiscordDb;`
`5`	`2`
`6`	`3`	`public partial class BotAdmin`
`7`	`4`	`{`