From 3657a1a14b3fcf875f55ebf7dc5b5fb014d16667 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Sat, 3 Oct 2015 15:44:46 -0700 Subject: [PATCH] Renaming Microsoft.Framework.* -> Microsoft.Extensions.* --- samples/ElmPageSample/HelloWorldMiddleware.cs | 4 ++-- samples/ElmPageSample/Startup.cs | 6 +++--- samples/ExceptionHandlerSample/Startup.cs | 4 ++-- samples/StatusCodePagesSample/Startup.cs | 2 +- .../ElmCaptureMiddleware.cs | 4 ++-- src/Microsoft.AspNet.Diagnostics.Elm/ElmExtensions.cs | 8 ++++---- src/Microsoft.AspNet.Diagnostics.Elm/ElmLogger.cs | 2 +- src/Microsoft.AspNet.Diagnostics.Elm/ElmLoggerProvider.cs | 4 ++-- src/Microsoft.AspNet.Diagnostics.Elm/ElmOptions.cs | 2 +- src/Microsoft.AspNet.Diagnostics.Elm/ElmPageMiddleware.cs | 4 ++-- src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs | 4 ++-- .../ElmServiceCollectionExtensions.cs | 4 ++-- src/Microsoft.AspNet.Diagnostics.Elm/ElmStore.cs | 2 +- src/Microsoft.AspNet.Diagnostics.Elm/LogInfo.cs | 2 +- src/Microsoft.AspNet.Diagnostics.Elm/ViewOptions.cs | 2 +- src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPage.cs | 2 +- .../Views/DetailsPage.cshtml | 4 ++-- src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cs | 2 +- src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cshtml | 4 ++-- src/Microsoft.AspNet.Diagnostics.Elm/project.json | 4 ++-- .../DataStoreErrorLogger.cs | 2 +- .../DataStoreErrorLoggerProvider.cs | 2 +- .../DatabaseErrorPageMiddleware.cs | 2 +- .../DeveloperExceptionPageMiddleware.cs | 2 +- .../DeveloperExceptionPage/Views/ErrorPageModel.cs | 2 +- .../ExceptionHandler/ExceptionHandlerMiddleware.cs | 2 +- src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs | 2 +- src/Microsoft.AspNet.Diagnostics/project.json | 6 +++--- .../DatabaseErrorPageMiddlewareTest.cs | 4 ++-- .../Helpers/TestLoggerProvider.cs | 2 +- .../TestHelperExtensions.cs | 2 +- .../DeveloperExceptionPageMiddlewareTest.cs | 6 +++--- test/Microsoft.AspNet.Diagnostics.Tests/ElmLoggerTest.cs | 2 +- .../ElmMiddlewareTest.cs | 4 ++-- .../RuntimeInfoMiddlewareTest.cs | 4 ++-- test/Microsoft.AspNet.Diagnostics.Tests/project.json | 2 +- 36 files changed, 58 insertions(+), 58 deletions(-) diff --git a/samples/ElmPageSample/HelloWorldMiddleware.cs b/samples/ElmPageSample/HelloWorldMiddleware.cs index f870a9d210..bda7da96eb 100644 --- a/samples/ElmPageSample/HelloWorldMiddleware.cs +++ b/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 { diff --git a/samples/ElmPageSample/Startup.cs b/samples/ElmPageSample/Startup.cs index a282c11fbe..cefaf663f4 100644 --- a/samples/ElmPageSample/Startup.cs +++ b/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 { diff --git a/samples/ExceptionHandlerSample/Startup.cs b/samples/ExceptionHandlerSample/Startup.cs index 9e162834a3..a143b167ba 100644 --- a/samples/ExceptionHandlerSample/Startup.cs +++ b/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 { diff --git a/samples/StatusCodePagesSample/Startup.cs b/samples/StatusCodePagesSample/Startup.cs index 4dfa37f284..13b12e4b1c 100644 --- a/samples/StatusCodePagesSample/Startup.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmCaptureMiddleware.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ElmCaptureMiddleware.cs index 5127ca4785..7f06dac0fb 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/ElmCaptureMiddleware.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmExtensions.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ElmExtensions.cs index 10a2c4255c..7d0c21564f 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/ElmExtensions.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmLogger.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ElmLogger.cs index 9a80b82baf..a9eec3705b 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/ElmLogger.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmLoggerProvider.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ElmLoggerProvider.cs index 0b34122a55..498254117e 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/ElmLoggerProvider.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmOptions.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ElmOptions.cs index 798714da63..496a6f974c 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/ElmOptions.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ElmPageMiddleware.cs index 05650772ec..499630b6d7 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/ElmPageMiddleware.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs index f1ca64b0d9..fb680260a5 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ElmServiceCollectionExtensions.cs index 2b6fc17ffb..5c0188084a 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/ElmServiceCollectionExtensions.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmStore.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ElmStore.cs index d220798f08..986e1e10bb 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/ElmStore.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/LogInfo.cs b/src/Microsoft.AspNet.Diagnostics.Elm/LogInfo.cs index 1588514a1d..1eba704031 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/LogInfo.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ViewOptions.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ViewOptions.cs index 4226e39066..c58cc469ec 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/ViewOptions.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPage.cs b/src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPage.cs index 5b7705542e..1003055c53 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPage.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPage.cshtml b/src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPage.cshtml index bba3a0ab71..9824337e67 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPage.cshtml +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cs b/src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cs index 81a30ca1ec..1c9313ee5a 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cshtml b/src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cshtml index 2490be69dd..7be96bef63 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cshtml +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/project.json b/src/Microsoft.AspNet.Diagnostics.Elm/project.json index 018adc1b48..5f7941225f 100644 --- a/src/Microsoft.AspNet.Diagnostics.Elm/project.json +++ b/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": { diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs b/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs index 3d9c8320df..cddb13761d 100644 --- a/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLoggerProvider.cs b/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLoggerProvider.cs index 1a432fcc4f..2dcd6b8b35 100644 --- a/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLoggerProvider.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs index 0bfabdcd28..18c51ff3b9 100644 --- a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs index 96ecafc022..a73c2ed707 100644 --- a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs index 5234c0cea5..2c7c3f6b26 100644 --- a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs index 771f73b727..4508bc6fe3 100644 --- a/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs b/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs index 5973288e1a..d9f73c82c0 100644 --- a/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Diagnostics/project.json b/src/Microsoft.AspNet.Diagnostics/project.json index e62e834150..944cdc473e 100644 --- a/src/Microsoft.AspNet.Diagnostics/project.json +++ b/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": {}, diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs index 5631c1d012..f1d1503e32 100644 --- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs +++ b/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 diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/Helpers/TestLoggerProvider.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/Helpers/TestLoggerProvider.cs index 9dad171470..54e7ddeb7f 100644 --- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/Helpers/TestLoggerProvider.cs +++ b/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 diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/TestHelperExtensions.cs b/test/Microsoft.AspNet.Diagnostics.Entity.Tests/TestHelperExtensions.cs index e77b6a2837..c430e8ea1b 100644 --- a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/TestHelperExtensions.cs +++ b/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 { diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs index 2edf6d21c5..46a35730c7 100644 --- a/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs +++ b/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 diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/ElmLoggerTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/ElmLoggerTest.cs index c6edafe041..01166acb4f 100644 --- a/test/Microsoft.AspNet.Diagnostics.Tests/ElmLoggerTest.cs +++ b/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 diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs index e9fdcba463..14bfd4b35b 100644 --- a/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs +++ b/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 diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs index 503ffbd2f6..c6a494942f 100644 --- a/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs +++ b/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 diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/project.json b/test/Microsoft.AspNet.Diagnostics.Tests/project.json index c6f0cfbfcf..8ffde45094 100644 --- a/test/Microsoft.AspNet.Diagnostics.Tests/project.json +++ b/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-*" },