Merge pull request #531 from ipax77/dev

ipax77 · web-flow · commit 09d8ee41a502 · 2025-04-15T19:49:48.000+02:00
update dotnet v8.0.15 / Fenix Dragoon fix
diff --git a/src/MysqlMigrations/Migrations/20250415174232_DragoonFix.Designer.cs b/src/MysqlMigrations/Migrations/20250415174232_DragoonFix.Designer.cs
diff --git a/src/MysqlMigrations/Migrations/20250415174232_DragoonFix.cs b/src/MysqlMigrations/Migrations/20250415174232_DragoonFix.cs
@@ -0,0 +1,24 @@
+﻿using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace MysqlMigrations.Migrations
+{
+    /// <inheritdoc />
+    public partial class DragoonFix : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var sql = @"UPDATE DsAbilities
+SET EnergyCost = 150 WHERE Commander = 50 AND Name = 'Solar Cannon';";
+            migrationBuilder.Sql(sql);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}
diff --git a/src/MysqlMigrations/Migrations/ReplayContextModelSnapshot.cs b/src/MysqlMigrations/Migrations/ReplayContextModelSnapshot.cs
@@ -17,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.13")
+                .HasAnnotation("ProductVersion", "8.0.15")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
             MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
diff --git a/src/MysqlMigrations/MysqlMigrations.csproj b/src/MysqlMigrations/MysqlMigrations.csproj
@@ -11,12 +11,12 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.13" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.13">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
+		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/SC2ArcadeCrawler/SC2ArcadeCrawler.csproj b/src/SC2ArcadeCrawler/SC2ArcadeCrawler.csproj
@@ -7,7 +7,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
diff --git a/src/dsstats.api/dsstats.api.csproj b/src/dsstats.api/dsstats.api.csproj
@@ -8,10 +8,10 @@
 
   <ItemGroup>
     <PackageReference Include="MailKit" Version="4.10.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.13" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.13" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.13" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.13">
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.15" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/dsstats.auth/dsstats.auth.csproj b/src/dsstats.auth/dsstats.auth.csproj
@@ -8,10 +8,10 @@
 
   <ItemGroup>
 	<PackageReference Include="MailKit" Version="4.10.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.13" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.13" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.13" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.15" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/dsstats.db8/dsstats.db8.csproj b/src/dsstats.db8/dsstats.db8.csproj
@@ -8,13 +8,13 @@
 
   <ItemGroup>
     <PackageReference Include="Automapper" Version="14.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.13" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.13">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.13" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.15" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/dsstats.db8services/dsstats.db8services.csproj b/src/dsstats.db8services/dsstats.db8services.csproj
@@ -10,11 +10,11 @@
     <PackageReference Include="CsvHelper" Version="33.0.1" />
     <PackageReference Include="LinqKit" Version="1.3.8" />
     <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.13" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.15" />
     <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
     <PackageReference Include="System.Data.SQLite" Version="1.0.119" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.13" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.15" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/dsstats.maui/SqliteMigrations/SqliteMigrations.csproj b/src/dsstats.maui/SqliteMigrations/SqliteMigrations.csproj
@@ -11,12 +11,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.13" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.13">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.15" />
   </ItemGroup>
 
 </Project>
diff --git a/src/dsstats.maui/pax.dsstats.parser/pax.dsstats.parser.csproj b/src/dsstats.maui/pax.dsstats.parser/pax.dsstats.parser.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="CsvHelper" Version="33.0.1" />
     <PackageReference Include="IronPython.StdLib" Version="2.7.12" />
     <PackageReference Include="s2protocol.NET" Version="0.8.4" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.13" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.15" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/dsstats.pickban/dsstats.pickban.csproj b/src/dsstats.pickban/dsstats.pickban.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/dsstats.ratings/ComboRatings.cs b/src/dsstats.ratings/ComboRatings.cs
@@ -60,10 +60,6 @@ public async Task CombineDsstatsSc2ArcadeReplays(bool add = true)
 
             foreach (var dsstatsReplay in dsstatsReplays)
             {
-                if (dsstatsReplay.ReplayId == 625546)
-                {
-                    logger.LogWarning("indahouse");
-                }
                 var arcadeReplay = await FindSc2ArcadeReplay(dsstatsReplay, matchedArcadeIds);
                 if (arcadeReplay is not null)
                 {
diff --git a/src/dsstats.ratings/dsstats.ratings.csproj b/src/dsstats.ratings/dsstats.ratings.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="33.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.13" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.15" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
   </ItemGroup>
 
diff --git a/src/dsstats.razorlib/Replays/ReplayPlayerMap.razor b/src/dsstats.razorlib/Replays/ReplayPlayerMap.razor
@@ -37,11 +37,11 @@
         @foreach (var unit in GetUnits())
         {
             var relpos = GetRelPos(new(unit.X, unit.Y), Team);
-            <div class="position-absolute d-inline-block unitimage xmirror" 
-                style="margin-left: @(relpos.Key.ToString(CultureInfo.InvariantCulture))px; margin-top: @(relpos.Value.ToString(CultureInfo.InvariantCulture))px;">
+            <div class="position-absolute d-inline-block unitimage xmirror"
+                 style="margin-left: @(relpos.Key.ToString(CultureInfo.InvariantCulture))px; margin-top: @(relpos.Value.ToString(CultureInfo.InvariantCulture))px;">
                 <div style="max-height: 20px; max-width: 20px;" @onclick="@(() => Interest = Interest == unit.Name ? "" : unit.Name)">
-                    <span class="badge bg-secondary @(unit.Name == Interest ? "text-danger" : "text-warning")" 
-                        style="transform: rotate(-45deg);">
+                    <span class="badge bg-secondary @(unit.Name == Interest ? "text-danger" : "text-warning")"
+                          style="transform: rotate(-45deg);">
                         @unit.Name
                     </span>
                 </div>
@@ -61,7 +61,7 @@
 
     private string Interest = "";
 
-    public static readonly Position center = new Position() { X = 128, Y = 120 };
+    public static readonly Services.Position center = new() { X = 128, Y = 120 };
 
     List<MapUnit> GetUnits()
     {
@@ -87,7 +87,7 @@
         return units;
     }
 
-    public KeyValuePair<float, float> GetRelPos(Position unitPos, int team)
+    public KeyValuePair<float, float> GetRelPos(Services.Position unitPos, int team)
     {
 
         var pos = RotatePoint(unitPos, center, -45);
@@ -110,8 +110,8 @@
             MathF.Round(distance_left_percent, 2));
     }
 
-    public static KeyValuePair<float, float> RotatePoint(Position pointToRotate,
-                                                         Position centerPoint,
+    public static KeyValuePair<float, float> RotatePoint(Services.Position pointToRotate,
+                                                          Services.Position centerPoint,
                                                          double angleInDegrees)
     {
         double angleInRadians = angleInDegrees * (Math.PI / 180);
diff --git a/src/dsstats.razorlib/dsstats.razorlib.csproj b/src/dsstats.razorlib/dsstats.razorlib.csproj
@@ -13,8 +13,8 @@
   <ItemGroup>
     <PackageReference Include="Blazored.Toast" Version="4.2.1" />
     <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.13" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.13" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.15" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
 	<PackageReference Include="pax.BlazorChartJs" Version="0.8.5" />
   </ItemGroup>
diff --git a/src/dsstats.shared/Enums.cs b/src/dsstats.shared/Enums.cs
@@ -214,4 +214,18 @@ public enum PickBanMode
     StdRandom = 4,
     Std1v1 = 5,
     CmdrBanOnly = 6
-}
+}
+
+public enum  Region
+{
+    None = 0,
+    Americas = 1,
+    Europe = 2,
+    Asia = 3,
+    Korea = 4,
+    Taiwan = 5,
+    China = 6
+}
+
+public sealed record Position(int X, int Y);
+public sealed record MiddleControl(int FirstTeam, List<int> Gameloops);
diff --git a/src/dsstats.web/dsstats.authclient/dsstats.authclient.csproj b/src/dsstats.web/dsstats.authclient/dsstats.authclient.csproj
@@ -13,8 +13,8 @@
 
   <ItemGroup>
     <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.13" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.13" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.15" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
   </ItemGroup>
 
diff --git a/src/dsstats.web/dsstats.web.Client/dsstats.web.Client.csproj b/src/dsstats.web/dsstats.web.Client/dsstats.web.Client.csproj
@@ -10,11 +10,11 @@
 
   <ItemGroup>
     <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.13" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.13" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.13" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.15" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.6.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.8.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/dsstats.web/dsstats.web/dsstats.web.csproj b/src/dsstats.web/dsstats.web/dsstats.web.csproj
@@ -12,11 +12,11 @@
     <ProjectReference Include="..\..\dsstats.shared\dsstats.shared.csproj" />
     <ProjectReference Include="..\dsstats.authclient\dsstats.authclient.csproj" />
     <ProjectReference Include="..\dsstats.web.Client\dsstats.web.Client.csproj" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.13" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.13" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.13" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.13" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.6.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.15" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.8.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/tests/dsstats.pickban.tests/dsstats.pickban.tests.csproj b/src/tests/dsstats.pickban.tests/dsstats.pickban.tests.csproj
@@ -14,7 +14,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.8.2" />
     <PackageReference Include="MSTest.TestFramework" Version="3.8.2" />
diff --git a/src/tests/dsstats.ratings.tests/dsstats.ratings.tests.csproj b/src/tests/dsstats.ratings.tests/dsstats.ratings.tests.csproj
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.13" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.13" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.13" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.15" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.8.2" />
     <PackageReference Include="MSTest.TestFramework" Version="3.8.2" />

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)`
`17`	`17`	`{`
`18`	`18`	`#pragma warning disable 612, 618`
`19`	`19`	`modelBuilder`
`20`		`- .HasAnnotation("ProductVersion", "8.0.13")`
	`20`	`+ .HasAnnotation("ProductVersion", "8.0.15")`
`21`	`21`	`.HasAnnotation("Relational:MaxIdentifierLength", 64);`
`22`	`22`
`23`	`23`	`MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);`