Merge remote-tracking branch 'maca88/ReduceSumCast' into GH2054

# Conflicts:
#	src/NHibernate.Test/Async/Linq/SelectionTests.cs
#	src/NHibernate.Test/Linq/SelectionTests.cs
#	src/NHibernate/Dialect/SQLiteDialect.cs
#	src/NHibernate/Util/ExpressionsHelper.cs

Author: maca88

.travis.yml

@@ -1,3 +1,4 @@
+dist: trusty
 language: csharp
 mono: latest
 dotnet: 2.1.300

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

@@ -1100,6 +1100,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
 =============================
 
@@ -342,6 +369,14 @@ Release notes - NHibernate - Version 5.2.0
 As part of releasing 5.2.0, a misnamed setting in 5.0.0 release notes has been fixed:
 transaction.use_connection_on_system_events correct name is transaction.use_connection_on_system_prepare
 
+Build 5.1.6
+=============================
+
+Release notes - NHibernate - Version 5.1.6
+
+** Bug
+    * #2172 Using DependentTransaction fails
+
 Build 5.1.5
 =============================
 
@@ -605,6 +640,14 @@ Release notes - NHibernate - Version 5.1.0
 As part of releasing 5.1.0, a missing 5.0.0 possible breaking change has been added about inequality semantic in LINQ
 queries. See 5.0.0 possible breaking changes.
 
+Build 5.0.8
+=============================
+
+Release notes - NHibernate - Version 5.0.8
+
+** Bug
+    * #2172 Using DependentTransaction fails
+
 Build 5.0.7
 =============================
 

src/AsyncGenerator.yml

@@ -7,6 +7,10 @@
   - pattern: ^.*(Hql\.g).*$
   analyzation:
     methodConversion:
+#TODO 6.0: Remove ignore rule for IQueryBatchItem.ProcessResults  
+    - conversion: Ignore
+      name: ProcessResults
+      containingTypeName: IQueryBatchItem
     - conversion: Ignore
       name: PostProcessInsert
       containingTypeName: HqlSqlWalker
@@ -185,6 +189,18 @@
   - pattern: ^.*(Hql\.g).*$
   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:

src/NHibernate.DomainModel/FooComponent.cs

@@ -92,6 +92,8 @@ public Int32 Count
 			set { _count = value; }
 		}
 
+		public int NotMapped { get; set; }
+
 		public DateTime[] ImportantDates
 		{
 			get { return _importantDates; }

src/NHibernate.DomainModel/NHSpecific/NullableInt32.cs

@@ -7,7 +7,7 @@ namespace NHibernate.DomainModel.NHSpecific
 	/// A nullable type that wraps an <see cref="Int32"/> value.
 	/// </summary>
 	[TypeConverter(typeof(NullableInt32Converter)), Serializable()]
-	public struct NullableInt32 : IFormattable, IComparable
+	public struct NullableInt32 : IFormattable, IComparable, IConvertible
 	{
 		public static readonly NullableInt32 Default = new NullableInt32();
 
@@ -234,5 +234,94 @@ public static NullableInt32 Parse(string s)
 		// TODO: implement the rest of the Parse overloads found in Int32
 
 		#endregion
+
+		#region IConvertible
+
+		public TypeCode GetTypeCode()
+		{
+			return _value.GetTypeCode();
+		}
+
+		public bool ToBoolean(IFormatProvider provider)
+		{
+			return ((IConvertible) _value).ToBoolean(provider);
+		}
+
+		public char ToChar(IFormatProvider provider)
+		{
+			return ((IConvertible) _value).ToChar(provider);
+		}
+
+		public sbyte ToSByte(IFormatProvider provider)
+		{
+			return ((IConvertible) _value).ToSByte(provider);
+		}
+
+		public byte ToByte(IFormatProvider provider)
+		{
+			return ((IConvertible) _value).ToByte(provider);
+		}
+
+		public short ToInt16(IFormatProvider provider)
+		{
+			return ((IConvertible) _value).ToInt16(provider);
+		}
+
+		public ushort ToUInt16(IFormatProvider provider)
+		{
+			return ((IConvertible) _value).ToUInt16(provider);
+		}
+
+		public int ToInt32(IFormatProvider provider)
+		{
+			return ((IConvertible) _value).ToInt32(provider);
+		}
+
+		public uint ToUInt32(IFormatProvider provider)
+		{
+			return ((IConvertible) _value).ToUInt32(provider);
+		}
+
+		public long ToInt64(IFormatProvider provider)
+		{
+			return ((IConvertible) _value).ToInt64(provider);
+		}
+
+		public ulong ToUInt64(IFormatProvider provider)
+		{
+			return ((IConvertible) _value).ToUInt64(provider);
+		}
+
+		public float ToSingle(IFormatProvider provider)
+		{
+			return ((IConvertible) _value).ToSingle(provider);
+		}
+
+		public double ToDouble(IFormatProvider provider)
+		{
+			return ((IConvertible) _value).ToDouble(provider);
+		}
+
+		public decimal ToDecimal(IFormatProvider provider)
+		{
+			return ((IConvertible) _value).ToDecimal(provider);
+		}
+
+		public DateTime ToDateTime(IFormatProvider provider)
+		{
+			return ((IConvertible) _value).ToDateTime(provider);
+		}
+
+		public string ToString(IFormatProvider provider)
+		{
+			return _value.ToString(provider);
+		}
+
+		public object ToType(System.Type conversionType, IFormatProvider provider)
+		{
+			return ((IConvertible) _value).ToType(conversionType, provider);
+		}
+
+		#endregion
 	}
 }

src/NHibernate.DomainModel/Northwind/Entities/Address.cs

@@ -61,6 +61,8 @@ public string Fax
             get { return _fax; }
         }
 
+		public int NotMapped => 1;
+
         public static bool operator ==(Address address1, Address address2)
         {
             if (!ReferenceEquals(address1, null) &&
@@ -114,4 +116,4 @@ public override int GetHashCode()
                 (_fax ?? string.Empty).GetHashCode();
         }
     }
-}
+}