Merge branch '5.2.x'

# Conflicts:
#	Tools/packages.config
#	src/NHibernate.Test/TestDialects/PostgreSQL83TestDialect.cs
#	src/NHibernate/Async/Cache/NonstrictReadWriteCache.cs
#	src/NHibernate/Async/Cache/ReadOnlyCache.cs
#	src/NHibernate/Async/Cache/StandardQueryCache.cs
#	src/NHibernate/Async/Multi/QueryBatchItemBase.cs
#	src/NHibernate/Cache/NonstrictReadWriteCache.cs
#	src/NHibernate/Cache/ReadOnlyCache.cs
#	src/NHibernate/Cache/StandardQueryCache.cs
#	src/NHibernate/Loader/JoinWalker.cs
#	src/NHibernate/Loader/Loader.cs
#	src/NHibernate/Multi/QueryBatchItemBase.cs

Author: fredericDelaporte

appveyor.yml

@@ -1,4 +1,4 @@
-version: 5.2.5.{build}
+version: 5.2.6.{build}
 image: Visual Studio 2017
 environment:
   matrix:

build-common/NHibernate.props

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
     <VersionMinor Condition="'$(VersionMinor)' == ''">2</VersionMinor>
-    <VersionPatch Condition="'$(VersionPatch)' == ''">5</VersionPatch>
+    <VersionPatch Condition="'$(VersionPatch)' == ''">6</VersionPatch>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>

build-common/common.xml

@@ -13,8 +13,8 @@
 
 	<!-- This is used only for build folder -->
 	<!-- TODO: Either remove or refactor to use NHibernate.props -->
-	<property name="project.version" value="5.2.5" overwrite="false" />
-	<property name="project.version.numeric" value="5.2.5" overwrite="false" />
+	<property name="project.version" value="5.2.6" overwrite="false" />
+	<property name="project.version.numeric" value="5.2.6" overwrite="false" />
 
 	<!-- properties used to connect to database for testing -->
 	<include buildfile="nhibernate-properties.xml" />

doc/reference/modules/configuration.xml

@@ -1081,6 +1081,20 @@ in the parameter binding.</programlisting>
                             </para>
                         </entry>
                     </row>
+                    <row>
+                        <entry>
+                            <literal>sqlite.binaryguid</literal>
+                        </entry>
+                        <entry>
+                            SQLite can store GUIDs in binary or text form, controlled by the BinaryGuid
+                            connection string parameter (default is 'true'). The BinaryGuid setting will affect
+                            how to cast GUID to string in SQL. NHibernate will attempt to detect this
+                            setting automatically from the connection string, but if the connection
+                            or connection string is being handled by the application instead of by NHibernate,
+                            you can use the <literal>sqlite.binaryguid</literal> NHibernate setting to override the behavior.
+                            The value can be <literal>true</literal> or <literal>false</literal>.
+                        </entry>
+                    </row>
                     <row>
                         <entry>
                             <literal>nhibernate-logger</literal>

releasenotes.txt

@@ -1,3 +1,30 @@
+Build 5.2.6
+=============================
+
+Release notes - NHibernate - Version 5.2.6
+
+11 issues were resolved in this release.
+
+** Bug
+
+   * #2190 Cannot instantiate a SessionFactory using Prevalence cache
+   * #2177 New Fetch() method in QueryOver returns IQueryOver<> instead of QueryOver<>
+   * #2172 Using DependentTransaction fails
+   * #2175 Subcriteria on component collection generates incorrect join alias 
+   * #2173 Futures not batching correctly in NH 5.2.x
+   * #2141 Undefined call to Equals object in collection during flush just before commit 
+   * #2127 StackExchangeRedisCache with PreferMultipleGet = true calls GetMany multiple times
+   * #2110 Wrong GUID to string conversion with SQLite  BinaryGuid=False
+
+** Task
+
+   * #2200 Release 5.2.6
+   * #2199 Upgrade AsyncGenerator to 0.8.2.12
+
+** Tests
+
+   * #2132 Add GetMany for ReadWriteCache tests
+
 Build 5.2.5
 =============================
 

src/AsyncGenerator.yml

@@ -5,6 +5,10 @@
   applyChanges: true
   analyzation:
     methodConversion:
+#TODO 6.0: Remove ignore rule for IQueryBatchItem.ProcessResults  
+    - conversion: Ignore
+      name: ProcessResults
+      containingTypeName: IQueryBatchItem
     - conversion: Ignore
       name: PostProcessInsert
       containingTypeName: HqlSqlWalker
@@ -179,6 +183,18 @@
   applyChanges: true
   analyzation:
     methodConversion:
+    - conversion: Ignore
+      name: CanUseDependentTransaction
+      containingTypeName: DistributedSystemTransactionFixture
+    - conversion: Ignore
+      name: CanUseSessionWithManyDependentTransaction
+      containingTypeName: DistributedSystemTransactionFixture
+    - conversion: Ignore
+      name: CanUseDependentTransaction
+      containingTypeName: SystemTransactionFixture
+    - conversion: Ignore
+      name: CanUseSessionWithManyDependentTransaction
+      containingTypeName: SystemTransactionFixture
     - conversion: Copy
       name: AfterTransactionCompletionProcess_EvictsFromCache
     asyncExtensionMethods: