diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerTypeProvider.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultControllerTypeProvider.cs
index 8480c49a5a..0f4a6ae111 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerTypeProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/DefaultControllerTypeProvider.cs
@@ -5,9 +5,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
-using Microsoft.AspNet.Mvc.Logging;
using Microsoft.Framework.Internal;
-using Microsoft.Framework.Logging;
namespace Microsoft.AspNet.Mvc
{
@@ -27,7 +25,6 @@ namespace Microsoft.AspNet.Mvc
///
/// that provides assemblies to look for
/// controllers in.
- /// The .
public DefaultControllerTypeProvider(IAssemblyProvider assemblyProvider)
{
_assemblyProvider = assemblyProvider;
diff --git a/src/Microsoft.AspNet.Mvc.Core/Logging/LoggerExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Logging/LoggerExtensions.cs
deleted file mode 100644
index 3471bdc78b..0000000000
--- a/src/Microsoft.AspNet.Mvc.Core/Logging/LoggerExtensions.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.Framework.Internal;
-using Microsoft.Framework.Logging;
-
-namespace Microsoft.AspNet.Mvc.Logging
-{
- internal static class LoggerExtensions
- {
- public static void WriteValues([NotNull] this ILogger logger, object values)
- {
- logger.Log(
- logLevel: LogLevel.Verbose,
- eventId: 0,
- state: values,
- exception: null,
- formatter: LogFormatter.Formatter);
- }
- }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.Core/Logging/StringBuilderHelpers.cs b/src/Microsoft.AspNet.Mvc.Core/Logging/StringBuilderHelpers.cs
deleted file mode 100644
index 725ef8a63e..0000000000
--- a/src/Microsoft.AspNet.Mvc.Core/Logging/StringBuilderHelpers.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Microsoft.AspNet.Mvc.Logging
-{
- internal static class StringBuilderHelpers
- {
- public static void Append(
- StringBuilder builder,
- IEnumerable items,
- Func itemFormatter = null)
- {
- if (items == null)
- {
- return;
- }
-
- foreach (var item in items)
- {
- builder.Append(Environment.NewLine);
- builder.Append("\t\t");
-
- if (itemFormatter == null)
- {
- builder.Append(item != null ? item.ToString() : "null");
- }
- else
- {
- builder.Append(item != null ? itemFormatter(item) : "null");
- }
- }
- }
-
- public static void Append(StringBuilder builder, IDictionary dict)
- {
- if (dict == null)
- {
- return;
- }
-
- foreach (var kvp in dict)
- {
- builder.Append(Environment.NewLine);
- builder.Append("\t\t");
- builder.Append(kvp.Key != null ? kvp.Key.ToString() : "null");
- builder.Append(" : ");
- builder.Append(kvp.Value != null ? kvp.Value.ToString() : "null");
- }
- }
- }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs
index cbd1a70fdf..b6ee8e94e9 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs
@@ -17,6 +17,7 @@ using Microsoft.AspNet.Mvc.Routing;
using Microsoft.AspNet.Routing;
using Microsoft.Framework.Internal;
using Microsoft.Framework.Logging;
+using Microsoft.Framework.Logging.Testing;
using Moq;
using Xunit;
@@ -29,7 +30,7 @@ namespace Microsoft.AspNet.Mvc
{
// Arrange
var sink = new TestSink();
- var loggerFactory = new TestLoggerFactory(sink);
+ var loggerFactory = new TestLoggerFactory(sink, enabled: true);
var actions = new ActionDescriptor[]
{
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Logging/BeginScopeContext.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Logging/BeginScopeContext.cs
deleted file mode 100644
index 4c69db10b8..0000000000
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Logging/BeginScopeContext.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.AspNet.Mvc
-{
- public class BeginScopeContext
- {
- public object Scope { get; set; }
-
- public string LoggerName { get; set; }
- }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Logging/NullDisposable.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Logging/NullDisposable.cs
deleted file mode 100644
index 7d2e1ef73a..0000000000
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Logging/NullDisposable.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. 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.AspNet.Mvc
-{
- public class NullDisposable : IDisposable
- {
- public static NullDisposable Instance = new NullDisposable();
-
- public void Dispose()
- {
- // intentionally does nothing
- }
- }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Logging/NullLogger.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Logging/NullLogger.cs
deleted file mode 100644
index f6a304d3e7..0000000000
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Logging/NullLogger.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.Framework.Logging;
-
-namespace Microsoft.AspNet.Mvc
-{
- public class NullLogger : ILogger
- {
- public static NullLogger Instance = new NullLogger();
-
- public IDisposable BeginScopeImpl(object state)
- {
- return NullDisposable.Instance;
- }
-
- public void Log(LogLevel logLevel, int eventId, object state, Exception exception, Func