Update packages + add support for IRC_USER env variable

FAForever · Nov 12, 2023 · 591bc54 · 591bc54
1 parent 94ea920
commit 591bc54
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 27 deletions.
diff --git a/Faforever.Qai.sln b/Faforever.Qai.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30611.23
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34221.43
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B2EBCF82-642E-48F5-8CE8-9F7E960C99EF}"
 EndProject

diff --git a/src/Faforever.Qai.Core/Faforever.Qai.Core.csproj b/src/Faforever.Qai.Core/Faforever.Qai.Core.csproj
@@ -6,14 +6,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="DSharpPlus" Version="4.4.1" />
-      <PackageReference Include="DSharpPlus.Rest" Version="4.4.1" />
-      <PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.1" />
+      <PackageReference Include="DSharpPlus" Version="4.4.3" />
+      <PackageReference Include="DSharpPlus.Rest" Version="4.4.3" />
+      <PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.3" />
       <PackageReference Include="JsonApiSerializer" Version="1.7.4" />
       <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.5" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.5">
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.13" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.13" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.13">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>

diff --git a/src/Faforever.Qai.Database.Setup/Faforever.Qai.Database.Setup.csproj b/src/Faforever.Qai.Database.Setup/Faforever.Qai.Database.Setup.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.13">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.5">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.13">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Faforever.Qai.Discord/Faforever.Qai.Discord.csproj b/src/Faforever.Qai.Discord/Faforever.Qai.Discord.csproj
@@ -6,10 +6,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="DSharpPlus" Version="4.4.1" />
-      <PackageReference Include="DSharpPlus.CommandsNext" Version="4.4.1" />
-      <PackageReference Include="DSharpPlus.Rest" Version="4.4.1" />
-      <PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.1" />
+      <PackageReference Include="DSharpPlus" Version="4.4.3" />
+      <PackageReference Include="DSharpPlus.CommandsNext" Version="4.4.3" />
+      <PackageReference Include="DSharpPlus.Rest" Version="4.4.3" />
+      <PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Faforever.Qai.Irc/Faforever.Qai.Irc.csproj b/src/Faforever.Qai.Irc/Faforever.Qai.Irc.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Faforever.Qai/Faforever.Qai.csproj b/src/Faforever.Qai/Faforever.Qai.csproj
@@ -17,14 +17,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="11.5.2" />
+    <PackageReference Include="FluentValidation" Version="11.8.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="2.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.13">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 

diff --git a/src/Faforever.Qai/Program.cs b/src/Faforever.Qai/Program.cs
@@ -4,15 +4,10 @@
 using Faforever.Qai.Startup;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Configuration.Json;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi.Models;
-using System;
-using System.IO;
 using System.Linq;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -59,7 +54,6 @@
 ircBot.Run();
 
 var discordBot = app.Services.GetRequiredService<DiscordBot>();
-
 await discordBot.InitializeAsync();
 await discordBot.StartAsync();
 

diff --git a/src/Faforever.Qai/Startup/InitializeBotConfig.cs b/src/Faforever.Qai/Startup/InitializeBotConfig.cs
@@ -40,6 +40,7 @@ private static void SetLegacyEnvironmentVariables(BotConfig botConfig)
                 ["DISCORD_TOKEN"] = value => botConfig.Discord.Token = value,
                 ["IRC_SERVER"] = value => botConfig.Irc.Connection = value,
                 ["IRC_CHANNELS"] = value => botConfig.Irc.Channels = value,
+                ["IRC_USER"] = value => botConfig.Irc.User = value,
                 ["IRC_PASS"] = value => botConfig.Irc.Password = value,
                 ["TWITCH_CLIENT_SECRET"] = value => botConfig.Twitch.ClientSecret = value
             };

diff --git a/tests/Faforever.Qai.Core.Tests/Faforever.Qai.Core.Tests.csproj b/tests/Faforever.Qai.Core.Tests/Faforever.Qai.Core.Tests.csproj
@@ -29,9 +29,9 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
   </ItemGroup>
 
   <ItemGroup>