Merge pull request #466 from johelvisguzman/issue464

Renamed caching namespaces

Author: johelvisguzman

DotNetToolkit.Repository.sln

@@ -33,15 +33,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolkit.Repository.Ex
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolkit.Repository.Extensions.Unity", "src\DotNetToolkit.Repository.Extensions.Unity\DotNetToolkit.Repository.Extensions.Unity.csproj", "{33BA3639-6B06-4D2B-8273-9CFDFF46A431}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory", "src\DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory\DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory.csproj", "{D02247D4-1A6E-4BA8-9D87-2F70F2C234CE}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolkit.Repository.Json", "src\DotNetToolkit.Repository.Json\DotNetToolkit.Repository.Json.csproj", "{4CE4219B-92D6-464C-8A0E-5151AD842AF8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolkit.Repository.Xml", "src\DotNetToolkit.Repository.Xml\DotNetToolkit.Repository.Xml.csproj", "{85FECE4B-2092-4C91-A089-963BAF89E502}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolkit.Repository.Extensions.Caching.Redis", "src\DotNetToolkit.Repository.Extensions.Caching.Redis\DotNetToolkit.Repository.Extensions.Caching.Redis.csproj", "{4511188D-8846-4F88-9457-078AD1F0D62B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolkit.Repository.NHibernate", "src\DotNetToolkit.Repository.NHibernate\DotNetToolkit.Repository.NHibernate.csproj", "{32262A29-A96F-423B-BA97-F7E2F79FAB16}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolkit.Repository.Caching.InMemory", "src\DotNetToolkit.Repository.Caching.InMemory\DotNetToolkit.Repository.Caching.InMemory.csproj", "{75757CCF-9F6E-433A-885E-F92DE12FFB51}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetToolkit.Repository.NHibernate", "src\DotNetToolkit.Repository.NHibernate\DotNetToolkit.Repository.NHibernate.csproj", "{32262A29-A96F-423B-BA97-F7E2F79FAB16}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolkit.Repository.Caching.Redis", "src\DotNetToolkit.Repository.Caching.Redis\DotNetToolkit.Repository.Caching.Redis.csproj", "{445F6C84-FF28-4243-8148-DAB5A4813F93}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -92,10 +92,6 @@ Global
 		{33BA3639-6B06-4D2B-8273-9CFDFF46A431}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{33BA3639-6B06-4D2B-8273-9CFDFF46A431}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{33BA3639-6B06-4D2B-8273-9CFDFF46A431}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D02247D4-1A6E-4BA8-9D87-2F70F2C234CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D02247D4-1A6E-4BA8-9D87-2F70F2C234CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D02247D4-1A6E-4BA8-9D87-2F70F2C234CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D02247D4-1A6E-4BA8-9D87-2F70F2C234CE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4CE4219B-92D6-464C-8A0E-5151AD842AF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4CE4219B-92D6-464C-8A0E-5151AD842AF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4CE4219B-92D6-464C-8A0E-5151AD842AF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -104,14 +100,18 @@ Global
 		{85FECE4B-2092-4C91-A089-963BAF89E502}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{85FECE4B-2092-4C91-A089-963BAF89E502}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{85FECE4B-2092-4C91-A089-963BAF89E502}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4511188D-8846-4F88-9457-078AD1F0D62B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4511188D-8846-4F88-9457-078AD1F0D62B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4511188D-8846-4F88-9457-078AD1F0D62B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4511188D-8846-4F88-9457-078AD1F0D62B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{32262A29-A96F-423B-BA97-F7E2F79FAB16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{32262A29-A96F-423B-BA97-F7E2F79FAB16}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{32262A29-A96F-423B-BA97-F7E2F79FAB16}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{32262A29-A96F-423B-BA97-F7E2F79FAB16}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75757CCF-9F6E-433A-885E-F92DE12FFB51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75757CCF-9F6E-433A-885E-F92DE12FFB51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75757CCF-9F6E-433A-885E-F92DE12FFB51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75757CCF-9F6E-433A-885E-F92DE12FFB51}.Release|Any CPU.Build.0 = Release|Any CPU
+		{445F6C84-FF28-4243-8148-DAB5A4813F93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{445F6C84-FF28-4243-8148-DAB5A4813F93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{445F6C84-FF28-4243-8148-DAB5A4813F93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{445F6C84-FF28-4243-8148-DAB5A4813F93}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -128,11 +128,11 @@ Global
 		{2700614E-A941-42C9-B86F-22D8A47690F3} = {91D14746-3446-48E3-B01C-BF77B848738A}
 		{6658C0C2-366C-4906-A333-BAB42A512CC5} = {DD273D5E-6D6C-41FA-A0C8-646CC53C4DC3}
 		{33BA3639-6B06-4D2B-8273-9CFDFF46A431} = {DD273D5E-6D6C-41FA-A0C8-646CC53C4DC3}
-		{D02247D4-1A6E-4BA8-9D87-2F70F2C234CE} = {DD273D5E-6D6C-41FA-A0C8-646CC53C4DC3}
 		{4CE4219B-92D6-464C-8A0E-5151AD842AF8} = {DD273D5E-6D6C-41FA-A0C8-646CC53C4DC3}
 		{85FECE4B-2092-4C91-A089-963BAF89E502} = {DD273D5E-6D6C-41FA-A0C8-646CC53C4DC3}
-		{4511188D-8846-4F88-9457-078AD1F0D62B} = {DD273D5E-6D6C-41FA-A0C8-646CC53C4DC3}
 		{32262A29-A96F-423B-BA97-F7E2F79FAB16} = {DD273D5E-6D6C-41FA-A0C8-646CC53C4DC3}
+		{75757CCF-9F6E-433A-885E-F92DE12FFB51} = {DD273D5E-6D6C-41FA-A0C8-646CC53C4DC3}
+		{445F6C84-FF28-4243-8148-DAB5A4813F93} = {DD273D5E-6D6C-41FA-A0C8-646CC53C4DC3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {96973E0C-81D1-42DE-9F78-7103241B4E07}

README.md

@@ -26,8 +26,8 @@ If you want to use DotNetToolkit.Repository for the first time, the [Getting Sta
 [DotNetToolkit.Repository.Xml](https://www.nuget.org/packages/DotNetToolkit.Repository.Xml/) | [![DotNetToolkit.Repository.Xml](https://img.shields.io/nuget/v/DotNetToolkit.Repository.Xml.svg)](https://www.nuget.org/packages/DotNetToolkit.Repository.Xml/) | [![DotNetToolkit.Repository.Xml](https://img.shields.io/nuget/dt/DotNetToolkit.Repository.Xml.svg)](https://www.nuget.org/packages/DotNetToolkit.Repository.Xml/) | [![MyGet (dev)](https://img.shields.io/myget/dotnettoolkitrepositorydev/v/DotNetToolkit.Repository.Xml.svg)](https://www.myget.org/feed/dotnettoolkitrepositorydev/package/nuget/DotNetToolkit.Repository.Xml) |
 [DotNetToolkit.Repository.Extensions.Microsoft.DependencyInjection](https://www.nuget.org/packages/DotNetToolkit.Repository.Extensions.Microsoft.DependencyInjection/) | [![DotNetToolkit.Repository.Extensions.Microsoft.DependencyInjection](https://img.shields.io/nuget/v/DotNetToolkit.Repository.Extensions.Microsoft.DependencyInjection.svg)](https://www.nuget.org/packages/DotNetToolkit.Repository.Extensions.Microsoft.DependencyInjection/) | [![DotNetToolkit.Repository.Extensions.Microsoft.DependencyInjection](https://img.shields.io/nuget/dt/DotNetToolkit.Repository.Extensions.Microsoft.DependencyInjection.svg)](https://www.nuget.org/packages/DotNetToolkit.Repository.Extensions.Microsoft.DependencyInjection/) | [![MyGet (dev)](https://img.shields.io/myget/dotnettoolkitrepositorydev/v/DotNetToolkit.Repository.Extensions.Microsoft.DependencyInjection.svg)](https://www.myget.org/feed/dotnettoolkitrepositorydev/package/nuget/DotNetToolkit.Repository.Extensions.Microsoft.DependencyInjection) |
 [DotNetToolkit.Repository.Extensions.Unity](https://www.nuget.org/packages/DotNetToolkit.Repository.Extensions.Unity/) | [![DotNetToolkit.Repository.Extensions.Unity](https://img.shields.io/nuget/v/DotNetToolkit.Repository.Extensions.Unity.svg)](https://www.nuget.org/packages/DotNetToolkit.Repository.Extensions.Unity/) | [![DotNetToolkit.Repository.Extensions.Unity](https://img.shields.io/nuget/dt/DotNetToolkit.Repository.Extensions.Unity.svg)](https://www.nuget.org/packages/DotNetToolkit.Repository.Extensions.Unity/) | [![MyGet (dev)](https://img.shields.io/myget/dotnettoolkitrepositorydev/v/DotNetToolkit.Repository.Extensions.Unity.svg)](https://www.myget.org/feed/dotnettoolkitrepositorydev/package/nuget/DotNetToolkit.Repository.Extensions.Unity) |
-[DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory](https://www.nuget.org/packages/DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory/) | [![DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory](https://img.shields.io/nuget/v/DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory.svg)](https://www.nuget.org/packages/DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory/) | [![DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory](https://img.shields.io/nuget/dt/DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory.svg)](https://www.nuget.org/packages/DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory/) | [![MyGet (dev)](https://img.shields.io/myget/dotnettoolkitrepositorydev/v/DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory.svg)](https://www.myget.org/feed/dotnettoolkitrepositorydev/package/nuget/DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory) |
-[DotNetToolkit.Repository.Extensions.Caching.Redis](https://www.nuget.org/packages/DotNetToolkit.Repository.Extensions.Caching.Redis/) | [![DotNetToolkit.Repository.Extensions.Caching.Redis](https://img.shields.io/nuget/v/DotNetToolkit.Repository.Extensions.Caching.Redis.svg)](https://www.nuget.org/packages/DotNetToolkit.Repository.Extensions.Caching.Redis/) | [![DotNetToolkit.Repository.Extensions.Caching.Redis](https://img.shields.io/nuget/dt/DotNetToolkit.Repository.Extensions.Caching.Redis.svg)](https://www.nuget.org/packages/DotNetToolkit.Repository.Extensions.Caching.Redis/) | [![MyGet (dev)](https://img.shields.io/myget/dotnettoolkitrepositorydev/v/DotNetToolkit.Repository.Extensions.Caching.Redis.svg)](https://www.myget.org/feed/dotnettoolkitrepositorydev/package/nuget/DotNetToolkit.Repository.Extensions.Caching.Redis) |
+[DotNetToolkit.Repository.Caching.InMemory](https://www.nuget.org/packages/DotNetToolkit.Repository.Caching.InMemory/) | [![DotNetToolkit.Repository.Caching.InMemory](https://img.shields.io/nuget/v/DotNetToolkit.Repository.Caching.InMemory.svg)](https://www.nuget.org/packages/DotNetToolkit.Repository.Caching.InMemory/) | [![DotNetToolkit.Repository.Caching.InMemory](https://img.shields.io/nuget/dt/DotNetToolkit.Repository.Caching.InMemory.svg)](https://www.nuget.org/packages/DotNetToolkit.Repository.Caching.InMemory/) | [![MyGet (dev)](https://img.shields.io/myget/dotnettoolkitrepositorydev/v/DotNetToolkit.Repository.Caching.InMemory.svg)](https://www.myget.org/feed/dotnettoolkitrepositorydev/package/nuget/DotNetToolkit.Repository.Caching.InMemory) |
+[DotNetToolkit.Repository.Caching.Redis](https://www.nuget.org/packages/DotNetToolkit.Repository.Caching.Redis/) | [![DotNetToolkit.Repository.Caching.Redis](https://img.shields.io/nuget/v/DotNetToolkit.Repository.Caching.Redis.svg)](https://www.nuget.org/packages/DotNetToolkit.Repository.Caching.Redis/) | [![DotNetToolkit.Repository.Caching.Redis](https://img.shields.io/nuget/dt/DotNetToolkit.Repository.Caching.Redis.svg)](https://www.nuget.org/packages/DotNetToolkit.Repository.Caching.Redis/) | [![MyGet (dev)](https://img.shields.io/myget/dotnettoolkitrepositorydev/v/DotNetToolkit.Repository.Caching.Redis.svg)](https://www.myget.org/feed/dotnettoolkitrepositorydev/package/nuget/DotNetToolkit.Repository.Caching.Redis) |
 
 ## Features
 

appveyor.yml

@@ -60,8 +60,8 @@ after_build:
   - dotnet pack .\src\DotNetToolkit.Repository.Xml\DotNetToolkit.Repository.Xml.csproj --configuration Release
   - dotnet pack .\src\DotNetToolkit.Repository.Extensions.Microsoft.DependencyInjection\DotNetToolkit.Repository.Extensions.Microsoft.DependencyInjection.csproj --configuration Release
   - dotnet pack .\src\DotNetToolkit.Repository.Extensions.Unity\DotNetToolkit.Repository.Extensions.Unity.csproj --configuration Release
-  - dotnet pack .\src\DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory\DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory.csproj --configuration Release
-  - dotnet pack .\src\DotNetToolkit.Repository.Extensions.Caching.Redis\DotNetToolkit.Repository.Extensions.Caching.Redis.csproj --configuration Release
+  - dotnet pack .\src\DotNetToolkit.Repository.Caching.InMemory\DotNetToolkit.Repository.Caching.InMemory.csproj --configuration Release
+  - dotnet pack .\src\DotNetToolkit.Repository.Caching.Redis\DotNetToolkit.Repository.Caching.Redis.csproj --configuration Release
 
 #---------------------------------#
 #      artifacts configuration    #

src/DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory/DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory.csproj renamed to src/DotNetToolkit.Repository.Caching.InMemory/DotNetToolkit.Repository.Caching.InMemory.csproj

@@ -5,8 +5,8 @@
   <PropertyGroup>
     <TargetFrameworks>net451;netstandard1.3;netstandard2.0</TargetFrameworks>
     <Description>A caching provider for the Microsoft in-memory cache.</Description>
-    <AssemblyName>DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory</AssemblyName>
-    <RootNamespace>DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory</RootNamespace>
+    <AssemblyName>DotNetToolkit.Repository.Caching.InMemory</AssemblyName>
+    <RootNamespace>DotNetToolkit.Repository.Caching.InMemory</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' Or '$(TargetFramework)' == 'net451'">

src/DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory/InMemoryCache.cs renamed to src/DotNetToolkit.Repository.Caching.InMemory/InMemoryCache.cs

@@ -1,8 +1,8 @@
-namespace DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory
+namespace DotNetToolkit.Repository.Caching.InMemory
 {
     using Configuration.Caching;
-    using global::Microsoft.Extensions.Caching.Memory;
     using JetBrains.Annotations;
+    using Microsoft.Extensions.Caching.Memory;
     using System;
     using Utility;
 

src/DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory/InMemoryCacheProvider.cs renamed to src/DotNetToolkit.Repository.Caching.InMemory/InMemoryCacheProvider.cs

@@ -1,8 +1,8 @@
-namespace DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory
+namespace DotNetToolkit.Repository.Caching.InMemory
 {
     using Configuration.Caching;
-    using global::Microsoft.Extensions.Caching.Memory;
     using JetBrains.Annotations;
+    using Microsoft.Extensions.Caching.Memory;
     using System;
     using Utility;
 

src/DotNetToolkit.Repository.Extensions.Microsoft.Caching.Memory/README.md renamed to src/DotNetToolkit.Repository.Caching.InMemory/README.md

@@ -5,8 +5,8 @@
   <PropertyGroup>
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <Description>A caching provider for redis.</Description>
-    <AssemblyName>DotNetToolkit.Repository.Extensions.Caching.Redis</AssemblyName>
-    <RootNamespace>DotNetToolkit.Repository.Extensions.Caching.Redis</RootNamespace>
+    <AssemblyName>DotNetToolkit.Repository.Caching.Redis</AssemblyName>
+    <RootNamespace>DotNetToolkit.Repository.Caching.Redis</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

src/DotNetToolkit.Repository.Extensions.Caching.Redis/DotNetToolkit.Repository.Extensions.Caching.Redis.csproj renamed to src/DotNetToolkit.Repository.Caching.Redis/DotNetToolkit.Repository.Caching.Redis.csproj

@@ -1,4 +1,4 @@
-namespace DotNetToolkit.Repository.Extensions.Caching.Redis
+namespace DotNetToolkit.Repository.Caching.Redis
 {
     using Configuration.Caching;
     using JetBrains.Annotations;
@@ -180,9 +180,9 @@ private static T Deserialize<T>(string v)
         /// </summary>
         /// <param name="key">An object identifying the entry.</param>
         /// <param name="value">The value to cache.</param>
-        /// <param name="cacheExpiration">The cache expiration time.</param>
+        /// <param name="expiry">The cache expiration time.</param>
         /// <param name="cacheRemovedCallback">A callback function for a value is removed from the cache.</param>
-        public void Set<T>([NotNull] string key, [CanBeNull] T value, [CanBeNull] TimeSpan? cacheExpiration, [CanBeNull] Action<string> cacheRemovedCallback = null)
+        public void Set<T>([NotNull] string key, [CanBeNull] T value, [CanBeNull] TimeSpan? expiry, [CanBeNull] Action<string> cacheRemovedCallback = null)
         {
             Guard.NotEmpty(key, nameof(key));
 
@@ -203,7 +203,7 @@ public void Set<T>([NotNull] string key, [CanBeNull] T value, [CanBeNull] TimeSp
                 });
             }
 
-            Redis.StringSet(key, Serialize(value), cacheExpiration);
+            Redis.StringSet(key, Serialize(value), expiry);
         }
 
         /// <summary>