Only use special data converters when handling bundles. Otherwhise use default serializer options (adjusted for trim support)

marticliment · marticliment · commit 953ad480ec5d · 2025-05-18T17:11:39.000+02:00
diff --git a/src/UniGetUI.Core.IconStore/IconDatabase.cs b/src/UniGetUI.Core.IconStore/IconDatabase.cs
@@ -91,7 +91,7 @@ public async Task LoadIconAndScreenshotsDatabaseAsync()
             {
                 IconScreenshotDatabase_v2 JsonData = JsonSerializer.Deserialize<IconScreenshotDatabase_v2>(
                     await File.ReadAllTextAsync(IconsAndScreenshotsFile),
-                    SerializationHelpers.SerializingOptions
+                    SerializationHelpers.DefaultOptions
                     );
                 if (JsonData.icons_and_screenshots is not null)
                 {
diff --git a/src/UniGetUI.Core.Settings/SettingsEngine_Dictionaries.cs b/src/UniGetUI.Core.Settings/SettingsEngine_Dictionaries.cs
@@ -43,7 +43,7 @@ public static partial class Settings
                         if (result != "")
                         {
 
-                            Dictionary<K, V?>? item = JsonSerializer.Deserialize<Dictionary<K, V?>>(result, SerializationHelpers.SerializingOptions);
+                            Dictionary<K, V?>? item = JsonSerializer.Deserialize<Dictionary<K, V?>>(result, SerializationOptions);
                             if (item is not null)
                             {
                                 value = item;
@@ -90,7 +90,7 @@ public static void SetDictionary<K, V>(string setting, Dictionary<K, V> value)
             try
             {
 
-                if (value.Count != 0) File.WriteAllText(file, JsonSerializer.Serialize(value, SerializationHelpers.SerializingOptions));
+                if (value.Count != 0) File.WriteAllText(file, JsonSerializer.Serialize(value, SerializationOptions));
                 else if (File.Exists(file)) File.Delete(file);
             }
             catch (Exception e)
diff --git a/src/UniGetUI.Core.Settings/SettingsEngine_Extras.cs b/src/UniGetUI.Core.Settings/SettingsEngine_Extras.cs
@@ -1,4 +1,6 @@
 using System.Net;
+using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
 using Windows.Security.Credentials;
 using UniGetUI.Core.Logging;
 
@@ -83,4 +85,11 @@ public static void SetProxyCredentials(string username, string password)
             Logger.Error(ex);
         }
     }
+
+    private static JsonSerializerOptions SerializationOptions = new()
+    {
+        TypeInfoResolver = new DefaultJsonTypeInfoResolver(),
+        AllowTrailingCommas = true,
+        WriteIndented = true,
+    };
 }
diff --git a/src/UniGetUI.Core.Settings/SettingsEngine_ImportExport.cs b/src/UniGetUI.Core.Settings/SettingsEngine_ImportExport.cs
@@ -17,7 +17,7 @@ public static void ExportToJSON(string path)
             settings.Add(Path.GetFileName(entry), File.ReadAllText(entry));
         }
 
-        File.WriteAllText(path, JsonSerializer.Serialize(settings, SerializationHelpers.SerializingOptions));
+        File.WriteAllText(path, JsonSerializer.Serialize(settings, SerializationOptions));
     }
 
     public static void ImportFromJSON(string path)
@@ -31,7 +31,7 @@ public static void ImportFromJSON(string path)
         }
 
         ResetSettings();
-        Dictionary<string, string> settings = JsonSerializer.Deserialize<Dictionary<string, string>>(File.ReadAllText(path), SerializationHelpers.SerializingOptions) ?? [];
+        Dictionary<string, string> settings = JsonSerializer.Deserialize<Dictionary<string, string>>(File.ReadAllText(path), SerializationOptions) ?? [];
         foreach (KeyValuePair<string, string> entry in settings)
         {
             if(new[] {"OperationHistory", "WinGetAlreadyUpgradedPackages.json", "TelemetryClientToken", "CurrentSessionToken"}.Contains(entry.Key))
diff --git a/src/UniGetUI.Core.Settings/SettingsEngine_Lists.cs b/src/UniGetUI.Core.Settings/SettingsEngine_Lists.cs
@@ -39,7 +39,7 @@ public static partial class Settings
                     {
                         if (result != "")
                         {
-                            List<T>? item = JsonSerializer.Deserialize<List<T>>(result, SerializationHelpers.SerializingOptions);
+                            List<T>? item = JsonSerializer.Deserialize<List<T>>(result, SerializationOptions);
                             if (item is not null)
                             {
                                 value = item;
@@ -76,7 +76,7 @@ public static void SetList<T>(string setting, List<T> value)
             var file = Path.Join(CoreData.UniGetUIUserConfigurationDirectory, $"{setting}.json");
             try
             {
-                if (value.Count != 0) File.WriteAllText(file, JsonSerializer.Serialize(value, SerializationHelpers.SerializingOptions));
+                if (value.Count != 0) File.WriteAllText(file, JsonSerializer.Serialize(value, SerializationOptions));
                 else if (File.Exists(file)) File.Delete(file);
             }
             catch (Exception e)
diff --git a/src/UniGetUI.Core.Tools.Tests/MetaTests.cs b/src/UniGetUI.Core.Tools.Tests/MetaTests.cs
@@ -17,10 +17,10 @@ public void TestJsonSerializationOptions()
             var lines = File.ReadAllLines(file);
             var jsonSerCount = lines.Count(x => x.Contains("JsonSerializer.Serialize"));
             var jsonDeserCount = lines.Count(x => x.Contains("JsonSerializer.Deserialize"));
-            var serialOptionsCount = lines.Count(x => x.Contains("CoreData.SerializingOptions"));
+            var serialOptionsCount = lines.Count(x => x.Contains("CoreData.DefaultOptions"));
             Assert.True((jsonSerCount + jsonDeserCount) <= serialOptionsCount,
                 $"Failing on {file}. The specified file does not serialize and/or deserialize JSON with" +
-                $" the proper CoreData.SerializingOptions set");
+                $" the proper CoreData.DefaultOptions set");
         }
     }
 
diff --git a/src/UniGetUI.Core.Tools/SerializationHelpers.cs b/src/UniGetUI.Core.Tools/SerializationHelpers.cs
@@ -28,7 +28,7 @@ private static string xml_to_json(string XML)
         var doc = new XmlDocument();
         doc.LoadXml(XML);
         if (doc.DocumentElement is null) return "{'message': 'XmlDocument.DocumentElement was null'}";
-        return JsonSerializer.Serialize(_convertXmlNode(doc.DocumentElement), SerializingOptions);
+        return JsonSerializer.Serialize(_convertXmlNode(doc.DocumentElement), DefaultOptions);
     }
 
     private static object? _convertXmlNode(XmlNode node)
@@ -78,16 +78,32 @@ private static string xml_to_json(string XML)
         return dict;
     }
 
-    public static JsonSerializerOptions SerializingOptions = new()
+    public static JsonSerializerOptions DefaultOptions = new()
     {
         TypeInfoResolver = new DefaultJsonTypeInfoResolver(),
-        NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals | JsonNumberHandling.AllowReadingFromString,
         AllowTrailingCommas = true,
         WriteIndented = true,
-        Converters = { new FlexibleBooleanConverter(), new FlexibleStringConverter(), new FlexibleListStringConverter() }
     };
 
-    private class FlexibleBooleanConverter : JsonConverter<bool>
+    public static JsonSerializerOptions ImportBundleOptions = new()
+    {
+        TypeInfoResolver = new DefaultJsonTypeInfoResolver(),
+        NumberHandling =
+            JsonNumberHandling.AllowNamedFloatingPointLiterals | JsonNumberHandling.AllowReadingFromString,
+        AllowTrailingCommas = true,
+        WriteIndented = true,
+        Converters =
+        {
+            new Converters.FlexibleBooleanConverter(),
+            new Converters.FlexibleStringConverter(),
+            new Converters.FlexibleListStringConverter()
+        }
+    };
+}
+
+internal class Converters
+{
+    public class FlexibleBooleanConverter : JsonConverter<bool>
     {
         public override bool Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
@@ -110,7 +126,7 @@ public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOpti
         }
     }
 
-    private class FlexibleStringConverter : JsonConverter<string>
+    public class FlexibleStringConverter : JsonConverter<string>
     {
         public override string Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
@@ -128,7 +144,7 @@ public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOp
         }
     }
 
-    private class FlexibleListStringConverter : JsonConverter<List<string>>
+    public class FlexibleListStringConverter : JsonConverter<List<string>>
     {
         public override List<string> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/UniGetUI.PackageEngine.Managers.Cargo/CratesIOClient.cs b/src/UniGetUI.PackageEngine.Managers.Cargo/CratesIOClient.cs
@@ -93,7 +93,7 @@ private static T Fetch<T>(Uri url)
 
         var manifestStr = client.GetStringAsync(url).GetAwaiter().GetResult();
 
-        var manifest = JsonSerializer.Deserialize<T>(manifestStr, options: SerializationHelpers.SerializingOptions)
+        var manifest = JsonSerializer.Deserialize<T>(manifestStr, options: SerializationHelpers.DefaultOptions)
                        ?? throw new NullResponseException($"Null response for request to {url}");
         return manifest;
     }
diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/InstallationOptions.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/InstallationOptions.cs
@@ -201,7 +201,7 @@ public void SaveToDisk()
 
                 string fileContents = JsonSerializer.Serialize(
                     AsSerializable(),
-                    SerializationHelpers.SerializingOptions
+                    SerializationHelpers.DefaultOptions
                 );
                 File.WriteAllText(optionsFile.FullName, fileContents);
             }
@@ -227,7 +227,7 @@ public void LoadFromDisk()
 
                 using FileStream inputStream = optionsFile.OpenRead();
                 SerializableInstallationOptions_v1? options = JsonSerializer.Deserialize<SerializableInstallationOptions_v1>(
-                    inputStream, SerializationHelpers.SerializingOptions);
+                    inputStream, SerializationHelpers.DefaultOptions);
 
                 if (options is null)
                 {
diff --git a/src/UniGetUI/Pages/SoftwarePages/PackageBundlesPage.cs b/src/UniGetUI/Pages/SoftwarePages/PackageBundlesPage.cs
@@ -608,7 +608,7 @@ static int Comparison(IPackage x, IPackage y)
             if (formatType is BundleFormatType.JSON or BundleFormatType.UBUNDLE)
                 ExportableData = JsonSerializer.Serialize(
                     exportable,
-                    SerializationHelpers.SerializingOptions);
+                    SerializationHelpers.DefaultOptions);
 
             else if (formatType is BundleFormatType.YAML)
             {
@@ -651,7 +651,7 @@ public async Task<double> AddFromBundle(string content, BundleFormatType format)
                 Logger.ImportantInfo("XML payload was converted to JSON dynamically before deserialization");
             }
 
-            DeserializedData = await Task.Run(() => JsonSerializer.Deserialize<SerializableBundle_v1>(content, SerializationHelpers.SerializingOptions));
+            DeserializedData = await Task.Run(() => JsonSerializer.Deserialize<SerializableBundle_v1>(content, SerializationHelpers.ImportBundleOptions));
 
 
             if (DeserializedData is null || DeserializedData.export_version is -1)

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public async Task LoadIconAndScreenshotsDatabaseAsync()`
`91`	`91`	`{`
`92`	`92`	`IconScreenshotDatabase_v2 JsonData = JsonSerializer.Deserialize<IconScreenshotDatabase_v2>(`
`93`	`93`	`await File.ReadAllTextAsync(IconsAndScreenshotsFile),`
`94`		`- SerializationHelpers.SerializingOptions`
	`94`	`+ SerializationHelpers.DefaultOptions`
`95`	`95`	`);`
`96`	`96`	`if (JsonData.icons_and_screenshots is not null)`
`97`	`97`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static partial class Settings`
`43`	`43`	`if (result != "")`
`44`	`44`	`{`
`45`	`45`
`46`		`- Dictionary<K, V?>? item = JsonSerializer.Deserialize<Dictionary<K, V?>>(result, SerializationHelpers.SerializingOptions);`
	`46`	`+ Dictionary<K, V?>? item = JsonSerializer.Deserialize<Dictionary<K, V?>>(result, SerializationOptions);`
`47`	`47`	`if (item is not null)`
`48`	`48`	`{`
`49`	`49`	`value = item;`
`@@ -90,7 +90,7 @@ public static void SetDictionary<K, V>(string setting, Dictionary<K, V> value)`
`90`	`90`	`try`
`91`	`91`	`{`
`92`	`92`
`93`		`- if (value.Count != 0) File.WriteAllText(file, JsonSerializer.Serialize(value, SerializationHelpers.SerializingOptions));`
	`93`	`+ if (value.Count != 0) File.WriteAllText(file, JsonSerializer.Serialize(value, SerializationOptions));`
`94`	`94`	`else if (File.Exists(file)) File.Delete(file);`
`95`	`95`	`}`
`96`	`96`	`catch (Exception e)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`using System.Net;`
	`2`	`+using System.Text.Json;`
	`3`	`+using System.Text.Json.Serialization.Metadata;`
`2`	`4`	`using Windows.Security.Credentials;`
`3`	`5`	`using UniGetUI.Core.Logging;`
`4`	`6`
`@@ -83,4 +85,11 @@ public static void SetProxyCredentials(string username, string password)`
`83`	`85`	`Logger.Error(ex);`
`84`	`86`	`}`
`85`	`87`	`}`
	`88`	`+`
	`89`	`+ private static JsonSerializerOptions SerializationOptions = new()`
	`90`	`+ {`
	`91`	`+ TypeInfoResolver = new DefaultJsonTypeInfoResolver(),`
	`92`	`+ AllowTrailingCommas = true,`
	`93`	`+ WriteIndented = true,`
	`94`	`+ };`
`86`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public static void ExportToJSON(string path)`
`17`	`17`	`settings.Add(Path.GetFileName(entry), File.ReadAllText(entry));`
`18`	`18`	`}`
`19`	`19`
`20`		`- File.WriteAllText(path, JsonSerializer.Serialize(settings, SerializationHelpers.SerializingOptions));`
	`20`	`+ File.WriteAllText(path, JsonSerializer.Serialize(settings, SerializationOptions));`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public static void ImportFromJSON(string path)`
`@@ -31,7 +31,7 @@ public static void ImportFromJSON(string path)`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`ResetSettings();`
`34`		`- Dictionary<string, string> settings = JsonSerializer.Deserialize<Dictionary<string, string>>(File.ReadAllText(path), SerializationHelpers.SerializingOptions) ?? [];`
	`34`	`+ Dictionary<string, string> settings = JsonSerializer.Deserialize<Dictionary<string, string>>(File.ReadAllText(path), SerializationOptions) ?? [];`
`35`	`35`	`foreach (KeyValuePair<string, string> entry in settings)`
`36`	`36`	`{`
`37`	`37`	`if(new[] {"OperationHistory", "WinGetAlreadyUpgradedPackages.json", "TelemetryClientToken", "CurrentSessionToken"}.Contains(entry.Key))`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static partial class Settings`
`39`	`39`	`{`
`40`	`40`	`if (result != "")`
`41`	`41`	`{`
`42`		`- List<T>? item = JsonSerializer.Deserialize<List<T>>(result, SerializationHelpers.SerializingOptions);`
	`42`	`+ List<T>? item = JsonSerializer.Deserialize<List<T>>(result, SerializationOptions);`
`43`	`43`	`if (item is not null)`
`44`	`44`	`{`
`45`	`45`	`value = item;`
`@@ -76,7 +76,7 @@ public static void SetList<T>(string setting, List<T> value)`
`76`	`76`	`var file = Path.Join(CoreData.UniGetUIUserConfigurationDirectory, $"{setting}.json");`
`77`	`77`	`try`
`78`	`78`	`{`
`79`		`- if (value.Count != 0) File.WriteAllText(file, JsonSerializer.Serialize(value, SerializationHelpers.SerializingOptions));`
	`79`	`+ if (value.Count != 0) File.WriteAllText(file, JsonSerializer.Serialize(value, SerializationOptions));`
`80`	`80`	`else if (File.Exists(file)) File.Delete(file);`
`81`	`81`	`}`
`82`	`82`	`catch (Exception e)`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@ public void TestJsonSerializationOptions()`
`17`	`17`	`var lines = File.ReadAllLines(file);`
`18`	`18`	`var jsonSerCount = lines.Count(x => x.Contains("JsonSerializer.Serialize"));`
`19`	`19`	`var jsonDeserCount = lines.Count(x => x.Contains("JsonSerializer.Deserialize"));`
`20`		`- var serialOptionsCount = lines.Count(x => x.Contains("CoreData.SerializingOptions"));`
	`20`	`+ var serialOptionsCount = lines.Count(x => x.Contains("CoreData.DefaultOptions"));`
`21`	`21`	`Assert.True((jsonSerCount + jsonDeserCount) <= serialOptionsCount,`
`22`	`22`	`$"Failing on {file}. The specified file does not serialize and/or deserialize JSON with" +`
`23`		`- $" the proper CoreData.SerializingOptions set");`
	`23`	`+ $" the proper CoreData.DefaultOptions set");`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ private static string xml_to_json(string XML)`
`28`	`28`	`var doc = new XmlDocument();`
`29`	`29`	`doc.LoadXml(XML);`
`30`	`30`	`if (doc.DocumentElement is null) return "{'message': 'XmlDocument.DocumentElement was null'}";`
`31`		`- return JsonSerializer.Serialize(_convertXmlNode(doc.DocumentElement), SerializingOptions);`
	`31`	`+ return JsonSerializer.Serialize(_convertXmlNode(doc.DocumentElement), DefaultOptions);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`private static object? _convertXmlNode(XmlNode node)`
`@@ -78,16 +78,32 @@ private static string xml_to_json(string XML)`
`78`	`78`	`return dict;`
`79`	`79`	`}`
`80`	`80`
`81`		`- public static JsonSerializerOptions SerializingOptions = new()`
	`81`	`+ public static JsonSerializerOptions DefaultOptions = new()`
`82`	`82`	`{`
`83`	`83`	`TypeInfoResolver = new DefaultJsonTypeInfoResolver(),`
`84`		`- NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals \| JsonNumberHandling.AllowReadingFromString,`
`85`	`84`	`AllowTrailingCommas = true,`
`86`	`85`	`WriteIndented = true,`
`87`		`- Converters = { new FlexibleBooleanConverter(), new FlexibleStringConverter(), new FlexibleListStringConverter() }`
`88`	`86`	`};`
`89`	`87`
`90`		`- private class FlexibleBooleanConverter : JsonConverter<bool>`
	`88`	`+ public static JsonSerializerOptions ImportBundleOptions = new()`
	`89`	`+ {`
	`90`	`+ TypeInfoResolver = new DefaultJsonTypeInfoResolver(),`
	`91`	`+ NumberHandling =`
	`92`	`+ JsonNumberHandling.AllowNamedFloatingPointLiterals \| JsonNumberHandling.AllowReadingFromString,`
	`93`	`+ AllowTrailingCommas = true,`
	`94`	`+ WriteIndented = true,`
	`95`	`+ Converters =`
	`96`	`+ {`
	`97`	`+ new Converters.FlexibleBooleanConverter(),`
	`98`	`+ new Converters.FlexibleStringConverter(),`
	`99`	`+ new Converters.FlexibleListStringConverter()`
	`100`	`+ }`
	`101`	`+ };`
	`102`	`+}`
	`103`	`+`
	`104`	`+internal class Converters`
	`105`	`+{`
	`106`	`+ public class FlexibleBooleanConverter : JsonConverter<bool>`
`91`	`107`	`{`
`92`	`108`	`public override bool Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)`
`93`	`109`	`{`
`@@ -110,7 +126,7 @@ public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOpti`
`110`	`126`	`}`
`111`	`127`	`}`
`112`	`128`
`113`		`- private class FlexibleStringConverter : JsonConverter<string>`
	`129`	`+ public class FlexibleStringConverter : JsonConverter<string>`
`114`	`130`	`{`
`115`	`131`	`public override string Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)`
`116`	`132`	`{`
`@@ -128,7 +144,7 @@ public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOp`
`128`	`144`	`}`
`129`	`145`	`}`
`130`	`146`
`131`		`- private class FlexibleListStringConverter : JsonConverter<List<string>>`
	`147`	`+ public class FlexibleListStringConverter : JsonConverter<List<string>>`
`132`	`148`	`{`
`133`	`149`	`public override List<string> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)`
`134`	`150`	`{`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ private static T Fetch<T>(Uri url)`
`93`	`93`
`94`	`94`	`var manifestStr = client.GetStringAsync(url).GetAwaiter().GetResult();`
`95`	`95`
`96`		`- var manifest = JsonSerializer.Deserialize<T>(manifestStr, options: SerializationHelpers.SerializingOptions)`
	`96`	`+ var manifest = JsonSerializer.Deserialize<T>(manifestStr, options: SerializationHelpers.DefaultOptions)`
`97`	`97`	`?? throw new NullResponseException($"Null response for request to {url}");`
`98`	`98`	`return manifest;`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ public void SaveToDisk()`
`201`	`201`
`202`	`202`	`string fileContents = JsonSerializer.Serialize(`
`203`	`203`	`AsSerializable(),`
`204`		`- SerializationHelpers.SerializingOptions`
	`204`	`+ SerializationHelpers.DefaultOptions`
`205`	`205`	`);`
`206`	`206`	`File.WriteAllText(optionsFile.FullName, fileContents);`
`207`	`207`	`}`
`@@ -227,7 +227,7 @@ public void LoadFromDisk()`
`227`	`227`
`228`	`228`	`using FileStream inputStream = optionsFile.OpenRead();`
`229`	`229`	`SerializableInstallationOptions_v1? options = JsonSerializer.Deserialize<SerializableInstallationOptions_v1>(`
`230`		`- inputStream, SerializationHelpers.SerializingOptions);`
	`230`	`+ inputStream, SerializationHelpers.DefaultOptions);`
`231`	`231`
`232`	`232`	`if (options is null)`
`233`	`233`	`{`
Original file line number	Diff line number	Diff line change
`@@ -608,7 +608,7 @@ static int Comparison(IPackage x, IPackage y)`
`608`	`608`	`if (formatType is BundleFormatType.JSON or BundleFormatType.UBUNDLE)`
`609`	`609`	`ExportableData = JsonSerializer.Serialize(`
`610`	`610`	`exportable,`
`611`		`- SerializationHelpers.SerializingOptions);`
	`611`	`+ SerializationHelpers.DefaultOptions);`
`612`	`612`
`613`	`613`	`else if (formatType is BundleFormatType.YAML)`
`614`	`614`	`{`
`@@ -651,7 +651,7 @@ public async Task<double> AddFromBundle(string content, BundleFormatType format)`
`651`	`651`	`Logger.ImportantInfo("XML payload was converted to JSON dynamically before deserialization");`
`652`	`652`	`}`
`653`	`653`
`654`		`- DeserializedData = await Task.Run(() => JsonSerializer.Deserialize<SerializableBundle_v1>(content, SerializationHelpers.SerializingOptions));`
	`654`	`+ DeserializedData = await Task.Run(() => JsonSerializer.Deserialize<SerializableBundle_v1>(content, SerializationHelpers.ImportBundleOptions));`
`655`	`655`
`656`	`656`
`657`	`657`	`if (DeserializedData is null \|\| DeserializedData.export_version is -1)`