Merge branch '2.X' into adcs

SpecterOps · Dec 6, 2023 · c27955e · c27955e
2 parents c130d1c + f87713c
commit c27955e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/JsonExtensions.cs b/src/JsonExtensions.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
-using SharpHoundCommonLib;
 using SharpHoundCommonLib.Enums;
 
 namespace Sharphound
@@ -14,7 +13,8 @@ public class CacheContractResolver : DefaultContractResolver
         private static readonly CacheContractResolver Instance = new();
         public static readonly JsonSerializerSettings Settings = new()
         {
-            ContractResolver = Instance
+            ContractResolver = Instance,
+            Converters = new List<JsonConverter> {new VersionConverter()}
         };
 
         protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)

diff --git a/src/Sharphound.cs b/src/Sharphound.cs
@@ -341,7 +341,7 @@ public IContext SaveCacheFile(IContext context)
             // 15. Program exit started. Save the cache file
             var cache = Cache.GetCacheInstance();
             context.Logger.LogInformation("Saving cache with stats: {stats}", cache.GetCacheStats());
-            var serialized = JsonConvert.SerializeObject(cache);
+            var serialized = JsonConvert.SerializeObject(cache, CacheContractResolver.Settings);
             using var stream =
                 new StreamWriter(context.GetCachePath());
             stream.Write(serialized);