icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-13 03:35:04 +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-05-27 15:59:12 -04:00
parent a22c3626ab 62f54f1213
commit b5ec51d9a4
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,8 @@
using System.Globalization;
#if SIMPLSHARP
using System.Globalization;
using Crestron.SimplSharp;
using ICD.Common.Utils.Services;
using ICD.Common.Utils.Services.Logging;
#if SIMPLSHARP
using System;
using System.Text.RegularExpressions;
using ICD.Common.Properties;
@@ -125,19 +126,7 @@ namespace ICD.Common.Utils
{
get
{
Regex regex = new Regex(VER_REGEX);
Match match = regex.Match(VersionResult);
if (!match.Success)
{
ServiceProvider.TryGetService<ILoggerService>()
.AddEntry(eSeverity.Warning, "Unable to get serial number from \"{0}\"", VersionResult);
return string.Empty;
}
int decValue = int.Parse(match.Groups["serial"].Value, System.Globalization.NumberStyles.HexNumber);
return decValue.ToString();
return CrestronEnvironment.SystemInfo.SerialNumber;
}
}