From 576023cc0f0bc0db326e486d3bbdf1c076c4c827 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Sat, 3 Oct 2015 15:44:59 -0700 Subject: [PATCH] Renaming Microsoft.Framework.* -> Microsoft.Extensions.* --- .../Admin/Controllers/StoreManagerController.cs | 4 ++-- src/MusicStore/Controllers/AccountController.cs | 4 ++-- src/MusicStore/Controllers/HomeController.cs | 4 ++-- src/MusicStore/Controllers/ShoppingCartController.cs | 4 ++-- src/MusicStore/Controllers/StoreController.cs | 4 ++-- src/MusicStore/Models/SampleData.cs | 6 +++--- src/MusicStore/Program.cs | 4 ++-- src/MusicStore/Startup.cs | 6 +++--- src/MusicStore/StartupNtlmAuthentication.cs | 6 +++--- src/MusicStore/StartupOpenIdConnect.cs | 6 +++--- src/MusicStore/Views/_ViewImports.cshtml | 4 ++-- src/MusicStore/project.json | 12 ++++++------ test/E2ETests/Common/DbUtils.cs | 4 ++-- test/E2ETests/Common/Helpers.cs | 4 ++-- .../Implementation/FacebookLoginScenarios.cs | 4 ++-- test/E2ETests/Implementation/GoogleLoginScenarios.cs | 4 ++-- .../MicrosoftAccountAuthenticationScenarios.cs | 4 ++-- .../Implementation/OpenIdConnectLoginScenarios.cs | 4 ++-- .../E2ETests/Implementation/TwitterLoginScenarios.cs | 4 ++-- test/E2ETests/Implementation/Validator.cs | 4 ++-- test/E2ETests/NtlmAuthentationTest.cs | 4 ++-- test/E2ETests/OpenIdConnectTests.cs | 4 ++-- test/E2ETests/PublishAndRunTests.cs | 4 ++-- test/E2ETests/SmokeTests.cs | 4 ++-- .../shared/Mocks/StartupOpenIdConnectTesting.cs | 8 ++++---- .../compiler/shared/Mocks/StartupSocialTesting.cs | 10 +++++----- test/E2ETests/project.json | 4 ++-- test/MusicStore.Test/CartSummaryComponentTest.cs | 4 ++-- test/MusicStore.Test/CheckoutControllerTest.cs | 6 +++--- test/MusicStore.Test/GenreMenuComponentTest.cs | 4 ++-- test/MusicStore.Test/HomeControllerTest.cs | 6 +++--- test/MusicStore.Test/ManageControllerTest.cs | 4 ++-- test/MusicStore.Test/ShoppingCartControllerTest.cs | 6 +++--- test/MusicStore.Test/StoreControllerTest.cs | 6 +++--- test/MusicStore.Test/project.json | 2 +- 35 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs b/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs index 05e2fda3ba..7673a35085 100644 --- a/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs +++ b/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -7,7 +7,7 @@ using Microsoft.AspNet.Cors.Core; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.Data.Entity; -using Microsoft.Framework.Caching.Memory; +using Microsoft.Extensions.Caching.Memory; using MusicStore.Models; using MusicStore.ViewModels; diff --git a/src/MusicStore/Controllers/AccountController.cs b/src/MusicStore/Controllers/AccountController.cs index 4593292b50..20beac527b 100644 --- a/src/MusicStore/Controllers/AccountController.cs +++ b/src/MusicStore/Controllers/AccountController.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using System.Security.Claims; using System.Threading.Tasks; using Microsoft.AspNet.Authorization; @@ -6,7 +6,7 @@ using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Identity; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using MusicStore.Models; namespace MusicStore.Controllers diff --git a/src/MusicStore/Controllers/HomeController.cs b/src/MusicStore/Controllers/HomeController.cs index 61d7c732bd..499c743f3f 100644 --- a/src/MusicStore/Controllers/HomeController.cs +++ b/src/MusicStore/Controllers/HomeController.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Mvc; using Microsoft.Data.Entity; -using Microsoft.Framework.Caching.Memory; +using Microsoft.Extensions.Caching.Memory; using MusicStore.Models; namespace MusicStore.Controllers diff --git a/src/MusicStore/Controllers/ShoppingCartController.cs b/src/MusicStore/Controllers/ShoppingCartController.cs index 31cae6c18d..f45544ecc8 100644 --- a/src/MusicStore/Controllers/ShoppingCartController.cs +++ b/src/MusicStore/Controllers/ShoppingCartController.cs @@ -1,10 +1,10 @@ -using System.Linq; +using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.Antiforgery; using Microsoft.AspNet.Mvc; using Microsoft.Data.Entity; -using Microsoft.Framework.Primitives; +using Microsoft.Extensions.Primitives; using MusicStore.Models; using MusicStore.ViewModels; diff --git a/src/MusicStore/Controllers/StoreController.cs b/src/MusicStore/Controllers/StoreController.cs index 79466d7d7b..ea9e9e6c76 100644 --- a/src/MusicStore/Controllers/StoreController.cs +++ b/src/MusicStore/Controllers/StoreController.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Mvc; using Microsoft.Data.Entity; -using Microsoft.Framework.Caching.Memory; +using Microsoft.Extensions.Caching.Memory; using MusicStore.Models; namespace MusicStore.Controllers diff --git a/src/MusicStore/Models/SampleData.cs b/src/MusicStore/Models/SampleData.cs index e927bc7d2a..7941874db4 100644 --- a/src/MusicStore/Models/SampleData.cs +++ b/src/MusicStore/Models/SampleData.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Security.Claims; @@ -6,8 +6,8 @@ using System.Threading.Tasks; using Microsoft.AspNet.Identity; using Microsoft.Data.Entity; using Microsoft.Dnx.Runtime; -using Microsoft.Framework.Configuration; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; namespace MusicStore.Models { diff --git a/src/MusicStore/Program.cs b/src/MusicStore/Program.cs index 600037c0fd..5deadfe0cc 100644 --- a/src/MusicStore/Program.cs +++ b/src/MusicStore/Program.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Threading.Tasks; using Microsoft.AspNet.Hosting; -using Microsoft.Framework.Configuration; +using Microsoft.Extensions.Configuration; namespace MusicStore { diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs index b65cabc54b..debb5ac60c 100644 --- a/src/MusicStore/Startup.cs +++ b/src/MusicStore/Startup.cs @@ -3,9 +3,9 @@ using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNet.Identity.EntityFramework; using Microsoft.Data.Entity; using Microsoft.Dnx.Runtime; -using Microsoft.Framework.Configuration; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using MusicStore.Components; using MusicStore.Models; diff --git a/src/MusicStore/StartupNtlmAuthentication.cs b/src/MusicStore/StartupNtlmAuthentication.cs index 8a464a8023..860afa3733 100644 --- a/src/MusicStore/StartupNtlmAuthentication.cs +++ b/src/MusicStore/StartupNtlmAuthentication.cs @@ -5,9 +5,9 @@ using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNet.Http.Features; using Microsoft.Data.Entity; using Microsoft.Dnx.Runtime; -using Microsoft.Framework.Configuration; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using Microsoft.Net.Http.Server; using MusicStore.Components; using MusicStore.Models; diff --git a/src/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/StartupOpenIdConnect.cs index 1bec946c46..b51d146b37 100644 --- a/src/MusicStore/StartupOpenIdConnect.cs +++ b/src/MusicStore/StartupOpenIdConnect.cs @@ -3,9 +3,9 @@ using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNet.Identity.EntityFramework; using Microsoft.Data.Entity; using Microsoft.Dnx.Runtime; -using Microsoft.Framework.Configuration; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using MusicStore.Components; using MusicStore.Models; diff --git a/src/MusicStore/Views/_ViewImports.cshtml b/src/MusicStore/Views/_ViewImports.cshtml index 448546cc87..58df25f1e8 100644 --- a/src/MusicStore/Views/_ViewImports.cshtml +++ b/src/MusicStore/Views/_ViewImports.cshtml @@ -1,5 +1,5 @@ -@using MusicStore +@using MusicStore @using MusicStore.Models -@using Microsoft.Framework.OptionsModel +@using Microsoft.Extensions.OptionsModel @using Microsoft.AspNet.Identity @addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers" diff --git a/src/MusicStore/project.json b/src/MusicStore/project.json index a8dd216497..83eb54830b 100644 --- a/src/MusicStore/project.json +++ b/src/MusicStore/project.json @@ -30,14 +30,14 @@ "Microsoft.AspNet.Session": "1.0.0-*", "Microsoft.AspNet.StaticFiles": "1.0.0-*", "Microsoft.AspNet.Tooling.Razor": "1.0.0-*", - "Microsoft.Framework.CodeGenerators.Mvc": "1.0.0-*", - "Microsoft.Framework.Configuration.CommandLine": "1.0.0-*", - "Microsoft.Framework.Configuration.EnvironmentVariables": "1.0.0-*", - "Microsoft.Framework.Configuration.Json": "1.0.0-*", - "Microsoft.Framework.Logging.Console": "1.0.0-*" + "Microsoft.Extensions.CodeGenerators.Mvc": "1.0.0-*", + "Microsoft.Extensions.Configuration.CommandLine": "1.0.0-*", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*", + "Microsoft.Extensions.Configuration.Json": "1.0.0-*", + "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "commands": { - "gen": "Microsoft.Framework.CodeGeneration", + "gen": "Microsoft.Extensions.CodeGeneration", "kestrel": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5004", "run": "run server.urls=http://localhost:5003", "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5002" diff --git a/test/E2ETests/Common/DbUtils.cs b/test/E2ETests/Common/DbUtils.cs index e9d10ccf1e..ebb529e6ac 100644 --- a/test/E2ETests/Common/DbUtils.cs +++ b/test/E2ETests/Common/DbUtils.cs @@ -1,6 +1,6 @@ -using System; +using System; using System.Data.SqlClient; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; namespace E2ETests { diff --git a/test/E2ETests/Common/Helpers.cs b/test/E2ETests/Common/Helpers.cs index 68ea7154be..d9051a8102 100644 --- a/test/E2ETests/Common/Helpers.cs +++ b/test/E2ETests/Common/Helpers.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.IO; using System.Linq; using Microsoft.AspNet.Server.Testing; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; namespace E2ETests { diff --git a/test/E2ETests/Implementation/FacebookLoginScenarios.cs b/test/E2ETests/Implementation/FacebookLoginScenarios.cs index 50910534eb..070bb91280 100644 --- a/test/E2ETests/Implementation/FacebookLoginScenarios.cs +++ b/test/E2ETests/Implementation/FacebookLoginScenarios.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.WebUtilities; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Xunit; namespace E2ETests diff --git a/test/E2ETests/Implementation/GoogleLoginScenarios.cs b/test/E2ETests/Implementation/GoogleLoginScenarios.cs index 4b125d0191..10830f4dae 100644 --- a/test/E2ETests/Implementation/GoogleLoginScenarios.cs +++ b/test/E2ETests/Implementation/GoogleLoginScenarios.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.WebUtilities; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Xunit; namespace E2ETests diff --git a/test/E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs b/test/E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs index fbb2b06f24..bcba0a49c1 100644 --- a/test/E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs +++ b/test/E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.WebUtilities; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Xunit; namespace E2ETests diff --git a/test/E2ETests/Implementation/OpenIdConnectLoginScenarios.cs b/test/E2ETests/Implementation/OpenIdConnectLoginScenarios.cs index c37f6a7151..53b014938a 100644 --- a/test/E2ETests/Implementation/OpenIdConnectLoginScenarios.cs +++ b/test/E2ETests/Implementation/OpenIdConnectLoginScenarios.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.WebUtilities; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Xunit; namespace E2ETests diff --git a/test/E2ETests/Implementation/TwitterLoginScenarios.cs b/test/E2ETests/Implementation/TwitterLoginScenarios.cs index 701cf92238..63502a500e 100644 --- a/test/E2ETests/Implementation/TwitterLoginScenarios.cs +++ b/test/E2ETests/Implementation/TwitterLoginScenarios.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.WebUtilities; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Xunit; namespace E2ETests diff --git a/test/E2ETests/Implementation/Validator.cs b/test/E2ETests/Implementation/Validator.cs index d354a0080a..7e9251b7bf 100644 --- a/test/E2ETests/Implementation/Validator.cs +++ b/test/E2ETests/Implementation/Validator.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.Server.Testing; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Xunit; namespace E2ETests diff --git a/test/E2ETests/NtlmAuthentationTest.cs b/test/E2ETests/NtlmAuthentationTest.cs index 9b4ebab0e3..0107a2a672 100644 --- a/test/E2ETests/NtlmAuthentationTest.cs +++ b/test/E2ETests/NtlmAuthentationTest.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.Server.Testing; using Microsoft.AspNet.Testing.xunit; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Xunit; namespace E2ETests diff --git a/test/E2ETests/OpenIdConnectTests.cs b/test/E2ETests/OpenIdConnectTests.cs index cba026ba2e..d8073c125f 100644 --- a/test/E2ETests/OpenIdConnectTests.cs +++ b/test/E2ETests/OpenIdConnectTests.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.Server.Testing; using Microsoft.AspNet.Testing.xunit; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Xunit; namespace E2ETests diff --git a/test/E2ETests/PublishAndRunTests.cs b/test/E2ETests/PublishAndRunTests.cs index 166febbc29..cd0c69f81a 100644 --- a/test/E2ETests/PublishAndRunTests.cs +++ b/test/E2ETests/PublishAndRunTests.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.Server.Testing; using Microsoft.AspNet.Testing.xunit; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Xunit; namespace E2ETests diff --git a/test/E2ETests/SmokeTests.cs b/test/E2ETests/SmokeTests.cs index 176dceb0d5..98b98d7400 100644 --- a/test/E2ETests/SmokeTests.cs +++ b/test/E2ETests/SmokeTests.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.Server.Testing; using Microsoft.AspNet.Testing.xunit; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; using Xunit; namespace E2ETests diff --git a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs index 19a131fe87..49811c341e 100644 --- a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs +++ b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs @@ -7,10 +7,10 @@ using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNet.Identity.EntityFramework; using Microsoft.Data.Entity; using Microsoft.Dnx.Runtime; -using Microsoft.Framework.Caching.Memory; -using Microsoft.Framework.Configuration; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Caching.Memory; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using MusicStore.Components; using MusicStore.Mocks.Common; using MusicStore.Mocks.OpenIdConnect; diff --git a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs index 781edde546..415b598605 100644 --- a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs +++ b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs @@ -1,4 +1,4 @@ -#if TESTING +#if TESTING using System; using Microsoft.AspNet.Authentication.OAuth; using Microsoft.AspNet.Authentication.Twitter; @@ -9,10 +9,10 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Identity.EntityFramework; using Microsoft.Data.Entity; using Microsoft.Dnx.Runtime; -using Microsoft.Framework.Caching.Memory; -using Microsoft.Framework.Configuration; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Caching.Memory; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using MusicStore.Components; using MusicStore.Mocks.Common; using MusicStore.Mocks.Facebook; diff --git a/test/E2ETests/project.json b/test/E2ETests/project.json index acd8ac13fd..b4e94f79d4 100644 --- a/test/E2ETests/project.json +++ b/test/E2ETests/project.json @@ -10,8 +10,8 @@ "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.Testing": "1.0.0-*", "Microsoft.AspNet.WebUtilities": "1.0.0-*", - "Microsoft.Framework.Configuration.EnvironmentVariables": "1.0.0-*", - "Microsoft.Framework.Logging.Console": "1.0.0-*", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*", + "Microsoft.Extensions.Logging.Console": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "frameworks": { diff --git a/test/MusicStore.Test/CartSummaryComponentTest.cs b/test/MusicStore.Test/CartSummaryComponentTest.cs index 2c821f475c..60e5989bfe 100644 --- a/test/MusicStore.Test/CartSummaryComponentTest.cs +++ b/test/MusicStore.Test/CartSummaryComponentTest.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Http; @@ -6,7 +6,7 @@ using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewComponents; using Microsoft.Data.Entity; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using MusicStore.Controllers; using MusicStore.Models; using Xunit; diff --git a/test/MusicStore.Test/CheckoutControllerTest.cs b/test/MusicStore.Test/CheckoutControllerTest.cs index 4dd20a15eb..2e6007d1b3 100644 --- a/test/MusicStore.Test/CheckoutControllerTest.cs +++ b/test/MusicStore.Test/CheckoutControllerTest.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Security.Claims; @@ -8,8 +8,8 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc; using Microsoft.Data.Entity; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Primitives; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Primitives; using MusicStore.Models; using Xunit; diff --git a/test/MusicStore.Test/GenreMenuComponentTest.cs b/test/MusicStore.Test/GenreMenuComponentTest.cs index a139cdc9a2..8c32810244 100644 --- a/test/MusicStore.Test/GenreMenuComponentTest.cs +++ b/test/MusicStore.Test/GenreMenuComponentTest.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Mvc.ViewComponents; using Microsoft.Data.Entity; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using MusicStore.Models; using Xunit; diff --git a/test/MusicStore.Test/HomeControllerTest.cs b/test/MusicStore.Test/HomeControllerTest.cs index 5bc75c35e3..83d9e56d05 100644 --- a/test/MusicStore.Test/HomeControllerTest.cs +++ b/test/MusicStore.Test/HomeControllerTest.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Mvc; using Microsoft.Data.Entity; -using Microsoft.Framework.Caching.Memory; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.Caching.Memory; +using Microsoft.Extensions.DependencyInjection; using MusicStore.Models; using Xunit; diff --git a/test/MusicStore.Test/ManageControllerTest.cs b/test/MusicStore.Test/ManageControllerTest.cs index ecaf16ce6e..0cfee51f47 100644 --- a/test/MusicStore.Test/ManageControllerTest.cs +++ b/test/MusicStore.Test/ManageControllerTest.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Security.Claims; using System.Threading.Tasks; @@ -11,7 +11,7 @@ using Microsoft.AspNet.Identity; using Microsoft.AspNet.Identity.EntityFramework; using Microsoft.AspNet.Mvc; using Microsoft.Data.Entity; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using MusicStore.Models; using Xunit; diff --git a/test/MusicStore.Test/ShoppingCartControllerTest.cs b/test/MusicStore.Test/ShoppingCartControllerTest.cs index c4b6a1babb..2b8a67e231 100644 --- a/test/MusicStore.Test/ShoppingCartControllerTest.cs +++ b/test/MusicStore.Test/ShoppingCartControllerTest.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading; @@ -10,8 +10,8 @@ using Microsoft.AspNet.Http.Features.Internal; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc; using Microsoft.Data.Entity; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Primitives; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Primitives; using MusicStore.Models; using MusicStore.ViewModels; using Xunit; diff --git a/test/MusicStore.Test/StoreControllerTest.cs b/test/MusicStore.Test/StoreControllerTest.cs index 1f38926c42..c258788fe2 100644 --- a/test/MusicStore.Test/StoreControllerTest.cs +++ b/test/MusicStore.Test/StoreControllerTest.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Mvc; using Microsoft.Data.Entity; -using Microsoft.Framework.Caching.Memory; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.Caching.Memory; +using Microsoft.Extensions.DependencyInjection; using MusicStore.Models; using Xunit; diff --git a/test/MusicStore.Test/project.json b/test/MusicStore.Test/project.json index 09e4e5905f..dcd5a686f8 100644 --- a/test/MusicStore.Test/project.json +++ b/test/MusicStore.Test/project.json @@ -3,7 +3,7 @@ "warningsAsErrors": true }, "dependencies": { - "Microsoft.Framework.Logging.Testing": "1.0.0-*", + "Microsoft.Extensions.Logging.Testing": "1.0.0-*", "MusicStore": "", "xunit.runner.aspnet": "2.0.0-aspnet-*" },