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

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

Browse Source
This commit is contained in:
Chris Cameron
2019-03-13 16:28:18 -04:00
parent 827ab2cd42 158c261d19
commit 4fa46ff5a0
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,12 +47,16 @@ namespace ICD.Common.Utils
public static string ModelName public static string ModelName
{ {
get get
{
string versionResult = VersionResult;
if (!String.IsNullOrEmpty(versionResult))
{ {
Regex regex = new Regex(MODEL_NAME_REGEX); Regex regex = new Regex(MODEL_NAME_REGEX);
Match match = regex.Match(VersionResult); Match match = regex.Match(versionResult);
if (match.Success) if (match.Success)
return match.Groups[1].Value; return match.Groups[1].Value;
}
ServiceProvider.TryGetService<ILoggerService>() ServiceProvider.TryGetService<ILoggerService>()
.AddEntry(eSeverity.Warning, "Unable to get model name from \"{0}\"", VersionResult); .AddEntry(eSeverity.Warning, "Unable to get model name from \"{0}\"", VersionResult);
@@ -67,12 +71,16 @@ namespace ICD.Common.Utils
public static Version ModelVersion public static Version ModelVersion
{ {
get get
{
string versionResult = VersionResult;
if (!String.IsNullOrEmpty(versionResult))
{ {
Regex regex = new Regex(MODEL_VERSION_REGEX); Regex regex = new Regex(MODEL_VERSION_REGEX);
Match match = regex.Match(VersionResult); Match match = regex.Match(VersionResult);
if (match.Success) if (match.Success)
return new Version(match.Groups[1].Value); return new Version(match.Groups[1].Value);
}
ServiceProvider.TryGetService<ILoggerService>() ServiceProvider.TryGetService<ILoggerService>()
.AddEntry(eSeverity.Warning, "Unable to get model version from \"{0}\"", VersionResult); .AddEntry(eSeverity.Warning, "Unable to get model version from \"{0}\"", VersionResult);