Update master

.config/dotnet-tools.json

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

.editorconfig

@@ -7,6 +7,13 @@ insert_final_newline = true
 indent_style = tab
 dotnet_sort_system_directives_first = true
 csharp_space_after_cast = true
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
 
 [*.xsd]
 indent_style = tab

.gitignore

@@ -18,3 +18,4 @@ TestResult.xml
 .idea/
 .vs/
 /build-common/NHibernate.dev.props
+/doc/reference/master.xml

.travis.yml

@@ -1,7 +1,8 @@
+os: linux
+dist: xenial
 language: csharp
-mono: latest
+mono: none
 dotnet: 2.1.300
-sudo: required
 services:
   - mysql
   - postgresql
@@ -12,35 +13,32 @@ 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:
-  - curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
-  - curl https://packages.microsoft.com/config/ubuntu/14.04/prod.list | sudo tee /etc/apt/sources.list.d/microsoft.list
   - sudo apt-get update -qq
   - sudo apt-get install -y powershell 
   - |-
     if [[ "$DB" == "MySQL" ]]
     then
-      echo -e '[server]\nlower_case_table_names=1' | sudo tee -a /etc/mysql/my.cnf
+      echo -e '[server]\nlower_case_table_names=1\n[mysqld]\ncharacter-set-server=utf8\ncollation-server=utf8_general_ci' | sudo tee -a /etc/mysql/my.cnf
       sudo service mysql restart
     fi
   - |-
     if [[ "$DB" == "Firebird" ]]
     then
-      sudo apt-get install -y libicu-dev libtommath-dev curl
-      curl -L -O https://github.com/FirebirdSQL/firebird/releases/download/R3_0_3/Firebird-3.0.3.32900-0.amd64.tar.gz
-      tar xzvf Firebird-3.0.3.32900-0.amd64.tar.gz
-      pushd Firebird-3.0.3.32900-0.amd64
+      sudo apt-get install -y libtommath-dev
+      # This would be required on bionic and above
+      # sudo ln -s /usr/lib/x86_64-linux-gnu/libtommath.so.1 /usr/lib/x86_64-linux-gnu/libtommath.so.0
+      wget -q https://github.com/FirebirdSQL/firebird/releases/download/R3_0_5/Firebird-3.0.5.33220-0.amd64.tar.gz
+      tar xzvf Firebird-3.0.5.33220-0.amd64.tar.gz
+      pushd Firebird-3.0.5.33220-0.amd64
         sudo ./install.sh -silent   
       popd
       export $(sudo cat /opt/firebird/SYSDBA.password | grep -v ^# | xargs)
       sudo chmod 775 /tmp/firebird
       echo -e "nhibernate = /tmp/firebird/nhibernate.fdb" | sudo tee -a /opt/firebird/databases.conf
       echo -e "AuthServer = Srp\nAuthClient = Srp\nUserManager = Srp\nWireCrypt = Enabled" | sudo tee -a /opt/firebird/firebird.conf
       sudo /opt/firebird/bin/gsec -modify SYSDBA -pw masterkey -admin yes
-      sudo service firebird restart
+      sudo systemctl restart firebird-superserver
     fi
 before_script:
   - if [[ "$DB" == "SqlServer2008" ]]; then docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=P@ssw0rd" -e "MSSQL_PID=Express" -p 1433:1433 -d --name sqlexpress microsoft/mssql-server-linux:latest; fi

HowInstall.txt

@@ -4,4 +4,4 @@ Required Bins : Minimal required assemblies to work with NHibernate
 Required for LazyLoading : 
 NHibernate 2.1 has a new important feature regarding dynamic-proxy systems for lazy-loading
 Details are available in releasenotes.txt and in this post
-http://nhibernate.info/blog/2008/11/09/nh2-1-0-bytecode-providers.html
+https://nhibernate.info/blog/2008/11/09/nh2-1-0-bytecode-providers.html

README.md

@@ -4,24 +4,42 @@ Welcome to NHibernate
 NHibernate is a mature, open source object-relational mapper for the .NET framework. It is actively developed,
 fully featured and used in thousands of successful projects.
 
-The NHibernate community website - <http://nhibernate.info> - has a range of resources to help you get started,
+The NHibernate community website - <https://nhibernate.info> - has a range of resources to help you get started,
 including [howtos][A1], [blogs][A2] and [reference documentation][A3].
 
-[A1]: http://nhibernate.info/doc/
-[A2]: http://nhibernate.info/blog/
-[A3]: http://nhibernate.info/doc/nh/en/index.html
+[A1]: https://nhibernate.info/doc/
+[A2]: https://nhibernate.info/blog/
+[A3]: https://nhibernate.info/doc/nh/en/index.html
 
-Latest Version
+Latest Release Version
 --------------
 
 The quickest way to get the latest release of NHibernate is to add it to your project using 
-NuGet (<http://nuget.org/List/Packages/NHibernate>).
+NuGet (<https://nuget.org/List/Packages/NHibernate>).
 
 Alternatively binaries are available from SourceForge at <http://sourceforge.net/projects/nhibernate>.
 
 You are encouraged to review the release notes ([releasenotes.txt](releasenotes.txt)), particularly when upgrading to a 
 later version. The release notes will generally document any breaking changes.
 
+Nightly Development Builds
+--------------------------
+
+The quickest way to get the latest development build of NHibernate is to add it to your project using 
+NuGet from MyGet feed (<https://www.myget.org/gallery/nhibernate>).
+
+In order to make life a little bit easier you can register the package source in the NuGet.Config
+file in the top folder of your project, similar to the following.
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="NHibernateDevBuilds" value="https://www.myget.org/F/nhibernate/api/v3/index.json" />
+  </packageSources>
+</configuration>
+```
+
 Community Forums
 ----------------
 
@@ -40,8 +58,8 @@ If you find any bugs, please report them using the [GitHub issue tracker][C1]. A
 test-case that demonstrates the issue is usually required. Instructions on providing a test-case
 can be found in [contributing guidelines][C3] or [here][C2].
 
-[C1]: http://github.com/nhibernate/nhibernate-core/issues
-[C2]: http://nhibernate.info/blog/2008/10/04/the-best-way-to-solve-nhibernate-bugs-submit-good-unit-test.html
+[C1]: https://github.com/nhibernate/nhibernate-core/issues
+[C2]: https://nhibernate.info/blog/2008/10/04/the-best-way-to-solve-nhibernate-bugs-submit-good-unit-test.html
 [C3]: CONTRIBUTING.md
 
 Licenses
@@ -85,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

ReleaseProcedure.txt

@@ -4,11 +4,11 @@ These are the tasks typically needed to create an official NHibernate release.
     that is about to happen (as these will show in the milestone).
 
   * Create a draft release in Github with GitReleaseManager. If you have used
-    the NHibernate build menu, it should be available in Tools\gitreleasemanage.x.x.x\
+    the NHibernate build menu, it should be available in Tools\gitreleasemanager\x.x.x\
     (change x.x.x by its current version in tools).
     By example:
 
-Tools\gitreleasemanager.0.7.0\tools\GitReleaseManager.exe create -o nhibernate -r nhibernate-core -m 5.1 -u username -p password
+Tools\gitreleasemanager\0.11.0\tools\GitReleaseManager.exe create -o nhibernate -r nhibernate-core -m 5.3 --token yourGitHubTokenWithRepoScope
 
     (Adjust the -m milestone parameter above, and add "-c branchname" if
     releasing another branch than master)
@@ -25,9 +25,8 @@ Tools\gitreleasemanager.0.7.0\tools\GitReleaseManager.exe create -o nhibernate -
     If the release tag does not match the released version with major.minor.release
     formalism, the NuGet package will have an invalid link to release notes.
 
-  * Check/update version number in common.xml and NHibernate.props under
-    build-common folder, in master.xml under doc\reference folder, and in
-    appveyor.yml in the NHibernate root.
+  * Check/update version number in NHibernate.props under build-common folder.
+    Clear VersionSuffix if present.
 
   * Don't forget to commit the above.
 
@@ -55,3 +54,10 @@ Tools\gitreleasemanager.0.7.0\tools\GitReleaseManager.exe create -o nhibernate -
   * If this was a stable branch, merge it forward to master. Perhaps some
     changes need to be edited out in the merge, but this will reduce the
     risk of some issue being left unfixed on master.
+
+  * If this was the master branch, create the stable branch for the new release, named
+    according to its version with "x" instead of its patch number. By example, "5.3.x".
+
+  * If next version is decided set it in NHibernate.props under build-common folder
+    (in most cases - increment minor version) and set VersionSuffix to "dev".
+    Commit it directly (without going through a PR).

ShowBuildMenu.bat

@@ -1,15 +1,21 @@
 @echo off
 pushd %~dp0
 
+for /f "tokens=* USEBACKQ delims= " %%i in (`findstr /c:"NUnit.Console" "Tools\packages.csproj"`) do set NUNIT_VERSION=%%i
+set NUNIT_VERSION=%NUNIT_VERSION:~51%
+set NUNIT_VERSION=%NUNIT_VERSION:" />=%
+
 set NANT="%~dp0Tools\nant\bin\NAnt.exe" -t:net-4.0
 set BUILD_TOOL_PATH=%~dp0Tools\BuildTool\bin\BuildTool.dll
 set BUILDTOOL=dotnet %BUILD_TOOL_PATH%
 set AVAILABLE_CONFIGURATIONS=%~dp0available-test-configurations
 set CURRENT_CONFIGURATION=%~dp0current-test-configuration
-set NUNIT="%~dp0Tools\NUnit.ConsoleRunner.3.7.0\tools\nunit3-console.exe"
+set NUNIT="%~dp0Tools\NUnit.ConsoleRunner\%NUNIT_VERSION%\tools\nunit3-console.exe"
 
 if not exist %BUILD_TOOL_PATH% (
-    dotnet build %~dp0Tools\BuildTool\BuildTool.sln -c Release -o bin
+    pushd %~dp0Tools\BuildTool
+    dotnet build BuildTool.sln -c Release -o bin
+    popd
 )
 
 :main-menu
@@ -182,7 +188,8 @@ SET NUNITPLATFORM=
 goto test-run
 
 :test-run
-start "nunit3-console" cmd /K %NUNIT% %NUNITPLATFORM% --agents=1 --process=separate NHibernate.nunit
+%NANT% common.tools-restore
+start "nunit3-console" cmd /K %NUNIT% %NUNITPLATFORM% --agents=1 NHibernate.nunit
 goto main-menu
 
 rem :build-test

ShowBuildMenu.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+cd "$(dirname "$0")"
+SCRIPT_PATH="$(pwd)"
 BUILD_TOOL_PATH="./Tools/BuildTool/bin/BuildTool.dll"
 BUILD_TOOL="dotnet $BUILD_TOOL_PATH"
 AVAILABLE_CONFIGURATIONS="available-test-configurations"
@@ -10,11 +12,14 @@ LIB_FILES2=""
 CURRENT_CONFIGURATION="./current-test-configuration"
 OPTION=0
 async_generator_path=""
+async_generator_version=""
 
 if [ ! -f $BUILD_TOOL_PATH ]
 then
-	dotnet build ./Tools/BuildTool/BuildTool.sln -c Release -o bin
+	cd ./Tools/BuildTool
+	dotnet build BuildTool.sln -c Release -o bin 
 fi
+cd "$SCRIPT_PATH"
 
 buildDebug(){
 	dotnet build ./src/NHibernate.sln
@@ -173,48 +178,15 @@ testRun(){
 }
 
 generateAsync(){
-	dotnet msbuild /t:Restore ./src/NHibernate.sln
-
-	getAsyncGeneratorPath
 	cd src
-	mono ../"$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
-
-	if [ ! -f nuget.exe ]
-	then
-		wget https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
-	fi
-
-	async_generator_path="CSharpAsyncGenerator.CommandLine.$(cat packages.config | grep id=\"CSharpAsyncGenerator.CommandLine | cut -d\" -f4)/tools"
-
-	if [ ! -d $async_generator_path ]
-	then
-		mono nuget.exe install
-	fi
-
-	if [ ! -f $async_generator_path/SQLitePCLRaw.core.dll ]
-	then
-		# This "hidden" dependency causes a failure under some Mono setup, add it explicitly
-		mono nuget.exe install SQLitePCLRaw.core -Version 1.0.0
-		cp SQLitePCLRaw.core.1.0.0/lib/net45/SQLitePCLRaw.core.dll $async_generator_path/
-	fi
-
-	async_generator_path="Tools/$async_generator_path/AsyncGenerator.CommandLine.exe"
-
-	cd ..
-}
-
 mainMenu() {
 	echo  "========================= NHIBERNATE BUILD MENU =========================="
 	echo  "--- TESTING ---"

Tools/.gitignore

@@ -1,6 +1,6 @@
-nuget.exe
-NUnit.*
-vswhere.*
-CSharpAsyncGenerator.CommandLine.*
-gitreleasemanager.*
-SQLitePCLRaw.core.*
+nunit.*
+vswhere/
+csharpasyncgenerator.commandline/
+gitreleasemanager/
+obj/
+microsoft.*

Tools/actual_msbuild.cmd

@@ -1,6 +1,6 @@
 @echo off
 
-for /f "usebackq tokens=*" %%i in (`%~dp0\vswhere.2.1.4\tools\vswhere -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do (
+for /f "usebackq tokens=*" %%i in (`%~dp0\vswhere\2.1.4\tools\vswhere -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do (
   set InstallDir=%%i
 )
 

Tools/packages.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="**\*" />
+    <EmbeddedResource Remove="**\*" />
+    <None Remove="**\*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="vswhere" Version="2.1.4" />
+    <PackageReference Include="NUnit.Console" Version="3.10.0" />
+    <PackageReference Include="GitReleaseManager" Version="0.11.0" />
+  </ItemGroup>
+
+</Project>

appveyor.yml

@@ -1,4 +1,4 @@
-version: 5.2.5.{build}
+version: '{build}'
 image: Visual Studio 2017
 environment:
   matrix:
@@ -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: |-
@@ -25,7 +22,7 @@ before_test:
         # Install Firebird
         New-Item -ItemType Directory -Force $FireBirdPath > $null
         Push-Location $FireBirdPath
-        Invoke-WebRequest 'https://github.com/FirebirdSQL/firebird/releases/download/R3_0_3/Firebird-3.0.3.32900-0_x64.zip' -OutFile firebird.zip
+        Invoke-WebRequest 'https://github.com/FirebirdSQL/firebird/releases/download/R3_0_5/Firebird-3.0.5.33220-0_x64.zip' -OutFile firebird.zip
         Unblock-File firebird.zip
         7z x firebird.zip
         New-Item -ItemType Directory -Force Data