Skip to content

Remote some unnecessary FEATURE_APPDOMAIN guards #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stakx merged 1 commit into from
Jun 10, 2020
Merged

Remote some unnecessary FEATURE_APPDOMAIN guards #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/Castle.Core/Core/Logging/AbstractExtendedLoggerFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
4 changes: 0 additions & 4 deletions src/Castle.Core/Core/Logging/AbstractLoggerFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
4 changes: 0 additions & 4 deletions src/Castle.Core/Core/Resource/AbstractResource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down