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

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

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
This commit is contained in:
Chris Cameron
2020-04-30 15:16:23 -04:00
parent a53ad74811 d90c60126e
commit a22c3626ab
5 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ICD.Common.Utils/ProcessorUtils.SimplSharp.cs
View File

@@ -1,4 +1,5 @@
using ICD.Common.Utils.Services;
using System.Globalization;
using ICD.Common.Utils.Services;
using ICD.Common.Utils.Services.Logging;
#if SIMPLSHARP
using System;
@@ -99,7 +100,7 @@ namespace ICD.Common.Utils
/// Gets the date that the firmware was updated.
/// </summary>
[PublicAPI]
public static string ModelVersionDate
public static DateTime ModelVersionDate
{
get
{
@@ -107,12 +108,12 @@ namespace ICD.Common.Utils
Match match = regex.Match(VersionResult);
if (match.Success)
return match.Groups["date"].Value;
return DateTime.ParseExact(match.Groups["date"].Value, "MMM dd yyyy", CultureInfo.InvariantCulture).ToUniversalTime();
ServiceProvider.TryGetService<ILoggerService>()
.AddEntry(eSeverity.Warning, "Unable to get model version date from \"{0}\"", VersionResult);
return string.Empty;
return DateTime.MinValue;
}
}