Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.2

# Conflicts:
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
This commit is contained in:
Chris Cameron
2020-08-17 10:08:10 -04:00
2 changed files with 10 additions and 16 deletions

View File

@@ -91,6 +91,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Better VC-4 support for IcdConsole - Better VC-4 support for IcdConsole
- JSON refactoring for simpler deserialization - JSON refactoring for simpler deserialization
## [8.9.3] - 2020-08-17
### Changed
- Workaround for logged XML format exceptions when failing to parse floats
## [8.9.2] - 2020-07-28 ## [8.9.2] - 2020-07-28
### Changed ### Changed
- StringExtensions - fixed an issue with IsNumeric where empty strings would return true - StringExtensions - fixed an issue with IsNumeric where empty strings would return true

View File

@@ -177,26 +177,16 @@ namespace ICD.Common.Utils.Xml
public long ReadElementContentAsLong() public long ReadElementContentAsLong()
{ {
try // ReadElementContentAsLong() logs and throws...
{ string value = ReadElementContentAsString();
return m_Reader.ReadElementContentAsLong(); return long.Parse(value);
}
catch (XmlException e)
{
throw new IcdXmlException(e);
}
} }
public float ReadElementContentAsFloat() public float ReadElementContentAsFloat()
{ {
try // ReadElementContentAsFloat() logs and throws...
{ string value = ReadElementContentAsString();
return m_Reader.ReadElementContentAsFloat(); return float.Parse(value);
}
catch (XmlException e)
{
throw new IcdXmlException(e);
}
} }
public bool ReadElementContentAsBoolean() public bool ReadElementContentAsBoolean()