icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-16 21:24:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'MetLife_v5.3' of Common/Utils into dev

Browse Source
This commit is contained in:
Drew Tingen
2018-06-25 20:12:38 +00:00
committed by Gogs
parent 1c420d111b 5d3b80938e
commit 336f39c9c2
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Changed ### Changed
- Potential fix for timer disposal on Net Standard - Potential fix for timer disposal on Net Standard
- Added workaround for older RPC servers where the typestring being broadcast would stil include _SimplSharp, now will be stripped
## [3.6.0] - 2018-06-19 ## [3.6.0] - 2018-06-19
### Added ### Added

6
ICD.Common.Utils/Json/JsonItemWrapper.cs
View File

@@ -71,6 +71,12 @@ namespace ICD.Common.Utils.Json
string itemString = (string)token.SelectToken(ITEM_TOKEN); string itemString = (string)token.SelectToken(ITEM_TOKEN);
Type type = Type.GetType(typeString); Type type = Type.GetType(typeString);
if (type == null)
{
typeString = typeString.Replace("_SimplSharp", "").Replace("_NetStandard", "");
type = Type.GetType(typeString);
}
return JsonConvert.DeserializeObject(itemString, type); return JsonConvert.DeserializeObject(itemString, type);
} }
} }