Merge branch 'master' into EnhanceEquality

# Conflicts:
#	src/NHibernate/Persister/Entity/IEntityPersister.cs

Author: maca88

Tools/packages.config

@@ -7,7 +7,7 @@
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
   <package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
   <package id="NUnit.Extension.VSProjectLoader" version="3.6.0" targetFramework="net461" />
-  <package id="CSharpAsyncGenerator.CommandLine" version="0.13.1" targetFramework="net461" />
+  <package id="CSharpAsyncGenerator.CommandLine" version="0.13.2" targetFramework="net461" />
   <package id="vswhere" version="2.1.4" targetFramework="net461" />
   <package id="gitreleasemanager" version="0.7.0" targetFramework="net461" />
 </packages>

appveyor.yml

@@ -1,4 +1,4 @@
-version: 5.2.3.{build}
+version: 5.2.5.{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)' == ''">3</VersionPatch>
+    <VersionPatch Condition="'$(VersionPatch)' == ''">5</VersionPatch>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
@@ -14,6 +14,9 @@
 
     <NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net461;netcoreapp2.0</NhAppTargetFrameworks>
     <NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
+    <NhNetFx>false</NhNetFx>
+    <NhNetFx Condition="$(TargetFramework.StartsWith('net4'))">true</NhNetFx>
+    <DefineConstants Condition="$(NhNetFx) AND $(NhVbNet) == ''" >NETFX;$(DefineConstants)</DefineConstants>
 
     <Product>NHibernate</Product>
     <Company>NHibernate.info</Company>
@@ -26,8 +29,9 @@
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
     <PackageReleaseNotes>https://github.com/nhibernate/nhibernate-core/blob/$(VersionPrefix)/releasenotes.txt</PackageReleaseNotes>
-    <RepositoryUrl>https://github.com/nhibernate/nhibernate-core.git</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <TreatSpecificWarningsAsErrors />

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.3" overwrite="false" />
-	<property name="project.version.numeric" value="5.2.3" overwrite="false" />
+	<property name="project.version" value="5.2.5" overwrite="false" />
+	<property name="project.version.numeric" value="5.2.5" overwrite="false" />
 
 	<!-- properties used to connect to database for testing -->
 	<include buildfile="nhibernate-properties.xml" />

default.build

@@ -6,6 +6,7 @@
 >
 
 	<property name="root.dir" value="." />
+	<property name="target.dir" value="net461" />
 
 	<include buildfile="${root.dir}/build-common/common.xml" />
 
@@ -144,7 +145,7 @@
 	</target>
 
 	<target name="put-connection-settings-into-app-config">
-		<property name="app.config" value="src/${test.file}/bin/${build.config}/net461/${test.file}.dll.config" />
+		<property name="app.config" value="src/${test.file}/bin/${build.config}/${target.dir}/${test.file}.dll.config" />
 		<call target="put-connection-settings-into-defined-app-config" />
 	</target>
 
@@ -156,15 +157,15 @@
 
 	<target name="run-tests" depends="find-nunit" description="Run NUnit tests">
 		<exec program="${nunit-console}" failonerror="${not property::exists(test.file + '.IgnoreFail')}">
-			<arg value="${root.dir}/src/${test.file}/bin/${build.config}/net461/${test.file}.dll" />
+			<arg value="${root.dir}/src/${test.file}/bin/${build.config}/${target.dir}/${test.file}.dll" />
 			<arg value="--result=${testresults.dir}/${test.file}.dll-results.xml;format=nunit2" />
 			<arg value="--teamcity" if="${property::exists('config.teamcity')}" />
 			<arg value="--x86" unless="${property::exists('nunit-x64')}" />
 		</exec>
 	</target>
 
 	<target name="remove-connection-settings-from-app-config">
-		<property name="app.config" value="${root.dir}/src/${test.file}/bin/${build.config}/net461/${test.file}.dll.config" />
+		<property name="app.config" value="${root.dir}/src/${test.file}/bin/${build.config}/${target.dir}/${test.file}.dll.config" />
 
 		<xmlpoke
 			file="${app.config}"
@@ -246,7 +247,7 @@
 			</fileset>
 		</copy>
 		<copy todir="${bin-pack.required}">
-			<fileset basedir="${root.dir}/src/NHibernate/bin/${build.config}/net461/">
+			<fileset basedir="${root.dir}/src/NHibernate/bin/${build.config}/${target.dir}/">
 				<include name="Antlr3.Runtime.???" />
 				<include name="Iesi.Collections.???" />
 				<include name="NHibernate.???" />
@@ -263,20 +264,20 @@
 			</fileset>
 		</copy>
 		<copy todir="${bin-pack.tests}">
-			<fileset basedir="${root.dir}/src/NHibernate.Test/bin/${build.config}/net461">
+			<fileset basedir="${root.dir}/src/NHibernate.Test/bin/${build.config}/${target.dir}">
 				<include name="log4net*" />
 				<include name="NHibernate.DomainModel.*" />
 				<include name="NHibernate.Test.*" />
 				<include name="nunit*" />
 			</fileset>
 		</copy>
 		<copy todir="${bin-pack.tests}">
-			<fileset basedir="${root.dir}/src/NHibernate.Test.VisualBasic/bin/${build.config}/net461">
+			<fileset basedir="${root.dir}/src/NHibernate.Test.VisualBasic/bin/${build.config}/${target.dir}">
 				<include name="NHibernate.Test.VisualBasic.*" />
 			</fileset>
 		</copy>
 		<copy todir="${bin-pack.tests}">
-			<fileset basedir="${root.dir}/src/NHibernate.TestDatabaseSetup/bin/${build.config}/net461">
+			<fileset basedir="${root.dir}/src/NHibernate.TestDatabaseSetup/bin/${build.config}/${target.dir}">
 				<include name="NHibernate.TestDatabaseSetup.*" />
 			</fileset>
 		</copy>
@@ -319,23 +320,12 @@
 			<in>
 				<items>
 					<include name="${nuget.nupackages.dir}/*.nupkg"/>
-					<exclude name="${nuget.nupackages.dir}/*.symbols.nupkg"/>
 				</items>
 			</in>
 			<do>
 				<echo message="nuget push -source https://nuget.org/ ${path::get-file-name(filename)} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
 			</do>
 		</foreach>
-		<foreach item="File" property="filename">
-			<in>
-				<items>
-					<include name="${nuget.nupackages.dir}/*.symbols.nupkg"/>
-				</items>
-			</in>
-			<do>
-				<echo message="nuget push -source https://nuget.smbsrc.net/ ${path::get-file-name(filename)} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
-			</do>
-		</foreach>
 	</target>
 
 	<target name="nugetpush" depends="init binaries common.download-nuget nuget.set-properties"

doc/reference/modules/basic_mapping.xml

@@ -1694,6 +1694,7 @@
                     <area id="property15" coords="16 55" />
                     <area id="property16" coords="17 55" />
                     <area id="property17" coords="18 55" />
+                    <area id="property18" coords="19 55" />
                 </areaspec>
                 <programlisting><![CDATA[<property
     name="propertyName"
@@ -1706,6 +1707,7 @@
     optimistic-lock="true|false"
     generated="never|insert|always"
     lazy="true|false"
+    lazy-group="groupName"
     not-null="true|false"
     unique="true|false"
     unique-key="uniqueKeyName"
@@ -1773,55 +1775,63 @@
                             <literal>lazy</literal> (optional - defaults to <literal>false</literal>):
                             specifies that this property is lazy. A lazy property is not loaded when
                             the object is initially loaded, unless the fetch mode has been overridden
-                            in a specific query. Values for lazy properties are loaded when any lazy
-                            property of the object is accessed. Having lazy properties causes instances
-                            of the entity to be loaded as proxies. Theses proxies ignore the class
-                            <literal>proxy</literal> setting and always derives from the persistent class,
-                            requiring its members to be overridable.
+                            in a specific query. Values for lazy properties are loaded per lazy-group.
+                        </para>
+                        <para>
+                            Having lazy properties causes instances of the entity to be loaded as proxies.
+                            Theses proxies ignore the class <literal>proxy</literal> setting and always
+                            derives from the persistent class, requiring its members to be overridable.
+                        </para>
+                    </callout>
+                    <callout arearefs="property11">
+                        <para>
+                            <literal>lazy-group</literal> (optional - defaults to <literal>DEFAULT</literal>):
+                            if the property is lazy, its lazy-loading group. When a lazy property is accessed,
+                            the other lazy properties of the lazy group are also loaded with it.
                         </para>
                     </callout>
-                   <callout arearefs="property11">
+                    <callout arearefs="property12">
                         <para>
                             <literal>not-null</literal> (optional - defaults to <literal>false</literal>):
                             sets the column nullability for DDL generation.
                         </para>
                     </callout>
-                   <callout arearefs="property12">
+                    <callout arearefs="property13">
                         <para>
                             <literal>unique</literal> (optional - defaults to <literal>false</literal>):
                             sets the column uniqueness for DDL generation. Use <literal>unique-key</literal>
                             instead if the value is unique only in combination with other properties.
                         </para>
                     </callout>
-                   <callout arearefs="property13">
+                    <callout arearefs="property14">
                         <para>
                             <literal>unique-key</literal> (optional):
                             a logical name for an unique index for DDL generation. The column will be included in
                             the index, along with other columns sharing the same <literal>unique-key</literal>
                             logical name. The actual index name depends on the dialect.
                         </para>
                     </callout>
-                   <callout arearefs="property14">
+                    <callout arearefs="property15">
                         <para>
                             <literal>index</literal> (optional):
                             a logical name for an index for DDL generation. The column will be included in
                             the index, along with other columns sharing the same <literal>index</literal> logical
                             name. The actual index name depends on the dialect.
                         </para>
                     </callout>
-                   <callout arearefs="property15">
+                    <callout arearefs="property16">
                         <para>
                             <literal>length</literal> (optional): if the type takes a length and does not
                             already specify it, its length.
                         </para>
                     </callout>
-                   <callout arearefs="property16">
+                    <callout arearefs="property17">
                         <para>
                             <literal>precision</literal> (optional): if the type takes a precision and does not
                             already specify it, its precision.
                         </para>
                     </callout>
-                   <callout arearefs="property17">
+                    <callout arearefs="property18">
                         <para>
                             <literal>scale</literal> (optional): if the type takes a scale and does not
                             already specify it, its scale.
@@ -2598,6 +2608,7 @@
                     <area id="component6" coords="7 60"/>
                     <area id="component7" coords="8 60"/>
                     <area id="component8" coords="9 60"/>
+                    <area id="component9" coords="10 60"/>
                 </areaspec>
                 <programlisting><![CDATA[<component
     name="propertyName"
@@ -2607,6 +2618,7 @@
     access="field|property|nosetter|className"
     optimistic-lock="true|false"
     lazy="true|false"
+    lazy-group="groupName"
     unique="true|false">
 
         <property ... />
@@ -2660,6 +2672,14 @@
                         </para>
                     </callout>
                     <callout arearefs="component8">
+                        <para>
+                            <literal>lazy-group</literal> (optional - defaults to <literal>DEFAULT</literal>):
+                            If the component is lazy, its lazy-loading group. When a lazy property is accessed
+                            on an object, included when the property is a component, the other lazy properties
+                            of the lazy group are also loaded with it.
+                        </para>
+                    </callout>
+                    <callout arearefs="component9">
                         <para>
                             <literal>unique</literal> (optional - defaults to <literal>false</literal>): Specifies
                             that an unique constraint exists upon all mapped columns of the component.

doc/reference/modules/nhibernate_caches.xml

@@ -783,7 +783,7 @@
 			<title>Memcached distributed cache factory</title>
 
 			<para>
-				<literal>NHibernate.Caches.CoreDistributedCache.Memcached</literal> provides a Redis distributed cache factory.
+				<literal>NHibernate.Caches.CoreDistributedCache.Memcached</literal> provides a Memcached distributed cache factory.
 				This factory yields a <literal>Enyim.Caching.MemcachedClient</literal> from <literal>EnyimMemcachedCore</literal>.
 				For using it, reference the cache factory package and set the <literal>factory-class</literal> attribute of the
 				<literal>coredistributedcache</literal> configuration section to

releasenotes.txt

@@ -1,3 +1,47 @@
+Build 5.2.5
+=============================
+
+Release notes - NHibernate - Version 5.2.5
+
+5 issues were resolved in this release.
+
+** Bug
+
+   * #2075 Missing cast when comparing a guid and string columns in SAP SQL Anywhere
+   * #2046 Fix nullable Guid ToString is not translated correctly on some dialects
+   * #2043 System.Reflection.TargetException when an interface is used as class mapping proxy definition
+   * #2040 Incorrect SQL when comparing a guid and string column in Sql Server
+
+** Task
+
+   * #2086 Release 5.2.5
+
+Build 5.2.4
+=============================
+
+Release notes - NHibernate - Version 5.2.4
+
+3 issues were resolved in this release. The dialect change has the side effect of
+re-enabling a hack used by NHibernate.Spatial, allowing Spatial users to upgrade
+to NHibernate 5.2.x. See NHibernate.Spatial#104.
+
+    ##### Possible Breaking Changes #####
+        * Using DML on an entity collection was applying the changes without
+          filtering according to the entity. It will now throw a
+          NotSupportedException.
+
+** Bug
+
+   * #2020 Throw for DML on filter
+   * #2011 Use a statically resolved dialect when building the session factory
+
+** Task
+
+   * #2030 Release 5.2.4
+
+As part of releasing 5.2.4, a missing 5.2.0 possible breaking change has been added about
+property-ref on null values. See 5.2.0 possible breaking changes.
+
 Build 5.2.3
 =============================
 
@@ -74,6 +118,9 @@ Release notes - NHibernate - Version 5.2.0
           IDictionary is no more supported.
         * Querying a dynamic entity as a Hashtable instead of an IDictionary is no more
           supported.
+        * A collection mapped with a `property-ref` will no more support being accessed
+          when the referenced property is null. It will throw. Previously, the collection
+          was not throwing but was always loaded empty.
         * With PostgreSQL, a HQL query using the bitwise xor operator "^" or "bxor"
           was exponentiating the arguments instead. It will now correctly apply the xor
           operator. (# operator in PostgreSQL SQL.)
@@ -295,6 +342,24 @@ 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.5
+=============================
+
+Release notes - NHibernate - Version 5.1.5
+
+    ##### Possible Breaking Changes #####
+        * Using DML on an entity collection was applying the changes without
+          filtering according to the entity. It will now throw a
+          NotSupportedException.
+
+** Bug
+
+   * #2043 System.Reflection.TargetException when an interface is used as class mapping proxy definition
+   * #2020 Throw for DML on filter
+
+** Task
+   * #2074 Release 5.1.5
+
 Build 5.1.4
 =============================
 
@@ -540,6 +605,24 @@ 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.7
+=============================
+
+Release notes - NHibernate - Version 5.0.7
+
+    ##### Possible Breaking Changes #####
+        * Using DML on an entity collection was applying the changes without
+          filtering according to the entity. It will now throw a
+          NotSupportedException.
+
+** Bug
+
+   * #2043 System.Reflection.TargetException when an interface is used as class mapping proxy definition
+   * #2020 Throw for DML on filter
+
+** Task
+   * #2073 Release 5.0.7
+
 Build 5.0.6
 =============================
 

src/AsyncGenerator.yml

@@ -288,6 +288,9 @@ methodRules:
   - containingType: NHibernate.Tool.hbm2ddl.SchemaUpdate
   - containingType: NHibernate.Tool.hbm2ddl.SchemaValidator
   - containingType: NHibernate.Tool.hbm2ddl.SchemaExport
+  - containingType: NHibernate.Linq.DmlExtensionMethods
+  - containingType: NHibernate.Linq.InsertBuilder<TSource, TTarget>
+  - containingType: NHibernate.Linq.UpdateBuilder<TSource>
   name: PubliclyExposedType
 - filters:
   - hasAttributeName: ObsoleteAttribute