diff --git a/ICD.Common.Utils.Tests/ICD.Common.Utils.Tests_NetStandard.csproj b/ICD.Common.Utils.Tests/ICD.Common.Utils.Tests_NetStandard.csproj index b56ba08..a1da264 100644 --- a/ICD.Common.Utils.Tests/ICD.Common.Utils.Tests_NetStandard.csproj +++ b/ICD.Common.Utils.Tests/ICD.Common.Utils.Tests_NetStandard.csproj @@ -26,9 +26,9 @@ - - - + + + diff --git a/ICD.Common.Utils/ICD.Common.Utils_NetStandard.csproj b/ICD.Common.Utils/ICD.Common.Utils_NetStandard.csproj index 80fd826..9a40653 100644 --- a/ICD.Common.Utils/ICD.Common.Utils_NetStandard.csproj +++ b/ICD.Common.Utils/ICD.Common.Utils_NetStandard.csproj @@ -38,10 +38,10 @@ - - - - + + + + diff --git a/ICD.Common.Utils/IO/IcdDirectory.cs b/ICD.Common.Utils/IO/IcdDirectory.cs index 27b3c31..36a3f05 100644 --- a/ICD.Common.Utils/IO/IcdDirectory.cs +++ b/ICD.Common.Utils/IO/IcdDirectory.cs @@ -4,7 +4,7 @@ using Crestron.SimplSharp.CrestronIO; #else using ICD.Common.Utils.Extensions; using System.IO; -using Microsoft.DotNet.PlatformAbstractions; +using System.Reflection; #endif namespace ICD.Common.Utils.IO @@ -16,7 +16,8 @@ namespace ICD.Common.Utils.IO #if SIMPLSHARP return Directory.GetApplicationDirectory(); #else - return ApplicationEnvironment.ApplicationBasePath; + string pathToDll = Assembly.GetExecutingAssembly().GetPath(); + return pathToDll == null ? null : IcdPath.GetDirectoryName(pathToDll); #endif }