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

CHANGELOG.md

@@ -95,6 +95,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
  - 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
 ### Added
  - Added logger timestamps to non simplsharp programs
@@ -178,6 +182,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
  - Better VC-4 support for IcdConsole
  - 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
 ### Changed
  - StringExtensions - fixed an issue with IsNumeric where empty strings would return true

ICD.Common.Utils/Globalization/IcdCultureInfo.cs

@@ -97,9 +97,9 @@ namespace ICD.Common.Utils.Globalization
 		private const string SQL_LOCAL_DATABASE_FILE = "CultureInfo.sqlite";
 		private const string SQL_CONNECTION_STRING_FORMAT =
 #if SIMPLSHARP
-			"Data Source = {0}; Version = 3; ReadOnly = True";
+			"Data Source={0};Version=3;ReadOnly=True";
 #else
-			"Data Source = {0}";
+			"Data Source={0}";
 #endif
 		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";

ICD.Common.Utils/Xml/IcdXmlReader.cs

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