Merge branch 'master' into GH-1381

Author: gliljas

.gitignore

@@ -13,3 +13,4 @@ current-test-configuration
 NHibernate.dll
 TestResult.xml
 .vscode
+.DS_Store

.travis.yml

@@ -1,6 +1,6 @@
 language: csharp
 mono: latest
-dotnet: 2.1.2
+dotnet: 2.1.300
 sudo: required
 services:
   - mysql

CONTRIBUTING.md

@@ -12,6 +12,8 @@ Visit [https://github.com/nhibernate/nhibernate-core/issues][1] and search for y
 
 Before creating an issue, please do your best to verify the existence of the problem. This reduces noise in the issue tracker and helps conserve the resources of the team for more useful tasks. Note the issue number for future steps.
 
+If you are familiar with NHibernate inner working and want to directly fix the issue, you may also contribute a PR without writing a separated issue, provided you describe the fixed issue in the PR.
+
 ## Fork and Clone from GitHub
 
 The main GitHub repository is at [https://github.com/nhibernate/nhibernate-core][2]. If you plan to contribute your test case or improvement back to NHibernate, you should visit that page and fork the repository so you can commit your own changes and then submit a pull request. 
@@ -44,10 +46,11 @@ The main GitHub repository is at [https://github.com/nhibernate/nhibernate-core]
 In most cases, you will be adding your test to the NHibernate.Test project. If there is a test that only works with VisualBasic, then add it to the NHibernate.Test.VisualBasic project instead. 
 
 1.  Open **NHibernate.sln** from the src folder.
-2.  If adding a C# test, go to the NHSpecificTest folder in the NHibernate.Test project. If adding a VisualBasic test, go to the Issues folder in the NHibernate.Test.VisualBasic project.
-3.  Copy and paste the GH0000 folder to create a duplicate test ("Copy of GH0000").
-4.  Replace the four instances of GH0000 with your issue number.
-5.  Edit the test as you see fit. Don't commit yet; there are details in a later step.
+2.  If adding a VisualBasic test, go to the Issues folder in the NHibernate.Test.VisualBasic project. If adding a C# test, go to the NHibernate.Test project.
+3.  C# only: either find the suitable feature folder and add your test there without following the two next points, or go to the NHSpecificTest folder.
+4.  Copy and paste the GH0000 folder to create a duplicate test ("Copy of GH0000").
+5.  Replace the four instances of GH0000 with your issue number.
+6.  Edit the test as you see fit. Don't commit yet; there are details in a later step.
 
 Do not use anymore the NHxxxx naming, they match issue numbers from https://nhibernate.jira.com/
 
@@ -63,7 +66,9 @@ NHibernate has migrated its issue tracking from Jira to GitHub, and using the Ji
 4.  Select and run the test.
 5.  You can also make the test project your startup project and it will run NUnit when you press F5.
 
-### Third Party NUnit Test Runner This would be something like ReSharper. 
+### Third Party NUnit Test Runner
+
+This could be something like ReSharper.
 
 1.  Sometimes tests fail when run under x64. If required (ex. SQLite and Firebird), go to the project properties Build tab and set the target to x86.
 2.  Next, just run the tests as usual.
@@ -91,11 +96,11 @@ Please note that some tests assume a case insensitive accent sensitive database
 
 ## Submit a Pull Request
 
-If you are fixing an existing issue, please make sure to include this issue number in your GitHub pull request. 
+If you are fixing an existing issue, please make sure to include this issue number in your GitHub pull request. (Use the # prefix instead of GH for automatically having a link to it.)
 
-We use tabs for code indentation, not spaces. As this is not the default in Visual Studio, you will need to reconfigure Visual Studio to indent with tabs whenever you work on the NHibernate codebase. To make this easier, NHibernate has an [editorconfig][3] configuration file to switch Visual Studio automatically between tabs and spaces mode. It is recommended you install editorconfig from the Visual Studio Extension Manager.
+We use tabs for code indentation, not spaces. To make this easier, NHibernate has an [editorconfig][3] configuration file to switch Visual Studio automatically between tabs and spaces mode.
 
-After submitting your pull request, come back later to check the outcome of automated builds. If some have failed, they will be listed in your pull request with a link to the corresponding TeamCity build. Find out in the build which tests are newly failing, and take appropriate action. Some of those builds have many known failing tests, which does not trigger a build failure. A *Comparison.txt* file in build Artifacts may help finding which failing tests are not known failing tests and must be addressed.
+After submitting your pull request, come back later to check the outcome of automated builds. If some have failed, they will be listed in your pull request with a link to the corresponding TeamCity build. Find out in the build which tests are newly failing, and take appropriate action. Some of those builds may have known failing tests, which does not trigger a build failure. In this case a *Comparison.txt* file in build Artifacts may help finding which failing tests are not known failing tests and must be addressed.
 
 ## Further Discussion
 

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.8.2.1" targetFramework="net461" />
+  <package id="CSharpAsyncGenerator.CommandLine" version="0.8.2.6" 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.1.1.{build}
+version: 5.1.2.{build}
 image: Visual Studio 2017
 environment:
   matrix:
@@ -63,4 +63,4 @@ on_finish:
     $wc = New-Object 'System.Net.WebClient'
     Get-Item '*-TestResult.xml' | ForEach-Object { 
         $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit3/$($env:APPVEYOR_JOB_ID)", $_)
-    }
+    }

build-common/NHibernate.props

@@ -3,13 +3,16 @@
   <PropertyGroup>
     <VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
     <VersionMinor Condition="'$(VersionMinor)' == ''">1</VersionMinor>
-    <VersionPatch Condition="'$(VersionPatch)' == ''">1</VersionPatch>
+    <VersionPatch Condition="'$(VersionPatch)' == ''">2</VersionPatch>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
     <AssemblyVersion>$(VersionMajor).$(VersionMinor).0.0</AssemblyVersion>
     <FileVersion>$(VersionPrefix).0</FileVersion>
 
+    <NhAppTargetFrameworks>net461;netcoreapp2.0</NhAppTargetFrameworks>
+    <NhLibTargetFrameworks>net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
+
     <Product>NHibernate</Product>
     <Company>NHibernate.info</Company>
     <Copyright>Licensed under LGPL.</Copyright>

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

doc/reference/modules/basic_mapping.xml

@@ -2019,7 +2019,7 @@
         name="PropertyName" 
         class="ClassName"
         insert="true|false"
-        upate="true|false"
+        update="true|false"
         access="field|property|nosetter|ClassName"
         optimistic-lock="true|false">
 

doc/reference/modules/configuration.xml

@@ -1135,6 +1135,10 @@ in the parameter binding.</programlisting>
                                 configuration file, nor supplied by using <literal>Configuration.SetProperties</literal>, nor
                                 set in the <literal>hibernate.cfg.xml</literal> configuration file.
                             </para>
+                            <para>
+                                Alternatively to using the setting, a logger factory can be programmatically supplied by using
+                                <literal>NHibernateLogger.SetLoggersFactory</literal>.
+                            </para>
                             <para>
                                 <emphasis role="strong">eg.</emphasis>
                                 <literal>classname.of.LoggerFactory, assembly</literal>

doc/reference/modules/performance.xml

@@ -235,20 +235,20 @@ int accessLevel = permissions["accounts"];  // Error!]]></programlisting>
                 <literal>left join fetch</literal> in HQL. This tells NHibernate to fetch 
                 the association eagerly in the first select, using an outer join. In the
                 <literal>ICriteria</literal> query API, you would use
-                <literal>SetFetchMode(FetchMode.Join)</literal>.
+                <literal>Fetch()</literal>.
             </para>
 
             <para>
                 If you ever feel like you wish you could change the fetching strategy used by
                 <literal>Get()</literal> or <literal>Load()</literal>, simply use a 
                 <literal>ICriteria</literal> query, for example:
             </para>
-            
+
             <programlisting><![CDATA[User user = session.CreateCriteria(typeof(User))
-    .SetFetchMode("Permissions", FetchMode.Join)
+    .Fetch(SelectMode.Fetch, "Permissions")
     .Add( Expression.Eq("Id", userId) )
     .UniqueResult<User>();]]></programlisting>
-                
+
             <para>
                 (This is NHibernate's equivalent of what some <emphasis>ORM</emphasis> solutions call a "fetch plan".)
             </para>
@@ -475,7 +475,7 @@ using(var iter = session
                         <literal>NHibernateUtil.Initialize()</literal> for each collection that will
                         be needed in the web tier (this call must occur before the session is closed)
                         or retrieves the collection eagerly using a NHibernate query with a
-                        <literal>FETCH</literal> clause or a <literal>FetchMode.Join</literal> in
+                        <literal>FETCH</literal> clause or a <literal>SelectMode.Fetch</literal> in
                         <literal>ICriteria</literal>. This is usually easier if you adopt the
                         <emphasis>Command</emphasis> pattern instead of a <emphasis>Session Facade</emphasis>.
                     </para>

doc/reference/modules/query_criteria.xml

@@ -175,13 +175,13 @@ foreach ( IDictionary map in cats )
 
         <para>
             You may specify association fetching semantics at runtime using
-            <literal>SetFetchMode()</literal>.
+            <literal>Fetch()</literal>.
         </para>
 
         <programlisting><![CDATA[var cats = sess.CreateCriteria<Cat>()
     .Add( Expression.Like("Name", "Fritz%") )
-    .SetFetchMode("Mate", FetchMode.Eager)
-    .SetFetchMode("Kittens", FetchMode.Eager)
+    .Fetch(SelectMode.Fetch, "Mate")
+    .Fetch(SelectMode.Fetch, "Kittens")
     .List<Cat>();]]></programlisting>
 
         <para>

releasenotes.txt

@@ -1,4 +1,29 @@
-Build 5.1.1
+Build 5.1.2
+=============================
+
+Release notes - NHibernate - Version 5.1.2
+
+** Bug
+
+   * #1680 RowCount not working with JoinEntityAlias
+   * #1672 Generated async methods do not correctly propagate OperationCanceledException
+   * #1667 Collection initializing with zero rows after update to NH5
+   * #1660 Wrong CopyTo implementation
+   * #1650 Cannot use cache.use_sliding_expiration in hibernate.cfg.xml
+   * #1585 Hashset unsupported by SetParameterList
+   * #1355 NH-3928 - Random invalid SQL generated when using bitwise operators
+
+** Task
+
+   * #1668 Merge 5.0.5 into 5.1.x
+   * #1664 Release 5.1.2
+   * #1659 Merge 5.0.4 into 5.1.x
+
+As part of releasing 5.1.2, a missing 5.0.0 possible breaking change has been added about future queries with data
+providers not actually supporting them. See 5.0.0 possible breaking changes.
+
+
+Build 5.1.1
 =============================
 
 Release notes - NHibernate - Version 5.1.1
@@ -192,6 +217,34 @@ 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.6
+=============================
+
+Release notes - NHibernate - Version 5.0.6
+
+** Bug
+    * #1672 Generated async methods do not correctly propagate OperationCanceledException
+    * #1355 NH-3928 - Random invalid SQL generated when using bitwise operators
+
+** Task
+    * #1686 Release 5.0.6
+
+Build 5.0.5
+=============================
+
+Release notes - NHibernate - Version 5.0.5
+
+** Bug
+    * #1665 Have IFutureEnumerable.GetEnumerable executing immediatly the query
+
+Build 5.0.4
+=============================
+
+Release notes - NHibernate - Version 5.0.4
+
+** Bug
+    * #1658 Add missing cache setting
+
 Build 5.0.3
 =============================
 
@@ -303,6 +356,10 @@ Build 5.0.0
           the dialect. They resolve to 4000 length string and (28, 10) precision/scale decimals by default, and are
           trimmed down according to dialect. Those defaults can be overridden with query.default_cast_length,
           query.default_cast_precision and query.default_cast_scale settings.
+        * Future queries with data provider not actually supporting them (not supporting mutliple queries in a single
+          SQL command) are no more immediately executed at the .Future call. They are executed only when directly
+          enumerated or when their IFutureEnumerable.GetEnumerable method is called. (This aligns them with the behavior
+          of FutureValue.)
         * Dialects are now configurable. If you instantiate a dialect directly, make sure you call its Configure
           method, with as argument the properties of a NHibernate Configuration object. You may use instead
           Dialect.GetDialect methods, which configure the dialect before returning it.
@@ -531,6 +588,14 @@ Release notes - NHibernate - Version 5.0.0
     * [NH-4011] - Fix transaction scopes handling
 
 
+Build 4.1.2.GA
+=============================
+
+Release notes - NHibernate - Version 4.1.2.GA
+
+** Bug
+    * #1355 NH-3928 - Random invalid SQL generated when using bitwise operators
+
 Build 4.1.1.GA
 =============================
 

src/AsyncGenerator.yml

@@ -191,13 +191,20 @@
     preserveReturnType:
     - hasAttributeName: TestAttribute
     - hasAttributeName: TheoryAttribute
+    alwaysAwait:
+    - hasAttributeName: TestAttribute
+    - hasAttributeName: TheoryAttribute
+    - hasAttributeName: SetUpAttribute
+    - hasAttributeName: TearDownAttribute
     typeConversion:
     - conversion: Ignore
       name: ObjectAssert
     - conversion: Ignore
       name: LinqReadonlyTestsContext
     - conversion: Ignore
       name: MultiThreadRunner
+    - conversion: Ignore
+      name: PeVerifier
     - conversion: Ignore
       hasAttributeName: IgnoreAttribute
     - conversion: NewType

src/NHibernate.DomainModel/NHibernate.DomainModel.csproj

@@ -2,7 +2,7 @@
   <Import Project="../../build-common/NHibernate.props" />
   <PropertyGroup>
     <Description>The Domain Model used by the Unit Tests.</Description>
-    <TargetFrameworks>netstandard2.0;net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>$(NhLibTargetFrameworks)</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
     <NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
   </PropertyGroup>

src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj

@@ -2,7 +2,7 @@
   <Import Project="../../build-common/NHibernate.props" />
   <PropertyGroup>
     <Description>The Visual Basic Unit Tests for NHibernate.</Description>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>$(NhAppTargetFrameworks)</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
     <NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
     <OptionExplicit>On</OptionExplicit>
@@ -32,7 +32,7 @@
     <PackageReference Include="Microsoft.VisualBasic" Version="10.2.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <PackageReference Include="NUnitLite" Version="3.9.0" />
+    <PackageReference Include="NUnitLite" Version="3.10.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NHibernate\NHibernate.csproj" />

src/NHibernate.Test/Async/CacheTest/CacheFixture.cs

@@ -22,9 +22,9 @@ namespace NHibernate.Test.CacheTest
 	public class CacheFixtureAsync
 	{
 		[Test]
-		public Task TestSimpleCacheAsync()
+		public async Task TestSimpleCacheAsync()
 		{
-			return DoTestCacheAsync(new HashtableCacheProvider());
+			await (DoTestCacheAsync(new HashtableCacheProvider()));
 		}
 
 		private CacheKey CreateCacheKey(string text)

src/NHibernate.Test/Async/Cascade/Circle/MultiPathCircleCascadeTest.cs

@@ -155,6 +155,7 @@ public async Task MergeEntityWithNonNullableEntityNullAsync()
 					await (session.MergeAsync(route, cancellationToken));
 					Assert.Fail("should have thrown an exception");
 				}
+				catch (OperationCanceledException) { throw; }
 				catch (Exception ex)
 				{
 					Assert.That(ex, Is.TypeOf(typeof(PropertyValueException)));

src/NHibernate.Test/Async/CfgTest/ConfigurationFixture.cs

@@ -65,11 +65,9 @@ public async Task ManualConfigurationAsync()
 		/// <see cref="Configuration" /> works as intended.
 		/// </summary>
 		[Test]
-		public Task SetDefaultAssemblyAndNamespaceAsync()
+		public async Task SetDefaultAssemblyAndNamespaceAsync()
 		{
-			try
-			{
-				string hbmFromDomainModel =
+			string hbmFromDomainModel =
 				@"<?xml version='1.0' ?>
 <hibernate-mapping xmlns='urn:nhibernate-mapping-2.2'>
 	<class name='A'>
@@ -79,7 +77,7 @@ public Task SetDefaultAssemblyAndNamespaceAsync()
 	</class>
 </hibernate-mapping>";
 
-				string hbmFromTest =
+			string hbmFromTest =
 				@"<?xml version='1.0' ?>
 <hibernate-mapping xmlns='urn:nhibernate-mapping-2.2'>
 	<class name='LocatedInTestAssembly' lazy='false'>
@@ -89,23 +87,18 @@ public Task SetDefaultAssemblyAndNamespaceAsync()
 	</class>
 </hibernate-mapping>";
 
-				Configuration cfg = new Configuration();
-				cfg
+			Configuration cfg = new Configuration();
+			cfg
 				.SetDefaultAssembly("NHibernate.DomainModel")
 				.SetDefaultNamespace("NHibernate.DomainModel")
 				.AddXmlString(hbmFromDomainModel);
 
-				cfg
+			cfg
 				.SetDefaultAssembly("NHibernate.Test")
 				.SetDefaultNamespace(typeof(LocatedInTestAssembly).Namespace)
 				.AddXmlString(hbmFromTest);
 
-				return cfg.BuildSessionFactory().CloseAsync();
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<object>(ex);
-			}
+			await (cfg.BuildSessionFactory().CloseAsync());
 		}
 
 		public class SampleQueryProvider : DefaultQueryProvider