icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-04-12 12:07:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/MetLife_v5.2' into MetLife_v5.3

Browse source 
# Conflicts:
#	ICD.Common.Utils/Json/JsonItemWrapper.cs
This commit is contained in:
Chris Cameron 2018-07-23 13:34:49 -04:00
commit d8d9f342c9
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ICD.Common.Utils/Json/JsonItemWrapper.cs
View file

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