Fixed some conflicts and added some async methods

imperugo · Feb 13, 2015 · bcb7f09 · bcb7f09
1 parent 3cba84b
commit bcb7f09
Show file tree

Hide file tree

Showing 27 changed files with 1,257 additions and 1,228 deletions.
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/.nuget/packages.config b/.nuget/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit.runners" version="2.0.0-beta5-build2785" />
-  <package id="xunit.runners" version="2.0.0-rc1-build2826" />
+  <package id="psake" version="4.4.1" />
   <package id="xunit.runners" version="1.9.2" />
 </packages>
diff --git a/StackExchange.Redis.Extensions.sln b/StackExchange.Redis.Extensions.sln
diff --git a/StackExchange.Redis.Extensions.sln.DotSettings b/StackExchange.Redis.Extensions.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String></wpf:ResourceDictionary>
diff --git a/src/StackExchange.Redis.Extensions.Core/ICacheClient.cs b/src/StackExchange.Redis.Extensions.Core/ICacheClient.cs
@@ -11,6 +11,8 @@ public interface ICacheClient : IDisposable
 		/// </summary>
 		IDatabase Database { get; }
 
+		ISerializer Serializer { get; }
+
 		/// <summary>
 		/// Verify that the specified cache key exists
 		/// </summary>

diff --git a/src/StackExchange.Redis.Extensions.Core/ISerializer.cs b/src/StackExchange.Redis.Extensions.Core/ISerializer.cs
@@ -1,4 +1,6 @@
-namespace StackExchange.Redis.Extensions.Core
+using System.Threading.Tasks;
+
+namespace StackExchange.Redis.Extensions.Core
 {
 	public interface ISerializer
 	{
@@ -9,6 +11,13 @@ public interface ISerializer
 		/// <returns></returns>
 		byte[] Serialize(object item);
 
+		/// <summary>
+		/// Serializes the asynchronous.
+		/// </summary>
+		/// <param name="item">The item.</param>
+		/// <returns></returns>
+		Task<byte[]> SerializeAsync(object item);
+
 		/// <summary>
 		/// Deserializes the specified bytes.
 		/// </summary>
@@ -18,6 +27,15 @@ public interface ISerializer
 		/// </returns>
 		object Deserialize(byte[] serializedObject);
 
+		/// <summary>
+		/// Deserializes the specified bytes.
+		/// </summary>
+		/// <param name="serializedObject">The serialized object.</param>
+		/// <returns>
+		/// The instance of the specified Item
+		/// </returns>
+		Task<object> DeserializeAsync(byte[] serializedObject);
+
 		/// <summary>
 		/// Deserializes the specified bytes.
 		/// </summary>
@@ -27,5 +45,15 @@ public interface ISerializer
 		/// The instance of the specified Item
 		/// </returns>
 		T Deserialize<T>(byte[] serializedObject) where T : class;
+
+		/// <summary>
+		/// Deserializes the specified bytes.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="serializedObject">The serialized object.</param>
+		/// <returns>
+		/// The instance of the specified Item
+		/// </returns>
+		Task<T> DeserializeAsync<T>(byte[] serializedObject) where T : class;
 	}
 }
diff --git a/src/StackExchange.Redis.Extensions.Core/Properties/AssemblyInfo.cs b/src/StackExchange.Redis.Extensions.Core/Properties/AssemblyInfo.cs
@@ -1,6 +1,5 @@
 using System.Reflection;
 using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -31,5 +30,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.4.0")]
+[assembly: AssemblyFileVersion("1.1.4.0")]
diff --git a/src/StackExchange.Redis.Extensions.Core/StackExchange.Redis.Extensions.Core.nuspec b/src/StackExchange.Redis.Extensions.Core/StackExchange.Redis.Extensions.Core.nuspec
@@ -16,6 +16,7 @@
 
 			- StackExchange.Redis.Extensions.Newtonsoft
 			- StackExchange.Redis.Extensions.Jil
+			- StackExchange.Redis.Extensions.MsgPack
 		</description>
 		<summary>
 			StackExchange.Redis.Extensions is a library that extends StackExchange.Redis
@@ -27,8 +28,8 @@
 			- Changed Flush method;
 			- Remove an object from Redis;
 			- Search Keys into Redis;
-			- Retrieve multiple object with a single roundtrop;
-			- Store multiple object with a single roundtrop;
+			- Retrieve multiple object with a single roundtrip;
+			- Store multiple object with a single roundtrip;
 			Async methods;
 		</releaseNotes>
 		<copyright>Ugo Lattanzi</copyright>