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.19.0" />
+    <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>
+    <packageSources>
-    <clear />
+        <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
+        <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

@@ -9,7 +9,7 @@ namespace Ryujinx.HLE.FileSystem
     public class EncryptedFileSystemCreator : IEncryptedFileSystemCreator
     {
         public Result Create(ref SharedRef<IFileSystem> outEncryptedFileSystem,
-            ref SharedRef<IFileSystem> baseFileSystem, IEncryptedFileSystemCreator.KeyId idIndex,
+            ref readonly SharedRef<IFileSystem> baseFileSystem, IEncryptedFileSystemCreator.KeyId idIndex,
             in EncryptionSeed encryptionSeed)
         {
             if (idIndex < IEncryptedFileSystemCreator.KeyId.Save || idIndex > IEncryptedFileSystemCreator.KeyId.CustomStorage)
@@ -18,7 +18,7 @@ namespace Ryujinx.HLE.FileSystem
             }
 
             // TODO: Reenable when AesXtsFileSystem is fixed.
-            outEncryptedFileSystem = SharedRef<IFileSystem>.CreateMove(ref baseFileSystem);
+            outEncryptedFileSystem = SharedRef<IFileSystem>.CreateMove(ref baseFileSystem.Ref);
 
             return Result.Success;
         }

src/Ryujinx.HLE/HOS/ModLoader.cs

@@ -791,7 +791,7 @@ namespace Ryujinx.HLE.HOS
             {
                 string buildId = p switch
                 {
-                    NsoExecutable nso => Convert.ToHexString(nso.BuildId.ItemsRo.ToArray()).TrimEnd('0'),
+                    NsoExecutable nso => Convert.ToHexString(nso.BuildId).TrimEnd('0'),
                     NroExecutable nro => Convert.ToHexString(nro.Header.BuildId).TrimEnd('0'),
                     _ => string.Empty,
                 };

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

@@ -753,17 +753,9 @@ namespace Ryujinx.HLE.HOS.Services.Fs
         public ResultCode OpenCloudBackupWorkStorageFileSystem(ServiceCtx context)
         {
             CloudBackupWorkStorageId storageId = (CloudBackupWorkStorageId)context.RequestData.ReadInt32();
-            using SharedRef<IFileSystem> fileSystem = new();
             
-            Result result = _baseFileSystemProxy.Get.OpenCloudBackupWorkStorageFileSystem(ref fileSystem.Ref, storageId);
+            Logger.Stub?.PrintStub(LogClass.ServiceFs, new { storageId });
-            if (result.IsFailure())
+            throw new NotImplementedException(); // reimplementing behavior from LibHac 0.19.0
-            {
-                return (ResultCode)result.Value;
-            }
-
-            MakeObject(context, new FileSystemProxy.IFileSystem(ref fileSystem.Ref));
-
-            return ResultCode.Success;
         }
 
         [CommandCmif(130)]
@@ -1028,7 +1020,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs
         {
             ref readonly FspPath path = ref FileSystemProxyHelper.GetFspPath(context);
 
-            Result result = _baseFileSystemProxy.Get.GetRightsIdByPath(out RightsId rightsId, in path);
+            Result result = _baseFileSystemProxy.Get.GetRightsIdAndKeyGenerationByPath(out RightsId rightsId, out _, in path, ContentAttributes.None);
             if (result.IsFailure())
             {
                 return (ResultCode)result.Value;
@@ -1044,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);
+            Result result = _baseFileSystemProxy.Get.GetRightsIdAndKeyGenerationByPath(out RightsId rightsId, out byte keyGeneration, in path, ContentAttributes.None);
             if (result.IsFailure())
             {
                 return (ResultCode)result.Value;
@@ -1241,7 +1233,9 @@ namespace Ryujinx.HLE.HOS.Services.Fs
             BisPartitionId partitionId = (BisPartitionId)context.RequestData.ReadInt32();
             ref readonly FspPath path = ref FileSystemProxyHelper.GetFspPath(context);
             
-            return (ResultCode)_baseFileSystemProxy.Get.SetBisRootForHost(partitionId, in path).Value;
+            Logger.Stub?.PrintStub(LogClass.ServiceFs, new { partitionId, path });
+            
+            throw new NotImplementedException(); // reimplementing behavior from LibHac 0.19.0
         }
 
         [CommandCmif(1001)]

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/INetworkClient.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         NetworkError ConnectPrivate(ConnectPrivateRequest request);
         ResultCode Reject(DisconnectReason disconnectReason, uint nodeId);
         NetworkInfo[] Scan(ushort channel, ScanFilter scanFilter);
-        void SetGameVersion(byte[] versionString);
+        void SetGameVersion(ReadOnlySpan<byte> versionString);
         void SetStationAcceptPolicy(AcceptPolicy acceptPolicy);
         void SetAdvertiseData(byte[] data);
         bool CreateNetwork(CreateAccessPointRequest request, byte[] advertiseData);

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs

@@ -62,7 +62,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             // TODO: Call nn::arp::GetApplicationControlProperty here when implemented.
             ApplicationControlProperty controlProperty = context.Device.Processes.ActiveApplication.ApplicationControlProperties;
 
-            foreach (ulong localCommunicationId in controlProperty.LocalCommunicationId.ItemsRo)
+            foreach (ulong localCommunicationId in controlProperty.LocalCommunicationId)
             {
                 if (localCommunicationId == localCommunicationIdChecked)
                 {
@@ -1114,7 +1114,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                         }
 
                         // TODO: Call nn::arp::GetApplicationLaunchProperty here when implemented.
-                        NetworkClient.SetGameVersion(context.Device.Processes.ActiveApplication.ApplicationControlProperties.DisplayVersion.Items.ToArray());
+                        NetworkClient.SetGameVersion(context.Device.Processes.ActiveApplication.ApplicationControlProperties.DisplayVersion);
 
                         resultCode = ResultCode.Success;
 

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnDisabledClient.cs

@@ -61,7 +61,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
         public void SetAdvertiseData(byte[] data) { }
 
-        public void SetGameVersion(byte[] versionString) { }
+        public void SetGameVersion(ReadOnlySpan<byte> versionString) { }
 
         public void SetStationAcceptPolicy(AcceptPolicy acceptPolicy) { }
 

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnMitm/LdnMitmClient.cs

@@ -85,7 +85,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnMitm
             _lanDiscovery.SetAdvertiseData(data);
         }
 
-        public void SetGameVersion(byte[] versionString)
+        public void SetGameVersion(ReadOnlySpan<byte> versionString)
         {
             // NOTE: This method is not implemented in ldn_mitm
             Logger.Stub?.PrintMsg(LogClass.ServiceLdn, "LdnMitmClient SetGameVersion");

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/LdnMasterProxyClient.cs

@@ -346,9 +346,9 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
             }
         }
 
-        public void SetGameVersion(byte[] versionString)
+        public void SetGameVersion(ReadOnlySpan<byte> versionString)
         {
-            _gameVersion = versionString;
+            _gameVersion = versionString.ToArray();
 
             if (_gameVersion.Length < 0x10)
             {

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

@@ -55,7 +55,13 @@ 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 = Array.ConvertAll(context.Device.Processes.ActiveApplication.ApplicationControlProperties.RatingAge.ItemsRo.ToArray(), Convert.ToInt32);
+                        _ratingAge = new int[context.Device.Processes.ActiveApplication.ApplicationControlProperties.RatingAge.Length];
+
+                        for (int i = 0; i < _ratingAge.Length; i++)
+                        {
+                            _ratingAge[i] = Convert.ToInt32(context.Device.Processes.ActiveApplication.ApplicationControlProperties.RatingAge[i]);
+                        }
+                        
                         _parentalControlFlag = context.Device.Processes.ActiveApplication.ApplicationControlProperties.ParentalControlFlag;
                     }
                 }

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

@@ -45,7 +45,7 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pdm.QueryService
                 // Check if input title ids are in the whitelist.
                 foreach (ulong titleId in titleIds)
                 {
-                    if (!context.Device.Processes.ActiveApplication.ApplicationControlProperties.PlayLogQueryableApplicationId.ItemsRo.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,7 +91,13 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
 
                 if (string.IsNullOrWhiteSpace(programName))
                 {
-                    programName = Array.Find(nacpData.Value.Title.ItemsRo.ToArray(), x => x.Name[0] != 0).NameString.ToString();
+                    foreach (ApplicationControlProperty.ApplicationTitle appTitle in nacpData.Value.Title)
+                    {
+                        if (appTitle.Name[0] != 0)
+                            continue;
+
+                        programName = appTitle.NameString.ToString();
+                    }
                 }
             }
 

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

@@ -202,7 +202,13 @@ namespace Ryujinx.HLE.Loaders.Processes
 
                     if (string.IsNullOrWhiteSpace(programName))
                     {
-                        programName = Array.Find(nacpData.Value.Title.ItemsRo.ToArray(), x => x.Name[0] != 0).NameString.ToString();
+                        foreach (ApplicationControlProperty.ApplicationTitle nacpTitles in nacpData.Value.Title)
+                        {
+                            if (nacpTitles.Name[0] != 0)
+                                continue;
+
+                            programName = nacpTitles.NameString.ToString();
+                        }
                     }
 
                     if (nacpData.Value.PresenceGroupId != 0)

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

@@ -258,7 +258,7 @@ namespace Ryujinx.HLE.Loaders.Processes
             {
                 buildIds[i] = (executables[i] switch
                 {
-                    NsoExecutable nso => Convert.ToHexString(nso.BuildId.ItemsRo.ToArray()),
+                    NsoExecutable nso => Convert.ToHexString(nso.BuildId),
                     NroExecutable nro => Convert.ToHexString(nro.Header.BuildId),
                     _ => string.Empty
                 }).ToUpper();

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

@@ -59,7 +59,13 @@ namespace Ryujinx.HLE.Loaders.Processes
 
                 if (string.IsNullOrWhiteSpace(Name))
                 {
-                    Name = Array.Find(ApplicationControlProperties.Title.ItemsRo.ToArray(), x => x.Name[0] != 0).NameString.ToString();
+                    foreach (ApplicationControlProperty.ApplicationTitle appTitle in ApplicationControlProperties.Title)
+                    {
+                        if (appTitle.Name[0] != 0)
+                            continue;
+
+                        Name = appTitle.NameString.ToString();
+                    }
                 }
 
                 DisplayVersion = ApplicationControlProperties.DisplayVersionString.ToString();

src/Ryujinx/Systems/AppLibrary/ApplicationData.cs

@@ -221,7 +221,7 @@ namespace Ryujinx.Ava.Systems.AppLibrary
             NsoReader reader = new();
             reader.Initialize(nsoFile.Release().AsStorage().AsFile(OpenMode.Read)).ThrowIfFailure();
 
-            return Convert.ToHexString(reader.Header.ModuleId.ItemsRo.ToArray()).Replace("-", string.Empty).ToUpper()[..16];
+            return Convert.ToHexString(reader.Header.ModuleId).Replace("-", string.Empty).ToUpper()[..16];
         }
     }
 }

src/Ryujinx/Systems/AppLibrary/ApplicationLibrary.cs

@@ -1367,7 +1367,7 @@ namespace Ryujinx.Ava.Systems.AppLibrary
         {
             _ = Enum.TryParse(DesiredLanguage.ToString(), out TitleLanguage desiredTitleLanguage);
 
-            if (controlData.Title.ItemsRo.Length > (int)desiredTitleLanguage)
+            if (controlData.Title.Length > (int)desiredTitleLanguage)
             {
                 data.Name = controlData.Title[(int)desiredTitleLanguage].NameString.ToString();
                 data.Developer = controlData.Title[(int)desiredTitleLanguage].PublisherString.ToString();
@@ -1380,7 +1380,7 @@ namespace Ryujinx.Ava.Systems.AppLibrary
 
             if (string.IsNullOrWhiteSpace(data.Name))
             {
-                foreach (ref readonly ApplicationControlProperty.ApplicationTitle controlTitle in controlData.Title.ItemsRo)
+                foreach (ref readonly ApplicationControlProperty.ApplicationTitle controlTitle in controlData.Title)
                 {
                     if (!controlTitle.NameString.IsEmpty())
                     {
@@ -1393,7 +1393,7 @@ namespace Ryujinx.Ava.Systems.AppLibrary
 
             if (string.IsNullOrWhiteSpace(data.Developer))
             {
-                foreach (ref readonly ApplicationControlProperty.ApplicationTitle controlTitle in controlData.Title.ItemsRo)
+                foreach (ref readonly ApplicationControlProperty.ApplicationTitle controlTitle in controlData.Title)
                 {
                     if (!controlTitle.PublisherString.IsEmpty())
                     {

src/Ryujinx/Systems/AppLibrary/LdnGameData.cs

@@ -23,7 +23,7 @@ namespace Ryujinx.Ava.Systems.AppLibrary
             LibHac.Common.FixedArrays.Array8<ulong> communicationId = acp.LocalCommunicationId;
 
             return new Array(receivedData.Where(game =>
-                communicationId.Items.Contains(game.TitleId.ToULong())
+                communicationId.AsReadOnlySpan().Contains(game.TitleId.ToULong())
             ));
         }