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

Merge remote-tracking branch 'origin/ConnectPro_v1.3' into feat/XmlUtilsRoku

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Austin Noska
2019-05-31 16:14:14 -04:00
parent 4312ad1a61 7e3aef4cb3
commit b996a295f6
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -6,9 +6,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased] ## [Unreleased]
### Added ### Added
- Added Shim to read a list from xml with no root element - Added Shim to read a list from xml with no root element
### Changed
- Fixed JSON DateTime parsing in .Net Standard
- Fixed threading exception in TypeExtensions
## [9.4.0] - 2019-05-10 ## [9.4.0] - 2019-05-10
### Added ### Added
- Added extension method for peeking queues - Added extension method for peeking queues

4
ICD.Common.Utils/Extensions/TypeExtensions.cs
View File

@@ -369,7 +369,7 @@ namespace ICD.Common.Utils.Extensions
: extends.FullName; : extends.FullName;
} }
s_TypeToMinimalName.Add(extends, name); s_TypeToMinimalName[extends] = name;
} }
return name; return name;
@@ -389,7 +389,7 @@ namespace ICD.Common.Utils.Extensions
if (!s_TypeToNameWithoutAssemblyDetails.TryGetValue(extends, out name)) if (!s_TypeToNameWithoutAssemblyDetails.TryGetValue(extends, out name))
{ {
name = RemoveAssemblyDetails(extends.AssemblyQualifiedName); name = RemoveAssemblyDetails(extends.AssemblyQualifiedName);
s_TypeToNameWithoutAssemblyDetails.Add(extends, name); s_TypeToNameWithoutAssemblyDetails[extends] = name;
} }
return name; return name;