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

samples/ElmPageSample/HelloWorldMiddleware.cs

@@ -1,10 +1,10 @@
-// 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.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace ElmPageSample
 {

samples/ElmPageSample/Startup.cs

@@ -1,9 +1,9 @@
-// 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 Microsoft.AspNet.Builder;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 namespace ElmPageSample
 {

samples/ExceptionHandlerSample/Startup.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Diagnostics;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 
 namespace ExceptionHandlerSample
 {

samples/StatusCodePagesSample/Startup.cs

@@ -9,7 +9,7 @@ using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Diagnostics;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 
 namespace StatusCodePagesSample
 {

src/Microsoft.AspNet.Diagnostics.Elm/ElmCaptureMiddleware.cs

@@ -5,8 +5,8 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
-using Microsoft.Framework.Logging;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.OptionsModel;
 
 namespace Microsoft.AspNet.Diagnostics.Elm
 {

src/Microsoft.AspNet.Diagnostics.Elm/ElmExtensions.cs

@@ -3,10 +3,10 @@
 
 using System;
 using Microsoft.AspNet.Diagnostics.Elm;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Internal;
-using Microsoft.Framework.Logging;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.OptionsModel;
 
 namespace Microsoft.AspNet.Builder
 {

src/Microsoft.AspNet.Diagnostics.Elm/ElmLogger.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.Diagnostics.Elm
 {

src/Microsoft.AspNet.Diagnostics.Elm/ElmLoggerProvider.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;
-using Microsoft.Framework.Internal;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNet.Diagnostics.Elm
 {

src/Microsoft.AspNet.Diagnostics.Elm/ElmOptions.cs

@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Http;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNet.Diagnostics.Elm
 {

src/Microsoft.AspNet.Diagnostics.Elm/ElmPageMiddleware.cs

@@ -6,8 +6,8 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Diagnostics.Elm.Views;
-using Microsoft.Framework.Logging;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.OptionsModel;
 using System.Linq;
 
 namespace Microsoft.AspNet.Diagnostics.Elm

src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs

@@ -1,11 +1,11 @@
-using System;
+using System;
 #if DNX451
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Messaging;
 #else
 using System.Threading;
 #endif
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Diagnostics.Elm
 {

src/Microsoft.AspNet.Diagnostics.Elm/ElmServiceCollectionExtensions.cs

@@ -3,9 +3,9 @@
 
 using System;
 using Microsoft.AspNet.Diagnostics.Elm;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     public static class ElmServiceCollectionExtensions
     {

src/Microsoft.AspNet.Diagnostics.Elm/ElmStore.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Diagnostics.Elm
 {

src/Microsoft.AspNet.Diagnostics.Elm/LogInfo.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.Diagnostics.Elm
 {

src/Microsoft.AspNet.Diagnostics.Elm/ViewOptions.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.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNet.Diagnostics.Elm
 {

src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPage.cs

@@ -37,7 +37,7 @@ using Microsoft.AspNet.Diagnostics.Elm.Views
 #line hidden
     ;
 #line 7 "DetailsPage.cshtml"
-using Microsoft.Framework.Logging
+using Microsoft.Extensions.Logging
 
 #line default
 #line hidden

src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPage.cshtml

@@ -1,10 +1,10 @@
-@using System
+@using System
 @using System.Globalization
 @using System.Linq
 @using Microsoft.AspNet.Diagnostics.Elm
 @using Microsoft.AspNet.Diagnostics.Views
 @using Microsoft.AspNet.Diagnostics.Elm.Views
-@using Microsoft.Framework.Logging
+@using Microsoft.Extensions.Logging
 
 @functions
 {

src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cs

@@ -43,7 +43,7 @@ using Microsoft.AspNet.Diagnostics.Views
 #line hidden
     ;
 #line 8 "LogPage.cshtml"
-using Microsoft.Framework.Logging
+using Microsoft.Extensions.Logging
 
 #line default
 #line hidden

src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cshtml

@@ -1,11 +1,11 @@
-@using System
+@using System
 @using System.Collections.Generic
 @using System.Globalization
 @using System.Linq
 @using Microsoft.AspNet.Diagnostics.Elm.Views
 @using Microsoft.AspNet.Diagnostics.Elm
 @using Microsoft.AspNet.Diagnostics.Views
-@using Microsoft.Framework.Logging
+@using Microsoft.Extensions.Logging
 
 @functions
 {

src/Microsoft.AspNet.Diagnostics.Elm/project.json

@@ -7,8 +7,8 @@
     },
     "dependencies": {
         "Microsoft.AspNet.Diagnostics": "1.0.0-*",
-        "Microsoft.Framework.Logging.Abstractions": "1.0.0-*",
-        "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }
+        "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*",
+        "Microsoft.Extensions.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }
     },
 
     "frameworks": {

src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs

@@ -4,7 +4,7 @@
 using JetBrains.Annotations;
 using Microsoft.AspNet.Diagnostics.Entity.Utilities;
 using Microsoft.Data.Entity.Storage;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 #if DNXCORE50
 using System.Threading;

src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLoggerProvider.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.Diagnostics.Entity
 {

src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs

@@ -13,7 +13,7 @@ using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.Infrastructure;
 using Microsoft.Data.Entity.Migrations;
 using Microsoft.Data.Entity.Storage;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNet.Diagnostics.Entity
 {

src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs

@@ -15,7 +15,7 @@ using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Http;
 using Microsoft.Dnx.Compilation;
 using Microsoft.Dnx.Runtime;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNet.Diagnostics
 {

src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs

@@ -4,7 +4,7 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNet.Http;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Diagnostics.Views
 {

src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.Diagnostics

src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 
 namespace Microsoft.AspNet.Diagnostics.Views
 {

src/Microsoft.AspNet.Diagnostics/project.json

@@ -10,10 +10,10 @@
         "Microsoft.AspNet.FileProviders.Physical": "1.0.0-*",
         "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
         "Microsoft.AspNet.WebUtilities": "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-*",
         "Microsoft.Dnx.Compilation.Abstractions": "1.0.0-*",
-        "Microsoft.Framework.WebEncoders.Core": "1.0.0-*"
+        "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
     },
     "frameworks": {
         "dnx451": {},

test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs

@@ -15,8 +15,8 @@ using Microsoft.AspNet.TestHost;
 using Microsoft.AspNet.Testing.xunit;
 using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.Infrastructure;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Xunit;
 
 namespace Microsoft.AspNet.Diagnostics.Entity.Tests

test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/Helpers/TestLoggerProvider.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;
 using System.Collections.Generic;
 
 namespace Microsoft.AspNet.Diagnostics.Entity.FunctionalTests.Helpers

test/Microsoft.AspNet.Diagnostics.Entity.Tests/TestHelperExtensions.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.Data.Entity.Infrastructure;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.Data.Entity.Tests
 {

test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.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,8 +13,8 @@ using Microsoft.AspNet.Diagnostics.Views;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Testing;
 using Microsoft.Dnx.Runtime;
-using Microsoft.Framework.Logging;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Primitives;
 using Xunit;
 
 namespace Microsoft.AspNet.Diagnostics

test/Microsoft.AspNet.Diagnostics.Tests/ElmLoggerTest.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using Microsoft.AspNet.Diagnostics.Elm;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 using Xunit;
 
 namespace Microsoft.AspNet.Diagnostics.Tests

test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs

@@ -12,8 +12,8 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Features.Internal;
 using Microsoft.AspNet.Http.Internal;
-using Microsoft.Framework.Logging;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.OptionsModel;
 #if DNX451
 using Moq;
 #endif

test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs

@@ -10,9 +10,9 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Dnx.Runtime;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 #if DNX451
 using Moq;
 #endif

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

@@ -7,7 +7,7 @@
         "Microsoft.AspNet.FileProviders.Embedded": "1.0.0-*",
         "Microsoft.AspNet.TestHost": "1.0.0-*",
         "Microsoft.AspNet.Testing": "1.0.0-*",
-        "Microsoft.Framework.DependencyInjection": "1.0.0-*",
+        "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
         "xunit.runner.aspnet": "2.0.0-aspnet-*"
     },