diff options
| author | Ac_K <Acoustik666@gmail.com> | 2022-11-23 18:55:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-23 17:55:26 +0000 |
| commit | 567c64e149f1ec3487dea34abdffc7bfa2f55400 (patch) | |
| tree | 17dcc25f2e34b4c5155d6fccc7273c64bf2660b8 | |
| parent | 36f00985d3191ebd6ea909ddc4ed447ebdbf51b5 (diff) | |
ava: Fix JsonSerializer warnings (#3884)1.1.373
Since we move to .NET7, JsonSerializer now needs to have explicit options as arguments, which leads to some warnings in Avalonia project. This is fixed by using our `JsonHelper` class.
| -rw-r--r-- | Ryujinx.Ava/Common/Locale/LocaleManager.cs | 3 | ||||
| -rw-r--r-- | Ryujinx.Ava/Ui/ViewModels/AmiiboWindowViewModel.cs | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Ryujinx.Ava/Common/Locale/LocaleManager.cs b/Ryujinx.Ava/Common/Locale/LocaleManager.cs index 42756990..41b98136 100644 --- a/Ryujinx.Ava/Common/Locale/LocaleManager.cs +++ b/Ryujinx.Ava/Common/Locale/LocaleManager.cs @@ -1,5 +1,6 @@ using Ryujinx.Ava.Ui.ViewModels; using Ryujinx.Common; +using Ryujinx.Common.Utilities; using Ryujinx.Ui.Common.Configuration; using System.Collections.Concurrent; using System.Collections.Generic; @@ -93,7 +94,7 @@ namespace Ryujinx.Ava.Common.Locale return; } - var strings = JsonSerializer.Deserialize<Dictionary<string, string>>(languageJson); + var strings = JsonHelper.Deserialize<Dictionary<string, string>>(languageJson); foreach (var item in strings) { diff --git a/Ryujinx.Ava/Ui/ViewModels/AmiiboWindowViewModel.cs b/Ryujinx.Ava/Ui/ViewModels/AmiiboWindowViewModel.cs index fc809e52..d007e0e7 100644 --- a/Ryujinx.Ava/Ui/ViewModels/AmiiboWindowViewModel.cs +++ b/Ryujinx.Ava/Ui/ViewModels/AmiiboWindowViewModel.cs @@ -8,6 +8,7 @@ using Ryujinx.Ava.Ui.Models; using Ryujinx.Ava.Ui.Windows; using Ryujinx.Common; using Ryujinx.Common.Configuration; +using Ryujinx.Common.Utilities; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -189,7 +190,7 @@ namespace Ryujinx.Ava.Ui.ViewModels { amiiboJsonString = File.ReadAllText(_amiiboJsonPath); - if (await NeedsUpdate(JsonSerializer.Deserialize<Amiibo.AmiiboJson>(amiiboJsonString).LastUpdated)) + if (await NeedsUpdate(JsonHelper.Deserialize<Amiibo.AmiiboJson>(amiiboJsonString).LastUpdated)) { amiiboJsonString = await DownloadAmiiboJson(); } @@ -206,7 +207,7 @@ namespace Ryujinx.Ava.Ui.ViewModels } } - _amiiboList = JsonSerializer.Deserialize<Amiibo.AmiiboJson>(amiiboJsonString).Amiibo; + _amiiboList = JsonHelper.Deserialize<Amiibo.AmiiboJson>(amiiboJsonString).Amiibo; _amiiboList = _amiiboList.OrderBy(amiibo => amiibo.AmiiboSeries).ToList(); ParseAmiiboData(); |