mirror of
https://github.com/ICDSystems/ICD.Common.Utils.git
synced 2026-01-11 19:44:55 +00:00
Merge remote-tracking branch 'origin/ConnectPro_v1.5' into ConnectPro_v1.6
This commit is contained in:
@@ -178,6 +178,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.1] - 2020-05-27
|
||||||
|
### Changed
|
||||||
|
- Changed ProcessorUtils to use CrestronEnvironment to retrive serial number - this fixes issues with new serial numbers that aren't deciaml TSIDs
|
||||||
|
|
||||||
## [8.9.0] - 2020-04-30
|
## [8.9.0] - 2020-04-30
|
||||||
### Changed
|
### Changed
|
||||||
- ProgramUtils and ProcessorUtils return dates instead of strings for date properties
|
- ProgramUtils and ProcessorUtils return dates instead of strings for date properties
|
||||||
|
|||||||
@@ -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;
|
||||||
using ICD.Common.Utils.Services.Logging;
|
using ICD.Common.Utils.Services.Logging;
|
||||||
#if SIMPLSHARP
|
|
||||||
using System;
|
using System;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using ICD.Common.Properties;
|
using ICD.Common.Properties;
|
||||||
@@ -125,19 +126,7 @@ namespace ICD.Common.Utils
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
Regex regex = new Regex(VER_REGEX);
|
return CrestronEnvironment.SystemInfo.SerialNumber;
|
||||||
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();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user