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

src/Microsoft.AspNet.Hosting.Server.Abstractions/IServerFactory.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Features;
-using Microsoft.Framework.Configuration;
+using Microsoft.Extensions.Configuration;
 
 namespace Microsoft.AspNet.Hosting.Server
 {

src/Microsoft.AspNet.Hosting.Server.Abstractions/project.json

@@ -1,4 +1,4 @@
-{
+{
     "version": "1.0.0-*",
     "description": "ASP.NET 5 Hosting server abstractions.",
     "repository": {
@@ -7,7 +7,7 @@
     },
     "dependencies": {
         "Microsoft.AspNet.Http.Features": "1.0.0-*",
-        "Microsoft.Framework.Configuration.Abstractions": "1.0.0-*"
+        "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-*"
     },
 
     "frameworks": {

src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs

@@ -15,9 +15,9 @@ using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Features.Internal;
 using Microsoft.AspNet.Server.Features;
 using Microsoft.Dnx.Runtime;
-using Microsoft.Framework.Configuration;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNet.Hosting.Internal
 {

src/Microsoft.AspNet.Hosting/Internal/RequestServicesContainerFeature.cs

@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Http.Features.Internal;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Hosting.Internal
 {

src/Microsoft.AspNet.Hosting/Internal/RequestServicesContainerMiddleware.cs

@@ -7,7 +7,7 @@ using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Features.Internal;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Hosting.Internal
 {

src/Microsoft.AspNet.Hosting/Program.cs

@@ -5,8 +5,8 @@ using System;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Server.Features;
 using Microsoft.Dnx.Runtime;
-using Microsoft.Framework.Configuration;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Hosting
 {

src/Microsoft.AspNet.Hosting/Server/ServerLoader.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Hosting.Server
 {

src/Microsoft.AspNet.Hosting/Startup/ConfigureDelegate.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Reflection;
 using Microsoft.AspNet.Builder;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Hosting.Startup
 {

src/Microsoft.AspNet.Hosting/Startup/ConfigureServicesDelegate.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Hosting.Startup
 {

src/Microsoft.AspNet.Hosting/Startup/StartupExceptionPage.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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;
@@ -13,7 +13,7 @@ using System.Runtime.ExceptionServices;
 using System.Text;
 using Microsoft.Dnx.Compilation;
 using Microsoft.Dnx.Runtime;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 
 namespace Microsoft.AspNet.Hosting.Startup
 {

src/Microsoft.AspNet.Hosting/Startup/StartupLoader.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Hosting.Startup
 {

src/Microsoft.AspNet.Hosting/Startup/StartupMethods.cs

@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Builder;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Hosting.Startup
 {

src/Microsoft.AspNet.Hosting/WebHostBuilder.cs

@@ -11,9 +11,9 @@ using Microsoft.AspNet.Hosting.Startup;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.Dnx.Runtime;
-using Microsoft.Framework.Configuration;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNet.Hosting
 {

src/Microsoft.AspNet.Hosting/project.json

@@ -12,12 +12,12 @@
         "Microsoft.AspNet.Hosting.Server.Abstractions": "1.0.0-*",
         "Microsoft.AspNet.Http": "1.0.0-*",
         "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
-        "Microsoft.Framework.Configuration": "1.0.0-*",
-        "Microsoft.Framework.Configuration.CommandLine": "1.0.0-*",
-        "Microsoft.Framework.Configuration.EnvironmentVariables": "1.0.0-*",
-        "Microsoft.Framework.Configuration.Json": "1.0.0-*",
-        "Microsoft.Framework.DependencyInjection": "1.0.0-*",
-        "Microsoft.Framework.Logging": "1.0.0-*",
+        "Microsoft.Extensions.Configuration": "1.0.0-*",
+        "Microsoft.Extensions.Configuration.CommandLine": "1.0.0-*",
+        "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
+        "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
+        "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
+        "Microsoft.Extensions.Logging": "1.0.0-*",
         "Microsoft.Dnx.Compilation.Abstractions": "1.0.0-*",
         "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*",
         "Newtonsoft.Json": "6.0.6",

src/Microsoft.AspNet.Server.Testing/Common/RetryHelper.cs

@@ -6,7 +6,7 @@ using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNet.Server.Testing
 {

src/Microsoft.AspNet.Server.Testing/Deployers/ApplicationDeployer.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNet.Server.Testing
 {

src/Microsoft.AspNet.Server.Testing/Deployers/ApplicationDeployerFactory.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.Server.Testing
 {

src/Microsoft.AspNet.Server.Testing/Deployers/IISDeployer.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Xml;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 using Microsoft.Web.Administration;
 
 namespace Microsoft.AspNet.Server.Testing

src/Microsoft.AspNet.Server.Testing/Deployers/IISExpressDeployer.cs

@@ -5,7 +5,7 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNet.Server.Testing
 {

src/Microsoft.AspNet.Server.Testing/Deployers/MonoDeployer.cs

@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNet.Server.Testing
 {

src/Microsoft.AspNet.Server.Testing/Deployers/SelfHostDeployer.cs

@@ -5,7 +5,7 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNet.Server.Testing
 {

src/Microsoft.AspNet.Server.Testing/project.json

@@ -7,7 +7,7 @@
     },
     "dependencies": {
         "Microsoft.AspNet.Testing": "1.0.0-*",
-        "Microsoft.Framework.Logging.Abstractions": "1.0.0-*",
+        "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*",
         "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*"
     },
     "frameworks": {

src/Microsoft.AspNet.TestHost/RequestFeature.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using Microsoft.AspNet.Http.Features;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.TestHost
 {

src/Microsoft.AspNet.TestHost/ResponseFeature.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Features;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.TestHost
 {

src/Microsoft.AspNet.TestHost/TestServer.cs

@@ -10,8 +10,8 @@ using Microsoft.AspNet.Hosting.Server;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.Dnx.Runtime.Infrastructure;
-using Microsoft.Framework.Configuration;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.TestHost
 {

test/Microsoft.AspNet.Hosting.Tests/Fakes/Startup.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Builder;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using System;
 
 namespace Microsoft.AspNet.Hosting.Fakes

test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupBase.cs

@@ -1,7 +1,7 @@
 // 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 Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Hosting.Fakes
 {

test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupConfigureServicesThrows.cs

@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Builder;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Hosting.Fakes
 {

test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupConfigureThrows.cs

@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Builder;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Hosting.Fakes
 {

test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupTwoConfigureServices.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Builder;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Hosting.Fakes
 {

test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupWithConfigureServices.cs

@@ -1,6 +1,6 @@
-using System;
+using System;
 using Microsoft.AspNet.Builder;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Hosting.Fakes
 {

test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupWithNullConfigureServices.cs

@@ -1,6 +1,6 @@
-using System;
+using System;
 using Microsoft.AspNet.Builder;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Hosting.Fakes
 {

test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs

@@ -18,10 +18,10 @@ using Microsoft.AspNet.Http.Features.Internal;
 using Microsoft.AspNet.Server.Features;
 using Microsoft.AspNet.Testing.xunit;
 using Microsoft.Dnx.Runtime.Infrastructure;
-using Microsoft.Framework.Configuration;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Internal;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.OptionsModel;
 using Moq;
 using Xunit;
 

test/Microsoft.AspNet.Hosting.Tests/StartupManagerTests.cs

@@ -8,8 +8,8 @@ using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Builder.Internal;
 using Microsoft.AspNet.Hosting.Fakes;
 using Microsoft.AspNet.Hosting.Startup;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.OptionsModel;
 using Xunit;
 
 namespace Microsoft.AspNet.Hosting.Tests

test/Microsoft.AspNet.Hosting.Tests/WebHostBuilderTests.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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;
@@ -11,7 +11,7 @@ using Microsoft.AspNet.Hosting.Server;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.Dnx.Runtime.Infrastructure;
-using Microsoft.Framework.Configuration;
+using Microsoft.Extensions.Configuration;
 using Xunit;
 
 namespace Microsoft.AspNet.Hosting

test/Microsoft.AspNet.Hosting.Tests/project.json

@@ -3,7 +3,7 @@
         "Microsoft.AspNet.Hosting": "1.0.0-*",
         "Microsoft.AspNet.Owin": "1.0.0-*",
         "Microsoft.AspNet.Testing": "1.0.0-*",
-        "Microsoft.Framework.OptionsModel": "1.0.0-*",
+        "Microsoft.Extensions.OptionsModel": "1.0.0-*",
         "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*",
         "Moq": "4.2.1312.1622",
         "xunit.runner.aspnet": "2.0.0-aspnet-*"

test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs

@@ -13,10 +13,10 @@ using Microsoft.AspNet.Hosting.Startup;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Features.Internal;
-using Microsoft.Framework.Configuration;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Logging;
-using Microsoft.Framework.TelemetryAdapter;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.TelemetryAdapter;
 using Xunit;
 
 namespace Microsoft.AspNet.TestHost

test/Microsoft.AspNet.TestHost.Tests/project.json

@@ -2,7 +2,7 @@
     "dependencies": {
         "Microsoft.AspNet.Testing": "1.0.0-*",
         "Microsoft.AspNet.TestHost": "1.0.0-*",
-        "Microsoft.Framework.TelemetryAdapter": "1.0.0-*",
+        "Microsoft.Extensions.TelemetryAdapter": "1.0.0-*",
         "xunit.runner.aspnet": "2.0.0-aspnet-*"
     },
     "commands": {