Merge pull request #222 from DennisvHest/development

1.6.3
DennisvHest · Sep 14, 2024 · f566e0d · f566e0d
2 parents 338f68c + f30e1fe
commit f566e0d
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 35 deletions.
diff --git a/MapMaven.Core.Tests/MapMaven.Core.Tests.csproj b/MapMaven.Core.Tests/MapMaven.Core.Tests.csproj
@@ -11,16 +11,16 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.1.35" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.7" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="MockQueryable.Moq" Version="7.0.1" />
-    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="MockQueryable.Moq" Version="7.0.3" />
+    <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
     <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29" />
     <PackageReference Include="TestableIO.System.IO.Abstractions" Version="21.0.29" />
     <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="21.0.29" />
     <PackageReference Include="xunit" Version="2.9.0" />
-    <PackageReference Include="Xunit.Microsoft.DependencyInjection" Version="8.2.0" />
+    <PackageReference Include="Xunit.Microsoft.DependencyInjection" Version="8.2.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

diff --git a/MapMaven.Core/MapMaven.Core.csproj b/MapMaven.Core/MapMaven.Core.csproj
@@ -22,16 +22,16 @@
     <PackageReference Include="BeatSaverSharper" Version="3.4.5" />
     <PackageReference Include="FastDeepCloner" Version="1.3.6" />
     <PackageReference Include="Microsoft.AspNetCore.Components.DataAnnotations.Validation" Version="3.2.0-rc1.20223.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" />
-    <PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="8.0.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
+    <PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="8.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageReference Include="Microsoft.ML" Version="3.0.1" />
     <PackageReference Include="Microsoft.ML.FastTree" Version="3.0.1" />
     <PackageReference Include="Microsoft.ML.LightGbm" Version="3.0.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Utilities" Version="17.10.40170" />
+    <PackageReference Include="Microsoft.VisualStudio.Utilities" Version="17.11.40262" />
     <PackageReference Include="NAudio" Version="2.2.1" />
     <PackageReference Include="NAudio.Vorbis" Version="1.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
@@ -40,11 +40,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Pather.CSharp" Version="2.1.0" />
-    <PackageReference Include="Plotly.NET" Version="5.0.0" />
+    <PackageReference Include="Plotly.NET" Version="5.1.0" />
     <PackageReference Include="RateLimiter" Version="2.2.0" />
     <PackageReference Include="Serilog" Version="4.0.1" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.7" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
     <PackageReference Include="System.Reactive" Version="6.0.1" />
     <PackageReference Include="TestableIO.System.IO.Abstractions" Version="21.0.29" />
     <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="21.0.29" />

diff --git a/MapMaven.DataGatherers.BeatLeader/MapMaven.DataGatherers.BeatLeader.csproj b/MapMaven.DataGatherers.BeatLeader/MapMaven.DataGatherers.BeatLeader.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/MapMaven.DataGatherers.ScoreSaber/MapMaven.DataGatherers.ScoreSaber.csproj b/MapMaven.DataGatherers.ScoreSaber/MapMaven.DataGatherers.ScoreSaber.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/MapMaven.Functions/MapMaven.Functions.csproj b/MapMaven.Functions/MapMaven.Functions.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.3.1" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.17.4" />
-    <PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.4" />
+    <PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.5" />
     <PackageReference Include="RateLimiter" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/MapMaven.Infrastructure/MapMaven.Infrastructure.csproj b/MapMaven.Infrastructure/MapMaven.Infrastructure.csproj
@@ -9,8 +9,8 @@
   <ItemGroup>
     <PackageReference Include="BeatSaber.SongHashing" Version="1.2.0" />
     <PackageReference Include="BeatSaverSharper" Version="3.4.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/MapMaven/Components/Maps/MapBrowser.razor.cs b/MapMaven/Components/Maps/MapBrowser.razor.cs
@@ -299,6 +299,8 @@ async Task RemoveSelectedMapsFromSelectedPlaylist()
 
         public void OnRowClick(DataGridRowClickEventArgs<Map> args)
         {
+            var mapIndex = TableRef.CurrentPage * TableRef.RowsPerPage + args.RowIndex;
+
             if (args.MouseEventArgs.CtrlKey || args.MouseEventArgs.ShiftKey)
             {
                 if (!Selectable)
@@ -309,19 +311,19 @@ public void OnRowClick(DataGridRowClickEventArgs<Map> args)
 
                 if (args.MouseEventArgs.ShiftKey)
                 {
-                    var lastSelectedRowIndex = LastSelectedRowIndex ?? args.RowIndex;
+                    var lastSelectedRowIndex = LastSelectedRowIndex ?? mapIndex;
 
                     var mapsToSelect = TableRef.FilteredItems
-                        .Skip(Math.Min(lastSelectedRowIndex, args.RowIndex))
-                        .Take(Math.Abs(args.RowIndex - lastSelectedRowIndex) + 1)
+                        .Skip(Math.Min(lastSelectedRowIndex, mapIndex))
+                        .Take(Math.Abs(mapIndex - lastSelectedRowIndex) + 1)
                         .ToList();
 
                     MapService.SelectMaps(mapsToSelect);
                 }
             }
 
             if (Selectable)
-                LastSelectedRowIndex = args.RowIndex;
+                LastSelectedRowIndex = mapIndex;
         }
 
         /// <summary>
@@ -346,12 +348,14 @@ public string RowClassFunc(Map map, int index)
             if (!Selectable)
                 return string.Empty;
 
+            var mapIndex = TableRef.CurrentPage * TableRef.RowsPerPage + index;
+
             string classes = string.Empty;
 
             if (MapService.MapIsSelected(map))
                 classes += "row-selected";
 
-            if (index == LastSelectedRowIndex)
+            if (mapIndex == LastSelectedRowIndex)
                 classes += " row-selected-active";
 
             return classes;

diff --git a/MapMaven/MapMaven.csproj b/MapMaven/MapMaven.csproj
@@ -22,6 +22,7 @@
 
         <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
         <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+		<WindowsSdkPackageVersion>10.0.26100.42</WindowsSdkPackageVersion>
 
 		<WindowsPackageType>None</WindowsPackageType>
     </PropertyGroup>
@@ -83,23 +84,23 @@
       <PackageReference Include="BeatSaberPlaylistsLib" Version="1.6.6" />
       <PackageReference Include="Blazor-ApexCharts" Version="3.3.0" />
       <PackageReference Include="Clowd.Squirrel" Version="2.11.1" />
-      <PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="7.0.0" />
+      <PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="7.0.1" />
       <PackageReference Include="Markdig" Version="0.37.0" />
       <PackageReference Include="Microsoft.AspNetCore.Components.DataAnnotations.Validation" Version="3.2.0-rc1.20223.4" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7">
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="Microsoft.VisualStudio.Utilities" Version="17.10.40170" />
-	  <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
-      <PackageReference Include="MudBlazor" Version="7.6.0" />
+      <PackageReference Include="Microsoft.VisualStudio.Utilities" Version="17.11.40262" />
+	  <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
+      <PackageReference Include="MudBlazor" Version="7.8.0" />
       <PackageReference Include="NAudio" Version="2.2.1" />
       <PackageReference Include="NAudio.Vorbis" Version="1.5.0" />
       <PackageReference Include="PInvoke.User32" Version="0.7.124" />
       <PackageReference Include="securifybv.ShellLink" Version="0.1.0" />
       <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
       <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-      <PackageReference Include="System.Drawing.Common" Version="8.0.7" />
+      <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
       <PackageReference Include="System.Reactive" Version="6.0.1" />
     </ItemGroup>
 
@@ -109,9 +110,9 @@
     </ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.80" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.80" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.80" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.82" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.82" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.82" />
 	</ItemGroup>
 
 	<PropertyGroup>