React to Caching package rename

Dependent on https://github.com/aspnet/Caching/pull/49/files

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;

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

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

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

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;

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;

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;

src/MusicStore/project.json

@@ -1,48 +1,48 @@
 {
-	"authors": [
+    "authors": [
-		"Microsoft"
+        "Microsoft"
-	],
+    ],
-	"description": "Music store application on ASP.NET 5",
+    "description": "Music store application on ASP.NET 5",
-	"version": "1.0.0-*",
+    "version": "1.0.0-*",
-	"compilationOptions": { "warningsAsErrors": true, "define": [ "DEMO", "TESTING" ] },
+    "compilationOptions": { "warningsAsErrors": true, "define": [ "DEMO", "TESTING" ] },
-	"code": [
+    "code": [
-		"**/*.cs",
+        "**/*.cs",
-		"../../test/E2ETests/compiler/shared/**/*.cs" // This code is for testing only.
+        "../../test/E2ETests/compiler/shared/**/*.cs" // This code is for testing only.
-	],
+    ],
-	"bundleExclude": "*.cmd",
+    "bundleExclude": "*.cmd",
-	"webroot": "wwwroot",
+    "webroot": "wwwroot",
-	"dependencies": {
+    "dependencies": {
-		"EntityFramework.SqlServer": "7.0.0-*",
+        "EntityFramework.SqlServer": "7.0.0-*",
-		"EntityFramework.InMemory": "7.0.0-*", // For Mono.
+        "EntityFramework.InMemory": "7.0.0-*", // For Mono.
-		"Kestrel": "1.0.0-*",
+        "Kestrel": "1.0.0-*",
-		"Microsoft.AspNet.Authentication.Cookies": "1.0.0-*",
+        "Microsoft.AspNet.Authentication.Cookies": "1.0.0-*",
-		"Microsoft.AspNet.Authentication.Facebook": "1.0.0-*",
+        "Microsoft.AspNet.Authentication.Facebook": "1.0.0-*",
-		"Microsoft.AspNet.Authentication.Google": "1.0.0-*",
+        "Microsoft.AspNet.Authentication.Google": "1.0.0-*",
-		"Microsoft.AspNet.Authentication.MicrosoftAccount": "1.0.0-*",
+        "Microsoft.AspNet.Authentication.MicrosoftAccount": "1.0.0-*",
-		"Microsoft.AspNet.Authentication.OpenIdConnect": "1.0.0-*",
+        "Microsoft.AspNet.Authentication.OpenIdConnect": "1.0.0-*",
-		"Microsoft.AspNet.Authentication.Twitter": "1.0.0-*",
+        "Microsoft.AspNet.Authentication.Twitter": "1.0.0-*",
-		"Microsoft.AspNet.Diagnostics": "1.0.0-*",
+        "Microsoft.AspNet.Diagnostics": "1.0.0-*",
-		"Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*",
+        "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*",
-		"Microsoft.AspNet.Identity.EntityFramework": "3.0.0-*",
+        "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-*",
-		"Microsoft.AspNet.Mvc": "6.0.0-*",
+        "Microsoft.AspNet.Mvc": "6.0.0-*",
-		"Microsoft.AspNet.Server.IIS": "1.0.0-*",
+        "Microsoft.AspNet.Server.IIS": "1.0.0-*",
-		"Microsoft.AspNet.Server.WebListener": "1.0.0-*",
+        "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
-		"Microsoft.AspNet.Session": "1.0.0-*",
+        "Microsoft.AspNet.Session": "1.0.0-*",
-		"Microsoft.AspNet.SignalR.Server": "3.0.0-*",
+        "Microsoft.AspNet.SignalR.Server": "3.0.0-*",
-		"Microsoft.AspNet.StaticFiles": "1.0.0-*",
+        "Microsoft.AspNet.StaticFiles": "1.0.0-*",
-		"Microsoft.Framework.Cache.Distributed": "1.0.0-*", // For Session.
+        "Microsoft.Framework.Caching.Distributed": "1.0.0-*", // For Session.
-		"Microsoft.Framework.CodeGenerators.Mvc": "1.0.0-*",
+        "Microsoft.Framework.CodeGenerators.Mvc": "1.0.0-*",
-		"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*",
+        "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*",
-		"Microsoft.Framework.Logging.Console": "1.0.0-*"
+        "Microsoft.Framework.Logging.Console": "1.0.0-*"
-	},
+    },
-	"commands": {
+    "commands": {
-		"gen": "Microsoft.Framework.CodeGeneration",
+        "gen": "Microsoft.Framework.CodeGeneration",
-		"kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5004",
+        "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5004",
-		"run": "run server.urls=http://localhost:5003",
+        "run": "run server.urls=http://localhost:5003",
-		"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5002"
+        "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5002"
-	},
+    },
-	"frameworks": {
+    "frameworks": {
-		"dnx451": { },
+        "dnx451": { },
-		"dnxcore50": { }
+        "dnxcore50": { }
-	}
+    }
-}
+}

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;

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;

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;

test/MusicStore.Test/MusicStore.Test.xproj

@@ -4,15 +4,13 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>beca766f-093e-4d08-9530-2bfa63c5bf93</ProjectGuid>
+    <ProjectGuid>ca663205-77de-4e55-b300-85594181b5a9</ProjectGuid>
     <RootNamespace>MusicStore</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

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.Caching.Distributed;
-using Microsoft.Framework.Cache.Memory;
+using Microsoft.Framework.Caching.Memory;
 using Microsoft.Framework.DependencyInjection;
 using MusicStore.Models;
 using MusicStore.ViewModels;