Merge branch 'master' into NH-3848_HQL

Author: hazzik

.editorconfig

@@ -30,3 +30,6 @@ indent_size = 2
 [*.cshtml]
 indent_style = space
 indent_size = 4
+
+[*.g]
+indent_style = tab

appveyor.yml

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

build-common/NHibernate.props

@@ -2,8 +2,8 @@
   <Import Project="DotNetSdkMono.props" />
   <PropertyGroup>
     <VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
-    <VersionMinor Condition="'$(VersionMinor)' == ''">1</VersionMinor>
-    <VersionPatch Condition="'$(VersionPatch)' == ''">3</VersionPatch>
+    <VersionMinor Condition="'$(VersionMinor)' == ''">2</VersionMinor>
+    <VersionPatch Condition="'$(VersionPatch)' == ''">1</VersionPatch>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>

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

doc/reference/master.xml

@@ -39,7 +39,7 @@
 	<bookinfo>
 		<title>NHibernate - Relational Persistence for Idiomatic .NET</title>
 		<subtitle>NHibernate Reference Documentation</subtitle>
-		<releaseinfo>5.1</releaseinfo>
+		<releaseinfo>5.2</releaseinfo>
 	</bookinfo>
 
 	<toc />