diff --git a/ICD.Common.Utils/IcdEnvironment.Standard.cs b/ICD.Common.Utils/IcdEnvironment.Standard.cs index 7015f6f..c9ed3a4 100644 --- a/ICD.Common.Utils/IcdEnvironment.Standard.cs +++ b/ICD.Common.Utils/IcdEnvironment.Standard.cs @@ -109,8 +109,8 @@ namespace ICD.Common.Utils static IcdEnvironment() { - s_Framework = eFramework.Standard; #if NETFRAMEWORK + s_Framework = eFramework.Framework; s_CrestronSeries = eCrestronSeries.FourSeries; if (CrestronEnvironment.RuntimeEnvironment == eRuntimeEnvironment.SIMPL) s_CrestronRuntimeEnvironment = eCrestronRuntimeEnvironment.Simpl; @@ -119,6 +119,7 @@ namespace ICD.Common.Utils else s_CrestronRuntimeEnvironment = eCrestronRuntimeEnvironment.Server; #else + s_Framework = eFramework.Standard; s_CrestronSeries = eCrestronSeries.Na; s_CrestronRuntimeEnvironment = eCrestronRuntimeEnvironment.Na; #endif diff --git a/ICD.Common.Utils/IcdEnvironment.cs b/ICD.Common.Utils/IcdEnvironment.cs index a37c0f2..ce551aa 100644 --- a/ICD.Common.Utils/IcdEnvironment.cs +++ b/ICD.Common.Utils/IcdEnvironment.cs @@ -12,6 +12,7 @@ namespace ICD.Common.Utils public enum eFramework { Crestron, + Framework, Standard } diff --git a/ICD.Common.Utils/PathUtils.cs b/ICD.Common.Utils/PathUtils.cs index a87d335..14efba4 100644 --- a/ICD.Common.Utils/PathUtils.cs +++ b/ICD.Common.Utils/PathUtils.cs @@ -175,7 +175,7 @@ namespace ICD.Common.Utils { get { - if (IcdEnvironment.Framework == IcdEnvironment.eFramework.Crestron) + if (IcdEnvironment.Framework != IcdEnvironment.eFramework.Standard) { // 3-series if (IcdEnvironment.CrestronSeries == IcdEnvironment.eCrestronSeries.ThreeSeries) @@ -190,9 +190,9 @@ namespace ICD.Common.Utils } #if LINUX - return Join(RootPath, "var", "www", "html"); + return Join(RootPath, "var", "www", "html"); #else - return "C:\\INetPub"; + return "C:\\INetPub"; #endif } } diff --git a/ICD.Common.Utils/ProgramUtils.cs b/ICD.Common.Utils/ProgramUtils.cs index e8a7c5e..cb06b14 100644 --- a/ICD.Common.Utils/ProgramUtils.cs +++ b/ICD.Common.Utils/ProgramUtils.cs @@ -41,6 +41,7 @@ namespace ICD.Common.Utils throw new ArgumentOutOfRangeException(); } break; + case IcdEnvironment.eFramework.Framework: case IcdEnvironment.eFramework.Standard: name += ' '; break;