From ad9e11ed2e88c9dab0c407c32acf3b2e92103939 Mon Sep 17 00:00:00 2001 From: Praburaj Date: Wed, 11 Mar 2015 17:37:48 -0700 Subject: [PATCH] React to Caching package rename Dependent on https://github.com/aspnet/Caching/pull/49/files --- .../Controllers/StoreManagerController.cs | 2 +- .../Components/AnnouncementComponent.cs | 2 +- src/MusicStore/Controllers/HomeController.cs | 2 +- src/MusicStore/Controllers/StoreController.cs | 2 +- src/MusicStore/Startup.cs | 2 +- src/MusicStore/StartupNtlmAuthentication.cs | 2 +- src/MusicStore/StartupOpenIdConnect.cs | 2 +- src/MusicStore/project.json | 94 +++++++++---------- .../Mocks/StartupOpenIdConnectTesting.cs | 2 +- .../shared/Mocks/StartupSocialTesting.cs | 2 +- test/MusicStore.Test/HomeControllerTest.cs | 2 +- test/MusicStore.Test/MusicStore.Test.xproj | 4 +- .../ShoppingCartControllerTest.cs | 4 +- 13 files changed, 60 insertions(+), 62 deletions(-) diff --git a/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs b/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs index 0fac2e888f..58caf0666f 100644 --- a/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs +++ b/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs @@ -6,7 +6,7 @@ using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.SignalR; using Microsoft.AspNet.SignalR.Infrastructure; -using Microsoft.Framework.Cache.Memory; +using Microsoft.Framework.Caching.Memory; using MusicStore.Hubs; using MusicStore.Models; using MusicStore.ViewModels; diff --git a/src/MusicStore/Components/AnnouncementComponent.cs b/src/MusicStore/Components/AnnouncementComponent.cs index 36191ff965..b349ba734c 100644 --- a/src/MusicStore/Components/AnnouncementComponent.cs +++ b/src/MusicStore/Components/AnnouncementComponent.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Mvc; -using Microsoft.Framework.Cache.Memory; +using Microsoft.Framework.Caching.Memory; using MusicStore.Models; namespace MusicStore.Components diff --git a/src/MusicStore/Controllers/HomeController.cs b/src/MusicStore/Controllers/HomeController.cs index 3ebb12e300..46a8c8da1d 100644 --- a/src/MusicStore/Controllers/HomeController.cs +++ b/src/MusicStore/Controllers/HomeController.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Mvc; -using Microsoft.Framework.Cache.Memory; +using Microsoft.Framework.Caching.Memory; using MusicStore.Models; namespace MusicStore.Controllers diff --git a/src/MusicStore/Controllers/StoreController.cs b/src/MusicStore/Controllers/StoreController.cs index e595b8d632..1514564b28 100644 --- a/src/MusicStore/Controllers/StoreController.cs +++ b/src/MusicStore/Controllers/StoreController.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Mvc; -using Microsoft.Framework.Cache.Memory; +using Microsoft.Framework.Caching.Memory; using MusicStore.Models; namespace MusicStore.Controllers diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs index 8e0eb01d16..b9c7aa31dd 100644 --- a/src/MusicStore/Startup.cs +++ b/src/MusicStore/Startup.cs @@ -4,7 +4,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Diagnostics; using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNet.Identity; -using Microsoft.Framework.Cache.Memory; +using Microsoft.Framework.Caching.Memory; using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Logging; diff --git a/src/MusicStore/StartupNtlmAuthentication.cs b/src/MusicStore/StartupNtlmAuthentication.cs index 54bcff927e..158da2891f 100644 --- a/src/MusicStore/StartupNtlmAuthentication.cs +++ b/src/MusicStore/StartupNtlmAuthentication.cs @@ -6,7 +6,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Diagnostics; using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNet.Server.WebListener; -using Microsoft.Framework.Cache.Memory; +using Microsoft.Framework.Caching.Memory; using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Logging; diff --git a/src/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/StartupOpenIdConnect.cs index ae45ee5eee..452373eaef 100644 --- a/src/MusicStore/StartupOpenIdConnect.cs +++ b/src/MusicStore/StartupOpenIdConnect.cs @@ -4,7 +4,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Diagnostics; using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNet.Identity; -using Microsoft.Framework.Cache.Memory; +using Microsoft.Framework.Caching.Memory; using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Logging; diff --git a/src/MusicStore/project.json b/src/MusicStore/project.json index 7cba53392d..a22c676d0a 100644 --- a/src/MusicStore/project.json +++ b/src/MusicStore/project.json @@ -1,48 +1,48 @@ { - "authors": [ - "Microsoft" - ], - "description": "Music store application on ASP.NET 5", - "version": "1.0.0-*", - "compilationOptions": { "warningsAsErrors": true, "define": [ "DEMO", "TESTING" ] }, - "code": [ - "**/*.cs", - "../../test/E2ETests/compiler/shared/**/*.cs" // This code is for testing only. - ], - "bundleExclude": "*.cmd", - "webroot": "wwwroot", - "dependencies": { - "EntityFramework.SqlServer": "7.0.0-*", - "EntityFramework.InMemory": "7.0.0-*", // For Mono. - "Kestrel": "1.0.0-*", - "Microsoft.AspNet.Authentication.Cookies": "1.0.0-*", - "Microsoft.AspNet.Authentication.Facebook": "1.0.0-*", - "Microsoft.AspNet.Authentication.Google": "1.0.0-*", - "Microsoft.AspNet.Authentication.MicrosoftAccount": "1.0.0-*", - "Microsoft.AspNet.Authentication.OpenIdConnect": "1.0.0-*", - "Microsoft.AspNet.Authentication.Twitter": "1.0.0-*", - "Microsoft.AspNet.Diagnostics": "1.0.0-*", - "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*", - "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-*", - "Microsoft.AspNet.Mvc": "6.0.0-*", - "Microsoft.AspNet.Server.IIS": "1.0.0-*", - "Microsoft.AspNet.Server.WebListener": "1.0.0-*", - "Microsoft.AspNet.Session": "1.0.0-*", - "Microsoft.AspNet.SignalR.Server": "3.0.0-*", - "Microsoft.AspNet.StaticFiles": "1.0.0-*", - "Microsoft.Framework.Cache.Distributed": "1.0.0-*", // For Session. - "Microsoft.Framework.CodeGenerators.Mvc": "1.0.0-*", - "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*", - "Microsoft.Framework.Logging.Console": "1.0.0-*" - }, - "commands": { - "gen": "Microsoft.Framework.CodeGeneration", - "kestrel": "Microsoft.AspNet.Hosting --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" - }, - "frameworks": { - "dnx451": { }, - "dnxcore50": { } - } -} + "authors": [ + "Microsoft" + ], + "description": "Music store application on ASP.NET 5", + "version": "1.0.0-*", + "compilationOptions": { "warningsAsErrors": true, "define": [ "DEMO", "TESTING" ] }, + "code": [ + "**/*.cs", + "../../test/E2ETests/compiler/shared/**/*.cs" // This code is for testing only. + ], + "bundleExclude": "*.cmd", + "webroot": "wwwroot", + "dependencies": { + "EntityFramework.SqlServer": "7.0.0-*", + "EntityFramework.InMemory": "7.0.0-*", // For Mono. + "Kestrel": "1.0.0-*", + "Microsoft.AspNet.Authentication.Cookies": "1.0.0-*", + "Microsoft.AspNet.Authentication.Facebook": "1.0.0-*", + "Microsoft.AspNet.Authentication.Google": "1.0.0-*", + "Microsoft.AspNet.Authentication.MicrosoftAccount": "1.0.0-*", + "Microsoft.AspNet.Authentication.OpenIdConnect": "1.0.0-*", + "Microsoft.AspNet.Authentication.Twitter": "1.0.0-*", + "Microsoft.AspNet.Diagnostics": "1.0.0-*", + "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*", + "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-*", + "Microsoft.AspNet.Mvc": "6.0.0-*", + "Microsoft.AspNet.Server.IIS": "1.0.0-*", + "Microsoft.AspNet.Server.WebListener": "1.0.0-*", + "Microsoft.AspNet.Session": "1.0.0-*", + "Microsoft.AspNet.SignalR.Server": "3.0.0-*", + "Microsoft.AspNet.StaticFiles": "1.0.0-*", + "Microsoft.Framework.Caching.Distributed": "1.0.0-*", // For Session. + "Microsoft.Framework.CodeGenerators.Mvc": "1.0.0-*", + "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*", + "Microsoft.Framework.Logging.Console": "1.0.0-*" + }, + "commands": { + "gen": "Microsoft.Framework.CodeGeneration", + "kestrel": "Microsoft.AspNet.Hosting --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" + }, + "frameworks": { + "dnx451": { }, + "dnxcore50": { } + } +} \ No newline at end of file diff --git a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs index 9a62b91fd7..1792538183 100644 --- a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs +++ b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs @@ -5,7 +5,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Diagnostics; using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNet.Identity; -using Microsoft.Framework.Cache.Memory; +using Microsoft.Framework.Caching.Memory; using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Logging; diff --git a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs index e8fbda790e..eb7ce53344 100644 --- a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs +++ b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs @@ -9,7 +9,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Diagnostics; using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNet.Identity; -using Microsoft.Framework.Cache.Memory; +using Microsoft.Framework.Caching.Memory; using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Logging; diff --git a/test/MusicStore.Test/HomeControllerTest.cs b/test/MusicStore.Test/HomeControllerTest.cs index 5f3cc88788..19d5646047 100644 --- a/test/MusicStore.Test/HomeControllerTest.cs +++ b/test/MusicStore.Test/HomeControllerTest.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Mvc; using Microsoft.Data.Entity; -using Microsoft.Framework.Cache.Memory; +using Microsoft.Framework.Caching.Memory; using Microsoft.Framework.DependencyInjection; using MusicStore.Models; using Xunit; diff --git a/test/MusicStore.Test/MusicStore.Test.xproj b/test/MusicStore.Test/MusicStore.Test.xproj index 907b86e201..ec10069089 100644 --- a/test/MusicStore.Test/MusicStore.Test.xproj +++ b/test/MusicStore.Test/MusicStore.Test.xproj @@ -4,15 +4,13 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - beca766f-093e-4d08-9530-2bfa63c5bf93 + ca663205-77de-4e55-b300-85594181b5a9 MusicStore ..\..\..\artifacts\obj\$(MSBuildProjectName) ..\..\..\artifacts\bin\$(MSBuildProjectName)\ - 2.0 diff --git a/test/MusicStore.Test/ShoppingCartControllerTest.cs b/test/MusicStore.Test/ShoppingCartControllerTest.cs index fb8c08abc7..48e47501e4 100644 --- a/test/MusicStore.Test/ShoppingCartControllerTest.cs +++ b/test/MusicStore.Test/ShoppingCartControllerTest.cs @@ -6,8 +6,8 @@ using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Session; using Microsoft.AspNet.Testing.Logging; -using Microsoft.Framework.Cache.Distributed; -using Microsoft.Framework.Cache.Memory; +using Microsoft.Framework.Caching.Distributed; +using Microsoft.Framework.Caching.Memory; using Microsoft.Framework.DependencyInjection; using MusicStore.Models; using MusicStore.ViewModels;