From 4c2eca29cc42d8e180982df067c67f672f874749 Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Fri, 15 Mar 2024 23:41:00 +0100
Subject: [PATCH 1/2] Storage - Fix profile order not loading/saving

---
 src/Artemis.Core/Models/Profile/ProfileCategory.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Artemis.Core/Models/Profile/ProfileCategory.cs b/src/Artemis.Core/Models/Profile/ProfileCategory.cs
index 1a5c6f269..19f0398a2 100644
--- a/src/Artemis.Core/Models/Profile/ProfileCategory.cs
+++ b/src/Artemis.Core/Models/Profile/ProfileCategory.cs
@@ -167,7 +167,7 @@ public class ProfileCategory : CorePropertyChanged, IStorageModel
         IsSuspended = Entity.IsSuspended;
         Order = Entity.Order;
 
-        ProfileConfigurations = new ReadOnlyCollection<ProfileConfiguration>(Entity.ProfileConfigurations.Select(pc => new ProfileConfiguration(this, pc)).ToList());
+        ProfileConfigurations = new ReadOnlyCollection<ProfileConfiguration>(Entity.ProfileConfigurations.Select(pc => new ProfileConfiguration(this, pc)).OrderBy(pc => pc.Order).ToList());
     }
 
     /// <inheritdoc />
@@ -180,7 +180,10 @@ public class ProfileCategory : CorePropertyChanged, IStorageModel
         
         Entity.ProfileConfigurations.Clear();
         foreach (ProfileConfiguration profileConfiguration in ProfileConfigurations)
+        {
+            profileConfiguration.Save();
             Entity.ProfileConfigurations.Add(profileConfiguration.Entity);
+        }
     }
 
     #endregion

From bedf1f5f3857357bacad97a81dc5868a86350d9d Mon Sep 17 00:00:00 2001
From: Darth Affe <darthaffe@wyrez.org>
Date: Sat, 10 Aug 2024 22:49:45 +0200
Subject: [PATCH 2/2] Bumped System-Text.Json to 8.0.4

---
 src/Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 9c07752b6..e56abfa8e 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -59,7 +59,7 @@
     <PackageVersion Include="Splat.DryIoc" Version="15.1.1" />
     <PackageVersion Include="StrawberryShake.Server" Version="13.9.6" />
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.6.2" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.3" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.4" />
     <PackageVersion Include="TextMateSharp.Grammars" Version="1.0.57" />
   </ItemGroup>
 </Project>
\ No newline at end of file