Use newtonsoft instead of System.Text.Json

Author: HeroponRikiBestest

SabreTools.Serialization/Models/VDF/File.cs

@@ -1,5 +1,4 @@
-#if NET6_0_OR_GREATER
-using System.Text.Json.Nodes;
+using Newtonsoft.Json.Linq;
 
 namespace SabreTools.Data.Models.VDF
 {
@@ -18,7 +17,6 @@ public class File
         /// <summary>
         /// A JSON Object representing the VDF structure.
         /// </summary>
-        public JsonObject? VDFObject { get; set; }
+        public JObject? VDFObject { get; set; }
     }
 }
-#endif

SabreTools.Serialization/Readers/SkuSis.cs

@@ -1,12 +1,10 @@
-#if NET6_0_OR_GREATER
 using System;
 using System.IO;
 using SabreTools.IO.Extensions;
 using File = SabreTools.Data.Models.VDF.File;
 using static SabreTools.Data.Models.VDF.Constants;
 using System.Text;
-using System.Text.Json;
-using System.Text.Json.Nodes;
+using Newtonsoft.Json.Linq;
 
 namespace SabreTools.Serialization.Readers
 {
@@ -96,11 +94,9 @@ public class SkuSis : BaseBinaryReader<File>
             }
 
             json += "\n}";
-            var options = new JsonDocumentOptions { AllowTrailingCommas = true};
-            obj.VDFObject = JsonNode.Parse(json, null, options)?.AsObject();
+            obj.VDFObject = JObject.Parse(json);
 
             return obj;
         }
     }
 }
-#endif

SabreTools.Serialization/WrapperFactory.cs

@@ -53,9 +53,7 @@ public static class WrapperFactory
                 WrapperType.SecuROMDFA => SecuROMDFA.Create(data),
                 WrapperType.SevenZip => SevenZip.Create(data),
                 WrapperType.Skeleton => Skeleton.Create(data),
-#if NET6_0_OR_GREATER
                 WrapperType.SkuSis => SkuSis.Create(data),
-#endif
                 WrapperType.SFFS => SFFS.Create(data),
                 WrapperType.SGA => SGA.Create(data),
                 WrapperType.TapeArchive => TapeArchive.Create(data),

SabreTools.Serialization/Wrappers/SkuSis.cs

@@ -1,6 +1,5 @@
-#if NET6_0_OR_GREATER
 using System.IO;
-using System.Text.Json.Nodes;
+using Newtonsoft.Json.Linq;
 
 namespace SabreTools.Serialization.Wrappers
 {
@@ -19,7 +18,7 @@ public partial class SkuSis : WrapperBase<Data.Models.VDF.File>
         public byte[]? Signature => Model.Signature;
 
         /// <inheritdoc cref="Models.VDF.File.VDFObject"/>
-        public JsonObject? VDFObject => Model.VDFObject;
+        public JObject? VDFObject => Model.VDFObject;
 
         #endregion
 
@@ -97,5 +96,4 @@ public SkuSis(Data.Models.VDF.File model, Stream data, long offset, long length)
 
         #endregion
     }
-}
-#endif
+}