Renaming Microsoft.Framework.* -> Microsoft.Extensions.*

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
 {

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
 {

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
 {

src/Microsoft.AspNet.Routing/Logging/LogFormatter.cs

@@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Routing.Logging.Internal
     public static class LogFormatter
     {
         /// <summary>
-        /// A formatter for use with <see cref="Microsoft.Framework.Logging.ILogger.Log"/>.
+        /// A formatter for use with <see cref="Microsoft.Extensions.Logging.ILogger.Log"/>.
         /// </summary>
         public static string Formatter(object o, Exception e)
         {

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
 {

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
 {

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.Extensions.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.OptionsModel;
 
 namespace Microsoft.AspNet.Routing
 {

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
 {

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
 {

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
     {

src/Microsoft.AspNet.Routing/ServiceCollectionExtensions.cs

@@ -4,7 +4,7 @@
 using System;
 using Microsoft.AspNet.Routing;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     /// <summary>
     /// Contains extension methods to <see cref="IServiceCollection"/>.

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.Extensions.DependencyInjection;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNet.Routing.Template
 {

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.Extensions.Logging.Abstractions": "1.0.0-*",
-        "Microsoft.Framework.OptionsModel": "1.0.0-*"
+        "Microsoft.Extensions.OptionsModel": "1.0.0-*"
     },
     "frameworks": {
         "dnx451": { },

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;

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.Extensions.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.OptionsModel;
 using Moq;
 using Xunit;
 

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.Extensions.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.OptionsModel;
 using Xunit;
 using System.Linq;
 

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
 {

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.Extensions.Logging.Testing;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.OptionsModel;
 using Moq;
 using Xunit;
 

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;
 

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.Extensions.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.OptionsModel;
 using Xunit;
 
 namespace Microsoft.AspNet.Routing.Tests

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

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.Extensions.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.OptionsModel;
 using Moq;
 using Xunit;
 

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.Extensions.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.OptionsModel;
 using Xunit;
 
 namespace Microsoft.AspNet.Routing.Template.Tests

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.Extensions.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.OptionsModel;
 using Moq;
 using Xunit;
 

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.Extensions.Logging.Internal;
-using Microsoft.Framework.Logging.Testing;
+using Microsoft.Extensions.Logging.Testing;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 using Moq;
 using Xunit;
 

test/Microsoft.AspNet.Routing.Tests/TemplateParserDefaultValuesTests.cs

@@ -5,8 +5,8 @@
 
 using System;
 using Microsoft.AspNet.Builder;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.OptionsModel;
 using Moq;
 using Xunit;
 

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.Extensions.DependencyInjection": "1.0.0-*",
-        "Microsoft.Framework.Logging.Testing": "1.0.0-*",
+        "Microsoft.Extensions.Logging.Testing": "1.0.0-*",
         "xunit.runner.aspnet": "2.0.0-aspnet-*"
     },
     "frameworks": {