Rename AspNet 5 file contents.

See https://github.com/aspnet/Announcements/issues/144 for more information.

shared/Mocks/Common/CustomStateDataFormat.cs

@@ -1,6 +1,6 @@
-#if TESTING
+#if TESTING
-using Microsoft.AspNet.Authentication;
+using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNet.Http.Authentication;
+using Microsoft.AspNetCore.Http.Authentication;
 using Newtonsoft.Json;
 
 namespace MusicStore.Mocks.Common

shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs

@@ -1,11 +1,11 @@
-#if TESTING
+#if TESTING
 using System;
 using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNet.WebUtilities;
+using Microsoft.AspNetCore.WebUtilities;
 using MusicStore.Mocks.Common;
 
 namespace MusicStore.Mocks.Facebook

shared/Mocks/Facebook/TestFacebookEvents.cs

@@ -1,12 +1,12 @@
-#if TESTING
+#if TESTING
 using System;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authentication;
+using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNet.Authentication.Facebook;
+using Microsoft.AspNetCore.Authentication.Facebook;
-using Microsoft.AspNet.Authentication.OAuth;
+using Microsoft.AspNetCore.Authentication.OAuth;
-using Microsoft.AspNet.Identity;
+using Microsoft.AspNetCore.Identity;
 using MusicStore.Mocks.Common;
 
 namespace MusicStore.Mocks.Facebook

shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs

@@ -1,12 +1,12 @@
-#if TESTING
+#if TESTING
 using System;
 using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNet.WebUtilities;
+using Microsoft.AspNetCore.WebUtilities;
 
 namespace MusicStore.Mocks.Google
 {

shared/Mocks/Google/TestGoogleEvents.cs

@@ -1,12 +1,12 @@
-#if TESTING
+#if TESTING
 using System;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authentication;
+using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNet.Authentication.Google;
+using Microsoft.AspNetCore.Authentication.Google;
-using Microsoft.AspNet.Authentication.OAuth;
+using Microsoft.AspNetCore.Authentication.OAuth;
-using Microsoft.AspNet.Identity;
+using Microsoft.AspNetCore.Identity;
 using MusicStore.Mocks.Common;
 
 namespace MusicStore.Mocks.Google

shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs

@@ -1,12 +1,12 @@
-#if TESTING
+#if TESTING
 using System;
 using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNet.WebUtilities;
+using Microsoft.AspNetCore.WebUtilities;
 
 namespace MusicStore.Mocks.MicrosoftAccount
 {

shared/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs

@@ -1,12 +1,12 @@
-#if TESTING
+#if TESTING
 using System;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authentication;
+using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNet.Authentication.MicrosoftAccount;
+using Microsoft.AspNetCore.Authentication.MicrosoftAccount;
-using Microsoft.AspNet.Authentication.OAuth;
+using Microsoft.AspNetCore.Authentication.OAuth;
-using Microsoft.AspNet.Identity;
+using Microsoft.AspNetCore.Identity;
 using MusicStore.Mocks.Common;
 
 namespace MusicStore.Mocks.MicrosoftAccount

shared/Mocks/OpenIdConnect/CustomStringDataFormat.cs

@@ -1,5 +1,5 @@
-#if TESTING
+#if TESTING
-using Microsoft.AspNet.Authentication;
+using Microsoft.AspNetCore.Authentication;
 
 namespace MusicStore.Mocks.OpenIdConnect
 {

shared/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs

@@ -1,9 +1,9 @@
-#if TESTING
+#if TESTING
 using System.Collections.Generic;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authentication.OpenIdConnect;
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using MusicStore.Mocks.Common;
 

shared/Mocks/StartupOpenIdConnectTesting.cs

@@ -1,11 +1,11 @@
 #if TESTING
 using System;
-using Microsoft.AspNet.Authentication.OpenIdConnect;
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
-using Microsoft.AspNet.Authorization;
+using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNet.Builder;
+using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNet.Diagnostics.Entity;
+using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore;
-using Microsoft.AspNet.Identity.EntityFramework;
+using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.PlatformAbstractions;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Configuration;

shared/Mocks/StartupSocialTesting.cs

@@ -1,13 +1,13 @@
 #if TESTING
 using System;
-using Microsoft.AspNet.Authentication.OAuth;
+using Microsoft.AspNetCore.Authentication.OAuth;
-using Microsoft.AspNet.Authentication.Twitter;
+using Microsoft.AspNetCore.Authentication.Twitter;
-using Microsoft.AspNet.Authorization;
+using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNet.Builder;
+using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNet.Diagnostics.Entity;
+using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.Identity.EntityFramework;
+using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.PlatformAbstractions;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Configuration;

shared/Mocks/Twitter/CustomTwitterStateDataFormat.cs

@@ -1,6 +1,6 @@
-#if TESTING
+#if TESTING
-using Microsoft.AspNet.Authentication;
+using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNet.Authentication.Twitter;
+using Microsoft.AspNetCore.Authentication.Twitter;
 using Newtonsoft.Json;
 
 namespace MusicStore.Mocks.Twitter

shared/Mocks/Twitter/TestTwitterEvents.cs

@@ -1,10 +1,10 @@
-#if TESTING
+#if TESTING
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authentication;
+using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNet.Authentication.Twitter;
+using Microsoft.AspNetCore.Authentication.Twitter;
-using Microsoft.AspNet.Identity;
+using Microsoft.AspNetCore.Identity;
 using MusicStore.Mocks.Common;
 
 namespace MusicStore.Mocks.Twitter

shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs

@@ -1,12 +1,12 @@
-#if TESTING
+#if TESTING
 using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNet.WebUtilities;
+using Microsoft.AspNetCore.WebUtilities;
 
 namespace MusicStore.Mocks.Twitter
 {

src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs

@@ -2,11 +2,11 @@ using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authorization;
+using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNet.Cors;
+using Microsoft.AspNetCore.Cors;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using MusicStore.Models;
 using MusicStore.ViewModels;

src/MusicStore/Components/CartSummaryComponent.cs

@@ -1,6 +1,6 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using MusicStore.Models;
 
 namespace MusicStore.Components

src/MusicStore/Components/GenreMenuComponent.cs

@@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using MusicStore.Models;
 
 namespace MusicStore.Components

src/MusicStore/Controllers/AccountController.cs

@@ -1,11 +1,11 @@
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authorization;
+using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNet.Identity;
+using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.Extensions.DependencyInjection;
 using MusicStore.Models;
 

src/MusicStore/Controllers/CheckoutController.cs

@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authorization;
+using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using MusicStore.Models;
 
 namespace MusicStore.Controllers

src/MusicStore/Controllers/HomeController.cs

@@ -2,8 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using MusicStore.Models;
 

src/MusicStore/Controllers/ManageController.cs

@@ -1,9 +1,9 @@
-using System.Linq;
+using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authorization;
+using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNet.Identity;
+using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using MusicStore.Models;
 
 namespace MusicStore.Controllers

src/MusicStore/Controllers/ShoppingCartController.cs

@@ -1,8 +1,8 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using MusicStore.Models;
 using MusicStore.ViewModels;
 

src/MusicStore/Controllers/StoreController.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using MusicStore.Models;
 

src/MusicStore/Models/AccountViewModels.cs

@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Rendering;
 
 namespace MusicStore.Models
 {

src/MusicStore/Models/Album.cs

@@ -1,7 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNet.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 
 namespace MusicStore.Models
 {

src/MusicStore/Models/ManageViewModels.cs

@@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNet.Http.Authentication;
+using Microsoft.AspNetCore.Http.Authentication;
-using Microsoft.AspNet.Identity;
+using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Rendering;
 
 namespace MusicStore.Models
 {

src/MusicStore/Models/MusicStoreContext.cs

@@ -1,5 +1,5 @@
-using Microsoft.AspNet.Identity.EntityFramework;
+using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 
 namespace MusicStore.Models
 {

src/MusicStore/Models/Order.cs

@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNet.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 
 namespace MusicStore.Models
 {

src/MusicStore/Models/SampleData.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Identity;
+using Microsoft.AspNetCore.Identity;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.PlatformAbstractions;

src/MusicStore/Models/ShoppingCart.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 
 namespace MusicStore.Models
 {

src/MusicStore/Program.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNetCore.Hosting;
 
 namespace MusicStore
 {

src/MusicStore/Startup.cs

@@ -1,6 +1,6 @@
-using Microsoft.AspNet.Builder;
+using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNet.Identity.EntityFramework;
+using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;

src/MusicStore/StartupNtlmAuthentication.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Security.Claims;
-using Microsoft.AspNet.Builder;
+using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -15,7 +15,7 @@ namespace MusicStore
 {
     /// <summary>
     /// To make runtime to load an environment based startup class, specify the environment by the following ways:
-    /// 1. Drop a Microsoft.AspNet.Hosting.ini file in the wwwroot folder
+    /// 1. Drop a Microsoft.AspNetCore.Hosting.ini file in the wwwroot folder
     /// 2. Add a setting in the ini file named 'ASPNET_ENV' with value of the format 'Startup[EnvironmentName]'.
     ///    For example: To load a Startup class named 'StartupNtlmAuthentication' the value of the env should be
     ///    'NtlmAuthentication' (eg. ASPNET_ENV=NtlmAuthentication). Runtime adds a 'Startup' prefix to this and
@@ -26,7 +26,7 @@ namespace MusicStore
     /// 1. Set the environment variable named SET ASPNET_ENV=NtlmAuthentication
     /// 2. For selfhost based servers pass in a command line variable named --env with this value. Eg:
     /// "commands": {
-    ///    "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener
+    ///    "web": "Microsoft.AspNetCore.Hosting --server Microsoft.AspNetCore.Server.WebListener
     ///           --server.urls http://localhost:5002 --ASPNET_ENV NtlmAuthentication",
     ///  },
     /// </summary>

src/MusicStore/StartupOpenIdConnect.cs

@@ -1,6 +1,6 @@
-using Microsoft.AspNet.Builder;
+using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNet.Identity.EntityFramework;
+using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -12,7 +12,7 @@ namespace MusicStore
 {
     /// <summary>
     /// To make runtime to load an environment based startup class, specify the environment by the following ways:
-    /// 1. Drop a Microsoft.AspNet.Hosting.ini file in the wwwroot folder
+    /// 1. Drop a Microsoft.AspNetCore.Hosting.ini file in the wwwroot folder
     /// 2. Add a setting in the ini file named 'ASPNET_ENV' with value of the format 'Startup[EnvironmentName]'.
     ///    For example: To load a Startup class named 'StartupOpenIdConnect' the value of the env should be
     ///    'OpenIdConnect' (eg. ASPNET_ENV=OpenIdConnect). Runtime adds a 'Startup' prefix to this
@@ -23,7 +23,7 @@ namespace MusicStore
     /// 1. Set the environment variable named SET ASPNET_ENV=OpenIdConnect
     /// 2. For selfhost based servers pass in a command line variable named --env with this value. Eg:
     /// "commands": {
-    ///    "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener
+    ///    "web": "Microsoft.AspNetCore.Hosting --server Microsoft.AspNetCore.Server.WebListener
     /// --server.urls http://localhost:5002 --ASPNET_ENV OpenIdConnect",
     ///  },
     /// </summary>

src/MusicStore/TestMIddleware.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 
 namespace MusicStore

src/MusicStore/Views/Shared/_LoginPartial.cshtml

@@ -1,4 +1,4 @@
-@using Microsoft.AspNet.Identity
+@using Microsoft.AspNetCore.Identity
 @using MusicStore.Models
 
 @inject SignInManager<ApplicationUser> SignInManager

src/MusicStore/Views/ShoppingCart/Index.cshtml

@@ -1,5 +1,5 @@
-@model MusicStore.ViewModels.ShoppingCartViewModel
+@model MusicStore.ViewModels.ShoppingCartViewModel
-@inject Microsoft.AspNet.Antiforgery.IAntiforgery Xsrf
+@inject Microsoft.AspNetCore.Antiforgery.IAntiforgery Xsrf
 @{
     ViewBag.Title = "Shopping Cart";
 }

src/MusicStore/Views/_ViewImports.cshtml

@@ -1,5 +1,5 @@
 @using MusicStore
 @using MusicStore.Models
 @using Microsoft.Extensions.Options
-@using Microsoft.AspNet.Identity
+@using Microsoft.AspNetCore.Identity
-@addTagHelper *, Microsoft.AspNet.Mvc.TagHelpers
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

src/MusicStore/hosting.json

@@ -1,3 +1,3 @@
-{
+{
-  "server": "Microsoft.AspNet.Server.Kestrel"
+  "server": "Microsoft.AspNetCore.Server.Kestrel"
 }

src/MusicStore/project.json

@@ -14,24 +14,24 @@
   ],
   "publishExclude": "*.cmd",
   "dependencies": {
-    "EntityFramework.InMemory": "7.0.0-*",
+    "Microsoft.EntityFrameworkCore.InMemory": "7.0.0-*",
-    "EntityFramework.MicrosoftSqlServer": "7.0.0-*",
+    "Microsoft.EntityFrameworkCore.SqlServer": "7.0.0-*",
-    "Microsoft.AspNet.Authentication.Cookies": "1.0.0-*",
+    "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",
-    "Microsoft.AspNet.Authentication.Facebook": "1.0.0-*",
+    "Microsoft.AspNetCore.Authentication.Facebook": "1.0.0-*",
-    "Microsoft.AspNet.Authentication.Google": "1.0.0-*",
+    "Microsoft.AspNetCore.Authentication.Google": "1.0.0-*",
-    "Microsoft.AspNet.Authentication.MicrosoftAccount": "1.0.0-*",
+    "Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.0.0-*",
-    "Microsoft.AspNet.Authentication.OpenIdConnect": "1.0.0-*",
+    "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.0.0-*",
-    "Microsoft.AspNet.Authentication.Twitter": "1.0.0-*",
+    "Microsoft.AspNetCore.Authentication.Twitter": "1.0.0-*",
-    "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*",
+    "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "7.0.0-*",
-    "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-*",
+    "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "3.0.0-*",
-    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*",
+    "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
-    "Microsoft.AspNet.Mvc": "6.0.0-*",
+    "Microsoft.AspNetCore.Mvc": "6.0.0-*",
-    "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-*",
+    "Microsoft.AspNetCore.Mvc.TagHelpers": "6.0.0-*",
-    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
-    "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.WebListener": "1.0.0-*",
-    "Microsoft.AspNet.Session": "1.0.0-*",
+    "Microsoft.AspNetCore.Session": "1.0.0-*",
-    "Microsoft.AspNet.StaticFiles": "1.0.0-*",
+    "Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
-    "Microsoft.AspNet.Tooling.Razor": "1.0.0-*",
+    "Microsoft.AspNetCore.Tooling.Razor": "1.0.0-*",
     "Microsoft.Extensions.CodeGenerators.Mvc": "1.0.0-*",
     "Microsoft.Extensions.Configuration.CommandLine": "1.0.0-*",
     "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",

test/E2ETests/Common/Helpers.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
-using Microsoft.AspNet.Server.Testing;
+using Microsoft.AspNetCore.Server.Testing;
 using Microsoft.Extensions.Logging;
 
 namespace E2ETests

test/E2ETests/Implementation/FacebookLoginScenarios.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNet.WebUtilities;
+using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
@@ -86,8 +86,8 @@ namespace E2ETests
             Assert.Contains(string.Format("Hello {0}!", "AspnetvnextTest@test.com"), responseContent, StringComparison.OrdinalIgnoreCase);
             Assert.Contains("Log off", responseContent, StringComparison.OrdinalIgnoreCase);
             //Verify cookie sent
-            Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.Application"));
+            Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.Application"));
-            Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.ExternalLogin"));
+            Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.ExternalLogin"));
             _logger.LogInformation("Successfully signed in with user '{email}'", "AspnetvnextTest@test.com");
 
             _logger.LogInformation("Verifying if the middleware events were fired");

test/E2ETests/Implementation/GoogleLoginScenarios.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNet.WebUtilities;
+using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
@@ -87,8 +87,8 @@ namespace E2ETests
             Assert.Contains(string.Format("Hello {0}!", "AspnetvnextTest@gmail.com"), responseContent, StringComparison.OrdinalIgnoreCase);
             Assert.Contains("Log off", responseContent, StringComparison.OrdinalIgnoreCase);
             //Verify cookie sent
-            Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.Application"));
+            Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.Application"));
-            Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.ExternalLogin"));
+            Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.ExternalLogin"));
             _logger.LogInformation("Successfully signed in with user '{email}'", "AspnetvnextTest@gmail.com");
 
             _logger.LogInformation("Verifying if the middleware events were fired");

test/E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNet.WebUtilities;
+using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
@@ -86,8 +86,8 @@ namespace E2ETests
             Assert.Contains(string.Format("Hello {0}!", "microsoft@test.com"), responseContent, StringComparison.OrdinalIgnoreCase);
             Assert.Contains("Log off", responseContent, StringComparison.OrdinalIgnoreCase);
             //Verify cookie sent
-            Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.Application"));
+            Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.Application"));
-            Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.ExternalLogin"));
+            Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.ExternalLogin"));
             _logger.LogInformation("Successfully signed in with user '{email}'", "microsoft@test.com");
 
             _logger.LogInformation("Verifying if the middleware events were fired");

test/E2ETests/Implementation/OpenIdConnectLoginScenarios.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNet.WebUtilities;
+using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
@@ -73,8 +73,8 @@ namespace E2ETests
             Assert.Contains(string.Format("Hello {0}!", "User3@aspnettest.onmicrosoft.com"), responseContent, StringComparison.OrdinalIgnoreCase);
             Assert.Contains("Log off", responseContent, StringComparison.OrdinalIgnoreCase);
             //Verify cookie sent
-            Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.Application"));
+            Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.Application"));
-            Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.ExternalLogin"));
+            Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.ExternalLogin"));
             _logger.LogInformation("Successfully signed in with user '{email}'", "User3@aspnettest.onmicrosoft.com");
 
             _logger.LogInformation("Verifying if the middleware events were fired");
@@ -101,7 +101,7 @@ namespace E2ETests
             _httpClient = new HttpClient(handler) { BaseAddress = new Uri(_deploymentResult.ApplicationBaseUri) };
 
             response = await _httpClient.PostAsync("Account/LogOff", content);
-            Assert.Null(handler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.Application"));
+            Assert.Null(handler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.Application"));
             Assert.Equal<string>(
                 "https://login.windows.net/4afbc689-805b-48cf-a24c-d4aa3248a248/oauth2/logout",
                 response.Headers.Location.AbsoluteUri.Replace(response.Headers.Location.Query, string.Empty));

test/E2ETests/Implementation/TwitterLoginScenarios.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNet.WebUtilities;
+using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
@@ -86,8 +86,8 @@ namespace E2ETests
             Assert.Contains(string.Format("Hello {0}!", "twitter@test.com"), responseContent, StringComparison.OrdinalIgnoreCase);
             Assert.Contains("Log off", responseContent, StringComparison.OrdinalIgnoreCase);
             //Verify cookie sent
-            Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.Application"));
+            Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.Application"));
-            Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.ExternalLogin"));
+            Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.ExternalLogin"));
             _logger.LogInformation("Successfully signed in with user '{email}'", "twitter@test.com");
 
             _logger.LogInformation("Verifying if the middleware events were fired");

test/E2ETests/Implementation/Validator.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Server.Testing;
+using Microsoft.AspNetCore.Server.Testing;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
@@ -178,7 +178,7 @@ namespace E2ETests
             var content = new FormUrlEncodedContent(formParameters.ToArray());
             response = await _httpClient.PostAsync("Account/Register", content);
             responseContent = await response.Content.ReadAsStringAsync();
-            Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.Application"));
+            Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.Application"));
             Assert.Contains("<div class=\"text-danger validation-summary-errors\" data-valmsg-summary=\"true\"><ul><li>The password and confirmation password do not match.</li>", responseContent, StringComparison.OrdinalIgnoreCase);
             _logger.LogInformation("Server side model validator rejected the user '{email}''s registration as passwords do not match.", generatedEmail);
         }
@@ -265,7 +265,7 @@ namespace E2ETests
                 Assert.Contains("www.github.com/aspnet/MusicStore", responseContent, StringComparison.OrdinalIgnoreCase);
                 Assert.Contains("/Images/home-showcase.png", responseContent, StringComparison.OrdinalIgnoreCase);
                 //Verify cookie cleared on logout
-                Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.Application"));
+                Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.Application"));
                 _logger.LogInformation("Successfully signed out of '{email}''s session", email);
             }
             else
@@ -294,7 +294,7 @@ namespace E2ETests
             responseContent = await response.Content.ReadAsStringAsync();
             Assert.Contains("<div class=\"text-danger validation-summary-errors\" data-valmsg-summary=\"true\"><ul><li>Invalid login attempt.</li>", responseContent, StringComparison.OrdinalIgnoreCase);
             //Verify cookie not sent
-            Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.Application"));
+            Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.Application"));
             _logger.LogInformation("Identity successfully prevented an invalid user login.");
         }
 
@@ -318,7 +318,7 @@ namespace E2ETests
             Assert.Contains(string.Format("Hello {0}!", email), responseContent, StringComparison.OrdinalIgnoreCase);
             Assert.Contains("Log off", responseContent, StringComparison.OrdinalIgnoreCase);
             //Verify cookie sent
-            Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.Application"));
+            Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.Application"));
             _logger.LogInformation("Successfully signed in with user '{email}'", email);
         }
 
@@ -340,7 +340,7 @@ namespace E2ETests
             response = await _httpClient.GetAsync(response.Headers.Location);
             responseContent = await response.Content.ReadAsStringAsync();
             Assert.Contains("Your password has been changed.", responseContent, StringComparison.OrdinalIgnoreCase);
-            Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.Application"));
+            Assert.NotNull(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNetCore.Identity.Application"));
             _logger.LogInformation("Successfully changed the password for user '{email}'", email);
         }
 

test/E2ETests/NtlmAuthentationTest.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Server.Testing;
+using Microsoft.AspNetCore.Server.Testing;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Xunit;
 

test/E2ETests/OpenIdConnectTests.cs

@@ -2,9 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Server.Testing;
+using Microsoft.AspNetCore.Server.Testing;
-using Microsoft.AspNet.Testing;
+using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Xunit;
 

test/E2ETests/PublishAndRunTests.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Server.Testing;
+using Microsoft.AspNetCore.Server.Testing;
-using Microsoft.AspNet.Testing;
+using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Xunit;
 

test/E2ETests/SmokeTests.cs

@@ -2,9 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Server.Testing;
+using Microsoft.AspNetCore.Server.Testing;
-using Microsoft.AspNet.Testing;
+using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Xunit;
 

test/E2ETests/project.json

@@ -9,9 +9,9 @@
         "test": "xunit.runner.aspnet"
     },
     "dependencies": {
-        "Microsoft.AspNet.Authentication.OpenIdConnect": "1.0.0-*",
+        "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.0.0-*",
-        "Microsoft.AspNet.Server.Testing": "1.0.0-*",
+        "Microsoft.AspNetCore.Server.Testing": "1.0.0-*",
-        "Microsoft.AspNet.WebUtilities": "1.0.0-*",
+        "Microsoft.AspNetCore.WebUtilities": "1.0.0-*",
         "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
         "Microsoft.Extensions.Logging.Console": "1.0.0-*",
         "xunit.runner.aspnet": "2.0.0-aspnet-*"

test/MusicStore.Test/CartSummaryComponentTest.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.AspNet.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using MusicStore.Controllers;
 using MusicStore.Models;

test/MusicStore.Test/CheckoutControllerTest.cs

@@ -4,10 +4,10 @@ using System.Linq;
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Primitives;
 using MusicStore.Models;

test/MusicStore.Test/GenreMenuComponentTest.cs

@@ -2,8 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using MusicStore.Models;
 using Xunit;

test/MusicStore.Test/HomeControllerTest.cs

@@ -2,8 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
 using MusicStore.Models;

test/MusicStore.Test/ManageControllerTest.cs

@@ -2,15 +2,15 @@ using System;
 using System.Collections.Generic;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNet.Http.Features.Authentication;
+using Microsoft.AspNetCore.Http.Features.Authentication;
-using Microsoft.AspNet.Http.Features.Authentication.Internal;
+using Microsoft.AspNetCore.Http.Features.Authentication.Internal;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNet.Identity;
+using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNet.Identity.EntityFramework;
+using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using MusicStore.Models;
 using Xunit;

test/MusicStore.Test/ShoppingCartControllerTest.cs

@@ -3,13 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Antiforgery;
+using Microsoft.AspNetCore.Antiforgery;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNet.Http.Features.Internal;
+using Microsoft.AspNetCore.Http.Features.Internal;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Primitives;
 using MusicStore.Models;

test/MusicStore.Test/StoreControllerTest.cs

@@ -2,8 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
 using MusicStore.Models;

test/MusicStore.Test/TestSession.cs

@@ -1,7 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
 
 namespace MusicStore.Controllers
 {