Merge branch 'master' into travis-xenial

Author: hazzik

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "csharpasyncgenerator.tool": {
+      "version": "0.19.1",
+      "commands": [
+        "async-generator"
+      ]
+    }
+  }
+}

.github/dependabot.yml

@@ -0,0 +1,20 @@
+version: 2
+updates:
+- package-ecosystem: nuget
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: Microsoft.AspNetCore
+    versions:
+    - "> 2.0.0"
+  - dependency-name: Microsoft.AspNetCore.Mvc
+    versions:
+    - "> 2.0.0"
+  - dependency-name: Microsoft.AspNetCore.Mvc.Razor.ViewCompilation
+    versions:
+    - "> 2.0.0"
+  - dependency-name: Microsoft.AspNetCore.StaticFiles
+    versions:
+    - "> 2.0.0"

.travis.yml

@@ -13,9 +13,6 @@ env:
   - DB=Firebird 
   - DB=MySQL CONNECTION_STRING="Server=127.0.0.1;Uid=root;Database=nhibernate;Old Guids=True;"   
   - DB=SQLite 
-matrix:
-  allow_failures:
-    - env: DB=MySQL CONNECTION_STRING="Server=127.0.0.1;Uid=root;Database=nhibernate;Old Guids=True;"
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y powershell 

README.md

@@ -103,7 +103,7 @@ of NHibernate (in no particular order):
 [Apache Software Foundation]: http://www.apache.org
 [JetBrains]: http://www.jetbrains.com
 [ReSharper]: http://www.jetbrains.com/resharper
-[LinFu]: http://code.google.com/p/linfu
+[LinFu]: https://github.com/philiplaureano/LinFu
 [article]: http://www.codeproject.com/KB/recipes/sets.aspx
-[Relinq]: http://relinq.codeplex.com/
+[Relinq]: https://github.com/re-motion/Relinq
 [AsyncGenerator]: http://github.com/maca88/AsyncGenerator

ShowBuildMenu.sh

@@ -178,36 +178,15 @@ testRun(){
 }
 
 generateAsync(){
-	dotnet restore ./src/NHibernate.sln
-
-	getAsyncGeneratorPath
 	cd src
-	dotnet ../"$async_generator_path"
+	dotnet tool restore
+	dotnet restore ./NHibernate.sln
+	dotnet async-generator
 	cd ..
 
 	mainMenu
 }
 
-getAsyncGeneratorPath(){
-	if [ "$async_generator_path" ]
-	then
-		return
-	fi
-
-	cd Tools
-
-	async_generator_version="$(cat packages.csproj | grep Include=\"CSharpAsyncGenerator.CommandLine | cut -d\" -f4)"
-	async_generator_path="csharpasyncgenerator.commandline/$async_generator_version/tools"
-
-	if [ ! -d $async_generator_path ]
-	then
-		dotnet restore "./packages.csproj" --packages .
-	fi
-
-	async_generator_path="Tools/$async_generator_path/netcoreapp2.1/AsyncGenerator.CommandLine.dll"
-	cd ..
-}
-
 mainMenu() {
 	echo  "========================= NHIBERNATE BUILD MENU =========================="
 	echo  "--- TESTING ---"

Tools/packages.csproj

@@ -11,7 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSharpAsyncGenerator.CommandLine" Version="0.18.2" />
     <PackageReference Include="vswhere" Version="2.1.4" />
     <PackageReference Include="NUnit.Console" Version="3.10.0" />
     <PackageReference Include="GitReleaseManager" Version="0.11.0" />

appveyor.yml

@@ -13,9 +13,6 @@ environment:
 init:
     # Required for having windows endlines in sources zip
     - git config --global core.autocrlf true
-matrix:
-  allow_failures:
-  - DB: MySQL
 build: off
 before_test:
 - ps: |-

build-common/NHibernate.props

@@ -2,10 +2,10 @@
   <Import Condition="Exists('NHibernate.dev.props')" Project="NHibernate.dev.props"/>
 
   <PropertyGroup>
-    <NhVersion     Condition="'$(NhVersion)' == ''"    >5.3</NhVersion>
-    <VersionPatch  Condition="'$(VersionPatch)'  == ''">8</VersionPatch>
+    <NhVersion     Condition="'$(NhVersion)' == ''"    >5.4</NhVersion>
+    <VersionPatch  Condition="'$(VersionPatch)'  == ''">0</VersionPatch>
     <!-- Clear VersionSuffix for making release and set it to dev for making development builds -->
-    <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
+    <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
 
     <VersionPrefix Condition="'$(VersionPrefix)' == ''">$(NhVersion).$(VersionPatch)</VersionPrefix>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
@@ -42,6 +42,6 @@
     <DisableImplicitPackageTargetFallback>True</DisableImplicitPackageTargetFallback>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="all" />
   </ItemGroup>
 </Project>

build-common/common.xml

@@ -48,6 +48,9 @@
 	</target>
 
 	<target name="common.tools-restore" depends="common.init">
+		<exec workingdir="${root.dir}" program="dotnet" verbose="true">
+			<arg line="tool restore" />
+		</exec> 
 		<exec workingdir="${root.dir}/Tools" program="dotnet" verbose="true">
 			<arg line="restore ./packages.csproj --packages ." />
 		</exec> 

default.build

@@ -64,15 +64,9 @@
 		<property name="tool.path" value="${tools.dir}/${tool.id}/${tool.version}/" />
 	</target>
 
-	<target name="find-async-generator-console">
-		<property name="tool.id" value="CSharpAsyncGenerator.CommandLine" />
-		<call target="get-tool-info" />
-		<property name="async-generator-console"  value="${tool.path}tools/netcoreapp2.1/AsyncGenerator.CommandLine.dll" />
-	</target>
-
-	<target name="generate-async" depends="solution-restore find-async-generator-console">
+	<target name="generate-async" depends="solution-restore">
 		<exec workingdir="${root.dir}/src" program="dotnet" verbose="true">
-			<arg line=".${async-generator-console}" />
+			<arg line="async-generator" />
 		</exec> 
 	</target>
 

src/AsyncGenerator.yml

@@ -60,8 +60,12 @@
       name: BestGuessEntityName
       containingTypeName: ISessionImplementor
     - conversion: Ignore
-      name: Contains
+      name: CloseSessionFromSystemTransaction
       containingTypeName: ISessionImplementor
+# TODO 6.0: Remove ignore rule for IStatelessSession.Close
+    - conversion: Ignore
+      name: Close
+      containingTypeName: IStatelessSession
     - conversion: Ignore
       name: GetUnsavedVersionValue
       containingTypeName: UnsavedValueFactory
@@ -287,6 +291,7 @@ methodRules:
   - containingType: NHibernate.Linq.DmlExtensionMethods
   - containingType: NHibernate.Linq.InsertBuilder<TSource, TTarget>
   - containingType: NHibernate.Linq.UpdateBuilder<TSource>
+  - containingType: NHibernate.Multi.IQueryBatch 
   name: PubliclyExposedType
 - filters:
   - hasAttributeName: ObsoleteAttribute

src/NHibernate.Config.Templates/MySql.cfg.xml

@@ -9,7 +9,7 @@ for your own use before compile tests in VisualStudio.
 		<property name="connection.driver_class">NHibernate.Driver.MySqlDataDriver</property>
 		<property name="connection.connection_string">
 			Database=nhibernate;Data Source=localhost;User Id=nhibernate;Password=;
-			Protocol=memory;Old Guids=True;
+			Old Guids=True;
 		</property>
 		<property name="dialect">NHibernate.Dialect.MySQL5Dialect</property>
 	</session-factory>

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

@@ -32,13 +32,13 @@
     <None Include="..\NHibernate.Test\App.config" Link="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
-    <PackageReference Include="Microsoft.VisualBasic" Version="10.2.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <PackageReference Include="NUnitLite" Version="3.12.0" />
+    <PackageReference Include="NUnitLite" Version="3.13.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NHibernate\NHibernate.csproj" />

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

@@ -1112,7 +1112,7 @@ public async Task QueryCacheTestAsync()
 
 				using (var t = s.BeginTransaction())
 				{
-					await (queries.ExecuteAsync(CancellationToken.None));
+					await (queries.ExecuteAsync());
 					await (t.CommitAsync());
 				}
 
@@ -1127,24 +1127,24 @@ public async Task QueryCacheTestAsync()
 				// Run a second time, to test the query cache
 				using (var t = s.BeginTransaction())
 				{
-					await (queries.ExecuteAsync(CancellationToken.None));
+					await (queries.ExecuteAsync());
 					await (t.CommitAsync());
 				}
 
 				Assert.That(
-					await (queries.GetResultAsync<ReadOnly>(0, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadOnly>(0)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name1), "q1");
 				Assert.That(
-					await (queries.GetResultAsync<ReadOnly>(1, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadOnly>(1)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name2), "q2");
 				Assert.That(
-					await (queries.GetResultAsync<ReadWrite>(2, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadWrite>(2)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadWrite.Name)).EqualTo(name3), "q3");
 				Assert.That(
-					await (queries.GetResultAsync<ReadWrite>(3, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadWrite>(3)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadWrite.Name)).EqualTo(name4), "q4");
 				Assert.That(
-					await (queries.GetResultAsync<ReadOnly>(4, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadOnly>(4)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name5), "q5");
 
 				Assert.That(cache.GetMultipleCalls, Has.Count.EqualTo(2), "cache GetMany secondExecution");
@@ -1174,24 +1174,24 @@ public async Task QueryCacheTestAsync()
 				// Run a third time, to re-test the query cache
 				using (var t = s.BeginTransaction())
 				{
-					await (queries.ExecuteAsync(CancellationToken.None));
+					await (queries.ExecuteAsync());
 					await (t.CommitAsync());
 				}
 
 				Assert.That(
-					await (queries.GetResultAsync<ReadOnly>(0, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadOnly>(0)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name1), "q1 after update");
 				Assert.That(
-					await (queries.GetResultAsync<ReadOnly>(1, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadOnly>(1)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name2), "q2 after update");
 				Assert.That(
-					await (queries.GetResultAsync<ReadWrite>(2, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadWrite>(2)),
 					Has.Count.EqualTo(0), "q3 after update");
 				Assert.That(
-					await (queries.GetResultAsync<ReadWrite>(3, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadWrite>(3)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadWrite.Name)).EqualTo(name4), "q4 after update");
 				Assert.That(
-					await (queries.GetResultAsync<ReadOnly>(4, CancellationToken.None)),
+					await (queries.GetResultAsync<ReadOnly>(4)),
 					Has.Count.EqualTo(1).And.One.Property(nameof(ReadOnly.Name)).EqualTo(name5), "q5 after update");
 
 				Assert.That(cache.GetMultipleCalls, Has.Count.EqualTo(3), "cache GetMany thirdExecution");

src/NHibernate.Test/Async/Criteria/CriteriaQueryTest.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using NHibernate.Dialect;
 using NHibernate.Criterion;
 using NHibernate.Linq;
@@ -2085,6 +2086,64 @@ public async Task RestrictionOnSubclassCollectionAsync()
 			s.Close();
 		}
 
+		//NH-2239 (GH-1075) - Wrong OrderBy in generated SQL
+		[Test]
+		public async Task OrderByAndOrderedCollectionAsync()
+		{
+			var reptile1 = new Reptile { SerialNumber = "9" };
+			var reptile2 = new Reptile { SerialNumber = "8" };
+			var reptile3 = new Reptile { SerialNumber = "7" };
+			var reptile4 = new Reptile { SerialNumber = "6" };
+			var reptile5 = new Reptile { SerialNumber = "5" };
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				await (s.SaveAsync(reptile5));
+				await (s.SaveAsync(reptile1));
+				await (s.SaveAsync(reptile2));
+				await (s.SaveAsync(reptile3));
+				await (s.SaveAsync(reptile4));
+
+				reptile1.AddOffspring(reptile4);
+				reptile1.AddOffspring(reptile2);
+				reptile4.Father = reptile3;
+				reptile2.Father = reptile4;
+				reptile1.Father = reptile5;
+				reptile3.AddOffspring(reptile1);
+
+				await (t.CommitAsync());
+			}
+
+			using(var s = OpenSession())
+			{
+				var list = await (s.CreateCriteria(typeof(Reptile))
+							.Fetch(SelectMode.Fetch, "offspring")
+							.AddOrder(Order.Asc("serialNumber"))
+							.SetResultTransformer(Transformers.DistinctRootEntity)
+							.ListAsync<Reptile>());
+
+				var expectedList = list.OrderBy(x => x.SerialNumber).ToList();
+
+				Assert.That(list.Count, Is.EqualTo(5));
+				CollectionAssert.AreEqual(expectedList, list);
+
+				var mother = expectedList.Last();
+				Assert.That(NHibernateUtil.IsInitialized(mother.Offspring), Is.True);
+
+				var expectedAssociationList = mother.Offspring.OrderBy(r => r.Father.Id).ToList();
+				Assert.That(expectedAssociationList.Count, Is.EqualTo(2));
+				CollectionAssert.AreEqual(expectedAssociationList, mother.Offspring);
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				await (s.DeleteAsync("from Reptile"));
+				await (t.CommitAsync());
+			}
+		}
+
 		[Test]
 		public async Task ClassPropertyAsync()
 		{
@@ -2441,6 +2500,22 @@ public async Task SubcriteriaJoinTypesAsync()
 			session.Close();
 		}
 
+		public class NotMappedEntity
+		{
+			public  virtual  int Id { get; set; }
+			public  virtual  string Name { get; set; }
+		}
+
+		[Test]
+		public void CriteriaOnNotMappedEntityAsync()
+		{
+			using (ISession session = OpenSession())
+			{
+				Assert.ThrowsAsync<QueryException>(
+					() => session.CreateCriteria(typeof(NotMappedEntity)).ListAsync());
+			}
+		}
+
 		[Test]
 		public void TypeMismatchAsync()
 		{