pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-01-26 19:04:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
parent d81bcfba9a d905b2c25b
commit a2ebeab839
63 changed files with 2552 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PepperDashEssentials/ControlSystem.cs
View File

@@ -95,9 +95,10 @@ namespace PepperDash.Essentials
var dirSeparator = Global.DirectorySeparator;
Global.SetApplicationDirectoryPathPrefix(Crestron.SimplSharp.CrestronIO.Directory.GetApplicationRootDirectory());
var directoryPrefix = Global.ApplicationDirectoryPathPrefix;
string directoryPrefix;
directoryPrefix = Crestron.SimplSharp.CrestronIO.Directory.GetApplicationRootDirectory();
var version = Crestron.SimplSharp.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
Global.SetAssemblyVersion(string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build));