Skip to content

Commit 20bda13

Browse files
authored
Remove TODO as FakeAppDomain is obsolete, and also automatic assembly loading (#5169)
1 parent 0527d3e commit 20bda13

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/NLog/Config/ConfigurationItemFactory.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,6 @@ internal static IEnumerable<KeyValuePair<string, string>> GetAutoLoadingFileLoca
546546
if (!string.IsNullOrEmpty(entryAssemblyLocation) && !string.Equals(entryAssemblyLocation, nlogAssemblyLocation, StringComparison.OrdinalIgnoreCase))
547547
yield return new KeyValuePair<string, string>(entryAssemblyLocation, nameof(entryAssemblyLocation));
548548

549-
// TODO Consider to prioritize AppDomain.PrivateBinPath
550549
var baseDirectory = PathHelpers.TrimDirectorySeparators(LogFactory.DefaultAppEnvironment.AppDomainBaseDirectory);
551550
InternalLogger.Debug("Auto loading based on AppDomain-BaseDirectory found location: {0}", baseDirectory);
552551
if (!string.IsNullOrEmpty(baseDirectory) && !string.Equals(baseDirectory, nlogAssemblyLocation, StringComparison.OrdinalIgnoreCase))

src/NLog/Internal/AppDomains/FakeAppDomain.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ private static string GetFriendlyNameFromProcessName()
126126
/// <returns>A list of assemblies in this application domain.</returns>
127127
public IEnumerable<Assembly> GetAssemblies()
128128
{
129-
return Internal.ArrayHelper.Empty<Assembly>(); // TODO NETSTANDARD1_6 has DependencyContext.RuntimeLibraries
129+
return Internal.ArrayHelper.Empty<Assembly>();
130130
}
131131

132132
/// <summary>

0 commit comments

Comments
 (0)