mirror of
https://github.com/ICDSystems/ICD.Common.Utils.git
synced 2026-02-12 19:25:00 +00:00
fix: Fixed IcdEnvironment.Framework for .net framework
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -12,6 +12,7 @@ namespace ICD.Common.Utils
|
||||
public enum eFramework
|
||||
{
|
||||
Crestron,
|
||||
Framework,
|
||||
Standard
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,6 +41,7 @@ namespace ICD.Common.Utils
|
||||
throw new ArgumentOutOfRangeException();
|
||||
}
|
||||
break;
|
||||
case IcdEnvironment.eFramework.Framework:
|
||||
case IcdEnvironment.eFramework.Standard:
|
||||
name += ' ';
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user