Remove some unnecessary FEATURE_APPDOMAIN guards

(.NET Standard 2.x supports `AppDomain.CurrentDomain.BaseDirectory`.)
castleproject · Jun 10, 2020 · f2619a5 · f2619a5
1 parent 4871e9b
commit f2619a5
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/src/Castle.Core/Core/Logging/AbstractExtendedLoggerFactory.cs b/src/Castle.Core/Core/Logging/AbstractExtendedLoggerFactory.cs
@@ -101,11 +101,7 @@ protected static FileInfo GetConfigFile(string fileName)
 			}
 			else
 			{
-#if FEATURE_APPDOMAIN
 				string baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
-#else
-				string baseDirectory = AppContext.BaseDirectory;
-#endif
 				result = new FileInfo(Path.Combine(baseDirectory, fileName));
 			}
 

diff --git a/src/Castle.Core/Core/Logging/AbstractLoggerFactory.cs b/src/Castle.Core/Core/Logging/AbstractLoggerFactory.cs
@@ -60,11 +60,7 @@ protected static FileInfo GetConfigFile(string fileName)
 			}
 			else
 			{
-#if FEATURE_APPDOMAIN
 				string baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
-#else
-				string baseDirectory = AppContext.BaseDirectory;
-#endif
 				result = new FileInfo(Path.Combine(baseDirectory, fileName));
 			}
 

diff --git a/src/Castle.Core/Core/Resource/AbstractResource.cs b/src/Castle.Core/Core/Resource/AbstractResource.cs
@@ -20,11 +20,7 @@ namespace Castle.Core.Resource
 
 	public abstract class AbstractResource : IResource
 	{
-#if FEATURE_APPDOMAIN
 		protected static readonly string DefaultBasePath = AppDomain.CurrentDomain.BaseDirectory;
-#else
-		protected static readonly string DefaultBasePath = AppContext.BaseDirectory;
-#endif
 
 		public virtual string FileBasePath
 		{