icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-01-11 19:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fixed preprocessors in IcdDirectory

Browse Source
This commit is contained in:
Drew Tingen
2022-11-30 12:09:24 -05:00
parent b09b22266b
commit 2700f5018a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Changed ### Changed
- IcdEnvironment - Added CrestronDevicePlatform, removed from CrestronRuntimeEnvironment, to support SimplWindows on VC-4 - IcdEnvironment - Added CrestronDevicePlatform, removed from CrestronRuntimeEnvironment, to support SimplWindows on VC-4
- Fixed IcdEnvironment CrestronRuntimeEnvironment uses in IcdConsole, PathUtils, and ProgramUtils - Fixed IcdEnvironment CrestronRuntimeEnvironment uses in IcdConsole, PathUtils, and ProgramUtils
- Fixed preprocessors in IcdDirectory
## [16.0.5] 2022-07-11 ## [16.0.5] 2022-07-11
### Changed ### Changed

6
ICD.Common.Utils/IO/IcdDirectory.cs
View File

@@ -1,5 +1,5 @@
using System; using System;
#if SIMPLSHARP #if !NETSTANDARD
using Crestron.SimplSharp.CrestronIO; using Crestron.SimplSharp.CrestronIO;
#else #else
using ICD.Common.Utils.Extensions; using ICD.Common.Utils.Extensions;
@@ -13,7 +13,7 @@ namespace ICD.Common.Utils.IO
{ {
public static string GetApplicationDirectory() public static string GetApplicationDirectory()
{ {
#if SIMPLSHARP #if !NETSTANDARD
return Directory.GetApplicationDirectory(); return Directory.GetApplicationDirectory();
#else #else
string pathToDll = Assembly.GetExecutingAssembly().GetPath(); string pathToDll = Assembly.GetExecutingAssembly().GetPath();
@@ -27,7 +27,7 @@ namespace ICD.Common.Utils.IO
/// <returns></returns> /// <returns></returns>
public static string GetApplicationRootDirectory() public static string GetApplicationRootDirectory()
{ {
#if SIMPLSHARP #if !NETSTANDARD
return Directory.GetApplicationRootDirectory(); return Directory.GetApplicationRootDirectory();
#else #else
return Path.GetDirectoryName(Assembly.GetExecutingAssembly().GetPath()); return Path.GetDirectoryName(Assembly.GetExecutingAssembly().GetPath());