icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-14 20:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ConnectPro_v1.4' into ConnectPro_v1.5

Browse Source
This commit is contained in:
Chris Cameron
2020-08-17 10:15:39 -04:00
parent 6173be0a1d dd6dfa191e
commit 66b8107233
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@@ -66,6 +66,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Changed ### Changed
- Improvements to JSON DateTime parsing, particularly in Net Standard - Improvements to JSON DateTime parsing, particularly in Net Standard
## [9.7.1] - 2019-08-17
### Changed
- Fixed CultureInfo SQLite conection string for 4-series compatibility
## [9.7.0] - 2019-08-15 ## [9.7.0] - 2019-08-15
### Added ### Added
- Added logger timestamps to non simplsharp programs - Added logger timestamps to non simplsharp programs
@@ -149,6 +153,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

4
ICD.Common.Utils/Globalization/IcdCultureInfo.cs
View File

@@ -97,9 +97,9 @@ namespace ICD.Common.Utils.Globalization
private const string SQL_LOCAL_DATABASE_FILE = "CultureInfo.sqlite"; private const string SQL_LOCAL_DATABASE_FILE = "CultureInfo.sqlite";
private const string SQL_CONNECTION_STRING_FORMAT = private const string SQL_CONNECTION_STRING_FORMAT =
#if SIMPLSHARP #if SIMPLSHARP
"Data Source = {0}; Version = 3; ReadOnly = True"; "Data Source={0};Version=3;ReadOnly=True";
#else #else
"Data Source = {0}"; "Data Source={0}";
#endif #endif
private const string SQL_CMD_SELECT_BY_NAME = "select * from cultureinfo where name = @name collate nocase"; private const string SQL_CMD_SELECT_BY_NAME = "select * from cultureinfo where name = @name collate nocase";
private const string SQL_CMD_SELECT_BY_LCID = "select * from cultureinfo where lcid = @lcid"; private const string SQL_CMD_SELECT_BY_LCID = "select * from cultureinfo where lcid = @lcid";

22
ICD.Common.Utils/Xml/IcdXmlReader.cs
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()