From b36d5663b2893560e10ef8f1ee574c2cfe3d8bb1 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Sat, 3 Oct 2015 15:44:49 -0700 Subject: [PATCH] Renaming Microsoft.Framework.* -> Microsoft.Extensions.* --- samples/SessionSample/Startup.cs | 6 +++--- samples/SessionSample/project.json | 8 ++++---- src/Microsoft.AspNet.Session/DistributedSession.cs | 6 +++--- .../DistributedSessionStore.cs | 6 +++--- src/Microsoft.AspNet.Session/SessionMiddleware.cs | 6 +++--- .../SessionMiddlewareExtensions.cs | 2 +- .../SessionServiceCollectionExtensions.cs | 4 ++-- src/Microsoft.AspNet.Session/project.json | 8 ++++---- test/Microsoft.AspNet.Session.Tests/SessionTests.cs | 12 ++++++------ test/Microsoft.AspNet.Session.Tests/project.json | 4 ++-- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/samples/SessionSample/Startup.cs b/samples/SessionSample/Startup.cs index 6a60ec435e..1445e050de 100644 --- a/samples/SessionSample/Startup.cs +++ b/samples/SessionSample/Startup.cs @@ -1,11 +1,11 @@ -// 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; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; namespace SessionSample { diff --git a/samples/SessionSample/project.json b/samples/SessionSample/project.json index b85cd3f507..5b354a5d16 100644 --- a/samples/SessionSample/project.json +++ b/samples/SessionSample/project.json @@ -6,10 +6,10 @@ "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", "Microsoft.AspNet.Session": "1.0.0-*", - "Microsoft.Framework.Caching.Memory": "1.0.0-*", - "Microsoft.Framework.Caching.Redis": "1.0.0-*", - "Microsoft.Framework.Caching.SqlServer": "1.0.0-*", - "Microsoft.Framework.Logging.Console": "1.0.0-*" + "Microsoft.Extensions.Caching.Memory": "1.0.0-*", + "Microsoft.Extensions.Caching.Redis": "1.0.0-*", + "Microsoft.Extensions.Caching.SqlServer": "1.0.0-*", + "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "exclude": "wwwroot/**/*.*", "frameworks": { diff --git a/src/Microsoft.AspNet.Session/DistributedSession.cs b/src/Microsoft.AspNet.Session/DistributedSession.cs index dc78bb49a7..2f5b5e6774 100644 --- a/src/Microsoft.AspNet.Session/DistributedSession.cs +++ b/src/Microsoft.AspNet.Session/DistributedSession.cs @@ -8,9 +8,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Http.Features; -using Microsoft.Framework.Caching.Distributed; -using Microsoft.Framework.Internal; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Caching.Distributed; +using Microsoft.Extensions.Internal; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.Session { diff --git a/src/Microsoft.AspNet.Session/DistributedSessionStore.cs b/src/Microsoft.AspNet.Session/DistributedSessionStore.cs index 4391214c54..f6a0866de9 100644 --- a/src/Microsoft.AspNet.Session/DistributedSessionStore.cs +++ b/src/Microsoft.AspNet.Session/DistributedSessionStore.cs @@ -3,9 +3,9 @@ using System; using Microsoft.AspNet.Http.Features; -using Microsoft.Framework.Caching.Distributed; -using Microsoft.Framework.Internal; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Caching.Distributed; +using Microsoft.Extensions.Internal; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.Session { diff --git a/src/Microsoft.AspNet.Session/SessionMiddleware.cs b/src/Microsoft.AspNet.Session/SessionMiddleware.cs index 5215ffa830..65294a2841 100644 --- a/src/Microsoft.AspNet.Session/SessionMiddleware.cs +++ b/src/Microsoft.AspNet.Session/SessionMiddleware.cs @@ -7,9 +7,9 @@ using System.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Features; -using Microsoft.Framework.Internal; -using Microsoft.Framework.Logging; -using Microsoft.Framework.OptionsModel; +using Microsoft.Extensions.Internal; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.OptionsModel; namespace Microsoft.AspNet.Session { diff --git a/src/Microsoft.AspNet.Session/SessionMiddlewareExtensions.cs b/src/Microsoft.AspNet.Session/SessionMiddlewareExtensions.cs index d4a2e322f9..d6f16d0dc7 100644 --- a/src/Microsoft.AspNet.Session/SessionMiddlewareExtensions.cs +++ b/src/Microsoft.AspNet.Session/SessionMiddlewareExtensions.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.Session; -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.Builder { diff --git a/src/Microsoft.AspNet.Session/SessionServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Session/SessionServiceCollectionExtensions.cs index af253aaaac..31bd37ca8d 100644 --- a/src/Microsoft.AspNet.Session/SessionServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Session/SessionServiceCollectionExtensions.cs @@ -3,9 +3,9 @@ using System; using Microsoft.AspNet.Session; -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Internal; -namespace Microsoft.Framework.DependencyInjection +namespace Microsoft.Extensions.DependencyInjection { /// /// Extension methods for adding session services to the DI container. diff --git a/src/Microsoft.AspNet.Session/project.json b/src/Microsoft.AspNet.Session/project.json index 41b911dc92..cdd5db0e77 100644 --- a/src/Microsoft.AspNet.Session/project.json +++ b/src/Microsoft.AspNet.Session/project.json @@ -7,10 +7,10 @@ }, "dependencies": { "Microsoft.AspNet.Http.Abstractions": "1.0.0-*", - "Microsoft.Framework.Caching.Abstractions": "1.0.0-*", - "Microsoft.Framework.Logging.Abstractions": "1.0.0-*", - "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }, - "Microsoft.Framework.OptionsModel": "1.0.0-*" + "Microsoft.Extensions.Caching.Abstractions": "1.0.0-*", + "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", + "Microsoft.Extensions.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }, + "Microsoft.Extensions.OptionsModel": "1.0.0-*" }, "compilationOptions": { "allowUnsafe": true diff --git a/test/Microsoft.AspNet.Session.Tests/SessionTests.cs b/test/Microsoft.AspNet.Session.Tests/SessionTests.cs index af91a911ca..209d716ff1 100644 --- a/test/Microsoft.AspNet.Session.Tests/SessionTests.cs +++ b/test/Microsoft.AspNet.Session.Tests/SessionTests.cs @@ -11,12 +11,12 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.TestHost; -using Microsoft.Framework.Caching.Distributed; -using Microsoft.Framework.Caching.Memory; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Internal; -using Microsoft.Framework.Logging; -using Microsoft.Framework.Logging.Testing; +using Microsoft.Extensions.Caching.Distributed; +using Microsoft.Extensions.Caching.Memory; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Internal; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Net.Http.Headers; using Xunit; diff --git a/test/Microsoft.AspNet.Session.Tests/project.json b/test/Microsoft.AspNet.Session.Tests/project.json index 658662375c..d13f6c1a7c 100644 --- a/test/Microsoft.AspNet.Session.Tests/project.json +++ b/test/Microsoft.AspNet.Session.Tests/project.json @@ -2,8 +2,8 @@ "dependencies": { "Microsoft.AspNet.Session": "1.0.0-*", "Microsoft.AspNet.TestHost": "1.0.0-*", - "Microsoft.Framework.Caching.Memory": "1.0.0-*", - "Microsoft.Framework.Logging.Testing": "1.0.0-*", + "Microsoft.Extensions.Caching.Memory": "1.0.0-*", + "Microsoft.Extensions.Logging.Testing": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "commands": {