Merge branch 'release/v1.4.33' into feature/ecs-1257

# Conflicts:
#	PepperDashEssentials/ControlSystem.cs
#	essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs
This commit is contained in:
Neil Dorin
2020-02-26 10:35:56 -07:00
63 changed files with 2552 additions and 1578 deletions

View File

@@ -27,9 +27,15 @@ namespace PepperDash.Essentials.Core
public static string FilePathPrefix { get; private set; }
/// <summary>
/// The file path prefix to the folder containing the running application files
/// The file path prefix to the applciation directory
/// </summary>
public static string ApplicationDirectoryPathPrefix { get; private set; }
public static string ApplicationDirectoryPathPrefix
{
get
{
return Crestron.SimplSharp.CrestronIO.Directory.GetApplicationDirectory();
}
}
/// <summary>
/// Returns the directory separator character based on the running OS