Skip to content

Commit

Permalink
Remove TODO as FakeAppDomain is obsolete, and also automatic assembly…
Browse files Browse the repository at this point in the history
… loading (#5169)
  • Loading branch information
snakefoot authored Mar 11, 2023
1 parent 0527d3e commit 20bda13
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion src/NLog/Config/ConfigurationItemFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,6 @@ internal static IEnumerable<KeyValuePair<string, string>> GetAutoLoadingFileLoca
if (!string.IsNullOrEmpty(entryAssemblyLocation) && !string.Equals(entryAssemblyLocation, nlogAssemblyLocation, StringComparison.OrdinalIgnoreCase))
yield return new KeyValuePair<string, string>(entryAssemblyLocation, nameof(entryAssemblyLocation));

// TODO Consider to prioritize AppDomain.PrivateBinPath
var baseDirectory = PathHelpers.TrimDirectorySeparators(LogFactory.DefaultAppEnvironment.AppDomainBaseDirectory);
InternalLogger.Debug("Auto loading based on AppDomain-BaseDirectory found location: {0}", baseDirectory);
if (!string.IsNullOrEmpty(baseDirectory) && !string.Equals(baseDirectory, nlogAssemblyLocation, StringComparison.OrdinalIgnoreCase))
Expand Down
2 changes: 1 addition & 1 deletion src/NLog/Internal/AppDomains/FakeAppDomain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ private static string GetFriendlyNameFromProcessName()
/// <returns>A list of assemblies in this application domain.</returns>
public IEnumerable<Assembly> GetAssemblies()
{
return Internal.ArrayHelper.Empty<Assembly>(); // TODO NETSTANDARD1_6 has DependencyContext.RuntimeLibraries
return Internal.ArrayHelper.Empty<Assembly>();
}

/// <summary>
Expand Down

0 comments on commit 20bda13

Please sign in to comment.