infra: Update to Ryujinx.LibHac 0.20.0.

This time it's pulled in via GitLab package registry.

Directory.Packages.props

@@ -40,7 +40,7 @@
     <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.2-build3" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
-    <PackageVersion Include="Ryujinx.LibHac" Version="0.20.0-alpha.90" />
+    <PackageVersion Include="Ryujinx.LibHac" Version="0.20.0-alpha.103" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
     <PackageVersion Include="Gommon" Version="2.7.1.1" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />

nuget.config

@@ -1,7 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <configuration>
-  <packageSources>
-    <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
+    <packageSources>
+        <clear />
+        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+        <add key="LibHacAlpha" value="https://git.ryujinx.app/api/v4/projects/17/packages/nuget/index.json" />
+    </packageSources>
+
+    <!-- Define mappings by adding package patterns beneath the target source. -->
+    <!-- Ryujinx.LibHac packages will be restored from LibHacAlpha,
+       everything else from nuget.org. -->
+    <packageSourceMapping>
+        <!-- key value for <packageSource> should match key values from <packageSources> element -->
+        <packageSource key="nuget.org">
+            <package pattern="*" />
+        </packageSource>
+        <packageSource key="LibHacAlpha">
+            <package pattern="Ryujinx.LibHac" />
+        </packageSource>
+    </packageSourceMapping>
 </configuration>

src/Ryujinx.HLE/FileSystem/EncryptedFileSystemCreator.cs

@@ -3,7 +3,6 @@ using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSrv.FsCreator;
-using System.Runtime.CompilerServices;
 
 namespace Ryujinx.HLE.FileSystem
 {

src/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs

@@ -16,7 +16,6 @@ using Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy;
 using Ryujinx.Memory;
 using System;
 using System.IO;
-using System.Text;
 using static Ryujinx.HLE.Utilities.StringUtils;
 using GameCardHandle = System.UInt32;
 using IFile = Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy.IFile;
@@ -1021,7 +1020,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs
         {
             ref readonly FspPath path = ref FileSystemProxyHelper.GetFspPath(context);
 
-            Result result = _baseFileSystemProxy.Get.GetRightsIdAndKeyGenerationByPath(out RightsId rightsId, out byte _, in path, ContentAttributes.All);
+            Result result = _baseFileSystemProxy.Get.GetRightsIdAndKeyGenerationByPath(out RightsId rightsId, out _, in path, ContentAttributes.None);
             if (result.IsFailure())
             {
                 return (ResultCode)result.Value;
@@ -1037,7 +1036,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs
         {
             ref readonly FspPath path = ref FileSystemProxyHelper.GetFspPath(context);
 
-            Result result = _baseFileSystemProxy.Get.GetRightsIdAndKeyGenerationByPath(out RightsId rightsId, out byte keyGeneration, in path, ContentAttributes.All);
+            Result result = _baseFileSystemProxy.Get.GetRightsIdAndKeyGenerationByPath(out RightsId rightsId, out byte keyGeneration, in path, ContentAttributes.None);
             if (result.IsFailure())
             {
                 return (ResultCode)result.Value;

src/Ryujinx.HLE/HOS/Services/Pctl/ParentalControlServiceFactory/IParentalControlService.cs

@@ -55,7 +55,6 @@ namespace Ryujinx.HLE.HOS.Services.Pctl.ParentalControlServiceFactory
                         _titleId = titleId;
 
                         // TODO: Call nn::arp::GetApplicationControlProperty here when implemented, if it return ResultCode.Success we assign fields.
-
                         _ratingAge = new int[context.Device.Processes.ActiveApplication.ApplicationControlProperties.RatingAge.Length];
 
                         for (int i = 0; i < _ratingAge.Length; i++)

src/Ryujinx.HLE/HOS/Services/Sdb/Pdm/QueryService/QueryPlayStatisticsManager.cs

@@ -45,10 +45,7 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pdm.QueryService
                 // Check if input title ids are in the whitelist.
                 foreach (ulong titleId in titleIds)
                 {
-                    ReadOnlySpan<ulong> temp = context.Device.Processes.ActiveApplication
-                        .ApplicationControlProperties.PlayLogQueryableApplicationId;
-                    
-                    if (!temp.Contains(titleId))
+                    if (!context.Device.Processes.ActiveApplication.ApplicationControlProperties.PlayLogQueryableApplicationId.AsReadOnlySpan().Contains(titleId))
                     {
                         return (ResultCode)Am.ResultCode.ObjectInvalid;
                     }

src/Ryujinx.HLE/Loaders/Processes/Extensions/FileSystemExtensions.cs

@@ -91,12 +91,12 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
 
                 if (string.IsNullOrWhiteSpace(programName))
                 {
-                    foreach (ApplicationControlProperty.ApplicationTitle nacpTitles in nacpData.Value.Title)
+                    foreach (ApplicationControlProperty.ApplicationTitle appTitle in nacpData.Value.Title)
                     {
-                        if (nacpTitles.Name[0] != 0)
+                        if (appTitle.Name[0] != 0)
                             continue;
 
-                        programName = nacpTitles.NameString.ToString();
+                        programName = appTitle.NameString.ToString();
                     }
                 }
             }

src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs

@@ -195,7 +195,11 @@ namespace Ryujinx.HLE.Loaders.Processes
                     nacpStorage.Read(0, nacpData.ByteSpan);
 
                     programName = nacpData.Value.Title[(int)_device.System.State.DesiredTitleLanguage].NameString.ToString();
-                    
+
+                    if ("Switch Verification" ==
+                        nacpData.Value.Title[(int)TitleLanguage.AmericanEnglish].NameString.ToString())
+                        throw new InvalidOperationException();
+
                     if (string.IsNullOrWhiteSpace(programName))
                     {
                         foreach (ApplicationControlProperty.ApplicationTitle nacpTitles in nacpData.Value.Title)
@@ -207,10 +211,6 @@ namespace Ryujinx.HLE.Loaders.Processes
                         }
                     }
 
-                    if ("Switch Verification" ==
-                        nacpData.Value.Title[(int)TitleLanguage.AmericanEnglish].NameString.ToString())
-                        throw new InvalidOperationException();
-                    
                     if (nacpData.Value.PresenceGroupId != 0)
                     {
                         programId = nacpData.Value.PresenceGroupId;

src/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs

@@ -59,12 +59,12 @@ namespace Ryujinx.HLE.Loaders.Processes
 
                 if (string.IsNullOrWhiteSpace(Name))
                 {
-                    foreach (ApplicationControlProperty.ApplicationTitle nacpTitles in ApplicationControlProperties.Title)
+                    foreach (ApplicationControlProperty.ApplicationTitle appTitle in ApplicationControlProperties.Title)
                     {
-                        if (nacpTitles.Name[0] != 0)
+                        if (appTitle.Name[0] != 0)
                             continue;
 
-                        Name = nacpTitles.NameString.ToString();
+                        Name = appTitle.NameString.ToString();
                     }
                 }
 

src/Ryujinx/Systems/AppLibrary/LdnGameData.cs

@@ -20,11 +20,10 @@ namespace Ryujinx.Ava.Systems.AppLibrary
         public static Array GetArrayForApp(
             LdnGameData[] receivedData, ref ApplicationControlProperty acp)
         {
-            ReadOnlySpan<ulong> communicationId = acp.LocalCommunicationId;
-            ulong[] allowedTitleIds = communicationId.ToArray();
-            
+            LibHac.Common.FixedArrays.Array8<ulong> communicationId = acp.LocalCommunicationId;
+
             return new Array(receivedData.Where(game =>
-                allowedTitleIds.Contains(game.TitleId.ToULong())
+                communicationId.AsReadOnlySpan().Contains(game.TitleId.ToULong())
             ));
         }