From 8dd8d48a8b4be0c0b306192d7303f6b08f7cc48b Mon Sep 17 00:00:00 2001 From: Drew Tingen Date: Thu, 13 Aug 2020 22:41:31 -0400 Subject: [PATCH 1/5] fix: Fixed cultureinfo sqlite connection for 4 series compatability --- ICD.Common.Utils/Globalization/IcdCultureInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ICD.Common.Utils/Globalization/IcdCultureInfo.cs b/ICD.Common.Utils/Globalization/IcdCultureInfo.cs index 50aa17f..9678d0f 100644 --- a/ICD.Common.Utils/Globalization/IcdCultureInfo.cs +++ b/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"; From 6d939117663d6ab66d8531a228eb1c36570b349a Mon Sep 17 00:00:00 2001 From: Drew Tingen Date: Thu, 13 Aug 2020 22:44:44 -0400 Subject: [PATCH 2/5] chore:changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12c160f..30354b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed + - Fixed CultureInfo SQLite conection string for 4-series compatibility ## [9.7.0] - 2019-08-15 ### Added From 34cfe8c7a35a429c137d03b0fac11d85a5fba09c Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Mon, 17 Aug 2020 10:01:58 -0400 Subject: [PATCH 3/5] fix: Workaround for logged XML format exceptions when failing to parse floats --- CHANGELOG.md | 3 +++ ICD.Common.Utils/Xml/IcdXmlReader.cs | 22 ++++++---------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b80c258..c23a0e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### 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 diff --git a/ICD.Common.Utils/Xml/IcdXmlReader.cs b/ICD.Common.Utils/Xml/IcdXmlReader.cs index 18e2af1..86d25ec 100644 --- a/ICD.Common.Utils/Xml/IcdXmlReader.cs +++ b/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() From 15330d7dd0a3e5922b266953906f2425d4e7d74e Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Mon, 17 Aug 2020 10:03:30 -0400 Subject: [PATCH 4/5] chore: Updating changelog, incrementing patch version --- CHANGELOG.md | 1 + ICD.Common.Utils/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c23a0e0..53a0a8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [8.9.3] - 2020-08-17 ### Changed - Workaround for logged XML format exceptions when failing to parse floats diff --git a/ICD.Common.Utils/Properties/AssemblyInfo.cs b/ICD.Common.Utils/Properties/AssemblyInfo.cs index b35da97..627fb21 100644 --- a/ICD.Common.Utils/Properties/AssemblyInfo.cs +++ b/ICD.Common.Utils/Properties/AssemblyInfo.cs @@ -4,4 +4,4 @@ using System.Reflection; [assembly: AssemblyCompany("ICD Systems")] [assembly: AssemblyProduct("ICD.Common.Utils")] [assembly: AssemblyCopyright("Copyright © ICD Systems 2020")] -[assembly: AssemblyVersion("8.9.2.0")] +[assembly: AssemblyVersion("8.9.3.0")] From c6cfdd4d72d6f7e9d6ff49da183d41ac71149226 Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Mon, 17 Aug 2020 10:09:58 -0400 Subject: [PATCH 5/5] chore: Updating changelog, incrementing patch version --- CHANGELOG.md | 2 ++ ICD.Common.Utils/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abfc9d0..2405ea4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [9.7.1] - 2019-08-17 ### Changed - Fixed CultureInfo SQLite conection string for 4-series compatibility diff --git a/ICD.Common.Utils/Properties/AssemblyInfo.cs b/ICD.Common.Utils/Properties/AssemblyInfo.cs index b485b0b..72350de 100644 --- a/ICD.Common.Utils/Properties/AssemblyInfo.cs +++ b/ICD.Common.Utils/Properties/AssemblyInfo.cs @@ -4,4 +4,4 @@ using System.Reflection; [assembly: AssemblyCompany("ICD Systems")] [assembly: AssemblyProduct("ICD.Common.Utils")] [assembly: AssemblyCopyright("Copyright © ICD Systems 2020")] -[assembly: AssemblyVersion("9.7.0.0")] +[assembly: AssemblyVersion("9.7.1.0")]