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

Merge remote-tracking branch 'origin/feat/seeded_guid' into Telemetry

Browse Source 
# Conflicts:
#	ICD.Common.Utils/Attributes/RangeAttribute.cs
This commit is contained in:
Chris Cameron
2019-03-26 11:58:07 -04:00
parent c55e35ac6e 87d1f4da16
commit 17e7f4d3c9
16 changed files with 133 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ICD.Common.Utils/IcdEnvironment.SimplSharp.cs
View File

@@ -12,7 +12,12 @@ namespace ICD.Common.Utils
public static eRuntimeEnvironment RuntimeEnvironment
{
get { return GetRuntimeEnvironment(CrestronEnvironment.RuntimeEnvironment); }
get
{
return CrestronEnvironment.DevicePlatform == eDevicePlatform.Server
? eRuntimeEnvironment.SimplSharpProMono
: GetRuntimeEnvironment(CrestronEnvironment.RuntimeEnvironment);
}
}
/// <summary>