Merge branch 'master' into gh-2129

Author: hazzik

.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,5 +1,6 @@
+dist: trusty
 language: csharp
-mono: latest
+mono: none
 dotnet: 2.1.300
 sudo: required
 services:

README.md

@@ -11,7 +11,7 @@ including [howtos][A1], [blogs][A2] and [reference documentation][A3].
 [A2]: http://nhibernate.info/blog/
 [A3]: http://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 
@@ -22,6 +22,24 @@ Alternatively binaries are available from SourceForge at <http://sourceforge.net
 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
 ----------------
 

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.7.0\tools\GitReleaseManager.exe create -o nhibernate -r nhibernate-core -m 5.1 -u username -p password
 
     (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,11 +178,11 @@ testRun(){
 }
 
 generateAsync(){
-	dotnet msbuild /t:Restore ./src/NHibernate.sln
+	dotnet restore ./src/NHibernate.sln
 
 	getAsyncGeneratorPath
 	cd src
-	mono ../"$async_generator_path"
+	dotnet ../"$async_generator_path"
 	cd ..
 
 	mainMenu
@@ -191,27 +196,15 @@ getAsyncGeneratorPath(){
 
 	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"
+	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
-		mono nuget.exe install
+		dotnet restore "./packages.csproj" --packages .
 	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"
-
+	async_generator_path="Tools/$async_generator_path/netcoreapp2.1/AsyncGenerator.CommandLine.dll"
 	cd ..
 }
 

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.config

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="**\*" />
+    <EmbeddedResource Remove="**\*" />
+    <None Remove="**\*" />
+  </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.7.0" />
+  </ItemGroup>
+  
+</Project>

Tools/packages.csproj

@@ -1,4 +1,4 @@
-version: 5.2.5.{build}
+version: '{build}'
 image: Visual Studio 2017
 environment:
   matrix:

appveyor.yml

@@ -1,16 +1,17 @@
 <Project>
-  <Import Project="DotNetSdkMono.props" />
   <Import Condition="Exists('NHibernate.dev.props')" Project="NHibernate.dev.props"/>
 
   <PropertyGroup>
-    <VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
-    <VersionMinor Condition="'$(VersionMinor)' == ''">2</VersionMinor>
-    <VersionPatch Condition="'$(VersionPatch)' == ''">5</VersionPatch>
-    <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
+    <NhVersion     Condition="'$(NhVersion)' == ''"    >5.3</NhVersion>
+    <VersionPatch  Condition="'$(VersionPatch)'  == ''">0</VersionPatch>
+    <!-- Clear VersionSuffix for making release and set it to dev for making development builds -->
+    <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
 
-    <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
-    <AssemblyVersion>$(VersionMajor).$(VersionMinor).0.0</AssemblyVersion>
-    <FileVersion>$(VersionPrefix).0</FileVersion>
+    <VersionPrefix Condition="'$(VersionPrefix)' == ''">$(NhVersion).$(VersionPatch)</VersionPrefix>
+    <VersionSuffix Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
+    <AssemblyVersion>$(NhVersion).0.0</AssemblyVersion>
+    <FileVersion Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionPrefix).$(BuildNumber)</FileVersion>
+    <FileVersion Condition="'$(FileVersion)' == ''">$(VersionPrefix).0</FileVersion>
 
     <NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net461;netcoreapp2.0</NhAppTargetFrameworks>
     <NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
@@ -28,7 +29,8 @@
     <PackageIconUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/logo/NHibernate-NuGet.png</PackageIconUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
-    <PackageReleaseNotes>https://github.com/nhibernate/nhibernate-core/blob/$(VersionPrefix)/releasenotes.txt</PackageReleaseNotes>
+    <PackageReleaseNotes Condition="'$(VersionSuffix)' == ''">https://github.com/nhibernate/nhibernate-core/blob/$(VersionPrefix)/releasenotes.txt</PackageReleaseNotes>
+    <PackageReleaseNotes Condition="'$(PackageReleaseNotes)' == ''">This is development version for testing purposes only</PackageReleaseNotes>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -38,4 +40,7 @@
 
     <DisableImplicitPackageTargetFallback>True</DisableImplicitPackageTargetFallback>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all" />
+  </ItemGroup>
 </Project>