From 5ce58c790f38e64f57907a8c6ea767b62b8a3810 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Sat, 3 Oct 2015 15:44:47 -0700 Subject: [PATCH] Renaming Microsoft.Framework.* -> Microsoft.Extensions.* --- samples/UseOptions/Startup.cs | 4 ++-- samples/UseOptions/project.json | 4 ++-- samples/UsePolicyBuilder/Startup.cs | 4 ++-- samples/UsePolicyBuilder/project.json | 4 ++-- src/Microsoft.AspNet.Cors.Core/CorsService.cs | 4 ++-- .../CorsServiceCollectionExtensions.cs | 8 ++++---- .../DefaultCorsPolicyProvider.cs | 2 +- src/Microsoft.AspNet.Cors.Core/project.json | 6 +++--- src/Microsoft.AspNet.Cors/CorsMiddleware.cs | 2 +- test/Microsoft.AspNet.Cors.Core.Test/TestCorsOptions.cs | 4 ++-- test/Microsoft.AspNet.Cors.Test/CorsMiddlewareTests.cs | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/samples/UseOptions/Startup.cs b/samples/UseOptions/Startup.cs index 732cfbca1e..c2e8299fc0 100644 --- a/samples/UseOptions/Startup.cs +++ b/samples/UseOptions/Startup.cs @@ -1,7 +1,7 @@ -using System; +using System; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; namespace UseOptions { diff --git a/samples/UseOptions/project.json b/samples/UseOptions/project.json index 7d68c72128..2733f72e2f 100644 --- a/samples/UseOptions/project.json +++ b/samples/UseOptions/project.json @@ -1,4 +1,4 @@ -{ +{ "webroot": "wwwroot", "version": "1.0.0-*", "dependencies": { @@ -6,7 +6,7 @@ "Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", - "Microsoft.Framework.Logging.Console": "1.0.0-*" + "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "commands": { "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000" diff --git a/samples/UsePolicyBuilder/Startup.cs b/samples/UsePolicyBuilder/Startup.cs index de8233cfbb..bbc269f970 100644 --- a/samples/UsePolicyBuilder/Startup.cs +++ b/samples/UsePolicyBuilder/Startup.cs @@ -1,8 +1,8 @@ -using System; +using System; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Cors.Core; using Microsoft.AspNet.Http; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; namespace UsePolicy { diff --git a/samples/UsePolicyBuilder/project.json b/samples/UsePolicyBuilder/project.json index 7d68c72128..2733f72e2f 100644 --- a/samples/UsePolicyBuilder/project.json +++ b/samples/UsePolicyBuilder/project.json @@ -1,4 +1,4 @@ -{ +{ "webroot": "wwwroot", "version": "1.0.0-*", "dependencies": { @@ -6,7 +6,7 @@ "Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", - "Microsoft.Framework.Logging.Console": "1.0.0-*" + "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "commands": { "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000" diff --git a/src/Microsoft.AspNet.Cors.Core/CorsService.cs b/src/Microsoft.AspNet.Cors.Core/CorsService.cs index de4a1cd8fc..f4d06c9395 100644 --- a/src/Microsoft.AspNet.Cors.Core/CorsService.cs +++ b/src/Microsoft.AspNet.Cors.Core/CorsService.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using Microsoft.AspNet.Http; -using Microsoft.Framework.OptionsModel; -using Microsoft.Framework.Primitives; +using Microsoft.Extensions.OptionsModel; +using Microsoft.Extensions.Primitives; namespace Microsoft.AspNet.Cors.Core { diff --git a/src/Microsoft.AspNet.Cors.Core/CorsServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Cors.Core/CorsServiceCollectionExtensions.cs index e4e3eccf6b..ed4544b91e 100644 --- a/src/Microsoft.AspNet.Cors.Core/CorsServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Cors.Core/CorsServiceCollectionExtensions.cs @@ -4,11 +4,11 @@ using System; using Microsoft.AspNet.Cors; using Microsoft.AspNet.Cors.Core; -using Microsoft.Framework.Configuration; -using Microsoft.Framework.DependencyInjection.Extensions; -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.Internal; -namespace Microsoft.Framework.DependencyInjection +namespace Microsoft.Extensions.DependencyInjection { /// /// The extensions for enabling CORS support. diff --git a/src/Microsoft.AspNet.Cors.Core/DefaultCorsPolicyProvider.cs b/src/Microsoft.AspNet.Cors.Core/DefaultCorsPolicyProvider.cs index 188b8930fe..01f4574a8b 100644 --- a/src/Microsoft.AspNet.Cors.Core/DefaultCorsPolicyProvider.cs +++ b/src/Microsoft.AspNet.Cors.Core/DefaultCorsPolicyProvider.cs @@ -4,7 +4,7 @@ using System; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.Framework.OptionsModel; +using Microsoft.Extensions.OptionsModel; namespace Microsoft.AspNet.Cors.Core { diff --git a/src/Microsoft.AspNet.Cors.Core/project.json b/src/Microsoft.AspNet.Cors.Core/project.json index 239620ae72..bf2c81b3d2 100644 --- a/src/Microsoft.AspNet.Cors.Core/project.json +++ b/src/Microsoft.AspNet.Cors.Core/project.json @@ -9,9 +9,9 @@ }, "dependencies": { "Microsoft.AspNet.Http.Extensions": "1.0.0-*", - "Microsoft.Framework.Configuration.Abstractions": "1.0.0-*", - "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-*", - "Microsoft.Framework.OptionsModel": "1.0.0-*" + "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-*", + "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*", + "Microsoft.Extensions.OptionsModel": "1.0.0-*" }, "frameworks" : { diff --git a/src/Microsoft.AspNet.Cors/CorsMiddleware.cs b/src/Microsoft.AspNet.Cors/CorsMiddleware.cs index cccac69fec..1ab7bc2917 100644 --- a/src/Microsoft.AspNet.Cors/CorsMiddleware.cs +++ b/src/Microsoft.AspNet.Cors/CorsMiddleware.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Cors.Core; using Microsoft.AspNet.Http; -using Microsoft.Framework.Primitives; +using Microsoft.Extensions.Primitives; namespace Microsoft.AspNet.Cors { diff --git a/test/Microsoft.AspNet.Cors.Core.Test/TestCorsOptions.cs b/test/Microsoft.AspNet.Cors.Core.Test/TestCorsOptions.cs index 5bce510449..fa8e0059a5 100644 --- a/test/Microsoft.AspNet.Cors.Core.Test/TestCorsOptions.cs +++ b/test/Microsoft.AspNet.Cors.Core.Test/TestCorsOptions.cs @@ -1,7 +1,7 @@ -// 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.Framework.OptionsModel; +using Microsoft.Extensions.OptionsModel; namespace Microsoft.AspNet.Cors.Core.Test { diff --git a/test/Microsoft.AspNet.Cors.Test/CorsMiddlewareTests.cs b/test/Microsoft.AspNet.Cors.Test/CorsMiddlewareTests.cs index a8906b1f49..ba3759a5a7 100644 --- a/test/Microsoft.AspNet.Cors.Test/CorsMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Cors.Test/CorsMiddlewareTests.cs @@ -9,7 +9,7 @@ using Microsoft.AspNet.Cors.Core; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.TestHost; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Moq; using Xunit;