From 7a0068ede29d07960af8f808f733467d91cd45ac 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/AntiforgerySample/FormPostSampleMiddleware.cs | 4 ++-- samples/AntiforgerySample/Startup.cs | 4 ++-- src/Microsoft.AspNet.Antiforgery/AntiforgeryOptionsSetup.cs | 4 ++-- src/Microsoft.AspNet.Antiforgery/DefaultAntiforgery.cs | 4 ++-- .../DefaultAntiforgeryTokenStore.cs | 4 ++-- .../ServiceCollectionExtensions.cs | 6 +++--- src/Microsoft.AspNet.Antiforgery/project.json | 6 +++--- .../AntiforgeryOptionsSetupTest.cs | 6 +++--- .../DefaultAntiforgeryTest.cs | 4 ++-- .../DefaultAntiforgeryTokenStoreTest.cs | 4 ++-- .../Microsoft.AspNet.Antiforgery.Test/TestOptionsManager.cs | 4 ++-- test/Microsoft.AspNet.Antiforgery.Test/project.json | 6 +++--- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/samples/AntiforgerySample/FormPostSampleMiddleware.cs b/samples/AntiforgerySample/FormPostSampleMiddleware.cs index 494e84a0b5..aa9b41a872 100644 --- a/samples/AntiforgerySample/FormPostSampleMiddleware.cs +++ b/samples/AntiforgerySample/FormPostSampleMiddleware.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.Threading.Tasks; using Microsoft.AspNet.Antiforgery; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; -using Microsoft.Framework.OptionsModel; +using Microsoft.Extensions.OptionsModel; namespace AntiforgerySample { diff --git a/samples/AntiforgerySample/Startup.cs b/samples/AntiforgerySample/Startup.cs index dadb75b86f..6fef43186c 100644 --- a/samples/AntiforgerySample/Startup.cs +++ b/samples/AntiforgerySample/Startup.cs @@ -1,8 +1,8 @@ -// 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.Extensions.DependencyInjection; namespace AntiforgerySample { diff --git a/src/Microsoft.AspNet.Antiforgery/AntiforgeryOptionsSetup.cs b/src/Microsoft.AspNet.Antiforgery/AntiforgeryOptionsSetup.cs index f37c3e9b2d..58b38be7a6 100644 --- a/src/Microsoft.AspNet.Antiforgery/AntiforgeryOptionsSetup.cs +++ b/src/Microsoft.AspNet.Antiforgery/AntiforgeryOptionsSetup.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.Linq; @@ -6,7 +6,7 @@ using System.Security.Cryptography; using System.Text; using Microsoft.AspNet.DataProtection; using Microsoft.AspNet.WebUtilities; -using Microsoft.Framework.OptionsModel; +using Microsoft.Extensions.OptionsModel; namespace Microsoft.AspNet.Antiforgery { diff --git a/src/Microsoft.AspNet.Antiforgery/DefaultAntiforgery.cs b/src/Microsoft.AspNet.Antiforgery/DefaultAntiforgery.cs index c2c66444ce..e1eb7a10eb 100644 --- a/src/Microsoft.AspNet.Antiforgery/DefaultAntiforgery.cs +++ b/src/Microsoft.AspNet.Antiforgery/DefaultAntiforgery.cs @@ -5,8 +5,8 @@ using System; using System.Diagnostics; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.Framework.OptionsModel; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.OptionsModel; +using Microsoft.Extensions.WebEncoders; namespace Microsoft.AspNet.Antiforgery { diff --git a/src/Microsoft.AspNet.Antiforgery/DefaultAntiforgeryTokenStore.cs b/src/Microsoft.AspNet.Antiforgery/DefaultAntiforgeryTokenStore.cs index 0e67c14827..29a50483ce 100644 --- a/src/Microsoft.AspNet.Antiforgery/DefaultAntiforgeryTokenStore.cs +++ b/src/Microsoft.AspNet.Antiforgery/DefaultAntiforgeryTokenStore.cs @@ -5,8 +5,8 @@ using System; using System.Diagnostics; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.OptionsModel; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.OptionsModel; namespace Microsoft.AspNet.Antiforgery { diff --git a/src/Microsoft.AspNet.Antiforgery/ServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Antiforgery/ServiceCollectionExtensions.cs index e33c314b6c..e78899c7ba 100644 --- a/src/Microsoft.AspNet.Antiforgery/ServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Antiforgery/ServiceCollectionExtensions.cs @@ -3,10 +3,10 @@ using System; using Microsoft.AspNet.Antiforgery; -using Microsoft.Framework.DependencyInjection.Extensions; -using Microsoft.Framework.OptionsModel; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.OptionsModel; -namespace Microsoft.Framework.DependencyInjection +namespace Microsoft.Extensions.DependencyInjection { public static class ServiceCollectionExtensions { diff --git a/src/Microsoft.AspNet.Antiforgery/project.json b/src/Microsoft.AspNet.Antiforgery/project.json index 4bc77d47bd..51c2e51048 100644 --- a/src/Microsoft.AspNet.Antiforgery/project.json +++ b/src/Microsoft.AspNet.Antiforgery/project.json @@ -9,9 +9,9 @@ "Microsoft.AspNet.DataProtection": "1.0.0-*", "Microsoft.AspNet.Http.Abstractions": "1.0.0-*", "Microsoft.AspNet.WebUtilities": "1.0.0-*", - "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-*", - "Microsoft.Framework.OptionsModel": "1.0.0-*", - "Microsoft.Framework.WebEncoders": "1.0.0-*" + "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*", + "Microsoft.Extensions.OptionsModel": "1.0.0-*", + "Microsoft.Extensions.WebEncoders": "1.0.0-*" }, "frameworks" : { diff --git a/test/Microsoft.AspNet.Antiforgery.Test/AntiforgeryOptionsSetupTest.cs b/test/Microsoft.AspNet.Antiforgery.Test/AntiforgeryOptionsSetupTest.cs index 946a0812e6..3966090c1e 100644 --- a/test/Microsoft.AspNet.Antiforgery.Test/AntiforgeryOptionsSetupTest.cs +++ b/test/Microsoft.AspNet.Antiforgery.Test/AntiforgeryOptionsSetupTest.cs @@ -1,8 +1,8 @@ -// 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.DependencyInjection; -using Microsoft.Framework.OptionsModel; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.OptionsModel; using Xunit; namespace Microsoft.AspNet.Antiforgery diff --git a/test/Microsoft.AspNet.Antiforgery.Test/DefaultAntiforgeryTest.cs b/test/Microsoft.AspNet.Antiforgery.Test/DefaultAntiforgeryTest.cs index 912bc015cc..112b1fc629 100644 --- a/test/Microsoft.AspNet.Antiforgery.Test/DefaultAntiforgeryTest.cs +++ b/test/Microsoft.AspNet.Antiforgery.Test/DefaultAntiforgeryTest.cs @@ -6,8 +6,8 @@ using System.Security.Claims; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.Framework.OptionsModel; -using Microsoft.Framework.WebEncoders.Testing; +using Microsoft.Extensions.OptionsModel; +using Microsoft.Extensions.WebEncoders.Testing; #if DNX451 using Moq; #endif diff --git a/test/Microsoft.AspNet.Antiforgery.Test/DefaultAntiforgeryTokenStoreTest.cs b/test/Microsoft.AspNet.Antiforgery.Test/DefaultAntiforgeryTokenStoreTest.cs index 98f56039e2..3b546e99d9 100644 --- a/test/Microsoft.AspNet.Antiforgery.Test/DefaultAntiforgeryTokenStoreTest.cs +++ b/test/Microsoft.AspNet.Antiforgery.Test/DefaultAntiforgeryTokenStoreTest.cs @@ -8,8 +8,8 @@ using System.Threading.Tasks; using Microsoft.AspNet.DataProtection; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Primitives; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Primitives; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Antiforgery.Test/TestOptionsManager.cs b/test/Microsoft.AspNet.Antiforgery.Test/TestOptionsManager.cs index e1c1c5cbcc..830d3a7913 100644 --- a/test/Microsoft.AspNet.Antiforgery.Test/TestOptionsManager.cs +++ b/test/Microsoft.AspNet.Antiforgery.Test/TestOptionsManager.cs @@ -1,8 +1,8 @@ -// 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.Framework.OptionsModel; +using Microsoft.Extensions.OptionsModel; namespace Microsoft.AspNet.Antiforgery { diff --git a/test/Microsoft.AspNet.Antiforgery.Test/project.json b/test/Microsoft.AspNet.Antiforgery.Test/project.json index ce82ef7f25..e3a04e2114 100644 --- a/test/Microsoft.AspNet.Antiforgery.Test/project.json +++ b/test/Microsoft.AspNet.Antiforgery.Test/project.json @@ -1,9 +1,9 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Antiforgery": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.Framework.DependencyInjection": "1.0.0-*", - "Microsoft.Framework.WebEncoders.Testing": "1.0.0-*", + "Microsoft.Extensions.DependencyInjection": "1.0.0-*", + "Microsoft.Extensions.WebEncoders.Testing": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "commands": {