Skip to content

Commit 38d141e

Browse files
committed
renamed "_log" variable into "log"
(cherry picked from commit f642e99)
1 parent b01ad3e commit 38d141e

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/NUnitEngine/nunit.engine.core/Internal/TestAssemblyLoadContext.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace NUnit.Engine.Internal
1212
{
1313
internal sealed class TestAssemblyLoadContext : AssemblyLoadContext
1414
{
15-
private static readonly Logger _log = InternalTrace.GetLogger(typeof(TestAssemblyLoadContext));
15+
private static readonly Logger log = InternalTrace.GetLogger(typeof(TestAssemblyLoadContext));
1616

1717
private readonly string _testAssemblyPath;
1818
private readonly string _basePath;
@@ -29,12 +29,12 @@ public TestAssemblyLoadContext(string testAssemblyPath)
2929

3030
protected override Assembly Load(AssemblyName name)
3131
{
32-
_log.Debug("Loading {0} assembly", name);
32+
log.Debug("Loading {0} assembly", name);
3333

3434
var loadedAssembly = base.Load(name);
3535
if (loadedAssembly != null)
3636
{
37-
_log.Info("Assembly {0} ({1}) is loaded using default base.Load()", name, GetAssemblyLocationInfo(loadedAssembly));
37+
log.Info("Assembly {0} ({1}) is loaded using default base.Load()", name, GetAssemblyLocationInfo(loadedAssembly));
3838
return loadedAssembly;
3939
}
4040

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

4949
if (loadedAssembly != null)
5050
{
51-
_log.Info("Assembly {0} ({1}) is loaded using the deps.json info", name, GetAssemblyLocationInfo(loadedAssembly));
51+
log.Info("Assembly {0} ({1}) is loaded using the deps.json info", name, GetAssemblyLocationInfo(loadedAssembly));
5252
return loadedAssembly;
5353
}
5454

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

6060
return loadedAssembly;
6161
}
@@ -72,7 +72,7 @@ protected override Assembly Load(AssemblyName name)
7272

7373
if (loadedAssembly != null)
7474
{
75-
_log.Info("Assembly {0} ({1}) is loaded using base path", name, GetAssemblyLocationInfo(loadedAssembly));
75+
log.Info("Assembly {0} ({1}) is loaded using base path", name, GetAssemblyLocationInfo(loadedAssembly));
7676
return loadedAssembly;
7777
}
7878

src/NUnitEngine/nunit.engine.core/Internal/TestAssemblyResolver.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace NUnit.Engine.Internal
1717
{
1818
internal sealed class TestAssemblyResolver : IDisposable
1919
{
20-
private static readonly Logger _log = InternalTrace.GetLogger(typeof(TestAssemblyResolver));
20+
private static readonly Logger log = InternalTrace.GetLogger(typeof(TestAssemblyResolver));
2121

2222
private readonly ICompilationAssemblyResolver _assemblyResolver;
2323
private readonly DependencyContext _dependencyContext;
@@ -68,7 +68,7 @@ private Assembly OnResolving(AssemblyLoadContext context, AssemblyName name)
6868

6969
if (TryLoadFromTrustedPlatformAssemblies(context, name, out var loadedAssembly))
7070
{
71-
_log.Info("'{0}' assembly is loaded from trusted path '{1}'", name, loadedAssembly.Location);
71+
log.Info("'{0}' assembly is loaded from trusted path '{1}'", name, loadedAssembly.Location);
7272
return loadedAssembly;
7373
}
7474

@@ -91,7 +91,7 @@ private Assembly OnResolving(AssemblyLoadContext context, AssemblyName name)
9191
if (name.Name == Path.GetFileNameWithoutExtension(assemblyPath))
9292
{
9393
loadedAssembly = context.LoadFromAssemblyPath(assemblyPath);
94-
_log.Info("'{0}' ({1}) assembly is loaded from runtime libraries {2} dependencies",
94+
log.Info("'{0}' ({1}) assembly is loaded from runtime libraries {2} dependencies",
9595
name,
9696
loadedAssembly.Location,
9797
library.Name);
@@ -116,7 +116,7 @@ private Assembly OnResolving(AssemblyLoadContext context, AssemblyName name)
116116
if (File.Exists(candidate))
117117
{
118118
loadedAssembly = context.LoadFromAssemblyPath(candidate);
119-
_log.Info("'{0}' ({1}) assembly is loaded from AdditionalFrameworkDirectory {2} dependencies with best candidate version {3}",
119+
log.Info("'{0}' ({1}) assembly is loaded from AdditionalFrameworkDirectory {2} dependencies with best candidate version {3}",
120120
name,
121121
loadedAssembly.Location,
122122
frameworkDirectory,
@@ -126,12 +126,12 @@ private Assembly OnResolving(AssemblyLoadContext context, AssemblyName name)
126126
}
127127
else
128128
{
129-
_log.Debug("Best version dir for {0} is {1}, but there is no {2} file", frameworkDirectory, versionDir, candidate);
129+
log.Debug("Best version dir for {0} is {1}, but there is no {2} file", frameworkDirectory, versionDir, candidate);
130130
}
131131
}
132132
}
133133

134-
_log.Info("Cannot resolve assembly '{0}'", name);
134+
log.Info("Cannot resolve assembly '{0}'", name);
135135
return null;
136136
}
137137

0 commit comments

Comments
 (0)