diff --git a/Caches/MemCache.Tests/MemCacheFixture.cs b/Caches/MemCache.Tests/MemCacheFixture.cs index 721db19..8833096 100644 --- a/Caches/MemCache.Tests/MemCacheFixture.cs +++ b/Caches/MemCache.Tests/MemCacheFixture.cs @@ -39,7 +39,7 @@ public class MemCacheFixture private MemCacheProvider provider; private Dictionary props; - [TestFixtureSetUp] + [OneTimeSetUp] public void FixtureSetup() { XmlConfigurator.Configure(); @@ -48,10 +48,13 @@ public void FixtureSetup() provider.Start(props); } - [TestFixtureTearDown] + [OneTimeSetUp] public void FixtureStop() { - provider.Stop(); + if (provider != null) + { + provider.Stop(); + } } [Test] diff --git a/Caches/MemCache.Tests/MemCacheProviderFixture.cs b/Caches/MemCache.Tests/MemCacheProviderFixture.cs index a724b14..80eeac3 100644 --- a/Caches/MemCache.Tests/MemCacheProviderFixture.cs +++ b/Caches/MemCache.Tests/MemCacheProviderFixture.cs @@ -37,7 +37,7 @@ public class MemCacheProviderFixture private ICacheProvider provider; private Dictionary props; - [TestFixtureSetUp] + [OneTimeSetUp] public void FixtureSetup() { XmlConfigurator.Configure(); @@ -56,7 +56,7 @@ public void FixtureSetup() provider.Start(props); } - [TestFixtureTearDown] + [OneTimeSetUp] public void Stop() { provider.Stop(); diff --git a/Caches/MemCache.Tests/NHibernate.Caches.MemCache.Tests.csproj b/Caches/MemCache.Tests/NHibernate.Caches.MemCache.Tests.csproj index 966f4af..f312fb3 100644 --- a/Caches/MemCache.Tests/NHibernate.Caches.MemCache.Tests.csproj +++ b/Caches/MemCache.Tests/NHibernate.Caches.MemCache.Tests.csproj @@ -59,8 +59,9 @@ ..\..\packages\Memcached.ClientLibrary.1.0\lib\net20\ICSharpCode.SharpZipLib.dll - - ..\..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll + + ..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll + True ..\..\packages\Memcached.ClientLibrary.1.0\lib\net20\log4net.dll @@ -68,12 +69,17 @@ ..\..\packages\Memcached.ClientLibrary.1.0\lib\net20\Memcached.ClientLibrary.dll - - ..\..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll + + ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll + True - - False - ..\..\Lib\net\3.5\nunit.framework.dll + + ..\..\packages\NodaTime.1.3.2\lib\net35-Client\NodaTime.dll + True + + + ..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + True @@ -115,6 +121,9 @@ true + + + - + \ No newline at end of file diff --git a/Caches/RtMemoryCache.Tests/RtMemoryCacheFixture.cs b/Caches/RtMemoryCache.Tests/RtMemoryCacheFixture.cs index 692244b..afccea1 100644 --- a/Caches/RtMemoryCache.Tests/RtMemoryCacheFixture.cs +++ b/Caches/RtMemoryCache.Tests/RtMemoryCacheFixture.cs @@ -39,7 +39,7 @@ public class RtMemoryCacheFixture private RtMemoryCacheProvider provider; private Dictionary props; - [TestFixtureSetUp] + [OneTimeSetUp] public void FixtureSetup() { props = new Dictionary(); diff --git a/Caches/RtMemoryCache.Tests/RtMemoryCacheProviderFixture.cs b/Caches/RtMemoryCache.Tests/RtMemoryCacheProviderFixture.cs index 9b44fa5..72604d7 100644 --- a/Caches/RtMemoryCache.Tests/RtMemoryCacheProviderFixture.cs +++ b/Caches/RtMemoryCache.Tests/RtMemoryCacheProviderFixture.cs @@ -44,7 +44,7 @@ public void Setup() private RtMemoryCacheProvider provider; private Dictionary props; - [TestFixtureSetUp] + [OneTimeSetUp] public void FixtureSetup() { props = new Dictionary {{"expiration", 120.ToString()}, {"priority", 2.ToString()}}; diff --git a/Caches/RtMemoryCache.Tests/packages.config b/Caches/RtMemoryCache.Tests/packages.config index 54a32d8..55053ea 100644 --- a/Caches/RtMemoryCache.Tests/packages.config +++ b/Caches/RtMemoryCache.Tests/packages.config @@ -1,6 +1,7 @@  - - - + + + + \ No newline at end of file diff --git a/Caches/RtMemoryCache/AssemblyInfo.cs b/Caches/RtMemoryCache/AssemblyInfo.cs index 23c9388..da6d4ee 100644 --- a/Caches/RtMemoryCache/AssemblyInfo.cs +++ b/Caches/RtMemoryCache/AssemblyInfo.cs @@ -8,9 +8,9 @@ [assembly: AssemblyCompanyAttribute("NHibernate.org")] [assembly: AssemblyProductAttribute("NHibernate.Caches.RtMemoryCache")] [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")] -[assembly: AssemblyVersionAttribute("4.0.0.4000")] -[assembly: AssemblyInformationalVersionAttribute("4.0.0.4000")] -[assembly: AssemblyFileVersionAttribute("4.0.0.4000")] +[assembly: AssemblyVersionAttribute("4.1.0.4000")] +[assembly: AssemblyInformationalVersionAttribute("4.1.0.4000")] +[assembly: AssemblyFileVersionAttribute("4.1.0.4000")] //[assembly: AssemblyKeyFileAttribute("../../src/NHibernate.snk")] [assembly: AssemblyDelaySignAttribute(false)] [assembly: AllowPartiallyTrustedCallers()] diff --git a/Caches/RtMemoryCache/NHibernate.Caches.RtMemoryCache.csproj b/Caches/RtMemoryCache/NHibernate.Caches.RtMemoryCache.csproj index 327f261..050050e 100644 --- a/Caches/RtMemoryCache/NHibernate.Caches.RtMemoryCache.csproj +++ b/Caches/RtMemoryCache/NHibernate.Caches.RtMemoryCache.csproj @@ -41,11 +41,21 @@ ..\NHibernate.Caches.snk - - ..\..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll + + ..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll + True - - ..\..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll + + ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll + True + + + ..\..\packages\NodaTime.1.3.2\lib\net35-Client\NodaTime.dll + True + + + ..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + True @@ -77,4 +87,4 @@ --> - + \ No newline at end of file diff --git a/Caches/RtMemoryCache/packages.config b/Caches/RtMemoryCache/packages.config index 23f0b1a..55053ea 100644 --- a/Caches/RtMemoryCache/packages.config +++ b/Caches/RtMemoryCache/packages.config @@ -1,5 +1,7 @@  - - + + + + \ No newline at end of file diff --git a/Caches/SysCache.Tests/NHibernate.Caches.SysCache.Tests.csproj b/Caches/SysCache.Tests/NHibernate.Caches.SysCache.Tests.csproj index bb19471..9000e01 100644 --- a/Caches/SysCache.Tests/NHibernate.Caches.SysCache.Tests.csproj +++ b/Caches/SysCache.Tests/NHibernate.Caches.SysCache.Tests.csproj @@ -55,14 +55,21 @@ AllRules.ruleset - - ..\..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll + + ..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll + True - - ..\..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll + + ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll + True - - ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll + + ..\..\packages\NodaTime.1.3.2\lib\net35-Client\NodaTime.dll + True + + + ..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + True @@ -106,6 +113,9 @@ true + + + - + \ No newline at end of file diff --git a/Caches/SysCache.Tests/SysCacheFixture.cs b/Caches/SysCache.Tests/SysCacheFixture.cs index b4e8030..24513fb 100644 --- a/Caches/SysCache.Tests/SysCacheFixture.cs +++ b/Caches/SysCache.Tests/SysCacheFixture.cs @@ -38,7 +38,7 @@ public class SysCacheFixture private SysCacheProvider provider; private Dictionary props; - [TestFixtureSetUp] + [OneTimeSetUp] public void FixtureSetup() { props = new Dictionary(); diff --git a/Caches/SysCache.Tests/SysCacheProviderFixture.cs b/Caches/SysCache.Tests/SysCacheProviderFixture.cs index 6c07f90..4f16d69 100644 --- a/Caches/SysCache.Tests/SysCacheProviderFixture.cs +++ b/Caches/SysCache.Tests/SysCacheProviderFixture.cs @@ -44,7 +44,7 @@ public void Setup() private SysCacheProvider provider; private Dictionary props; - [TestFixtureSetUp] + [OneTimeSetUp] public void FixtureSetup() { props = new Dictionary {{"expiration", 120.ToString()}, {"priority", 2.ToString()}}; diff --git a/Caches/SysCache.Tests/packages.config b/Caches/SysCache.Tests/packages.config index 54a32d8..55053ea 100644 --- a/Caches/SysCache.Tests/packages.config +++ b/Caches/SysCache.Tests/packages.config @@ -1,6 +1,7 @@  - - - + + + + \ No newline at end of file diff --git a/Caches/SysCache/AssemblyInfo.cs b/Caches/SysCache/AssemblyInfo.cs index 148df07..ed3db38 100644 --- a/Caches/SysCache/AssemblyInfo.cs +++ b/Caches/SysCache/AssemblyInfo.cs @@ -8,9 +8,9 @@ [assembly: AssemblyCompanyAttribute("NHibernate.org")] [assembly: AssemblyProductAttribute("NHibernate.Caches.SysCache")] [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")] -[assembly: AssemblyVersionAttribute("4.0.0.4000")] -[assembly: AssemblyInformationalVersionAttribute("4.0.0.4000")] -[assembly: AssemblyFileVersionAttribute("4.0.0.4000")] +[assembly: AssemblyVersionAttribute("4.1.0.4000")] +[assembly: AssemblyInformationalVersionAttribute("4.1.0.4000")] +[assembly: AssemblyFileVersionAttribute("4.1.0.4000")] //[assembly: AssemblyKeyFileAttribute("../../src/NHibernate.snk")] [assembly: AssemblyDelaySignAttribute(false)] [assembly: AllowPartiallyTrustedCallers()] diff --git a/Caches/SysCache/NHibernate.Caches.SysCache.csproj b/Caches/SysCache/NHibernate.Caches.SysCache.csproj index 0235f0d..99a8bcb 100644 --- a/Caches/SysCache/NHibernate.Caches.SysCache.csproj +++ b/Caches/SysCache/NHibernate.Caches.SysCache.csproj @@ -58,11 +58,21 @@ true - - ..\..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll + + ..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll + True - - ..\..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll + + ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll + True + + + ..\..\packages\NodaTime.1.3.2\lib\net35-Client\NodaTime.dll + True + + + ..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + True @@ -112,4 +122,4 @@ --> - + \ No newline at end of file diff --git a/Caches/SysCache/packages.config b/Caches/SysCache/packages.config index 23f0b1a..55053ea 100644 --- a/Caches/SysCache/packages.config +++ b/Caches/SysCache/packages.config @@ -1,5 +1,7 @@  - - + + + + \ No newline at end of file diff --git a/Caches/SysCache2/AssemblyInfo.cs b/Caches/SysCache2/AssemblyInfo.cs index b5f34ef..2151b14 100644 --- a/Caches/SysCache2/AssemblyInfo.cs +++ b/Caches/SysCache2/AssemblyInfo.cs @@ -7,9 +7,9 @@ [assembly: AssemblyCompanyAttribute("NHibernate.org")] [assembly: AssemblyProductAttribute("NHibernate.Caches.SysCache2")] [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")] -[assembly: AssemblyVersionAttribute("4.0.0.4000")] -[assembly: AssemblyInformationalVersionAttribute("4.0.0.4000")] -[assembly: AssemblyFileVersionAttribute("4.0.0.4000")] +[assembly: AssemblyVersionAttribute("4.1.0.4000")] +[assembly: AssemblyInformationalVersionAttribute("4.1.0.4000")] +[assembly: AssemblyFileVersionAttribute("4.1.0.4000")] //[assembly: AssemblyKeyFileAttribute("../../src/NHibernate.snk")] //[assembly: AssemblyDelaySignAttribute(false)] diff --git a/Caches/SysCache2/NHibernate.Caches.SysCache2.csproj b/Caches/SysCache2/NHibernate.Caches.SysCache2.csproj index 5ae393e..9aacec0 100644 --- a/Caches/SysCache2/NHibernate.Caches.SysCache2.csproj +++ b/Caches/SysCache2/NHibernate.Caches.SysCache2.csproj @@ -56,11 +56,21 @@ AllRules.ruleset - - ..\..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll + + ..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll + True - - ..\..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll + + ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll + True + + + ..\..\packages\NodaTime.1.3.2\lib\net35-Client\NodaTime.dll + True + + + ..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + True diff --git a/Caches/SysCache2/packages.config b/Caches/SysCache2/packages.config index 23f0b1a..55053ea 100644 --- a/Caches/SysCache2/packages.config +++ b/Caches/SysCache2/packages.config @@ -1,5 +1,7 @@  - - + + + + \ No newline at end of file diff --git a/CollectionQuery/NHibernate.CollectionQuery.csproj b/CollectionQuery/NHibernate.CollectionQuery.csproj index 66bd0f4..42b9ba8 100644 --- a/CollectionQuery/NHibernate.CollectionQuery.csproj +++ b/CollectionQuery/NHibernate.CollectionQuery.csproj @@ -13,7 +13,8 @@ 512 ..\ true - Client + + true @@ -33,15 +34,27 @@ 4 - - ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll + + ..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll + True - - ..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll + + ..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll + True + + + ..\packages\NodaTime.1.3.2\lib\net35-Client\NodaTime.dll + True + + + ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + True + + @@ -67,4 +80,4 @@ --> - + \ No newline at end of file diff --git a/CollectionQuery/PersistentQueryableList.cs b/CollectionQuery/PersistentQueryableList.cs index d8f28f8..8eb5b78 100644 --- a/CollectionQuery/PersistentQueryableList.cs +++ b/CollectionQuery/PersistentQueryableList.cs @@ -41,7 +41,7 @@ public IQueryProvider Provider IQueryable GetQueryable() { - return queryable ?? (queryable = WasInitialized ? glist.AsQueryable() : this.Query(Session)); + return queryable ?? (queryable = WasInitialized ? WrappedList.AsQueryable() : this.Query(Session)); } } } \ No newline at end of file diff --git a/CollectionQuery/PersistentQueryableSet.cs b/CollectionQuery/PersistentQueryableSet.cs index ab4d5d3..6454308 100644 --- a/CollectionQuery/PersistentQueryableSet.cs +++ b/CollectionQuery/PersistentQueryableSet.cs @@ -21,7 +21,7 @@ public PersistentQueryableSet(ISessionImplementor sessionImplementor) } public PersistentQueryableSet(ISessionImplementor sessionImplementor, ICollection original) - : base(sessionImplementor, original as Iesi.Collections.Generic.ISet ?? new HashedSet(original)) + : base(sessionImplementor, original as System.Collections.Generic.ISet ?? new HashSet(original)) { } @@ -42,7 +42,7 @@ public IQueryProvider Provider IQueryable GetQueryable() { - return queryable ?? (queryable = WasInitialized ? gset.AsQueryable() : this.Query(Session)); + return queryable ?? (queryable = WasInitialized ? WrappedSet.AsQueryable() : this.Query(Session)); } } } \ No newline at end of file diff --git a/CollectionQuery/PersistentQueryableSetType.cs b/CollectionQuery/PersistentQueryableSetType.cs index 8302dce..a1259d4 100644 --- a/CollectionQuery/PersistentQueryableSetType.cs +++ b/CollectionQuery/PersistentQueryableSetType.cs @@ -50,7 +50,7 @@ public object ReplaceElements(object original, object target, ICollectionPersist public object Instantiate(int anticipatedSize) { - return new HashedSet(); + return new HashSet(); } } } \ No newline at end of file diff --git a/CollectionQuery/Test/NHibernate.CollectionQuery.Test.csproj b/CollectionQuery/Test/NHibernate.CollectionQuery.Test.csproj index 883079f..0793ec9 100644 --- a/CollectionQuery/Test/NHibernate.CollectionQuery.Test.csproj +++ b/CollectionQuery/Test/NHibernate.CollectionQuery.Test.csproj @@ -32,14 +32,21 @@ 4 - - ..\..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll + + ..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll + True - - ..\..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll + + ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll + True - - ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll + + ..\..\packages\NodaTime.1.3.2\lib\net35-Client\NodaTime.dll + True + + + ..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + True @@ -77,6 +84,9 @@ Always + + + - + \ No newline at end of file diff --git a/CollectionQuery/Test/QueryableCollectionsFixture.cs b/CollectionQuery/Test/QueryableCollectionsFixture.cs index d304645..5ce837d 100644 --- a/CollectionQuery/Test/QueryableCollectionsFixture.cs +++ b/CollectionQuery/Test/QueryableCollectionsFixture.cs @@ -19,7 +19,7 @@ public abstract class QueryableCollectionFixture ISessionFactory sessionFactory; object id; - [TestFixtureSetUp] + [OneTimeSetUp] public void TestFixtureSetUp() { configuration = new Configuration(); @@ -54,7 +54,7 @@ public void TestFixtureSetUp() protected abstract void CustomizeMapping(ConventionModelMapper mapper); - [TestFixtureTearDown] + [OneTimeTearDown] public void TestFixtureTearDown() { new SchemaExport(configuration).Drop(false, true); diff --git a/CollectionQuery/Test/packages.config b/CollectionQuery/Test/packages.config index f365ab4..4e57604 100644 --- a/CollectionQuery/Test/packages.config +++ b/CollectionQuery/Test/packages.config @@ -1,7 +1,8 @@  - - - + + + + \ No newline at end of file diff --git a/CollectionQuery/packages.config b/CollectionQuery/packages.config index 0e16293..39ed59c 100644 --- a/CollectionQuery/packages.config +++ b/CollectionQuery/packages.config @@ -1,5 +1,7 @@  - - + + + + \ No newline at end of file diff --git a/NodaTime/NHibernate.NodaTime.csproj b/NodaTime/NHibernate.NodaTime.csproj index 8b2a4bc..5bf605c 100644 --- a/NodaTime/NHibernate.NodaTime.csproj +++ b/NodaTime/NHibernate.NodaTime.csproj @@ -37,14 +37,21 @@ - - ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll + + ..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll + True - - ..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll + + ..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll + True - - ..\packages\NodaTime.1.3.0\lib\net35-Client\NodaTime.dll + + ..\packages\NodaTime.1.3.2\lib\net35-Client\NodaTime.dll + True + + + ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + True @@ -69,4 +76,4 @@ --> - + \ No newline at end of file diff --git a/NodaTime/Test/LocalDateFixture.cs b/NodaTime/Test/LocalDateFixture.cs index 3aac64f..ea8e426 100644 --- a/NodaTime/Test/LocalDateFixture.cs +++ b/NodaTime/Test/LocalDateFixture.cs @@ -17,7 +17,7 @@ public class LocalDateFixture ISessionFactory sessionFactory; static readonly LocalDate someDate = new LocalDate(1979, 7, 17); - [TestFixtureSetUp] + [OneTimeSetUp] public void TestFixtureSetUp() { var configuration = new Configuration(); diff --git a/NodaTime/Test/NHibernate.NodaTime.Test.csproj b/NodaTime/Test/NHibernate.NodaTime.Test.csproj index 34df639..f7f9eb9 100644 --- a/NodaTime/Test/NHibernate.NodaTime.Test.csproj +++ b/NodaTime/Test/NHibernate.NodaTime.Test.csproj @@ -32,17 +32,21 @@ 4 - - ..\..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll + + ..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll + True - - ..\..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll + + ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll + True - - ..\..\packages\NodaTime.1.3.0\lib\net35-Client\NodaTime.dll + + ..\..\packages\NodaTime.1.3.2\lib\net35-Client\NodaTime.dll + True - - ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll + + ..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + True @@ -75,6 +79,9 @@ Always + + + - + \ No newline at end of file diff --git a/NodaTime/Test/packages.config b/NodaTime/Test/packages.config index a4db16c..4e57604 100644 --- a/NodaTime/Test/packages.config +++ b/NodaTime/Test/packages.config @@ -1,8 +1,8 @@  - - - - + + + + \ No newline at end of file diff --git a/NodaTime/packages.config b/NodaTime/packages.config index 2cd3a88..55053ea 100644 --- a/NodaTime/packages.config +++ b/NodaTime/packages.config @@ -1,6 +1,7 @@  - - - + + + + \ No newline at end of file