From 6c529eae7ac1d36ff9981d742aab44b83ed9d83d 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/CookieSample/Startup.cs | 4 ++-- samples/CookieSample/project.json | 2 +- samples/CookieSessionSample/MemoryCacheTicketStore.cs | 4 ++-- samples/CookieSessionSample/Startup.cs | 4 ++-- samples/CookieSessionSample/project.json | 4 ++-- samples/OpenIdConnectSample/Startup.cs | 6 +++--- samples/OpenIdConnectSample/project.json | 2 +- samples/SocialSample/Startup.cs | 4 ++-- samples/SocialSample/project.json | 2 +- .../ChunkingCookieManager.cs | 4 ++-- .../CookieAuthenticationHandler.cs | 4 ++-- .../CookieAuthenticationMiddleware.cs | 4 ++-- .../CookieAuthenticationOptions.cs | 2 +- .../CookieServiceCollectionExtensions.cs | 4 ++-- src/Microsoft.AspNet.Authentication.Cookies/project.json | 2 +- .../FacebookMiddleware.cs | 6 +++--- .../GoogleHelper.cs | 2 +- .../GoogleMiddleware.cs | 6 +++--- .../JwtBearerHandler.cs | 2 +- .../JwtBearerMiddleware.cs | 4 ++-- .../MicrosoftAccountMiddleware.cs | 6 +++--- src/Microsoft.AspNet.Authentication.OAuth/OAuthHandler.cs | 4 ++-- .../OAuthMiddleware.cs | 6 +++--- .../OpenIdConnectHandler.cs | 2 +- .../OpenIdConnectMiddleware.cs | 6 +++--- .../OpenIdConnectOptions.cs | 2 +- .../TwitterHandler.cs | 4 ++-- .../TwitterMiddleware.cs | 6 +++--- .../AuthenticationHandler.cs | 6 +++--- .../AuthenticationMiddleware.cs | 4 ++-- .../AuthenticationServiceCollectionExtensions.cs | 2 +- src/Microsoft.AspNet.Authentication/project.json | 8 ++++---- .../AuthorizationServiceCollectionExtensions.cs | 4 ++-- .../DefaultAuthorizationService.cs | 2 +- src/Microsoft.AspNet.Authorization/project.json | 4 ++-- .../AuthenticationHandlerFacts.cs | 4 ++-- .../Cookies/CookieMiddlewareTests.cs | 2 +- .../Facebook/FacebookMiddlewareTests.cs | 4 ++-- .../Google/GoogleMiddlewareTests.cs | 4 ++-- .../JwtBearer/JwtBearerMiddlewareTests.cs | 2 +- .../MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs | 4 ++-- .../AuthenticationPropertiesFormaterKeyValue.cs | 4 ++-- .../OpenIdConnect/ExpectedQueryValues.cs | 2 +- .../OpenIdConnect/InMemoryLogger.cs | 4 ++-- .../OpenIdConnect/InMemoryLoggerFactory.cs | 4 ++-- .../OpenIdConnect/LogEntry.cs | 4 ++-- .../OpenIdConnect/LoggingUtilities.cs | 4 ++-- .../OpenIdConnect/OpenIdConnectHandlerTests.cs | 6 +++--- .../OpenIdConnectMiddlewareForTestingAuthenticate.cs | 8 ++++---- .../OpenIdConnect/OpenIdConnectMiddlewareTests.cs | 4 ++-- .../Twitter/TwitterMiddlewareTests.cs | 2 +- .../DefaultAuthorizationServiceTests.cs | 2 +- test/Microsoft.AspNet.Authorization.Test/project.json | 2 +- test/Microsoft.AspNet.CookiePolicy.Test/project.json | 2 +- 54 files changed, 103 insertions(+), 103 deletions(-) diff --git a/samples/CookieSample/Startup.cs b/samples/CookieSample/Startup.cs index 6fd616bd7f..b21a6a85b9 100644 --- a/samples/CookieSample/Startup.cs +++ b/samples/CookieSample/Startup.cs @@ -3,8 +3,8 @@ using System.Security.Claims; using Microsoft.AspNet.Authentication.Cookies; 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 CookieSample { diff --git a/samples/CookieSample/project.json b/samples/CookieSample/project.json index 1b7c3471ca..4464f21fe2 100644 --- a/samples/CookieSample/project.json +++ b/samples/CookieSample/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNet.DataProtection": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", "Microsoft.AspNet.Server.IIS": "1.0.0-*", - "Microsoft.Framework.Logging.Console": "1.0.0-*", + "Microsoft.Extensions.Logging.Console": "1.0.0-*", "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" }, "commands": { diff --git a/samples/CookieSessionSample/MemoryCacheTicketStore.cs b/samples/CookieSessionSample/MemoryCacheTicketStore.cs index e308825edc..833ad35ac8 100644 --- a/samples/CookieSessionSample/MemoryCacheTicketStore.cs +++ b/samples/CookieSessionSample/MemoryCacheTicketStore.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Threading.Tasks; using Microsoft.AspNet.Authentication; using Microsoft.AspNet.Authentication.Cookies; -using Microsoft.Framework.Caching.Memory; +using Microsoft.Extensions.Caching.Memory; namespace CookieSessionSample { diff --git a/samples/CookieSessionSample/Startup.cs b/samples/CookieSessionSample/Startup.cs index 941911ad73..3e89f67ca6 100644 --- a/samples/CookieSessionSample/Startup.cs +++ b/samples/CookieSessionSample/Startup.cs @@ -4,8 +4,8 @@ using System.Security.Claims; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; using Microsoft.AspNet.Authentication.Cookies; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; namespace CookieSessionSample { diff --git a/samples/CookieSessionSample/project.json b/samples/CookieSessionSample/project.json index 73a19f94e6..be0b1ae052 100644 --- a/samples/CookieSessionSample/project.json +++ b/samples/CookieSessionSample/project.json @@ -4,8 +4,8 @@ "Microsoft.AspNet.DataProtection": "1.0.0-*", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", - "Microsoft.Framework.Caching.Memory": "1.0.0-*", - "Microsoft.Framework.Logging.Console": "1.0.0-*", + "Microsoft.Extensions.Caching.Memory": "1.0.0-*", + "Microsoft.Extensions.Logging.Console": "1.0.0-*", "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" }, "commands": { diff --git a/samples/OpenIdConnectSample/Startup.cs b/samples/OpenIdConnectSample/Startup.cs index 177e866d7b..2001cd979a 100644 --- a/samples/OpenIdConnectSample/Startup.cs +++ b/samples/OpenIdConnectSample/Startup.cs @@ -1,11 +1,11 @@ -using System.Linq; +using System.Linq; using Microsoft.AspNet.Authentication.Cookies; using Microsoft.AspNet.Authentication.OpenIdConnect; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.Protocols.OpenIdConnect; namespace OpenIdConnectSample diff --git a/samples/OpenIdConnectSample/project.json b/samples/OpenIdConnectSample/project.json index 2dbf30c6bd..7397fe51e6 100644 --- a/samples/OpenIdConnectSample/project.json +++ b/samples/OpenIdConnectSample/project.json @@ -5,7 +5,7 @@ "Microsoft.AspNet.DataProtection": "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-*", "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" }, "frameworks": { diff --git a/samples/SocialSample/Startup.cs b/samples/SocialSample/Startup.cs index 3ebe511560..9915784d72 100644 --- a/samples/SocialSample/Startup.cs +++ b/samples/SocialSample/Startup.cs @@ -9,8 +9,8 @@ using Microsoft.AspNet.Authentication.OAuth; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; namespace CookieSample diff --git a/samples/SocialSample/project.json b/samples/SocialSample/project.json index 5e94c6d106..48b78d3584 100644 --- a/samples/SocialSample/project.json +++ b/samples/SocialSample/project.json @@ -8,7 +8,7 @@ "Microsoft.AspNet.DataProtection": "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-*", "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" }, "commands": { diff --git a/src/Microsoft.AspNet.Authentication.Cookies/ChunkingCookieManager.cs b/src/Microsoft.AspNet.Authentication.Cookies/ChunkingCookieManager.cs index 95838f409f..dbd94f844d 100644 --- a/src/Microsoft.AspNet.Authentication.Cookies/ChunkingCookieManager.cs +++ b/src/Microsoft.AspNet.Authentication.Cookies/ChunkingCookieManager.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using Microsoft.AspNet.Http; -using Microsoft.Framework.Primitives; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.Primitives; +using Microsoft.Extensions.WebEncoders; using Microsoft.Net.Http.Headers; namespace Microsoft.AspNet.Authentication.Cookies diff --git a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationHandler.cs b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationHandler.cs index e8c100adf8..5ea99ad2b0 100644 --- a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationHandler.cs +++ b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationHandler.cs @@ -9,8 +9,8 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Http.Features.Authentication; -using Microsoft.Framework.Logging; -using Microsoft.Framework.Primitives; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Primitives; using Microsoft.Net.Http.Headers; namespace Microsoft.AspNet.Authentication.Cookies diff --git a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationMiddleware.cs index faa8fd99d9..bce9648b87 100644 --- a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationMiddleware.cs @@ -4,8 +4,8 @@ using System; using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection; -using Microsoft.Framework.Logging; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.WebEncoders; namespace Microsoft.AspNet.Authentication.Cookies { diff --git a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationOptions.cs b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationOptions.cs index bf10e155b5..472ea80eac 100644 --- a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationOptions.cs +++ b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationOptions.cs @@ -4,7 +4,7 @@ using System; using System.Diagnostics.CodeAnalysis; using Microsoft.AspNet.Http; -using Microsoft.Framework.OptionsModel; +using Microsoft.Extensions.OptionsModel; namespace Microsoft.AspNet.Authentication.Cookies { diff --git a/src/Microsoft.AspNet.Authentication.Cookies/CookieServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.Cookies/CookieServiceCollectionExtensions.cs index 5fb59747b8..260539b551 100644 --- a/src/Microsoft.AspNet.Authentication.Cookies/CookieServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.Cookies/CookieServiceCollectionExtensions.cs @@ -3,9 +3,9 @@ using System; using Microsoft.AspNet.Authentication.Cookies; -using Microsoft.Framework.Configuration; +using Microsoft.Extensions.Configuration; -namespace Microsoft.Framework.DependencyInjection +namespace Microsoft.Extensions.DependencyInjection { /// /// Extension methods provided by the cookies authentication middleware diff --git a/src/Microsoft.AspNet.Authentication.Cookies/project.json b/src/Microsoft.AspNet.Authentication.Cookies/project.json index c7aea2a71f..d767f187aa 100644 --- a/src/Microsoft.AspNet.Authentication.Cookies/project.json +++ b/src/Microsoft.AspNet.Authentication.Cookies/project.json @@ -10,7 +10,7 @@ }, "dependencies": { "Microsoft.AspNet.Authentication": "1.0.0-*", - "Microsoft.Framework.WebEncoders": "1.0.0-*", + "Microsoft.Extensions.WebEncoders": "1.0.0-*", "Newtonsoft.Json": "6.0.6" }, "frameworks": { diff --git a/src/Microsoft.AspNet.Authentication.Facebook/FacebookMiddleware.cs b/src/Microsoft.AspNet.Authentication.Facebook/FacebookMiddleware.cs index b2893852e9..8976b93fe0 100644 --- a/src/Microsoft.AspNet.Authentication.Facebook/FacebookMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.Facebook/FacebookMiddleware.cs @@ -6,9 +6,9 @@ using System.Globalization; using Microsoft.AspNet.Authentication.OAuth; using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection; -using Microsoft.Framework.Logging; -using Microsoft.Framework.OptionsModel; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.OptionsModel; +using Microsoft.Extensions.WebEncoders; namespace Microsoft.AspNet.Authentication.Facebook { diff --git a/src/Microsoft.AspNet.Authentication.Google/GoogleHelper.cs b/src/Microsoft.AspNet.Authentication.Google/GoogleHelper.cs index a30e7d1fc2..5327ddcb2e 100644 --- a/src/Microsoft.AspNet.Authentication.Google/GoogleHelper.cs +++ b/src/Microsoft.AspNet.Authentication.Google/GoogleHelper.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.Internal; +using Microsoft.Extensions.Internal; using Newtonsoft.Json.Linq; namespace Microsoft.AspNet.Authentication.Google diff --git a/src/Microsoft.AspNet.Authentication.Google/GoogleMiddleware.cs b/src/Microsoft.AspNet.Authentication.Google/GoogleMiddleware.cs index 1d97d5ec5c..fe398c5f6e 100644 --- a/src/Microsoft.AspNet.Authentication.Google/GoogleMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.Google/GoogleMiddleware.cs @@ -6,9 +6,9 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.AspNet.Authentication.OAuth; using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection; -using Microsoft.Framework.Logging; -using Microsoft.Framework.OptionsModel; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.OptionsModel; +using Microsoft.Extensions.WebEncoders; namespace Microsoft.AspNet.Authentication.Google { diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerHandler.cs b/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerHandler.cs index cc8a838331..9627c0e1f0 100644 --- a/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerHandler.cs +++ b/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerHandler.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Http.Features.Authentication; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.Protocols.OpenIdConnect; namespace Microsoft.AspNet.Authentication.JwtBearer diff --git a/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerMiddleware.cs b/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerMiddleware.cs index 26e9e1e804..2a97054797 100644 --- a/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.JwtBearer/JwtBearerMiddleware.cs @@ -4,8 +4,8 @@ using System; using System.Net.Http; using Microsoft.AspNet.Builder; -using Microsoft.Framework.Logging; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.WebEncoders; using Microsoft.IdentityModel.Protocols; using Microsoft.IdentityModel.Protocols.OpenIdConnect; diff --git a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountMiddleware.cs b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountMiddleware.cs index 167baa9901..f93b0feca8 100644 --- a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountMiddleware.cs @@ -5,9 +5,9 @@ using System; using Microsoft.AspNet.Authentication.OAuth; using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection; -using Microsoft.Framework.Logging; -using Microsoft.Framework.OptionsModel; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.OptionsModel; +using Microsoft.Extensions.WebEncoders; namespace Microsoft.AspNet.Authentication.MicrosoftAccount { diff --git a/src/Microsoft.AspNet.Authentication.OAuth/OAuthHandler.cs b/src/Microsoft.AspNet.Authentication.OAuth/OAuthHandler.cs index fcf693b249..ea6803b496 100644 --- a/src/Microsoft.AspNet.Authentication.OAuth/OAuthHandler.cs +++ b/src/Microsoft.AspNet.Authentication.OAuth/OAuthHandler.cs @@ -13,8 +13,8 @@ using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Http.Extensions; using Microsoft.AspNet.Http.Features.Authentication; using Microsoft.AspNet.WebUtilities; -using Microsoft.Framework.Logging; -using Microsoft.Framework.Primitives; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Primitives; using Newtonsoft.Json.Linq; namespace Microsoft.AspNet.Authentication.OAuth diff --git a/src/Microsoft.AspNet.Authentication.OAuth/OAuthMiddleware.cs b/src/Microsoft.AspNet.Authentication.OAuth/OAuthMiddleware.cs index f9bca2c49b..d980a5e305 100644 --- a/src/Microsoft.AspNet.Authentication.OAuth/OAuthMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.OAuth/OAuthMiddleware.cs @@ -7,9 +7,9 @@ using System.Globalization; using System.Net.Http; using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection; -using Microsoft.Framework.Logging; -using Microsoft.Framework.OptionsModel; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.OptionsModel; +using Microsoft.Extensions.WebEncoders; namespace Microsoft.AspNet.Authentication.OAuth { diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectHandler.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectHandler.cs index 0f5179a264..231c082137 100644 --- a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectHandler.cs +++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectHandler.cs @@ -16,7 +16,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Http.Features.Authentication; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.Protocols.OpenIdConnect; using Microsoft.Net.Http.Headers; using Newtonsoft.Json.Linq; diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectMiddleware.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectMiddleware.cs index 8207eb4741..17b2d3b594 100644 --- a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectMiddleware.cs @@ -8,9 +8,9 @@ using System.Text; using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection; using Microsoft.AspNet.Http; -using Microsoft.Framework.Logging; -using Microsoft.Framework.OptionsModel; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.OptionsModel; +using Microsoft.Extensions.WebEncoders; using Microsoft.IdentityModel.Protocols; using Microsoft.IdentityModel.Protocols.OpenIdConnect; diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectOptions.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectOptions.cs index aa77d09040..91f4e1089e 100644 --- a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectOptions.cs +++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectOptions.cs @@ -10,7 +10,7 @@ using System.Net.Http; using System.Security.Claims; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.WebEncoders; using Microsoft.IdentityModel.Protocols; using Microsoft.IdentityModel.Protocols.OpenIdConnect; diff --git a/src/Microsoft.AspNet.Authentication.Twitter/TwitterHandler.cs b/src/Microsoft.AspNet.Authentication.Twitter/TwitterHandler.cs index 5bfbc5c731..38c0897d1d 100644 --- a/src/Microsoft.AspNet.Authentication.Twitter/TwitterHandler.cs +++ b/src/Microsoft.AspNet.Authentication.Twitter/TwitterHandler.cs @@ -14,8 +14,8 @@ using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Http.Features.Authentication; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.WebUtilities; -using Microsoft.Framework.Logging; -using Microsoft.Framework.Primitives; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Primitives; namespace Microsoft.AspNet.Authentication.Twitter { diff --git a/src/Microsoft.AspNet.Authentication.Twitter/TwitterMiddleware.cs b/src/Microsoft.AspNet.Authentication.Twitter/TwitterMiddleware.cs index 268b6bec2d..ec75f449ec 100644 --- a/src/Microsoft.AspNet.Authentication.Twitter/TwitterMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication.Twitter/TwitterMiddleware.cs @@ -7,9 +7,9 @@ using System.Globalization; using System.Net.Http; using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection; -using Microsoft.Framework.Logging; -using Microsoft.Framework.OptionsModel; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.OptionsModel; +using Microsoft.Extensions.WebEncoders; namespace Microsoft.AspNet.Authentication.Twitter { diff --git a/src/Microsoft.AspNet.Authentication/AuthenticationHandler.cs b/src/Microsoft.AspNet.Authentication/AuthenticationHandler.cs index 5990d12358..2b256ee2bc 100644 --- a/src/Microsoft.AspNet.Authentication/AuthenticationHandler.cs +++ b/src/Microsoft.AspNet.Authentication/AuthenticationHandler.cs @@ -5,9 +5,9 @@ using System; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Features.Authentication; -using Microsoft.Framework.Internal; -using Microsoft.Framework.Logging; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.Internal; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.WebEncoders; namespace Microsoft.AspNet.Authentication { diff --git a/src/Microsoft.AspNet.Authentication/AuthenticationMiddleware.cs b/src/Microsoft.AspNet.Authentication/AuthenticationMiddleware.cs index 15dcce5bcd..ebf25c2174 100644 --- a/src/Microsoft.AspNet.Authentication/AuthenticationMiddleware.cs +++ b/src/Microsoft.AspNet.Authentication/AuthenticationMiddleware.cs @@ -5,8 +5,8 @@ using System; using System.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; -using Microsoft.Framework.Logging; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.WebEncoders; namespace Microsoft.AspNet.Authentication { diff --git a/src/Microsoft.AspNet.Authentication/AuthenticationServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication/AuthenticationServiceCollectionExtensions.cs index 286238b50f..a9ee391788 100644 --- a/src/Microsoft.AspNet.Authentication/AuthenticationServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Authentication/AuthenticationServiceCollectionExtensions.cs @@ -4,7 +4,7 @@ using System; using Microsoft.AspNet.Authentication; -namespace Microsoft.Framework.DependencyInjection +namespace Microsoft.Extensions.DependencyInjection { public static class AuthenticationServiceCollectionExtensions { diff --git a/src/Microsoft.AspNet.Authentication/project.json b/src/Microsoft.AspNet.Authentication/project.json index 656d0b2f22..c4132c0be1 100644 --- a/src/Microsoft.AspNet.Authentication/project.json +++ b/src/Microsoft.AspNet.Authentication/project.json @@ -12,10 +12,10 @@ "Microsoft.AspNet.DataProtection": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http.Extensions": "1.0.0-*", - "Microsoft.Framework.Logging.Abstractions": "1.0.0-*", - "Microsoft.Framework.SecurityHelper.Sources": { "type": "build", "version": "1.0.0-*" }, - "Microsoft.Framework.OptionsModel": "1.0.0-*", - "Microsoft.Framework.WebEncoders": "1.0.0-*" + "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", + "Microsoft.Extensions.SecurityHelper.Sources": { "type": "build", "version": "1.0.0-*" }, + "Microsoft.Extensions.OptionsModel": "1.0.0-*", + "Microsoft.Extensions.WebEncoders": "1.0.0-*" }, "frameworks": { "dnx451": { }, diff --git a/src/Microsoft.AspNet.Authorization/AuthorizationServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authorization/AuthorizationServiceCollectionExtensions.cs index 4b1015ade6..f00d44a59c 100644 --- a/src/Microsoft.AspNet.Authorization/AuthorizationServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Authorization/AuthorizationServiceCollectionExtensions.cs @@ -3,9 +3,9 @@ using System; using Microsoft.AspNet.Authorization; -using Microsoft.Framework.DependencyInjection.Extensions; +using Microsoft.Extensions.DependencyInjection.Extensions; -namespace Microsoft.Framework.DependencyInjection +namespace Microsoft.Extensions.DependencyInjection { public static class AuthorizationServiceCollectionExtensions { diff --git a/src/Microsoft.AspNet.Authorization/DefaultAuthorizationService.cs b/src/Microsoft.AspNet.Authorization/DefaultAuthorizationService.cs index b18c92031d..9730ba0d9f 100644 --- a/src/Microsoft.AspNet.Authorization/DefaultAuthorizationService.cs +++ b/src/Microsoft.AspNet.Authorization/DefaultAuthorizationService.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.Framework.OptionsModel; +using Microsoft.Extensions.OptionsModel; namespace Microsoft.AspNet.Authorization { diff --git a/src/Microsoft.AspNet.Authorization/project.json b/src/Microsoft.AspNet.Authorization/project.json index 92768710bc..a1513125b1 100644 --- a/src/Microsoft.AspNet.Authorization/project.json +++ b/src/Microsoft.AspNet.Authorization/project.json @@ -10,8 +10,8 @@ }, "dependencies": { "Microsoft.AspNet.Http.Features": "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-*" }, "frameworks": { "dnx451": { }, diff --git a/test/Microsoft.AspNet.Authentication.Test/AuthenticationHandlerFacts.cs b/test/Microsoft.AspNet.Authentication.Test/AuthenticationHandlerFacts.cs index 711e0f4b71..e0ea9720d6 100644 --- a/test/Microsoft.AspNet.Authentication.Test/AuthenticationHandlerFacts.cs +++ b/test/Microsoft.AspNet.Authentication.Test/AuthenticationHandlerFacts.cs @@ -8,8 +8,8 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Features.Authentication; using Microsoft.AspNet.Http.Internal; -using Microsoft.Framework.Logging; -using Microsoft.Framework.Primitives; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Primitives; using Xunit; namespace Microsoft.AspNet.Authentication diff --git a/test/Microsoft.AspNet.Authentication.Test/Cookies/CookieMiddlewareTests.cs b/test/Microsoft.AspNet.Authentication.Test/Cookies/CookieMiddlewareTests.cs index a097d98292..5a38ca1ad1 100644 --- a/test/Microsoft.AspNet.Authentication.Test/Cookies/CookieMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Authentication.Test/Cookies/CookieMiddlewareTests.cs @@ -18,7 +18,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Http.Features.Authentication; using Microsoft.AspNet.TestHost; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Xunit; namespace Microsoft.AspNet.Authentication.Cookies diff --git a/test/Microsoft.AspNet.Authentication.Test/Facebook/FacebookMiddlewareTests.cs b/test/Microsoft.AspNet.Authentication.Test/Facebook/FacebookMiddlewareTests.cs index f0cefe6561..efab3c54d1 100644 --- a/test/Microsoft.AspNet.Authentication.Test/Facebook/FacebookMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Authentication.Test/Facebook/FacebookMiddlewareTests.cs @@ -14,8 +14,8 @@ using Microsoft.AspNet.DataProtection; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.TestHost; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.WebEncoders; using Newtonsoft.Json; using Xunit; diff --git a/test/Microsoft.AspNet.Authentication.Test/Google/GoogleMiddlewareTests.cs b/test/Microsoft.AspNet.Authentication.Test/Google/GoogleMiddlewareTests.cs index 617b6862a3..b6335093c1 100644 --- a/test/Microsoft.AspNet.Authentication.Test/Google/GoogleMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Authentication.Test/Google/GoogleMiddlewareTests.cs @@ -14,8 +14,8 @@ using Microsoft.AspNet.DataProtection; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.TestHost; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.WebEncoders; using Newtonsoft.Json; using Xunit; diff --git a/test/Microsoft.AspNet.Authentication.Test/JwtBearer/JwtBearerMiddlewareTests.cs b/test/Microsoft.AspNet.Authentication.Test/JwtBearer/JwtBearerMiddlewareTests.cs index 96ea604ec5..efaef75e10 100644 --- a/test/Microsoft.AspNet.Authentication.Test/JwtBearer/JwtBearerMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Authentication.Test/JwtBearer/JwtBearerMiddlewareTests.cs @@ -12,7 +12,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.TestHost; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Xunit; namespace Microsoft.AspNet.Authentication.JwtBearer diff --git a/test/Microsoft.AspNet.Authentication.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs b/test/Microsoft.AspNet.Authentication.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs index 8ad48c8fde..a7d8a8b095 100644 --- a/test/Microsoft.AspNet.Authentication.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Authentication.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs @@ -14,8 +14,8 @@ using Microsoft.AspNet.DataProtection; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.TestHost; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.WebEncoders; using Newtonsoft.Json; using Xunit; diff --git a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/AuthenticationPropertiesFormaterKeyValue.cs b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/AuthenticationPropertiesFormaterKeyValue.cs index 6aaf42bd39..66fab419fd 100644 --- a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/AuthenticationPropertiesFormaterKeyValue.cs +++ b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/AuthenticationPropertiesFormaterKeyValue.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Text; using Microsoft.AspNet.Http.Authentication; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.WebEncoders; namespace Microsoft.AspNet.Authentication.Tests.OpenIdConnect { diff --git a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/ExpectedQueryValues.cs b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/ExpectedQueryValues.cs index ff48272b7d..aae31676d1 100644 --- a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/ExpectedQueryValues.cs +++ b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/ExpectedQueryValues.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Text; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.WebEncoders; using Microsoft.IdentityModel.Protocols.OpenIdConnect; using Xunit; diff --git a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/InMemoryLogger.cs b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/InMemoryLogger.cs index 67a2668c6d..a8bdbe8be4 100644 --- a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/InMemoryLogger.cs +++ b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/InMemoryLogger.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Collections.Generic; using System.Diagnostics; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.Authentication.Tests.OpenIdConnect { diff --git a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/InMemoryLoggerFactory.cs b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/InMemoryLoggerFactory.cs index bd65d09de5..3185e6518f 100644 --- a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/InMemoryLoggerFactory.cs +++ b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/InMemoryLoggerFactory.cs @@ -1,8 +1,8 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Copyright (c) Microsoft Open Technologies, Inc. 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.Framework.Logging; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.Authentication.Tests.OpenIdConnect { diff --git a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/LogEntry.cs b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/LogEntry.cs index 6f46195788..285d42a66c 100644 --- a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/LogEntry.cs +++ b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/LogEntry.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // this controls if the logs are written to the console. // they can be reviewed for general content. using System; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.Authentication.Tests.OpenIdConnect { diff --git a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/LoggingUtilities.cs b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/LoggingUtilities.cs index f8886e4842..b8d9e6e0c9 100644 --- a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/LoggingUtilities.cs +++ b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/LoggingUtilities.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // this controls if the logs are written to the console. // they can be reviewed for general content. @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Text; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNet.Authentication.Tests.OpenIdConnect { diff --git a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/OpenIdConnectHandlerTests.cs b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/OpenIdConnectHandlerTests.cs index 1cb1cb5890..d01f3e6d63 100644 --- a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/OpenIdConnectHandlerTests.cs +++ b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/OpenIdConnectHandlerTests.cs @@ -13,9 +13,9 @@ using Microsoft.AspNet.Authentication.OpenIdConnect; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.TestHost; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Logging; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.WebEncoders; using Microsoft.IdentityModel.Protocols.OpenIdConnect; using Xunit; diff --git a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/OpenIdConnectMiddlewareForTestingAuthenticate.cs b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/OpenIdConnectMiddlewareForTestingAuthenticate.cs index 46c04ab7a9..b144e838d9 100644 --- a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/OpenIdConnectMiddlewareForTestingAuthenticate.cs +++ b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/OpenIdConnectMiddlewareForTestingAuthenticate.cs @@ -1,13 +1,13 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Copyright (c) Microsoft Open Technologies, Inc. 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.Authentication.OpenIdConnect; using Microsoft.AspNet.Builder; using Microsoft.AspNet.DataProtection; -using Microsoft.Framework.Logging; -using Microsoft.Framework.OptionsModel; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.OptionsModel; +using Microsoft.Extensions.WebEncoders; namespace Microsoft.AspNet.Authentication.Tests.OpenIdConnect { diff --git a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/OpenIdConnectMiddlewareTests.cs b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/OpenIdConnectMiddlewareTests.cs index 8675319307..8b6eaf4d44 100644 --- a/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/OpenIdConnectMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Authentication.Test/OpenIdConnect/OpenIdConnectMiddlewareTests.cs @@ -16,8 +16,8 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.TestHost; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.WebEncoders; using Microsoft.IdentityModel.Protocols.OpenIdConnect; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Authentication.Test/Twitter/TwitterMiddlewareTests.cs b/test/Microsoft.AspNet.Authentication.Test/Twitter/TwitterMiddlewareTests.cs index 9b73806a90..d64474ae0a 100644 --- a/test/Microsoft.AspNet.Authentication.Test/Twitter/TwitterMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Authentication.Test/Twitter/TwitterMiddlewareTests.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; using Microsoft.AspNet.TestHost; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Xunit; namespace Microsoft.AspNet.Authentication.Twitter diff --git a/test/Microsoft.AspNet.Authorization.Test/DefaultAuthorizationServiceTests.cs b/test/Microsoft.AspNet.Authorization.Test/DefaultAuthorizationServiceTests.cs index e08dbeb003..fbf67ec15a 100644 --- a/test/Microsoft.AspNet.Authorization.Test/DefaultAuthorizationServiceTests.cs +++ b/test/Microsoft.AspNet.Authorization.Test/DefaultAuthorizationServiceTests.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Xunit; namespace Microsoft.AspNet.Authorization.Test diff --git a/test/Microsoft.AspNet.Authorization.Test/project.json b/test/Microsoft.AspNet.Authorization.Test/project.json index d00f53b651..7bbe7ed75b 100644 --- a/test/Microsoft.AspNet.Authorization.Test/project.json +++ b/test/Microsoft.AspNet.Authorization.Test/project.json @@ -4,7 +4,7 @@ }, "dependencies": { "Microsoft.AspNet.Authorization": "1.0.0-*", - "Microsoft.Framework.DependencyInjection": "1.0.0-*", + "Microsoft.Extensions.DependencyInjection": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "commands": { diff --git a/test/Microsoft.AspNet.CookiePolicy.Test/project.json b/test/Microsoft.AspNet.CookiePolicy.Test/project.json index 588852a032..6303a9f6ac 100644 --- a/test/Microsoft.AspNet.CookiePolicy.Test/project.json +++ b/test/Microsoft.AspNet.CookiePolicy.Test/project.json @@ -5,7 +5,7 @@ "dependencies": { "Microsoft.AspNet.CookiePolicy": "1.0.0-*", "Microsoft.AspNet.TestHost": "1.0.0-*", - "Microsoft.Framework.DependencyInjection": "1.0.0-*", + "Microsoft.Extensions.DependencyInjection": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "commands": {