Upgrades to nugets

edgiardina · Mar 23, 2024 · 992b730 · 992b730
1 parent 237b3ba
commit 992b730
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/IfpaMaui.csproj b/IfpaMaui.csproj
@@ -100,13 +100,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.7" />
-		<PackageReference Include="AathifMahir.Maui.MauiIcons.Fluent" Version="2.1.1" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.14" />
+		<PackageReference Include="AathifMahir.Maui.MauiIcons.Fluent" Version="2.1.2" />
 		<PackageReference Include="CommunityToolkit.Maui" Version="7.0.1" />
 		<PackageReference Include="LiveChartsCore.SkiaSharpView.Maui" Version="2.0.0-beta.911" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Maui.Controls.Maps" Version="8.0.7" />
-		<PackageReference Include="PinballApi" Version="2.3.0" />
+		<PackageReference Include="Microsoft.Maui.Controls.Maps" Version="8.0.14" />
+		<PackageReference Include="PinballApi" Version="2.4.1" />
 		<PackageReference Include="Plugin.Maui.Calendar" Version="1.1.4" />
 		<PackageReference Include="Scrutor" Version="4.2.2" />
 		<PackageReference Include="Serilog.Sinks.Xamarin" Version="1.0.0" />
@@ -248,6 +248,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.7" />
+	  <PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.14" />
 	</ItemGroup>
 </Project>
diff --git a/ViewModels/PlayerDetailViewModel.cs b/ViewModels/PlayerDetailViewModel.cs
@@ -24,7 +24,7 @@ public class PlayerDetailViewModel : BaseViewModel
 
         public int PlayerId { get; set; }
         public int LastTournamentCount { get; set; }
-        private Player playerRecord = new Player { PlayerStats = new PinballApi.Models.WPPR.v1.Players.PlayerStats { }, ChampionshipSeries = new List<ChampionshipSeries> { } };
+        private Player playerRecord = new Player { PlayerStats = new PlayerStats { }, ChampionshipSeries = new List<ChampionshipSeries> { } };
 
         private static readonly int s_logBase = 10;
 

diff --git a/ViewModels/PlayerSearchViewModel.cs b/ViewModels/PlayerSearchViewModel.cs
@@ -1,8 +1,7 @@
 using System.Collections.ObjectModel;
-using System.Diagnostics;
+using System.Text.Json;
 using Ifpa.Models;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
 using PinballApi;
 
 namespace Ifpa.ViewModels
@@ -40,8 +39,8 @@ public Command SearchCommand
                             var items = await PinballRankingApi.SearchForPlayerByName(text.Trim());
                             foreach (var item in items.Search)
                             {
-                                var serializedParent = JsonConvert.SerializeObject(item);
-                                var c = JsonConvert.DeserializeObject<PlayerSearchResult>(serializedParent);
+                                var serializedParent = JsonSerializer.Serialize(item);
+                                var c = JsonSerializer.Deserialize<PlayerSearchResult>(serializedParent);
 
                                 Players.Add(c);
                             }

diff --git a/ViewModels/SettingsViewModel.cs b/ViewModels/SettingsViewModel.cs
@@ -11,7 +11,7 @@ public class SettingsViewModel : BaseViewModel
     {
         AppSettings AppSettings;
 
-        private Player playerRecord = new Player { PlayerStats = new PinballApi.Models.WPPR.v1.Players.PlayerStats { }, ChampionshipSeries = new List<ChampionshipSeries> { } };
+        private Player playerRecord = new Player { PlayerStats = new PlayerStats { }, ChampionshipSeries = new List<ChampionshipSeries> { } };
 
         public string PlayerAvatar
         {
@@ -42,7 +42,7 @@ public async Task LoadPlayer()
                 }
                 else
                 {
-                    playerRecord = new Player { PlayerStats = new PinballApi.Models.WPPR.v1.Players.PlayerStats { }, ChampionshipSeries = new List<ChampionshipSeries> { } };
+                    playerRecord = new Player { PlayerStats = new PlayerStats { }, ChampionshipSeries = new List<ChampionshipSeries> { } };
                     OnPropertyChanged(null);
                 }
             }

diff --git a/Views/CalendarPage.xaml b/Views/CalendarPage.xaml
@@ -93,7 +93,6 @@
                            ArrowsColor="{StaticResource IconAccentColor}"
                            Events="{Binding TournamentCalenderItems}"
                            IsVisible="{Binding CurrentType, Converter={StaticResource IsEqualConverter}, ConverterParameter={x:Static vm:CalendarType.Calendar}}"
-                           MinimumDate="{Binding Source={x:Static sys:DateTime.Now}}"
                            ShownDate="{Binding Source={x:Static sys:DateTime.Now}}"
                            ShowYearPicker="False"
                            TodayOutlineColor="{StaticResource IconAccentColor}"