Merge branch 'master' of https://github.com/nhibernate/nhibernate-core into customsql

Author: ggeurts

ReleaseProcedure.txt

@@ -0,0 +1,42 @@
+These are the tasks typically needed to create an official NHibernate release.
+
+
+  * In Jira, make sure no open issues have "fix version" set to the release
+    that is about to happen (as these will show in the release notes).
+  
+  * Update releasenotes.txt with list of issues from Jira's Release Notes
+    feature. See if any additions to the list of "known breaking changes"
+    are necessary.
+	
+  * Check/update version number in build-common/common.xml.
+  
+  * Don't forget to commit the above.
+  
+  * Perform the release build including running all tests (GaRelease.bat or
+    ShowBuildMenu.bat).
+	
+  * If no error or other issue requiring further changes occured, tag the
+    current git HEAD with a tag according to version number. Don't forget to
+	push the tag to github.
+	
+  * Upload binary and source zip files to SourceForge. Update the "latest
+    release".
+
+  * Update download link on NHForge.
+  
+  * Push nuget packages including the symbol packages.
+  
+  * In Jira, mark the version as released.
+  
+  * Post release announcement to nhusers, nhibernate-development and as
+    project news on SourceForge.
+	
+	
+  * 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.
+
+
+  * Several weeks or months after the release, in Jira, we will assume all
+    issues resolved in the release have been verified. Go ahead and close
+    them.

Tools/NuGet.exe

@@ -208,8 +208,8 @@
 		<property overwrite="false" name="assembly.product" value="${project::get-name()}" />
 		<property overwrite="false" name="assembly.company" value="${project.company}" />
 		<property overwrite="false" name="assembly.title" value="${project::get-name()}" />
-		<property overwrite="false" name="assembly.version" value="${project.version.numeric}" />
-		<property overwrite="false" name="assembly.version.informational" value="${project.version.numeric}" />
+		<property overwrite="false" name="assembly.version" value="${project.default-assembly-version}" />
+		<property overwrite="false" name="assembly.version.informational" value="${project.version}" />
 		<property overwrite="false" name="assembly.version.file" value="${project.version.numeric}" />
 		<property overwrite="false" name="assembly.copyright" value="Licensed under LGPL." />
 		<property overwrite="false" name="assembly.sign" value="${sign}" />

build-common/common-project.xml

@@ -67,6 +67,10 @@
 	-->
 
 	<property name="project.version" value="3.4.0.Alpha1" overwrite="false" />
+	
+	<!-- This version number should be changed if, but only if, there are incompatible
+	     changes compared to the previous version. -->
+	<property name="project.default-assembly-version" value="3.4.0.1000" overwrite="false" />
 
 	<!-- Compute short project version (major.minor) using a regex -->
 	<regex input="${project.version}" pattern="^(?'shortversion'\d+\.\d+)" />

build-common/common.xml

@@ -0,0 +1,12 @@
+The NHibernate logo seems to have been choosen in a logo contest that took
+place sometime before 2008. Though there seems to have been some amount of
+confusion, this thread from 2008-04-03 seems to agree on this:
+https://groups.google.com/forum/?fromgroups=#!topic/nhibernate-development/iG72nfvI_g4
+
+According to this, the choosen logo was contributed by Andrew Mayorov. The file
+he posted in that thread is the one archived in the "old" folder.
+
+In the same thread, we also learn that the animal is a "dormouse", which is
+known for its habit of long hibernation periods.
+
+/ As understood by Oskar Berggren, 2012-10-20