Rename to Microsoft.Framework.Caching.*

Caching.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.22604.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Cache.Memory", "src\Microsoft.Framework.Cache.Memory\Microsoft.Framework.Cache.Memory.xproj", "{966D16D8-5D4E-4433-9DA7-F53EE44B7EE7}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Caching.Memory", "src\Microsoft.Framework.Caching.Memory\Microsoft.Framework.Caching.Memory.xproj", "{966D16D8-5D4E-4433-9DA7-F53EE44B7EE7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5A04042D-438D-407B-B239-0CAD6A2BD8C2}"
 EndProject
@@ -13,28 +13,28 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MemoryCacheSample", "sample
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2E14F082-1A04-4E7C-9162-1675119F9A9E}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Cache.Memory.Tests", "test\Microsoft.Framework.Cache.Memory.Tests\Microsoft.Framework.Cache.Memory.Tests.xproj", "{1C24C0CE-84B6-4D6C-B484-32741D704FD8}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Caching.Memory.Tests", "test\Microsoft.Framework.Caching.Memory.Tests\Microsoft.Framework.Caching.Memory.Tests.xproj", "{1C24C0CE-84B6-4D6C-B484-32741D704FD8}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MemoryCacheConcurencySample", "samples\MemoryCacheConcurencySample\MemoryCacheConcurencySample.xproj", "{FF7C7587-BBCA-4574-95AE-101A6FF63B8F}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Cache.Distributed", "src\Microsoft.Framework.Cache.Distributed\Microsoft.Framework.Cache.Distributed.xproj", "{74F4C074-93DD-4F7D-91CA-0F8DDC2BC6A1}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Caching.Distributed", "src\Microsoft.Framework.Caching.Distributed\Microsoft.Framework.Caching.Distributed.xproj", "{74F4C074-93DD-4F7D-91CA-0F8DDC2BC6A1}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Cache.Distributed.Tests", "test\Microsoft.Framework.Cache.Distributed.Tests\Microsoft.Framework.Cache.Distributed.Tests.xproj", "{C5A8A2C1-588D-4A1A-BB1D-B33B6DD89797}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Caching.Distributed.Tests", "test\Microsoft.Framework.Caching.Distributed.Tests\Microsoft.Framework.Caching.Distributed.Tests.xproj", "{C5A8A2C1-588D-4A1A-BB1D-B33B6DD89797}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ProfilingSample", "samples\ProfilingSample\ProfilingSample.xproj", "{FD9FD44E-50D7-4121-9DAB-87A88191CE9F}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Cache.Redis", "src\Microsoft.Framework.Cache.Redis\Microsoft.Framework.Cache.Redis.xproj", "{02E23070-947C-4438-8E50-CC2456D237BA}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Caching.Redis", "src\Microsoft.Framework.Caching.Redis\Microsoft.Framework.Caching.Redis.xproj", "{02E23070-947C-4438-8E50-CC2456D237BA}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RedisCacheSample", "samples\RedisCacheSample\RedisCacheSample.xproj", "{4109BDF4-BFF4-4AB6-8ED1-881DE410EA57}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Cache.Redis.Tests", "test\Microsoft.Framework.Cache.Redis.Tests\Microsoft.Framework.Cache.Redis.Tests.xproj", "{D1DCC5A4-3EC1-403B-B069-1F3FCB50E3A5}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Caching.Redis.Tests", "test\Microsoft.Framework.Caching.Redis.Tests\Microsoft.Framework.Caching.Redis.Tests.xproj", "{D1DCC5A4-3EC1-403B-B069-1F3FCB50E3A5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FB1086CF-F5C8-4B81-A685-C355F1BA9B97}"
 	ProjectSection(SolutionItems) = preProject
 		global.json = global.json
 	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Cache.Interfaces", "src\Microsoft.Framework.Cache.Interfaces\Microsoft.Framework.Cache.Interfaces.xproj", "{60AAD8D1-33A3-4943-A4AF-C8A5BA418BC6}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Caching.Interfaces", "src\Microsoft.Framework.Caching.Interfaces\Microsoft.Framework.Caching.Interfaces.xproj", "{60AAD8D1-33A3-4943-A4AF-C8A5BA418BC6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

samples/MemoryCacheConcurencySample/Program.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Framework.Cache.Memory;
+using Microsoft.Framework.Caching.Memory;
 
 namespace MemoryCacheSample
 {

samples/MemoryCacheConcurencySample/project.json

@@ -1,6 +1,6 @@
 {
     "dependencies": { 
-        "Microsoft.Framework.Cache.Memory": "1.0.0-*"
+        "Microsoft.Framework.Caching.Memory": "1.0.0-*"
     },
     "frameworks": {
         "dnx451": { },

samples/MemoryCacheSample/Program.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Threading;
-using Microsoft.Framework.Cache.Memory;
+using Microsoft.Framework.Caching.Memory;
 
 namespace MemoryCacheSample
 {

samples/MemoryCacheSample/project.json

@@ -1,6 +1,6 @@
 {
     "dependencies": {
-        "Microsoft.Framework.Cache.Memory": "1.0.0-*"
+        "Microsoft.Framework.Caching.Memory": "1.0.0-*"
     },
     "frameworks": {
         "dnx451": { },

samples/ProfilingSample/Program.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.Framework.Cache.Memory;
+using Microsoft.Framework.Caching.Memory;
 
 namespace ProfilingSample
 {

samples/ProfilingSample/project.json

@@ -1,6 +1,6 @@
 {
     "dependencies": { 
-        "Microsoft.Framework.Cache.Memory": "1.0.0-*"
+        "Microsoft.Framework.Caching.Memory": "1.0.0-*"
     },
     "frameworks": {
         "dnx451": { },

samples/RedisCacheSample/Program.cs

@@ -1,6 +1,6 @@
 using System;
 using System.IO;
-using Microsoft.Framework.Cache.Redis;
+using Microsoft.Framework.Caching.Redis;
 
 namespace RedisCacheSample
 {

samples/RedisCacheSample/project.json

@@ -1,6 +1,6 @@
 {
     "dependencies": {
-        "Microsoft.Framework.Cache.Redis": "1.0.0-*"
+        "Microsoft.Framework.Caching.Redis": "1.0.0-*"
     },
     "frameworks" : {
         "dnx451" : { },

src/Microsoft.Framework.Cache.Distributed/CacheExtensions.cs → src/Microsoft.Framework.Caching.Distributed/CacheExtensions.cs

@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 
-namespace Microsoft.Framework.Cache.Distributed
+namespace Microsoft.Framework.Caching.Distributed
 {
     public static class CacheExtensions
     {

src/Microsoft.Framework.Cache.Distributed/CachingServicesExtensions.cs → src/Microsoft.Framework.Caching.Distributed/CachingServicesExtensions.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.Framework.Cache.Distributed;
-using Microsoft.Framework.Cache.Memory;
+using Microsoft.Framework.Caching.Distributed;
+using Microsoft.Framework.Caching.Memory;
 
 namespace Microsoft.Framework.DependencyInjection
 {

src/Microsoft.Framework.Cache.Distributed/ICacheContext.cs → src/Microsoft.Framework.Caching.Distributed/ICacheContext.cs

@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 
-namespace Microsoft.Framework.Cache.Distributed
+namespace Microsoft.Framework.Caching.Distributed
 {
     public interface ICacheContext
     {

src/Microsoft.Framework.Cache.Distributed/IDistributedCache.cs → src/Microsoft.Framework.Caching.Distributed/IDistributedCache.cs

@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 
-namespace Microsoft.Framework.Cache.Distributed
+namespace Microsoft.Framework.Caching.Distributed
 {
     public interface IDistributedCache
     {

src/Microsoft.Framework.Cache.Distributed/LocalCache.cs → src/Microsoft.Framework.Caching.Distributed/LocalCache.cs

@@ -3,9 +3,9 @@
 
 using System;
 using System.IO;
-using Microsoft.Framework.Cache.Memory;
+using Microsoft.Framework.Caching.Memory;
 
-namespace Microsoft.Framework.Cache.Distributed
+namespace Microsoft.Framework.Caching.Distributed
 {
     public class LocalCache : IDistributedCache
     {

src/Microsoft.Framework.Cache.Distributed/LocalContextWrapper.cs → src/Microsoft.Framework.Caching.Distributed/LocalContextWrapper.cs

@@ -3,9 +3,9 @@
 
 using System;
 using System.IO;
-using Microsoft.Framework.Cache.Memory;
+using Microsoft.Framework.Caching.Memory;
 
-namespace Microsoft.Framework.Cache.Distributed
+namespace Microsoft.Framework.Caching.Distributed
 {
     internal class LocalContextWrapper : ICacheContext
     {

src/Microsoft.Framework.Cache.Distributed/NotNullAttribute.cs → src/Microsoft.Framework.Caching.Distributed/NotNullAttribute.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Distributed
+namespace Microsoft.Framework.Caching.Distributed
 {
     [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)]
     internal sealed class NotNullAttribute : Attribute

src/Microsoft.Framework.Cache.Distributed/project.json → src/Microsoft.Framework.Caching.Distributed/project.json

@@ -2,7 +2,7 @@
     "version": "1.0.0-*",
     "description": "ASP.NET 5 distributed cache abstractions.",
     "dependencies": {
-        "Microsoft.Framework.Cache.Memory": "1.0.0-*"
+        "Microsoft.Framework.Caching.Memory": "1.0.0-*"
     },
     "frameworks": {
         "dnx451": { },

src/Microsoft.Framework.Cache.Interfaces/CachePreservationPriority.cs → src/Microsoft.Framework.Caching.Interfaces/CachePreservationPriority.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     // TODO: Granularity?
     /// <summary>

src/Microsoft.Framework.Cache.Interfaces/EvictionReason.cs → src/Microsoft.Framework.Caching.Interfaces/EvictionReason.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public enum EvictionReason
     {

src/Microsoft.Framework.Cache.Interfaces/ICacheSetContext.cs → src/Microsoft.Framework.Caching.Interfaces/ICacheSetContext.cs

@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Framework.Expiration.Interfaces;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public interface ICacheSetContext
     {

src/Microsoft.Framework.Cache.Interfaces/IEntryLink.cs → src/Microsoft.Framework.Caching.Interfaces/IEntryLink.cs

@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using Microsoft.Framework.Expiration.Interfaces;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     /// <summary>
     /// Used to flow expiration information from one entry to another. Triggers and minimum absolute expiration will

src/Microsoft.Framework.Cache.Interfaces/IMemoryCache.cs → src/Microsoft.Framework.Caching.Interfaces/IMemoryCache.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public interface IMemoryCache : IDisposable
     {

src/Microsoft.Framework.Cache.Memory/CacheEntry.cs → src/Microsoft.Framework.Caching.Memory/CacheEntry.cs

@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     using EvictionCallback = Action<string, object, EvictionReason, object>;
 

src/Microsoft.Framework.Cache.Memory/CacheExtensions.cs → src/Microsoft.Framework.Caching.Memory/CacheExtensions.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public static class CacheExtensions
     {

src/Microsoft.Framework.Cache.Memory/CacheSetContext.cs → src/Microsoft.Framework.Caching.Memory/CacheSetContext.cs

@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using Microsoft.Framework.Expiration.Interfaces;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     using EvictionCallback = Action<string, object, EvictionReason, object>;
 

src/Microsoft.Framework.Cache.Memory/CancellationTokenTrigger.cs → src/Microsoft.Framework.Caching.Memory/CancellationTokenTrigger.cs

@@ -5,7 +5,7 @@
 using System.Threading;
 using Microsoft.Framework.Expiration.Interfaces;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public class CancellationTokenTrigger : IExpirationTrigger
     {

src/Microsoft.Framework.Cache.Memory/EntryLink.cs → src/Microsoft.Framework.Caching.Memory/EntryLink.cs

@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using Microsoft.Framework.Expiration.Interfaces;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public class EntryLink : IEntryLink
     {

src/Microsoft.Framework.Cache.Memory/EntryLinkHelpers.cs → src/Microsoft.Framework.Caching.Memory/EntryLinkHelpers.cs

@@ -9,7 +9,7 @@
 using System.Runtime.Remoting.Messaging;
 #endif
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public static class EntryLinkHelpers
     {

src/Microsoft.Framework.Cache.Memory/Infrastructure/GcNotification.cs → src/Microsoft.Framework.Caching.Memory/Infrastructure/GcNotification.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Memory.Infrastructure
+namespace Microsoft.Framework.Caching.Memory.Infrastructure
 {
     /// <summary>
     /// Registers a callback that fires each time a Gen2 garbage collection occurs,

src/Microsoft.Framework.Cache.Memory/Infrastructure/ISystemClock.cs → src/Microsoft.Framework.Caching.Memory/Infrastructure/ISystemClock.cs

@@ -4,7 +4,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Memory.Infrastructure
+namespace Microsoft.Framework.Caching.Memory.Infrastructure
 {
     /// <summary>
     /// Abstracts the system clock to facilitate testing.

src/Microsoft.Framework.Cache.Memory/Infrastructure/SystemClock.cs → src/Microsoft.Framework.Caching.Memory/Infrastructure/SystemClock.cs

@@ -4,7 +4,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Memory.Infrastructure
+namespace Microsoft.Framework.Caching.Memory.Infrastructure
 {
     /// <summary>
     /// Provides access to the normal system clock.

src/Microsoft.Framework.Cache.Memory/MemoryCache.cs → src/Microsoft.Framework.Caching.Memory/MemoryCache.cs

@@ -5,10 +5,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using Microsoft.Framework.Cache.Memory.Infrastructure;
+using Microsoft.Framework.Caching.Memory.Infrastructure;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public class MemoryCache : IMemoryCache
     {

src/Microsoft.Framework.Cache.Memory/MemoryCacheOptions.cs → src/Microsoft.Framework.Caching.Memory/MemoryCacheOptions.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.Framework.Cache.Memory.Infrastructure;
+using Microsoft.Framework.Caching.Memory.Infrastructure;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public class MemoryCacheOptions : IOptions<MemoryCacheOptions>
     {

src/Microsoft.Framework.Cache.Redis/NotNullAttribute.cs → src/Microsoft.Framework.Caching.Memory/NotNullAttribute.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Redis
+namespace Microsoft.Framework.Caching.Memory
 {
     [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)]
     internal sealed class NotNullAttribute : Attribute

src/Microsoft.Framework.Cache.Memory/project.json → src/Microsoft.Framework.Caching.Memory/project.json

@@ -3,7 +3,7 @@
     "description": "ASP.NET 5 in memory cache abstractions and implementation.",
     "dependencies": {
         "Microsoft.Framework.OptionsModel": "1.0.0-*",
-        "Microsoft.Framework.Cache.Interfaces": "1.0.0-*"
+        "Microsoft.Framework.Caching.Interfaces": "1.0.0-*"
     },
     "frameworks": {
         "net45": { },

src/Microsoft.Framework.Cache.Redis/CacheContext.cs → src/Microsoft.Framework.Caching.Redis/CacheContext.cs

@@ -3,10 +3,10 @@
 
 using System;
 using System.IO;
-using Microsoft.Framework.Cache.Distributed;
+using Microsoft.Framework.Caching.Distributed;
 using StackExchange.Redis;
 
-namespace Microsoft.Framework.Cache.Redis
+namespace Microsoft.Framework.Caching.Redis
 {
     internal class CacheContext : ICacheContext
     {

src/Microsoft.Framework.Cache.Memory/NotNullAttribute.cs → src/Microsoft.Framework.Caching.Redis/NotNullAttribute.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Redis
 {
     [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)]
     internal sealed class NotNullAttribute : Attribute

src/Microsoft.Framework.Cache.Redis/RedisCache.cs → src/Microsoft.Framework.Caching.Redis/RedisCache.cs

@@ -3,11 +3,11 @@
 
 using System;
 using System.IO;
-using Microsoft.Framework.Cache.Distributed;
+using Microsoft.Framework.Caching.Distributed;
 using Microsoft.Framework.OptionsModel;
 using StackExchange.Redis;
 
-namespace Microsoft.Framework.Cache.Redis
+namespace Microsoft.Framework.Caching.Redis
 {
     public class RedisCache : IDistributedCache
     {