From 03d9ab790e9135076cbc63a419318c35b4511153 Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Fri, 18 Oct 2019 22:32:10 +0300
Subject: [PATCH 01/16] Add dev build version suffix

---
 build-common/NHibernate.props | 14 +++++---------
 default.build                 |  1 +
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props
index e8b47ec9e69..5f9bbbbec14 100644
--- a/build-common/NHibernate.props
+++ b/build-common/NHibernate.props
@@ -2,14 +2,9 @@
   <Import Condition="Exists('NHibernate.dev.props')" Project="NHibernate.dev.props"/>
 
   <PropertyGroup>
-    <VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
-    <VersionMinor Condition="'$(VersionMinor)' == ''">2</VersionMinor>
-    <VersionPatch Condition="'$(VersionPatch)' == ''">7</VersionPatch>
-    <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
-
-    <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
-    <AssemblyVersion>$(VersionMajor).$(VersionMinor).0.0</AssemblyVersion>
-    <FileVersion>$(VersionPrefix).0</FileVersion>
+    <VersionPrefix Condition="'$(VersionPrefix)' == ''">5.3</VersionPrefix>
+    <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
+    <VersionSuffix Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
 
     <NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net461;netcoreapp2.0</NhAppTargetFrameworks>
     <NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
@@ -27,7 +22,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>
diff --git a/default.build b/default.build
index a65ecd04d78..c15384353da 100644
--- a/default.build
+++ b/default.build
@@ -39,6 +39,7 @@
 			<arg value="/p:IncludeSymbols=&quot;True&quot;" />
 			<arg value="/p:IncludeSource=&quot;True&quot;" />
 			<arg value="/p:PackageOutputPath=&quot;${path::get-full-path(nuget.nupackages.dir)}&quot;" />
+			<arg value="/p:BuildNumber=&quot;${build.counter}&quot;" />
 			<arg value="/t:Restore" />
 			<arg value="/t:Rebuild" />
 			<arg value="/v:q" />

From af29e0e5dc0c78125961b8abe16b956876c873f5 Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Sat, 19 Oct 2019 10:28:06 +0300
Subject: [PATCH 02/16] Commented and try to get project.version from project

---
 build-common/common.xml | 19 ++++++++++++++-----
 default.build           |  3 ++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/build-common/common.xml b/build-common/common.xml
index 21ad81ae444..04b37a542c0 100644
--- a/build-common/common.xml
+++ b/build-common/common.xml
@@ -11,15 +11,24 @@
 	<!-- Path to the folder that contain the external assemblies -->
 	<property name="lib.dir" value="lib" dynamic="true" />
 
-	<!-- This is used only for build folder -->
-	<!-- TODO: Either remove or refactor to use NHibernate.props -->
-	<property name="project.version" value="5.2.7" overwrite="false" />
-	<property name="project.version.numeric" value="5.2.7" overwrite="false" />
+  <!-- This is used only for build folder -->
+  <target name="get-project-version">
+    <xmlpeek
+      file="${root.dir}/src/NHibernate/NHibernate.csproj"
+    xpath="/Project/PropertyGroup/VersionPrefix"
+    property="version.prefix" />
+    <xmlpeek
+      file="${root.dir}/src/NHibernate/NHibernate.csproj"
+    xpath="/Project/PropertyGroup/VersionSuffix"
+    property="version.suffix" />
+    <property name="project.version" value="${version.prefix}" if="${version.suffix == ''}" />
+    <property name="project.version" value="${version.prefix}-${version.suffix}" unless="${version.suffix == ''}"/>
+  </target>
 
 	<!-- properties used to connect to database for testing -->
 	<include buildfile="nhibernate-properties.xml" />
 
-	<target name="common.init" description="Initializes build properties">
+	<target name="common.init" depends="get-project-version" description="Initializes build properties">
 		<property name="project.config" value="debug" overwrite="false" />
 		<property name="build.name" value="NHibernate-${project.version}" if="${project.config == 'release'}"/>
 		<property name="build.name" value="NHibernate-${project.version}-${project.config}" unless="${project.config == 'release'}" />
diff --git a/default.build b/default.build
index c15384353da..25e997dc49f 100644
--- a/default.build
+++ b/default.build
@@ -39,7 +39,8 @@
 			<arg value="/p:IncludeSymbols=&quot;True&quot;" />
 			<arg value="/p:IncludeSource=&quot;True&quot;" />
 			<arg value="/p:PackageOutputPath=&quot;${path::get-full-path(nuget.nupackages.dir)}&quot;" />
-			<arg value="/p:BuildNumber=&quot;${build.counter}&quot;" />
+			<!-- build.counter is not avaialbe by default. It needs to be exposed in Team City as system paramter system.build.counter with value %build.counter% -->
+			<arg value="/p:BuildNumber=&quot;${build.counter}&quot;" if="${property::exists('build.counter')}" />
 			<arg value="/t:Restore" />
 			<arg value="/t:Rebuild" />
 			<arg value="/v:q" />

From 08f02dcb020b1852377858bc0112341f8dfcadf1 Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Sat, 19 Oct 2019 10:43:22 +0300
Subject: [PATCH 03/16] Try to fix project.version

---
 build-common/common.xml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/build-common/common.xml b/build-common/common.xml
index 04b37a542c0..866c2174d2d 100644
--- a/build-common/common.xml
+++ b/build-common/common.xml
@@ -14,15 +14,10 @@
   <!-- This is used only for build folder -->
   <target name="get-project-version">
     <xmlpeek
-      file="${root.dir}/src/NHibernate/NHibernate.csproj"
-    xpath="/Project/PropertyGroup/VersionPrefix"
-    property="version.prefix" />
-    <xmlpeek
-      file="${root.dir}/src/NHibernate/NHibernate.csproj"
-    xpath="/Project/PropertyGroup/VersionSuffix"
-    property="version.suffix" />
-    <property name="project.version" value="${version.prefix}" if="${version.suffix == ''}" />
-    <property name="project.version" value="${version.prefix}-${version.suffix}" unless="${version.suffix == ''}"/>
+      file="${root.dir}/build-common/NHibernate.props"
+      xpath="/Project/PropertyGroup/VersionPrefix"
+      property="version.prefix" />
+    <property name="project.version" value="${version.prefix}" />
   </target>
 
 	<!-- properties used to connect to database for testing -->

From b94867457de44d7b38b3b8a49a88cc0bd87ab9b6 Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Sat, 19 Oct 2019 11:34:06 +0300
Subject: [PATCH 04/16] Try to handle missing build.counter

---
 default.build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/default.build b/default.build
index 25e997dc49f..23f5f839c48 100644
--- a/default.build
+++ b/default.build
@@ -29,6 +29,7 @@
 	<target name="build"
 		depends="init prepare-build-directory nuget.set-properties"
 		description="Builds NHibernate in the current configuration">
+		<property name="build.counter" value="" overwrite="false" />
 
 		<exec program="dotnet" verbose="true">
 			<arg value="msbuild" />
@@ -39,8 +40,8 @@
 			<arg value="/p:IncludeSymbols=&quot;True&quot;" />
 			<arg value="/p:IncludeSource=&quot;True&quot;" />
 			<arg value="/p:PackageOutputPath=&quot;${path::get-full-path(nuget.nupackages.dir)}&quot;" />
-			<!-- build.counter is not avaialbe by default. It needs to be exposed in Team City as system paramter system.build.counter with value %build.counter% -->
-			<arg value="/p:BuildNumber=&quot;${build.counter}&quot;" if="${property::exists('build.counter')}" />
+			<!-- build.counter is not available by default. It needs to be exposed in Team City as system parameter system.build.counter with value %build.counter% -->
+			<arg value="/p:BuildNumber=&quot;${build.counter}&quot;" />
 			<arg value="/t:Restore" />
 			<arg value="/t:Rebuild" />
 			<arg value="/v:q" />

From 9433e9ab8a1fd21d772d862652ff3dfff1c8a8e3 Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Sat, 19 Oct 2019 13:31:27 +0300
Subject: [PATCH 05/16] Nuke HelpFileVersion and skip empty BuildNumber msbuild
 param

---
 default.build                    | 2 +-
 doc/NHibernate.shfbproj.template | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/default.build b/default.build
index 23f5f839c48..c1d3244936f 100644
--- a/default.build
+++ b/default.build
@@ -41,7 +41,7 @@
 			<arg value="/p:IncludeSource=&quot;True&quot;" />
 			<arg value="/p:PackageOutputPath=&quot;${path::get-full-path(nuget.nupackages.dir)}&quot;" />
 			<!-- build.counter is not available by default. It needs to be exposed in Team City as system parameter system.build.counter with value %build.counter% -->
-			<arg value="/p:BuildNumber=&quot;${build.counter}&quot;" />
+			<arg value="/p:BuildNumber=&quot;${build.counter}&quot;" unless="${build.counter == ''}" />
 			<arg value="/t:Restore" />
 			<arg value="/t:Rebuild" />
 			<arg value="/v:q" />
diff --git a/doc/NHibernate.shfbproj.template b/doc/NHibernate.shfbproj.template
index 3e8e83d2363..bdfd2498951 100644
--- a/doc/NHibernate.shfbproj.template
+++ b/doc/NHibernate.shfbproj.template
@@ -23,7 +23,6 @@
     <FeedbackEMailLinkText>nhibernate team</FeedbackEMailLinkText>
     <HelpTitle>NHibernate API Reference</HelpTitle>
     <IndentHtml>False</IndentHtml>
-    <HelpFileVersion>${project.version.numeric}</HelpFileVersion>
     <DocumentationSources>
       <DocumentationSource sourceFile="${root.dir}/src/NHibernate/bin/${build.config}/net461/NHibernate.dll" />
       <DocumentationSource sourceFile="${root.dir}/src/NHibernate/bin/${build.config}/net461/Nhibernate.xml" />

From 504f5c1c78634a33e793426e4ae66043a2c201ea Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Sat, 19 Oct 2019 20:46:20 +0300
Subject: [PATCH 06/16] Restore HelpFileVersion for API docs

---
 build-common/common.xml          | 2 +-
 default.build                    | 2 +-
 doc/NHibernate.shfbproj.template | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build-common/common.xml b/build-common/common.xml
index 866c2174d2d..6a6c052408e 100644
--- a/build-common/common.xml
+++ b/build-common/common.xml
@@ -11,7 +11,7 @@
 	<!-- Path to the folder that contain the external assemblies -->
 	<property name="lib.dir" value="lib" dynamic="true" />
 
-  <!-- This is used only for build folder -->
+  <!-- This is used for build folder and also for "API Reference" docs (not active task, see doc/NHibernate.shfbproj.template) -->
   <target name="get-project-version">
     <xmlpeek
       file="${root.dir}/build-common/NHibernate.props"
diff --git a/default.build b/default.build
index c1d3244936f..01c9b8f4a65 100644
--- a/default.build
+++ b/default.build
@@ -2,7 +2,7 @@
 <project 
 	name="NHibernate" 
 	default="build"
-	xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd"
+	xmlns="http://nant.sf.net/release/0.90/nant.xsd"
 >
 
 	<property name="root.dir" value="." />
diff --git a/doc/NHibernate.shfbproj.template b/doc/NHibernate.shfbproj.template
index bdfd2498951..07367f2bd53 100644
--- a/doc/NHibernate.shfbproj.template
+++ b/doc/NHibernate.shfbproj.template
@@ -23,6 +23,7 @@
     <FeedbackEMailLinkText>nhibernate team</FeedbackEMailLinkText>
     <HelpTitle>NHibernate API Reference</HelpTitle>
     <IndentHtml>False</IndentHtml>
+    <HelpFileVersion>${project.version}</HelpFileVersion>
     <DocumentationSources>
       <DocumentationSource sourceFile="${root.dir}/src/NHibernate/bin/${build.config}/net461/NHibernate.dll" />
       <DocumentationSource sourceFile="${root.dir}/src/NHibernate/bin/${build.config}/net461/Nhibernate.xml" />

From 47e92b1e79ee25444e30109f8fd04e26d01001e9 Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Sun, 20 Oct 2019 21:17:20 +0300
Subject: [PATCH 07/16] Update VersionPrefix to 5.3.0

---
 build-common/NHibernate.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props
index 5f9bbbbec14..8b8eaea3875 100644
--- a/build-common/NHibernate.props
+++ b/build-common/NHibernate.props
@@ -2,7 +2,7 @@
   <Import Condition="Exists('NHibernate.dev.props')" Project="NHibernate.dev.props"/>
 
   <PropertyGroup>
-    <VersionPrefix Condition="'$(VersionPrefix)' == ''">5.3</VersionPrefix>
+    <VersionPrefix Condition="'$(VersionPrefix)' == ''">5.3.0</VersionPrefix>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
 

From 055bb2e6534a8b4371e0f326a018118d95240497 Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Mon, 27 Apr 2020 12:58:21 +0300
Subject: [PATCH 08/16] Remove version from appveyor. Update release procedure

---
 ReleaseProcedure.txt          | 7 ++++---
 appveyor.yml                  | 2 +-
 build-common/NHibernate.props | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ReleaseProcedure.txt b/ReleaseProcedure.txt
index 82ebcc510db..51fffb8b62d 100644
--- a/ReleaseProcedure.txt
+++ b/ReleaseProcedure.txt
@@ -25,9 +25,10 @@ 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.
+    Check/update version in master.xml under doc\reference folder in the NHibernate root.
+    NOTE: This paragraph is changed for 5.3 - if you are releasing earlier version please check instruction from appropriate branch   
 
   * Don't forget to commit the above.
 
diff --git a/appveyor.yml b/appveyor.yml
index 16e62c4e3be..23104e100e3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 5.2.7.{build}
+version: {build}
 image: Visual Studio 2017
 environment:
   matrix:
diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props
index 8b8eaea3875..950690ec666 100644
--- a/build-common/NHibernate.props
+++ b/build-common/NHibernate.props
@@ -3,7 +3,9 @@
 
   <PropertyGroup>
     <VersionPrefix Condition="'$(VersionPrefix)' == ''">5.3.0</VersionPrefix>
-    <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
+    <!-- Clear VersionSuffix for making release and set it to dev for making development builds -->
+    <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>  
+
     <VersionSuffix Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
 
     <NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net461;netcoreapp2.0</NhAppTargetFrameworks>

From 9a60c7b4ddb5204516cc8158bde34a1fc7eb6502 Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Mon, 27 Apr 2020 13:00:46 +0300
Subject: [PATCH 09/16] try to fix appveyor.yml

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 23104e100e3..771cd069dbc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: {build}
+version: '{build}'
 image: Visual Studio 2017
 environment:
   matrix:

From 88c1cc11abdffa446cb02e25057cfd07400a6114 Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Tue, 28 Apr 2020 01:53:07 +0300
Subject: [PATCH 10/16] Make assembly version as major.minor.0.0

---
 build-common/NHibernate.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props
index 950690ec666..aa94523ddb8 100644
--- a/build-common/NHibernate.props
+++ b/build-common/NHibernate.props
@@ -8,6 +8,9 @@
 
     <VersionSuffix Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
 
+    <!-- Make assembly version always as major.minor.0.0 -->
+    <AssemblyVersion>$([System.Text.RegularExpressions.Regex]::Replace($(VersionPrefix), '\.\d+$', '.0.0'))</AssemblyVersion>
+    
     <NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net461;netcoreapp2.0</NhAppTargetFrameworks>
     <NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
     <NhNetFx>false</NhNetFx>

From 35685129b3ed8022ee6d5b33069fc1b8552161f6 Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Tue, 28 Apr 2020 02:06:07 +0300
Subject: [PATCH 11/16] more accurate regex

---
 build-common/NHibernate.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props
index aa94523ddb8..80633331232 100644
--- a/build-common/NHibernate.props
+++ b/build-common/NHibernate.props
@@ -9,7 +9,7 @@
     <VersionSuffix Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
 
     <!-- Make assembly version always as major.minor.0.0 -->
-    <AssemblyVersion>$([System.Text.RegularExpressions.Regex]::Replace($(VersionPrefix), '\.\d+$', '.0.0'))</AssemblyVersion>
+    <AssemblyVersion>$([System.Text.RegularExpressions.Regex]::Replace($(VersionPrefix), '^(\d+\.\d+).+', '$1.0.0'))</AssemblyVersion>
     
     <NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net461;netcoreapp2.0</NhAppTargetFrameworks>
     <NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>

From e8de8f474b3b2b0b1c1407e939a44ea3edb9b2fd Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Tue, 28 Apr 2020 13:12:21 +0300
Subject: [PATCH 12/16] Attempt to automate doc version generation

---
 build-common/common.xml       | 7 +++++++
 doc/reference/reference.build | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/build-common/common.xml b/build-common/common.xml
index 6a6c052408e..f9d85d3a6ee 100644
--- a/build-common/common.xml
+++ b/build-common/common.xml
@@ -19,6 +19,13 @@
       property="version.prefix" />
     <property name="project.version" value="${version.prefix}" />
   </target>
+  
+  <target name="set-doc-version">
+    <xmlpoke
+      file="${root.dir}/doc/reference/master.xml"
+      xpath="/book/bookinfo/releaseinfo/text()"
+      value="${project.version}" />
+  </target>
 
 	<!-- properties used to connect to database for testing -->
 	<include buildfile="nhibernate-properties.xml" />
diff --git a/doc/reference/reference.build b/doc/reference/reference.build
index 9a07ff295bb..2a4c52aa851 100644
--- a/doc/reference/reference.build
+++ b/doc/reference/reference.build
@@ -8,7 +8,7 @@
 	<property name="root.dir" value="../.." />
 	<include buildfile="${root.dir}/build-common/common.xml" />
 
-	<target name="init" depends="common.init">
+	<target name="init" depends="common.init set-doc-version">
 		<property name="lang" value="en" />
 
 		<property name="output.dir" value="${build.dir}/doc" />

From 064a3f122593bd102574cf307dcfe911c4ecbe9a Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Tue, 28 Apr 2020 14:07:45 +0300
Subject: [PATCH 13/16] attempt 2

---
 build-common/common.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-common/common.xml b/build-common/common.xml
index f9d85d3a6ee..497dba431f6 100644
--- a/build-common/common.xml
+++ b/build-common/common.xml
@@ -23,7 +23,7 @@
   <target name="set-doc-version">
     <xmlpoke
       file="${root.dir}/doc/reference/master.xml"
-      xpath="/book/bookinfo/releaseinfo/text()"
+      xpath="/book/bookinfo/releaseinfo"
       value="${project.version}" />
   </target>
 

From 8339799a49f0a365f56c6bd844b463ef9c4e5cef Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Tue, 28 Apr 2020 14:53:27 +0300
Subject: [PATCH 14/16] Adjust ReleaseProcedure.txt

---
 ReleaseProcedure.txt             | 5 ++---
 doc/NHibernate.shfbproj.template | 4 ++--
 doc/reference/master.xml         | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ReleaseProcedure.txt b/ReleaseProcedure.txt
index 51fffb8b62d..7f7b72ff21e 100644
--- a/ReleaseProcedure.txt
+++ b/ReleaseProcedure.txt
@@ -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 NHibernate.props under
-    build-common folder. Clear VersionSuffix if present.
-    Check/update version in master.xml under doc\reference folder in the NHibernate root.
+  * Check/update version number in NHibernate.props under build-common folder.
+    Clear VersionSuffix if present.
     NOTE: This paragraph is changed for 5.3 - if you are releasing earlier version please check instruction from appropriate branch   
 
   * Don't forget to commit the above.
diff --git a/doc/NHibernate.shfbproj.template b/doc/NHibernate.shfbproj.template
index 07367f2bd53..de6d308eba5 100644
--- a/doc/NHibernate.shfbproj.template
+++ b/doc/NHibernate.shfbproj.template
@@ -18,8 +18,8 @@
     <HtmlHelpName>NHibernateAPI</HtmlHelpName>
     <HelpFileFormat>HtmlHelp1x</HelpFileFormat>
     <CopyrightText>NHibernate</CopyrightText>
-    <CopyrightHref>nhibernate.info</CopyrightHref>
-    <FeedbackEMailAddress>http://groups.google.com/group/nhibernate-development</FeedbackEMailAddress>
+    <CopyrightHref>https://nhibernate.info</CopyrightHref>
+    <FeedbackEMailAddress>https://groups.google.com/group/nhibernate-development</FeedbackEMailAddress>
     <FeedbackEMailLinkText>nhibernate team</FeedbackEMailLinkText>
     <HelpTitle>NHibernate API Reference</HelpTitle>
     <IndentHtml>False</IndentHtml>
diff --git a/doc/reference/master.xml b/doc/reference/master.xml
index 25d73df2047..23df7a16535 100644
--- a/doc/reference/master.xml
+++ b/doc/reference/master.xml
@@ -39,7 +39,7 @@
 	<bookinfo>
 		<title>NHibernate - Relational Persistence for Idiomatic .NET</title>
 		<subtitle>NHibernate Reference Documentation</subtitle>
-		<releaseinfo>5.2</releaseinfo>
+		<releaseinfo></releaseinfo>
 	</bookinfo>
 
 	<toc />

From 62b6f969fb94924ea8fd9de01a161858a15e5d16 Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Fri, 1 May 2020 09:07:31 +0300
Subject: [PATCH 15/16] avoid regex; avoid dirty workspace

---
 .gitignore                                        |  1 +
 ReleaseProcedure.txt                              |  8 +++++++-
 build-common/NHibernate.props                     | 11 ++++++-----
 build-common/common.xml                           | 13 +++++++++----
 doc/reference/{master.xml => master.template.xml} |  0
 5 files changed, 23 insertions(+), 10 deletions(-)
 rename doc/reference/{master.xml => master.template.xml} (100%)

diff --git a/.gitignore b/.gitignore
index 977afb3cb6b..678ae179fb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ TestResult.xml
 .idea/
 .vs/
 /build-common/NHibernate.dev.props
+/doc/reference/master.xml
diff --git a/ReleaseProcedure.txt b/ReleaseProcedure.txt
index 7f7b72ff21e..994d3d66f2c 100644
--- a/ReleaseProcedure.txt
+++ b/ReleaseProcedure.txt
@@ -27,7 +27,6 @@ Tools\gitreleasemanager\0.7.0\tools\GitReleaseManager.exe create -o nhibernate -
 
   * Check/update version number in NHibernate.props under build-common folder.
     Clear VersionSuffix if present.
-    NOTE: This paragraph is changed for 5.3 - if you are releasing earlier version please check instruction from appropriate branch   
 
   * 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).
diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props
index 80633331232..0af0b582015 100644
--- a/build-common/NHibernate.props
+++ b/build-common/NHibernate.props
@@ -2,15 +2,16 @@
   <Import Condition="Exists('NHibernate.dev.props')" Project="NHibernate.dev.props"/>
 
   <PropertyGroup>
-    <VersionPrefix Condition="'$(VersionPrefix)' == ''">5.3.0</VersionPrefix>
+    <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>  
+    <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
 
+    <VersionPrefix Condition="'$(VersionPrefix)' == ''">$(NhVersion).$(VersionPatch)</VersionPrefix>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
+    <AssemblyVersion>$(NhVersion).0.0</AssemblyVersion>
+    <FileVersion>$(VersionPrefix).0</FileVersion>
 
-    <!-- Make assembly version always as major.minor.0.0 -->
-    <AssemblyVersion>$([System.Text.RegularExpressions.Regex]::Replace($(VersionPrefix), '^(\d+\.\d+).+', '$1.0.0'))</AssemblyVersion>
-    
     <NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net461;netcoreapp2.0</NhAppTargetFrameworks>
     <NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
     <NhNetFx>false</NhNetFx>
diff --git a/build-common/common.xml b/build-common/common.xml
index 497dba431f6..43af878ff95 100644
--- a/build-common/common.xml
+++ b/build-common/common.xml
@@ -15,16 +15,21 @@
   <target name="get-project-version">
     <xmlpeek
       file="${root.dir}/build-common/NHibernate.props"
-      xpath="/Project/PropertyGroup/VersionPrefix"
-      property="version.prefix" />
-    <property name="project.version" value="${version.prefix}" />
+      xpath="/Project/PropertyGroup/NhVersion"
+      property="version.short" />
+    <xmlpeek
+      file="${root.dir}/build-common/NHibernate.props"
+      xpath="/Project/PropertyGroup/VersionPatch"
+      property="version.patch" />
+    <property name="project.version" value="${version.short}.${version.patch}" />
   </target>
   
   <target name="set-doc-version">
+    <copy file="${root.dir}/doc/reference/master.template.xml" tofile="${root.dir}/doc/reference/master.xml" overwrite="true" />
     <xmlpoke
       file="${root.dir}/doc/reference/master.xml"
       xpath="/book/bookinfo/releaseinfo"
-      value="${project.version}" />
+      value="${version.short}" />
   </target>
 
 	<!-- properties used to connect to database for testing -->
diff --git a/doc/reference/master.xml b/doc/reference/master.template.xml
similarity index 100%
rename from doc/reference/master.xml
rename to doc/reference/master.template.xml

From fe0dcaf629cb43147ea5708de354ecd382b9f918 Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Mon, 4 May 2020 09:35:47 +0300
Subject: [PATCH 16/16] Add buildnumber to FileVersion for dev builds

---
 build-common/NHibernate.props | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props
index 0af0b582015..38203a38b82 100644
--- a/build-common/NHibernate.props
+++ b/build-common/NHibernate.props
@@ -10,7 +10,8 @@
     <VersionPrefix Condition="'$(VersionPrefix)' == ''">$(NhVersion).$(VersionPatch)</VersionPrefix>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
     <AssemblyVersion>$(NhVersion).0.0</AssemblyVersion>
-    <FileVersion>$(VersionPrefix).0</FileVersion>
+    <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>