Update to NH5.2

And some cleanup

Author: fredericDelaporte

NHibernate.Caches.Common.Tests/BinaryCacheSerializerFixture.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NUnit.Framework;
 
 namespace NHibernate.Caches.Common.Tests

NHibernate.Caches.Common.Tests/CacheSerializerFixture.cs

@@ -184,25 +184,31 @@ protected List<object> CreateListOfObjects()
 		protected CacheEntry CreateCacheEntry()
 		{
 			var types = GetNHibernateTypes();
-			return new CacheEntry(types.Values.ToArray(), null, false, null, null, null);
+			return CacheEntry.Create(types.Values.ToArray(), null, false, null, null, null);
 		}
 
 		// TODO: make tests after upgraded to NHiberante 5.2
 		protected CollectionCacheEntry CreateCollectionCacheEntry()
 		{
-			return new CollectionCacheEntry(null, null);
+			return CollectionCacheEntry.Create(null, null);
 		}
 
 		// TODO: make tests after upgraded to NHiberante 5.2
 		protected CacheLock CreateCacheLock()
 		{
-			return new CacheLock(1234, 1, 5);
+			return new CacheLock
+			{
+				Timeout = 1234, Id = 1, Version = 5
+			};
 		}
 
 		// TODO: make tests after upgraded to NHiberante 5.2
 		protected CachedItem CreateCachedItem(object data)
 		{
-			return new CachedItem(data, 111, 5);
+			return new CachedItem
+			{
+				Value = data, FreshTimestamp = 111, Version = 5
+			};
 		}
 
 		// TODO: make tests after upgraded to NHiberante 5.2
@@ -263,7 +269,7 @@ protected Dictionary<IType, object> GetNHibernateTypes()
 				{NHibernateUtil.YesNo, true},
 				// TODO: enable after upgraded to NHiberante 5.2
 				//{NHibernateUtil.Class, typeof(IType)},
-				{NHibernateUtil.ClassMetaType, entityName},
+				{NHibernateUtil.MetaType, entityName},
 				{NHibernateUtil.Serializable, new CustomEntity {Id = 1}},
 				// TODO: enable after upgraded to NHiberante 5.2
 				//{NHibernateUtil.Object, new CustomEntity {Id = 10}},

NHibernate.Caches.Common/CacheSerializerBase.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NHibernate.Caches.Common
+namespace NHibernate.Caches.Common
 {
 	/// <summary>
 	/// Base class for serializing objects that will be stored in a distributed cache.

NHibernate.Caches.Common/NHibernate.Caches.Common.csproj

@@ -17,7 +17,7 @@
     <None Include="default.build" Link="default.build" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NHibernate" Version="5.1.0" />
+    <PackageReference Include="NHibernate" Version="5.2.0" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="../readme.md">

Util/NHibernate.Caches.Util.JsonSerializer.Tests/JsonCacheSerializerFixture.cs

@@ -1,14 +1,9 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Newtonsoft.Json.Serialization;
 using NHibernate.Caches.Common;
 using NHibernate.Caches.Common.Tests;
-using NHibernate.Intercept;
-using NHibernate.Properties;
 using NUnit.Framework;
 
 namespace NHibernate.Caches.Util.JsonSerializer.Tests