avoid regex; avoid dirty workspace

Author: bahusoid

.gitignore

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

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

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>

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