mirror of
https://github.com/ICDSystems/ICD.Common.Utils.git
synced 2026-02-12 03:05:06 +00:00
Merge remote-tracking branch 'origin/ConnectPro_v1.3' into feat/XmlUtilsRoku
# Conflicts: # CHANGELOG.md
This commit is contained in:
@@ -6,8 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
|
||||
### 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
|
||||
### Added
|
||||
|
||||
@@ -369,7 +369,7 @@ namespace ICD.Common.Utils.Extensions
|
||||
: extends.FullName;
|
||||
}
|
||||
|
||||
s_TypeToMinimalName.Add(extends, name);
|
||||
s_TypeToMinimalName[extends] = name;
|
||||
}
|
||||
|
||||
return name;
|
||||
@@ -389,7 +389,7 @@ namespace ICD.Common.Utils.Extensions
|
||||
if (!s_TypeToNameWithoutAssemblyDetails.TryGetValue(extends, out name))
|
||||
{
|
||||
name = RemoveAssemblyDetails(extends.AssemblyQualifiedName);
|
||||
s_TypeToNameWithoutAssemblyDetails.Add(extends, name);
|
||||
s_TypeToNameWithoutAssemblyDetails[extends] = name;
|
||||
}
|
||||
|
||||
return name;
|
||||
|
||||
Reference in New Issue
Block a user