diff --git a/ICD.Common.Utils/Json/JsonItemWrapper.cs b/ICD.Common.Utils/Json/JsonItemWrapper.cs index 400068e..de152e8 100644 --- a/ICD.Common.Utils/Json/JsonItemWrapper.cs +++ b/ICD.Common.Utils/Json/JsonItemWrapper.cs @@ -1,4 +1,5 @@ using System; +using System.Text.RegularExpressions; using ICD.Common.Utils.Extensions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -77,7 +78,20 @@ namespace ICD.Common.Utils.Json type = Type.GetType(typeString); } + if (type == null) + { + typeString = AddSimplSharpSuffix(typeString); + type = Type.GetType(typeString); + } + return JsonConvert.DeserializeObject(itemString, type); } + + private static string AddSimplSharpSuffix(string typeString) + { + return Regex.Replace(typeString, + "(?'prefix'[^,]+, )(?'assembly'[^,]*)(?'suffix', .*)", + "${prefix}${assembly}_SimplSharp${suffix}"); + } } }