Readd discord-rpc-csharp

We need to use our version which uses System.Text.Json, allowing more of the application to be trimmed (and at some point, be built for AOT). Also fixed Setting page not loading correctly

Author: Azyyyyyy

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "ext/avalonia.gif"]
 	path = ext/avalonia.gif
-	url = https://github.com/Azyyyyyy/Avalonia.GIF
+	url = https://github.com/Azyyyyyy/Avalonia.GIF
+[submodule "ext/discord-rpc-csharp"]
+	path = ext/discord-rpc-csharp
+	url = https://github.com/Azyyyyyy/discord-rpc-csharp

MultiRPC.sln

@@ -11,6 +11,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ext", "ext", "{B7AAF9E7-1C1
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiRPC.SourceGen", "src\MultiRPC.SourceGen\MultiRPC.SourceGen.csproj", "{3369169D-31C0-4A74-A5A9-F2BB1EA80705}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordRPC", "ext\discord-rpc-csharp\DiscordRPC\DiscordRPC.csproj", "{46073C54-E149-457D-9E6B-993A780E6AE8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -29,6 +31,10 @@ Global
 		{3369169D-31C0-4A74-A5A9-F2BB1EA80705}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3369169D-31C0-4A74-A5A9-F2BB1EA80705}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3369169D-31C0-4A74-A5A9-F2BB1EA80705}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46073C54-E149-457D-9E6B-993A780E6AE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46073C54-E149-457D-9E6B-993A780E6AE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46073C54-E149-457D-9E6B-993A780E6AE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46073C54-E149-457D-9E6B-993A780E6AE8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -38,5 +44,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{D4EBB986-EDAC-4C0B-AB58-70E4A5C7D2A4} = {B7AAF9E7-1C1E-4376-BAF6-D2FCA8B39CDF}
+		{46073C54-E149-457D-9E6B-993A780E6AE8} = {B7AAF9E7-1C1E-4376-BAF6-D2FCA8B39CDF}
 	EndGlobalSection
 EndGlobal

ext/discord-rpc-csharp

@@ -10,13 +10,13 @@ namespace MultiRPC;
 #pragma warning disable SYSLIB0020
 
 //TODO: Find a way which will let us be able to use Metadata as well on these which have Serialization (Trying to access state and details)
-[JsonSerializable(typeof(Presence), GenerationMode = JsonSourceGenerationMode.Serialization)]
+[JsonSerializable(typeof(Presence))]
 public partial class RichPresenceContext : JsonSerializerContext { }
 
-[JsonSerializable(typeof(ProfilesSettings), GenerationMode = JsonSourceGenerationMode.Serialization)]
+[JsonSerializable(typeof(ProfilesSettings))]
 public partial class ProfilesSettingsContext : JsonSerializerContext { }
 
-[JsonSerializable(typeof(MultiRPCSettings), GenerationMode = JsonSourceGenerationMode.Serialization)]
+[JsonSerializable(typeof(MultiRPCSettings))]
 public partial class MultiRPCSettingsContext : JsonSerializerContext { }
 
 [JsonSerializable(typeof(DisableSettings))]

src/MultiRPC/JsonSerializerContexts.cs

@@ -6,4 +6,10 @@
 	<PublishAot>true</PublishAot>
     <WarningsAsErrors>$(TreatWarningsAsErrors);IL3050;IL2026;IL3000</WarningsAsErrors>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Remove="DiscordRichPresence" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ext\discord-rpc-csharp\DiscordRPC\DiscordRPC.csproj" />
+  </ItemGroup>
 </Project>

src/MultiRPC/MultiRPC.csproj

@@ -71,9 +71,10 @@ public override void Initialize(bool loadXaml)
                     continue;
                 }
 
+                var tabName = setting.GetType().GetProperty("Name", BindingFlags.Static | BindingFlags.Public)?.GetValue(null);
                 settingPage ??= new SettingsTab
                 {
-                    TabName = setting.GetType().GetProperty("Name", BindingFlags.Static)?.Name!,
+                    TabName = tabName?.ToString(),
                     Margin = new Thickness(10)
                 };
 
@@ -99,8 +100,9 @@ public override void Initialize(bool loadXaml)
                 }
                 else
                 {
-                    //TODO: Readd
-                    /*var settingDropdownType = typeof(SettingDropdown<>).MakeGenericType(settingProperty.PropertyType);
+#pragma warning disable IL3050
+                    var settingDropdownType = typeof(SettingDropdown<>).MakeGenericType(settingProperty.PropertyType);
+#pragma warning restore IL3050
                     var settingDropdown = (SettingItem?)Activator.CreateInstance(settingDropdownType, name, setting, getMethod, 
                         setMethod, sourceAttribute, languageSourceAttribute, settingProperty.GetCustomAttribute<NoneLocalizableAttribute>() == null);
 
@@ -109,7 +111,7 @@ public override void Initialize(bool loadXaml)
                         settingDropdown.IsEnabled = isEditable;
                         settingPage.Add(settingDropdown);
                         continue;
-                    }*/
+                    }
                     //TODO: Log
                 }
             }