Nuget batch upgrade (#900)

Too behind for dependabot's 5prs/day thing --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
SapiensAnatis · Jun 23, 2024 · 7118d50 · 7118d50
1 parent a750e71
commit 7118d50
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 230 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "husky": {
-      "version": "0.6.5",
+      "version": "0.7.0",
       "commands": [
         "husky"
       ],

diff --git a/.husky/task-runner.json b/.husky/task-runner.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://alirezanet.github.io/Husky.Net/schema.json",
   "tasks": [
     {
       "name": "Run csharpier",

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,26 +3,25 @@
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     </PropertyGroup>
     <ItemGroup>
-        <PackageVersion Include="AutoMapper" Version="12.0.1" />
-        <PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+        <PackageVersion Include="AutoMapper" Version="13.0.1" />
         <PackageVersion Include="Basic.Reference.Assemblies" Version="1.7.2" />
         <PackageVersion Include="EntityGraphQL" Version="5.4.0" />
-        <PackageVersion Include="EntityGraphQL.AspNet" Version="5.3.0" />
+        <PackageVersion Include="EntityGraphQL.AspNet" Version="5.4.0" />
         <PackageVersion Include="FluentRandomPicker" Version="3.5.1" />
-        <PackageVersion Include="FluentValidation" Version="11.9.1" />
-        <PackageVersion Include="Hangfire.AspNetCore" Version="1.8.12" />
-        <PackageVersion Include="Hangfire.Core" Version="1.8.12" />
+        <PackageVersion Include="FluentValidation" Version="11.9.2" />
+        <PackageVersion Include="Hangfire.AspNetCore" Version="1.8.14" />
+        <PackageVersion Include="Hangfire.Core" Version="1.8.14" />
         <PackageVersion Include="Hangfire.Postgresql" Version="1.20.8" />
         <PackageVersion Include="Immediate.Apis" Version="1.1.0" />
         <PackageVersion Include="Immediate.Handlers" Version="1.4.0" />
         <PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
-        <PackageVersion Include="MessagePack" Version="2.5.140" />
-        <PackageVersion Include="MessagePack.AspNetCoreMvcFormatter" Version="2.5.140" />
+        <PackageVersion Include="MessagePack" Version="2.5.168" />
+        <PackageVersion Include="MessagePack.AspNetCoreMvcFormatter" Version="2.5.168" />
         <PackageVersion Include="MessagePackAnalyzer" Version="2.5.168" />
         <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6" />
-        <PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.5" />
+        <PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.6" />
         <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.6" />
-        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
         <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
         <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6" />
         <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.6.0" />
@@ -39,37 +38,37 @@
         <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.6.2" />
         <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
         <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
-        <PackageVersion Include="MudBlazor" Version="6.19.1" />
+        <PackageVersion Include="MudBlazor" Version="6.20.0" />
         <PackageVersion Include="PolySharp" Version="1.14.1" />
-        <PackageVersion Include="Riok.Mapperly" Version="3.5.1" />
+        <PackageVersion Include="Riok.Mapperly" Version="3.6.0" />
         <PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
-        <PackageVersion Include="Serilog.Expressions" Version="4.0.0" />
-        <PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.0" />
-        <PackageVersion Include="Serilog.Sinks.Async" Version="1.5.0" />
+        <PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
+        <PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.1" />
+        <PackageVersion Include="Serilog.Sinks.Async" Version="2.0.0" />
         <PackageVersion Include="Serilog.Sinks.Seq" Version="8.0.0" />
-        <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.6.0" />
+        <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.6.2" />
         <PackageVersion Include="System.Text.Json" Version="8.0.3" />
         <PackageVersion Include="Serilog" Version="4.0.0" />
         <PackageVersion Include="Serilog.AspNetCore" Version="8.0.1" />
         <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
-        <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
+        <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
         <PackageVersion Include="FluentAssertions" Version="6.12.0" />
         <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.6" />
-        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageVersion Include="MockQueryable.Moq" Version="7.0.1" />
         <PackageVersion Include="Moq" Version="4.20.70" />
         <PackageVersion Include="Verify.SourceGenerators" Version="2.2.0" />
-        <PackageVersion Include="Verify.XUnit" Version="25.0.1" />
+        <PackageVersion Include="Verify.XUnit" Version="25.0.3" />
         <PackageVersion Include="xunit" Version="2.8.1" />
-        <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
+        <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
         <PackageVersion Include="GraphQL.Client" Version="6.1.0" />
         <PackageVersion Include="GraphQL.Client.Serializer.SystemTextJson" Version="6.1.0" />
-        <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
+        <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.4.0" />
         <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.6" />
         <PackageVersion Include="Respawn" Version="6.2.1" />
         <PackageVersion Include="Snapshooter.Xunit" Version="0.14.1" />
-        <PackageVersion Include="Testcontainers" Version="3.8.0" />
-        <PackageVersion Include="Testcontainers.PostgreSql" Version="3.7.0" />
+        <PackageVersion Include="Testcontainers" Version="3.9.0" />
+        <PackageVersion Include="Testcontainers.PostgreSql" Version="3.9.0" />
         <PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="8.0.6" />
         <PackageVersion Include="Moq.EntityFrameworkCore" Version="8.0.1.2" />
         <PackageVersion Include="NSubstitute" Version="5.1.0" />

diff --git a/...AutoMapper/GameWeaponBodyResolversTest.cs → ...atabase.Test/Entities/DbWeaponBodyTest.cs b/...AutoMapper/GameWeaponBodyResolversTest.cs → ...atabase.Test/Entities/DbWeaponBodyTest.cs
@@ -1,19 +1,10 @@
-using AutoMapper;
-using DragaliaAPI.AutoMapper;
 using DragaliaAPI.Database.Entities;
 using DragaliaAPI.Shared.Definitions.Enums;
 
-namespace DragaliaAPI.Test.AutoMapper;
+namespace DragaliaAPI.Database.Test.Entities;
 
-public class GameWeaponBodyResolversTest
+public class DbWeaponBodyTest
 {
-    private readonly Mock<ResolutionContext> mockResolutionContext;
-
-    public GameWeaponBodyResolversTest()
-    {
-        this.mockResolutionContext = new(MockBehavior.Loose);
-    }
-
     [Theory]
     [InlineData(WeaponBodies.Nothung, 0, 0)]
     [InlineData(WeaponBodies.Nothung, 1, 2)]
@@ -30,22 +21,9 @@ public void AbilityOneResolver_ReturnsExpectedLevel(
         int expectedLevel
     )
     {
-        GameWeaponBodyResolvers.AbilityOneResolver resolver = new();
+        DbWeaponBody weapon = new() { WeaponBodyId = id, LimitOverCount = limitOverCount, };
 
-        resolver
-            .Resolve(
-                new DbWeaponBody()
-                {
-                    ViewerId = 1,
-                    WeaponBodyId = id,
-                    LimitOverCount = limitOverCount
-                },
-                new(),
-                0,
-                null!
-            )
-            .Should()
-            .Be(expectedLevel);
+        weapon.Ability1Level.Should().Be(expectedLevel);
     }
 
     [Theory]
@@ -64,22 +42,9 @@ public void AbilityTwoResolver_ReturnsExpectedLevel(
         int expectedLevel
     )
     {
-        GameWeaponBodyResolvers.AbilityTwoResolver resolver = new();
+        DbWeaponBody weapon = new() { WeaponBodyId = id, LimitOverCount = limitOverCount, };
 
-        resolver
-            .Resolve(
-                new DbWeaponBody()
-                {
-                    ViewerId = 1,
-                    WeaponBodyId = id,
-                    LimitOverCount = limitOverCount
-                },
-                new(),
-                0,
-                null!
-            )
-            .Should()
-            .Be(expectedLevel);
+        weapon.Ability2Level.Should().Be(expectedLevel);
     }
 
     [Theory]
@@ -103,22 +68,14 @@ public void SkillLevelResolver_ReturnsExpectedLevel(
         int expectedLevel
     )
     {
-        GameWeaponBodyResolvers.SkillLevelResolver resolver = new();
+        DbWeaponBody weapon =
+            new()
+            {
+                WeaponBodyId = id,
+                LimitBreakCount = limitBreakCount,
+                LimitOverCount = limitOverCount,
+            };
 
-        resolver
-            .Resolve(
-                new DbWeaponBody()
-                {
-                    ViewerId = 1,
-                    WeaponBodyId = id,
-                    LimitOverCount = limitOverCount,
-                    LimitBreakCount = limitBreakCount
-                },
-                new(),
-                0,
-                null!
-            )
-            .Should()
-            .Be(expectedLevel);
+        weapon.SkillLevel.Should().Be(expectedLevel);
     }
 }
diff --git a/DragaliaAPI/DragaliaAPI/DragaliaAPI.csproj b/DragaliaAPI/DragaliaAPI/DragaliaAPI.csproj
@@ -10,7 +10,6 @@
 
     <ItemGroup>
         <PackageReference Include="AutoMapper" />
-        <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" />
         <PackageReference Include="EntityGraphQL" />
         <PackageReference Include="EntityGraphQL.AspNet" />
         <PackageReference Include="FluentRandomPicker" />

diff --git a/DragaliaAPI/DragaliaAPI/Mapping/AutoMapper/GameWeaponBodyResolvers.cs b/DragaliaAPI/DragaliaAPI/Mapping/AutoMapper/GameWeaponBodyResolvers.cs