diff --git a/samples/RoutingSample.Web/RouteBuilderExtensions.cs b/samples/RoutingSample.Web/RouteBuilderExtensions.cs
index 73548de199..4c382c516e 100644
--- a/samples/RoutingSample.Web/RouteBuilderExtensions.cs
+++ b/samples/RoutingSample.Web/RouteBuilderExtensions.cs
@@ -4,7 +4,7 @@
using System;
using Microsoft.AspNet.Routing;
using Microsoft.AspNet.Routing.Template;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
namespace RoutingSample.Web
{
diff --git a/samples/RoutingSample.Web/Startup.cs b/samples/RoutingSample.Web/Startup.cs
index 6854c6aae8..f0c08e97ad 100644
--- a/samples/RoutingSample.Web/Startup.cs
+++ b/samples/RoutingSample.Web/Startup.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Routing;
using Microsoft.AspNet.Routing.Constraints;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
namespace RoutingSample.Web
{
diff --git a/src/Microsoft.AspNet.Routing/DefaultInlineConstraintResolver.cs b/src/Microsoft.AspNet.Routing/DefaultInlineConstraintResolver.cs
index 027537b3d5..23b1a348c1 100644
--- a/src/Microsoft.AspNet.Routing/DefaultInlineConstraintResolver.cs
+++ b/src/Microsoft.AspNet.Routing/DefaultInlineConstraintResolver.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Reflection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.OptionsModel;
namespace Microsoft.AspNet.Routing
{
diff --git a/src/Microsoft.AspNet.Routing/Logging/LogFormatter.cs b/src/Microsoft.AspNet.Routing/Logging/LogFormatter.cs
index 85131a3821..960ef5d6d2 100644
--- a/src/Microsoft.AspNet.Routing/Logging/LogFormatter.cs
+++ b/src/Microsoft.AspNet.Routing/Logging/LogFormatter.cs
@@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Routing.Logging.Internal
public static class LogFormatter
{
///
- /// A formatter for use with .
+ /// A formatter for use with .
///
public static string Formatter(object o, Exception e)
{
diff --git a/src/Microsoft.AspNet.Routing/Logging/LoggerExtensions.cs b/src/Microsoft.AspNet.Routing/Logging/LoggerExtensions.cs
index 5e2d088921..97c29946d4 100644
--- a/src/Microsoft.AspNet.Routing/Logging/LoggerExtensions.cs
+++ b/src/Microsoft.AspNet.Routing/Logging/LoggerExtensions.cs
@@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Routing.Logging.Internal
{
diff --git a/src/Microsoft.AspNet.Routing/RouteBuilderExtensions.cs b/src/Microsoft.AspNet.Routing/RouteBuilderExtensions.cs
index 13220a626f..1b3091c7b8 100644
--- a/src/Microsoft.AspNet.Routing/RouteBuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Routing/RouteBuilderExtensions.cs
@@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using Microsoft.AspNet.Routing;
using Microsoft.AspNet.Routing.Template;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Builder
{
diff --git a/src/Microsoft.AspNet.Routing/RouteCollection.cs b/src/Microsoft.AspNet.Routing/RouteCollection.cs
index 378269c316..1398e8cace 100644
--- a/src/Microsoft.AspNet.Routing/RouteCollection.cs
+++ b/src/Microsoft.AspNet.Routing/RouteCollection.cs
@@ -6,8 +6,8 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Threading.Tasks;
using Microsoft.AspNet.Http;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.OptionsModel;
namespace Microsoft.AspNet.Routing
{
diff --git a/src/Microsoft.AspNet.Routing/RouteConstraintMatcher.cs b/src/Microsoft.AspNet.Routing/RouteConstraintMatcher.cs
index 1af56b4907..67a407eb81 100644
--- a/src/Microsoft.AspNet.Routing/RouteConstraintMatcher.cs
+++ b/src/Microsoft.AspNet.Routing/RouteConstraintMatcher.cs
@@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
using Microsoft.AspNet.Http;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Routing
{
diff --git a/src/Microsoft.AspNet.Routing/RouterMiddleware.cs b/src/Microsoft.AspNet.Routing/RouterMiddleware.cs
index 1d81381616..e785b808e7 100644
--- a/src/Microsoft.AspNet.Routing/RouterMiddleware.cs
+++ b/src/Microsoft.AspNet.Routing/RouterMiddleware.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNet.Http;
using Microsoft.AspNet.Routing;
using Microsoft.AspNet.Routing.Logging;
using Microsoft.AspNet.Routing.Logging.Internal;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Builder
{
diff --git a/src/Microsoft.AspNet.Routing/RoutingServices.cs b/src/Microsoft.AspNet.Routing/RoutingServices.cs
index 2d547d2054..ff03f6a8ea 100644
--- a/src/Microsoft.AspNet.Routing/RoutingServices.cs
+++ b/src/Microsoft.AspNet.Routing/RoutingServices.cs
@@ -3,9 +3,9 @@
using System;
using Microsoft.AspNet.Routing;
-using Microsoft.Framework.DependencyInjection.Extensions;
+using Microsoft.Extensions.DependencyInjection.Extensions;
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
{
public static class RoutingServices
{
diff --git a/src/Microsoft.AspNet.Routing/ServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Routing/ServiceCollectionExtensions.cs
index e0786bfc42..0b9420e428 100644
--- a/src/Microsoft.AspNet.Routing/ServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNet.Routing/ServiceCollectionExtensions.cs
@@ -4,7 +4,7 @@
using System;
using Microsoft.AspNet.Routing;
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
{
///
/// Contains extension methods to .
diff --git a/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs b/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs
index 0f8988ec1a..6347d260cb 100644
--- a/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs
+++ b/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs
@@ -5,8 +5,8 @@ using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNet.Http;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Routing.Template
{
diff --git a/src/Microsoft.AspNet.Routing/project.json b/src/Microsoft.AspNet.Routing/project.json
index 7643857a86..3463d0b2d5 100644
--- a/src/Microsoft.AspNet.Routing/project.json
+++ b/src/Microsoft.AspNet.Routing/project.json
@@ -10,8 +10,8 @@
},
"dependencies": {
"Microsoft.AspNet.Http.Extensions": "1.0.0-*",
- "Microsoft.Framework.Logging.Abstractions": "1.0.0-*",
- "Microsoft.Framework.OptionsModel": "1.0.0-*"
+ "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*",
+ "Microsoft.Extensions.OptionsModel": "1.0.0-*"
},
"frameworks": {
"dnx451": { },
diff --git a/test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTest.cs b/test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTest.cs
index d0fb7dcfcb..c7a5de7a34 100644
--- a/test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTest.cs
+++ b/test/Microsoft.AspNet.Routing.Tests/ConstraintMatcherTest.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
using Microsoft.AspNet.Http;
#if DNX451
using Microsoft.AspNet.Routing.Logging;
-using Microsoft.Framework.Logging.Testing;
+using Microsoft.Extensions.Logging.Testing;
using Moq;
#endif
using Xunit;
diff --git a/test/Microsoft.AspNet.Routing.Tests/DefaultInlineConstraintResolverTest.cs b/test/Microsoft.AspNet.Routing.Tests/DefaultInlineConstraintResolverTest.cs
index 53fb482ddf..ed5930c73c 100644
--- a/test/Microsoft.AspNet.Routing.Tests/DefaultInlineConstraintResolverTest.cs
+++ b/test/Microsoft.AspNet.Routing.Tests/DefaultInlineConstraintResolverTest.cs
@@ -6,8 +6,8 @@ using System;
using System.Collections.Generic;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Routing.Constraints;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.OptionsModel;
using Moq;
using Xunit;
diff --git a/test/Microsoft.AspNet.Routing.Tests/InlineRouteParameterParserTests.cs b/test/Microsoft.AspNet.Routing.Tests/InlineRouteParameterParserTests.cs
index 1081f72abd..26068ce180 100644
--- a/test/Microsoft.AspNet.Routing.Tests/InlineRouteParameterParserTests.cs
+++ b/test/Microsoft.AspNet.Routing.Tests/InlineRouteParameterParserTests.cs
@@ -5,8 +5,8 @@ using System;
using System.Collections.Generic;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Routing.Template;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.OptionsModel;
using Xunit;
using System.Linq;
diff --git a/test/Microsoft.AspNet.Routing.Tests/Logging/WriteContext.cs b/test/Microsoft.AspNet.Routing.Tests/Logging/WriteContext.cs
index 151223b846..1fb13d7f79 100644
--- a/test/Microsoft.AspNet.Routing.Tests/Logging/WriteContext.cs
+++ b/test/Microsoft.AspNet.Routing.Tests/Logging/WriteContext.cs
@@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Routing
{
diff --git a/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs b/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs
index 6a48cc5e0f..3e279de5b6 100644
--- a/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs
+++ b/test/Microsoft.AspNet.Routing.Tests/RouteCollectionTest.cs
@@ -9,9 +9,9 @@ using System.Threading.Tasks;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Routing.Logging;
using Microsoft.AspNet.Routing.Template;
-using Microsoft.Framework.Logging.Testing;
-using Microsoft.Framework.Logging;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.Logging.Testing;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.OptionsModel;
using Moq;
using Xunit;
diff --git a/test/Microsoft.AspNet.Routing.Tests/RouteConstraintBuilderTest.cs b/test/Microsoft.AspNet.Routing.Tests/RouteConstraintBuilderTest.cs
index 7e6e2d9b6a..badc78eeb0 100644
--- a/test/Microsoft.AspNet.Routing.Tests/RouteConstraintBuilderTest.cs
+++ b/test/Microsoft.AspNet.Routing.Tests/RouteConstraintBuilderTest.cs
@@ -7,7 +7,7 @@ using System.Linq;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Routing.Constraints;
using Microsoft.AspNet.Testing;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.OptionsModel;
using Moq;
using Xunit;
diff --git a/test/Microsoft.AspNet.Routing.Tests/RouteOptionsTests.cs b/test/Microsoft.AspNet.Routing.Tests/RouteOptionsTests.cs
index 67d5eb0af3..aa32a4e462 100644
--- a/test/Microsoft.AspNet.Routing.Tests/RouteOptionsTests.cs
+++ b/test/Microsoft.AspNet.Routing.Tests/RouteOptionsTests.cs
@@ -4,8 +4,8 @@
using System;
using System.Collections.Generic;
using Microsoft.AspNet.Http;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.OptionsModel;
using Xunit;
namespace Microsoft.AspNet.Routing.Tests
diff --git a/test/Microsoft.AspNet.Routing.Tests/RouterMiddlewareTest.cs b/test/Microsoft.AspNet.Routing.Tests/RouterMiddlewareTest.cs
index 669a5da889..155c3fa125 100644
--- a/test/Microsoft.AspNet.Routing.Tests/RouterMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Routing.Tests/RouterMiddlewareTest.cs
@@ -5,7 +5,7 @@ using System;
using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Http.Internal;
-using Microsoft.Framework.Logging.Testing;
+using Microsoft.Extensions.Logging.Testing;
using Xunit;
namespace Microsoft.AspNet.Routing
diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.cs
index 91f4978336..e5a91b5946 100644
--- a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.cs
+++ b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.cs
@@ -5,8 +5,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.OptionsModel;
using Moq;
using Xunit;
diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.cs
index d097d7779c..a248f6c853 100644
--- a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.cs
+++ b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.cs
@@ -2,8 +2,8 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.OptionsModel;
using Xunit;
namespace Microsoft.AspNet.Routing.Template.Tests
diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs
index ba041473c1..beec5ffca0 100644
--- a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs
+++ b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs
@@ -6,8 +6,8 @@ using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNet.Testing;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.OptionsModel;
using Moq;
using Xunit;
diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.cs
index 2a78ac8383..e24107733a 100644
--- a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.cs
+++ b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateRouteTest.cs
@@ -11,9 +11,9 @@ using Microsoft.AspNet.Http;
using Microsoft.AspNet.Routing.Constraints;
using Microsoft.AspNet.Routing.Logging;
using Microsoft.AspNet.Testing;
-using Microsoft.Framework.Logging.Internal;
-using Microsoft.Framework.Logging.Testing;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging.Internal;
+using Microsoft.Extensions.Logging.Testing;
+using Microsoft.Extensions.Logging;
using Moq;
using Xunit;
diff --git a/test/Microsoft.AspNet.Routing.Tests/TemplateParserDefaultValuesTests.cs b/test/Microsoft.AspNet.Routing.Tests/TemplateParserDefaultValuesTests.cs
index 61eff2316f..6eeae1e5f0 100644
--- a/test/Microsoft.AspNet.Routing.Tests/TemplateParserDefaultValuesTests.cs
+++ b/test/Microsoft.AspNet.Routing.Tests/TemplateParserDefaultValuesTests.cs
@@ -5,8 +5,8 @@
using System;
using Microsoft.AspNet.Builder;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.OptionsModel;
using Moq;
using Xunit;
diff --git a/test/Microsoft.AspNet.Routing.Tests/project.json b/test/Microsoft.AspNet.Routing.Tests/project.json
index 09d8f3c115..69668e12db 100644
--- a/test/Microsoft.AspNet.Routing.Tests/project.json
+++ b/test/Microsoft.AspNet.Routing.Tests/project.json
@@ -6,8 +6,8 @@
"Microsoft.AspNet.Http": "1.0.0-*",
"Microsoft.AspNet.Routing": "1.0.0-*",
"Microsoft.AspNet.Testing": "1.0.0-*",
- "Microsoft.Framework.DependencyInjection": "1.0.0-*",
- "Microsoft.Framework.Logging.Testing": "1.0.0-*",
+ "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
+ "Microsoft.Extensions.Logging.Testing": "1.0.0-*",
"xunit.runner.aspnet": "2.0.0-aspnet-*"
},
"frameworks": {