diff --git a/src/Microsoft.Extensions.Logging.Testing/NullLogger.cs b/src/Microsoft.Extensions.Logging.Testing/NullLogger.cs deleted file mode 100644 index 8b436ea0..00000000 --- a/src/Microsoft.Extensions.Logging.Testing/NullLogger.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.Extensions.Logging.Testing -{ - public class NullLogger : ILogger - { - public static readonly NullLogger Instance = new NullLogger(); - - public IDisposable BeginScope(TState state) - { - return NullDisposable.Instance; - } - - public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) - { - } - - public bool IsEnabled(LogLevel logLevel) - { - return false; - } - - private class NullDisposable : IDisposable - { - public static readonly NullDisposable Instance = new NullDisposable(); - - public void Dispose() - { - // intentionally does nothing - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Logging.Testing/NullLoggerFactory.cs b/src/Microsoft.Extensions.Logging.Testing/NullLoggerFactory.cs deleted file mode 100644 index d227a383..00000000 --- a/src/Microsoft.Extensions.Logging.Testing/NullLoggerFactory.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.Extensions.Logging.Testing -{ - public class NullLoggerFactory : ILoggerFactory - { - public static readonly NullLoggerFactory Instance = new NullLoggerFactory(); - - public ILogger CreateLogger(string name) - { - return NullLogger.Instance; - } - - public void AddProvider(ILoggerProvider provider) - { - } - - public void Dispose() - { - } - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Logging.Testing/NullLoggerOfT.cs b/src/Microsoft.Extensions.Logging.Testing/NullLoggerOfT.cs deleted file mode 100644 index 42b97bb2..00000000 --- a/src/Microsoft.Extensions.Logging.Testing/NullLoggerOfT.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.Extensions.Logging.Testing -{ - public class NullLogger : ILogger - { - public static readonly NullLogger Instance = new NullLogger(); - - public IDisposable BeginScope(TState state) - { - return NullDisposable.Instance; - } - - public void Log( - LogLevel logLevel, - EventId eventId, - TState state, - Exception exception, - Func formatter) - { - } - - public bool IsEnabled(LogLevel logLevel) - { - return false; - } - - private class NullDisposable : IDisposable - { - public static readonly NullDisposable Instance = new NullDisposable(); - - public void Dispose() - { - // intentionally does nothing - } - } - } -} diff --git a/test/Microsoft.Extensions.Logging.Testing.Tests/NullLoggerFactoryTest.cs b/test/Microsoft.Extensions.Logging.Test/NullLoggerFactoryTest.cs similarity index 91% rename from test/Microsoft.Extensions.Logging.Testing.Tests/NullLoggerFactoryTest.cs rename to test/Microsoft.Extensions.Logging.Test/NullLoggerFactoryTest.cs index 592cb1a6..b8f83d7d 100644 --- a/test/Microsoft.Extensions.Logging.Testing.Tests/NullLoggerFactoryTest.cs +++ b/test/Microsoft.Extensions.Logging.Test/NullLoggerFactoryTest.cs @@ -3,7 +3,7 @@ using Xunit; -namespace Microsoft.Extensions.Logging.Testing +namespace Microsoft.Extensions.Logging.Abstractions { public class NullLoggerFactoryTest { diff --git a/test/Microsoft.Extensions.Logging.Testing.Tests/NullLoggerTest.cs b/test/Microsoft.Extensions.Logging.Test/NullLoggerTest.cs similarity index 96% rename from test/Microsoft.Extensions.Logging.Testing.Tests/NullLoggerTest.cs rename to test/Microsoft.Extensions.Logging.Test/NullLoggerTest.cs index 61d5cf09..ae5bbfb8 100644 --- a/test/Microsoft.Extensions.Logging.Testing.Tests/NullLoggerTest.cs +++ b/test/Microsoft.Extensions.Logging.Test/NullLoggerTest.cs @@ -3,7 +3,7 @@ using Xunit; -namespace Microsoft.Extensions.Logging.Testing +namespace Microsoft.Extensions.Logging.Abstractions { public class NullLoggerTest {