diff options
| author | Mary <me@thog.eu> | 2021-11-28 21:24:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-28 21:24:17 +0100 |
| commit | 57d3296ba4e5c1fc7ca30376c7ca8eb3041ae2f6 (patch) | |
| tree | 02e17606a847ff11f68bc7bf123e882f87055b52 /Ryujinx.HLE/HOS/Services | |
| parent | 7b040e51b078a16e979ad962ba1265f3be4bcb1d (diff) | |
infra: Migrate to .NET 6 (#2829)
* infra: Migrate to .NET 6
* Rollback version naming change
* Workaround .NET 6 ZipArchive API issues
* ci: Switch to VS 2022 for AppVeyor
CI is now ready for .NET 6
* Suppress WebClient warning in DoUpdateWithMultipleThreads
* Attempt to workaround System.Drawing.Common changes on 6.0.0
* Change keyboard rendering from System.Drawing to ImageSharp
* Make the software keyboard renderer multithreaded
* Bump ImageSharp version to 1.0.4 to fix a bug in Image.Load
* Add fallback fonts to the keyboard renderer
* Fix warnings
* Address caian's comment
* Clean up linux workaround as it's uneeded now
* Update readme
Co-authored-by: Caian Benedicto <caianbene@gmail.com>
Diffstat (limited to 'Ryujinx.HLE/HOS/Services')
3 files changed, 6 insertions, 6 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs b/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs index 9510ef4c..3eb88950 100644 --- a/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs +++ b/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs @@ -1,5 +1,6 @@ using Ryujinx.Common.Configuration; using Ryujinx.Common.Memory; +using Ryujinx.Common.Utilities; using Ryujinx.HLE.HOS.Services.Mii; using Ryujinx.HLE.HOS.Services.Mii.Types; using Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager; @@ -172,7 +173,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp if (File.Exists(filePath)) { - virtualAmiiboFile = JsonSerializer.Deserialize<VirtualAmiiboFile>(File.ReadAllText(filePath)); + virtualAmiiboFile = JsonHelper.DeserializeFromFile<VirtualAmiiboFile>(filePath); } else { diff --git a/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs b/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs index 0f38e685..3de746ac 100644 --- a/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs @@ -1,18 +1,17 @@ -using System; -using System.Security.Cryptography; +using System.Security.Cryptography; namespace Ryujinx.HLE.HOS.Services.Spl { [Service("csrng")] class IRandomInterface : DisposableIpcService { - private RNGCryptoServiceProvider _rng; + private RandomNumberGenerator _rng; private object _lock = new object(); public IRandomInterface(ServiceCtx context) { - _rng = new RNGCryptoServiceProvider(); + _rng = RandomNumberGenerator.Create(); } [CommandHipc(0)] diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs index 267548dd..49e6614b 100644 --- a/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs +++ b/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs @@ -396,7 +396,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService if (!applet.DrawTo(surfaceInfo, context.Memory, layerBuffPosition)) { - Logger.Error?.Print(LogClass.ServiceVi, $"Applet did not draw on indirect layer handle {layerHandle}"); + Logger.Warning?.Print(LogClass.ServiceVi, $"Applet did not draw on indirect layer handle {layerHandle}"); return ResultCode.Success; } |