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

fix: Fixed IcdEnvironment.Framework for .net framework

Browse Source
This commit is contained in:
Chris Cameron
2021-08-30 17:23:34 -04:00
parent 29013a2bf5
commit 74ff651798
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ICD.Common.Utils/IcdEnvironment.Standard.cs
View File

@@ -109,8 +109,8 @@ namespace ICD.Common.Utils
static IcdEnvironment() static IcdEnvironment()
{ {
s_Framework = eFramework.Standard;
#if NETFRAMEWORK #if NETFRAMEWORK
s_Framework = eFramework.Framework;
s_CrestronSeries = eCrestronSeries.FourSeries; s_CrestronSeries = eCrestronSeries.FourSeries;
if (CrestronEnvironment.RuntimeEnvironment == eRuntimeEnvironment.SIMPL) if (CrestronEnvironment.RuntimeEnvironment == eRuntimeEnvironment.SIMPL)
s_CrestronRuntimeEnvironment = eCrestronRuntimeEnvironment.Simpl; s_CrestronRuntimeEnvironment = eCrestronRuntimeEnvironment.Simpl;
@@ -119,6 +119,7 @@ namespace ICD.Common.Utils
else else
s_CrestronRuntimeEnvironment = eCrestronRuntimeEnvironment.Server; s_CrestronRuntimeEnvironment = eCrestronRuntimeEnvironment.Server;
#else #else
s_Framework = eFramework.Standard;
s_CrestronSeries = eCrestronSeries.Na; s_CrestronSeries = eCrestronSeries.Na;
s_CrestronRuntimeEnvironment = eCrestronRuntimeEnvironment.Na; s_CrestronRuntimeEnvironment = eCrestronRuntimeEnvironment.Na;
#endif #endif

1
ICD.Common.Utils/IcdEnvironment.cs
View File

@@ -12,6 +12,7 @@ namespace ICD.Common.Utils
public enum eFramework public enum eFramework
{ {
Crestron, Crestron,
Framework,
Standard Standard
} }

2
ICD.Common.Utils/PathUtils.cs
View File

@@ -175,7 +175,7 @@ namespace ICD.Common.Utils
{ {
get get
{ {
if (IcdEnvironment.Framework == IcdEnvironment.eFramework.Crestron) if (IcdEnvironment.Framework != IcdEnvironment.eFramework.Standard)
{ {
// 3-series // 3-series
if (IcdEnvironment.CrestronSeries == IcdEnvironment.eCrestronSeries.ThreeSeries) if (IcdEnvironment.CrestronSeries == IcdEnvironment.eCrestronSeries.ThreeSeries)

1
ICD.Common.Utils/ProgramUtils.cs
View File

@@ -41,6 +41,7 @@ namespace ICD.Common.Utils
throw new ArgumentOutOfRangeException(); throw new ArgumentOutOfRangeException();
} }
break; break;
case IcdEnvironment.eFramework.Framework:
case IcdEnvironment.eFramework.Standard: case IcdEnvironment.eFramework.Standard:
name += ' '; name += ' ';
break; break;