Skip to content

Commit

Permalink
renamed "_log" variable into "log"
Browse files Browse the repository at this point in the history
(cherry picked from commit f642e99)
  • Loading branch information
svg2003 committed Apr 20, 2023
1 parent b01ad3e commit 38d141e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace NUnit.Engine.Internal
{
internal sealed class TestAssemblyLoadContext : AssemblyLoadContext
{
private static readonly Logger _log = InternalTrace.GetLogger(typeof(TestAssemblyLoadContext));
private static readonly Logger log = InternalTrace.GetLogger(typeof(TestAssemblyLoadContext));

private readonly string _testAssemblyPath;
private readonly string _basePath;
Expand All @@ -29,12 +29,12 @@ public TestAssemblyLoadContext(string testAssemblyPath)

protected override Assembly Load(AssemblyName name)
{
_log.Debug("Loading {0} assembly", name);
log.Debug("Loading {0} assembly", name);

var loadedAssembly = base.Load(name);
if (loadedAssembly != null)
{
_log.Info("Assembly {0} ({1}) is loaded using default base.Load()", name, GetAssemblyLocationInfo(loadedAssembly));
log.Info("Assembly {0} ({1}) is loaded using default base.Load()", name, GetAssemblyLocationInfo(loadedAssembly));
return loadedAssembly;
}

Expand All @@ -48,14 +48,14 @@ protected override Assembly Load(AssemblyName name)

if (loadedAssembly != null)
{
_log.Info("Assembly {0} ({1}) is loaded using the deps.json info", name, GetAssemblyLocationInfo(loadedAssembly));
log.Info("Assembly {0} ({1}) is loaded using the deps.json info", name, GetAssemblyLocationInfo(loadedAssembly));
return loadedAssembly;
}

loadedAssembly = _resolver.Resolve(this, name);
if (loadedAssembly != null)
{
_log.Info("Assembly {0} ({1}) is loaded using the TestAssembliesResolver", name, GetAssemblyLocationInfo(loadedAssembly));
log.Info("Assembly {0} ({1}) is loaded using the TestAssembliesResolver", name, GetAssemblyLocationInfo(loadedAssembly));

return loadedAssembly;
}
Expand All @@ -72,7 +72,7 @@ protected override Assembly Load(AssemblyName name)

if (loadedAssembly != null)
{
_log.Info("Assembly {0} ({1}) is loaded using base path", name, GetAssemblyLocationInfo(loadedAssembly));
log.Info("Assembly {0} ({1}) is loaded using base path", name, GetAssemblyLocationInfo(loadedAssembly));
return loadedAssembly;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace NUnit.Engine.Internal
{
internal sealed class TestAssemblyResolver : IDisposable
{
private static readonly Logger _log = InternalTrace.GetLogger(typeof(TestAssemblyResolver));
private static readonly Logger log = InternalTrace.GetLogger(typeof(TestAssemblyResolver));

private readonly ICompilationAssemblyResolver _assemblyResolver;
private readonly DependencyContext _dependencyContext;
Expand Down Expand Up @@ -68,7 +68,7 @@ private Assembly OnResolving(AssemblyLoadContext context, AssemblyName name)

if (TryLoadFromTrustedPlatformAssemblies(context, name, out var loadedAssembly))
{
_log.Info("'{0}' assembly is loaded from trusted path '{1}'", name, loadedAssembly.Location);
log.Info("'{0}' assembly is loaded from trusted path '{1}'", name, loadedAssembly.Location);
return loadedAssembly;
}

Expand All @@ -91,7 +91,7 @@ private Assembly OnResolving(AssemblyLoadContext context, AssemblyName name)
if (name.Name == Path.GetFileNameWithoutExtension(assemblyPath))
{
loadedAssembly = context.LoadFromAssemblyPath(assemblyPath);
_log.Info("'{0}' ({1}) assembly is loaded from runtime libraries {2} dependencies",
log.Info("'{0}' ({1}) assembly is loaded from runtime libraries {2} dependencies",
name,
loadedAssembly.Location,
library.Name);
Expand All @@ -116,7 +116,7 @@ private Assembly OnResolving(AssemblyLoadContext context, AssemblyName name)
if (File.Exists(candidate))
{
loadedAssembly = context.LoadFromAssemblyPath(candidate);
_log.Info("'{0}' ({1}) assembly is loaded from AdditionalFrameworkDirectory {2} dependencies with best candidate version {3}",
log.Info("'{0}' ({1}) assembly is loaded from AdditionalFrameworkDirectory {2} dependencies with best candidate version {3}",
name,
loadedAssembly.Location,
frameworkDirectory,
Expand All @@ -126,12 +126,12 @@ private Assembly OnResolving(AssemblyLoadContext context, AssemblyName name)
}
else
{
_log.Debug("Best version dir for {0} is {1}, but there is no {2} file", frameworkDirectory, versionDir, candidate);
log.Debug("Best version dir for {0} is {1}, but there is no {2} file", frameworkDirectory, versionDir, candidate);
}
}
}

_log.Info("Cannot resolve assembly '{0}'", name);
log.Info("Cannot resolve assembly '{0}'", name);
return null;
}

Expand Down

0 comments on commit 38d141e

Please sign in to comment.