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

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
 {

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"

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
 {

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"

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.Extensions.OptionsModel;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Cors.Core
 {

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.Extensions.Configuration;
-using Microsoft.Framework.DependencyInjection.Extensions;
+using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     /// <summary>
     /// The <see cref="IServiceCollection"/> extensions for enabling CORS support.

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
 {

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.Extensions.Configuration.Abstractions": "1.0.0-*",
-         "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-*",
+         "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
-         "Microsoft.Framework.OptionsModel": "1.0.0-*"
+         "Microsoft.Extensions.OptionsModel": "1.0.0-*"
     },
 
     "frameworks" : {

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
 {

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
 {

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;