Merge pull request #2752 from marticliment/trim-support-and-aot

Add Trim support

.gitignore

@@ -76,3 +76,4 @@ src/UniGetUI/choco-cli/extensions/chocolatey-visualstudio/
 src/UniGetUI/choco-cli/extensions/chocolatey-dotnetfx/
 
 *.user
+/src/UniGetUI/Generated Files

src/UniGetUI.Core.Data/CoreData.cs

@@ -1,6 +1,8 @@
 using System.Diagnostics;
 using System.Net;
 using System.Runtime.InteropServices.JavaScript;
+using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
 using UniGetUI.Core.Logging;
 
 namespace UniGetUI.Core.Data
@@ -312,5 +314,11 @@ private static string GetNewDataDirectoryOrMoveOld(string old_path, string new_p
                 return new_path;
             }
         }
+
+        public static JsonSerializerOptions SerializingOptions = new()
+        {
+            TypeInfoResolverChain = { new DefaultJsonTypeInfoResolver() },
+            WriteIndented = true,
+        };
     }
 }

src/UniGetUI.Core.IconStore/IconDatabase.cs

@@ -88,7 +88,10 @@ public async Task LoadIconAndScreenshotsDatabaseAsync()
 
             try
             {
-                IconScreenshotDatabase_v2 JsonData = JsonSerializer.Deserialize<IconScreenshotDatabase_v2>(await File.ReadAllTextAsync(IconsAndScreenshotsFile));
+                IconScreenshotDatabase_v2 JsonData = JsonSerializer.Deserialize<IconScreenshotDatabase_v2>(
+                    await File.ReadAllTextAsync(IconsAndScreenshotsFile),
+                    CoreData.SerializingOptions
+                    );
                 if (JsonData.icons_and_screenshots != null)
                 {
                     IconDatabaseData = JsonData.icons_and_screenshots;

src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/IgnoredUpdatesDatabase.cs

@@ -40,7 +40,7 @@ public static Dictionary<string, string> GetDatabase()
     private static void SaveDatabase()
     {
         // Serialize and save to disk
-        string rawContents = JsonSerializer.Serialize(IgnoredPackages, options: new(){ WriteIndented = true });
+        string rawContents = JsonSerializer.Serialize(IgnoredPackages, options: CoreData.SerializingOptions);
         File.WriteAllText(CoreData.IgnoredUpdatesDatabaseFile, rawContents);
     }
 

src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/InstallationOptions.cs

@@ -194,7 +194,7 @@ public void SaveToDisk()
 
                 string fileContents = JsonSerializer.Serialize(
                     AsSerializable(),
-                    new JsonSerializerOptions(){ WriteIndented = true }
+                    CoreData.SerializingOptions
                 );
                 File.WriteAllText(optionsFile.FullName, fileContents);
             }
@@ -219,7 +219,8 @@ public void LoadFromDisk()
                 }
 
                 using FileStream inputStream = optionsFile.OpenRead();
-                SerializableInstallationOptions_v1? options = JsonSerializer.Deserialize<SerializableInstallationOptions_v1>(inputStream);
+                SerializableInstallationOptions_v1? options = JsonSerializer.Deserialize<SerializableInstallationOptions_v1>(
+                    inputStream, CoreData.SerializingOptions);
 
                 if (options == null)
                 {

src/UniGetUI/SoftwarePages/PackageBundlesPage.cs

@@ -8,6 +8,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Documents;
+using UniGetUI.Core.Data;
 using UniGetUI.Core.Logging;
 using UniGetUI.Core.Tools;
 using UniGetUI.Interface.Enums;
@@ -565,7 +566,10 @@ public static async Task<string> CreateBundle(IEnumerable<IPackage> packages, Bu
             string ExportableData;
 
             if (formatType == BundleFormatType.JSON)
-                ExportableData = JsonSerializer.Serialize(exportable, new JsonSerializerOptions { WriteIndented = true });
+                ExportableData = JsonSerializer.Serialize(
+                    exportable,
+                    CoreData.SerializingOptions);
+
             else if (formatType == BundleFormatType.YAML)
             {
                 YamlDotNet.Serialization.ISerializer serializer = new YamlDotNet.Serialization.SerializerBuilder()
@@ -595,7 +599,7 @@ public async Task AddFromBundle(string content, BundleFormatType format)
             SerializableBundle_v1? DeserializedData;
             if (format is BundleFormatType.JSON)
             {
-                DeserializedData = await Task.Run(() => JsonSerializer.Deserialize<SerializableBundle_v1>(content));
+                DeserializedData = await Task.Run(() => JsonSerializer.Deserialize<SerializableBundle_v1>(content, CoreData.SerializingOptions));
             }
             else if (format is BundleFormatType.YAML)
             {

src/UniGetUI/UniGetUI.csproj

@@ -30,6 +30,10 @@
       <WindowsAppSDKWinUI>true</WindowsAppSDKWinUI>
       <WindowsPackageType>None</WindowsPackageType>
       <WindowsSdkPackageVersion>10.0.22621.41</WindowsSdkPackageVersion>
+
+      <PublishTrimmed>true</PublishTrimmed>
+      <TrimMode>full</TrimMode>
+      <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
   </PropertyGroup>
 
   <ItemGroup>