Merge branch '3.3.3.x' into 3.3.x

Author: oskarb

build-common/common.xml

@@ -66,7 +66,7 @@
 		effectively SP0).
 	-->
 
-	<property name="project.version" value="3.3.3.GA" overwrite="false" />
+	<property name="project.version" value="3.3.3.SP1" overwrite="false" />
 
 	<!-- This version number should be changed if, but only if, there are incompatible
 	     changes compared to the previous version. -->
@@ -105,7 +105,11 @@
 					
 					string qualifier = matches.Groups["qualifier"].Value;
 					
+					// For official releases we must use a completely numeric version.
+					// For pre-releases, the alphanumerics should be retained, to make Nuget
+					// understand it's a pre-release.
 					if (qualifier == "GA") return ToNumericVersion(version);
+					if (qualifier == "SP") return ToNumericVersion(version);
 					
 					return String.Concat(
 						String.Join(".", new string[] { matches.Groups["major"].Value, matches.Groups["minor"].Value, matches.Groups["build"].Value }),

releasenotes.txt

@@ -1,3 +1,12 @@
+Build 3.3.3.SP1
+=============================
+
+Fixes for regressions introduced in the 3.3.3 cycle.
+
+** Bug
+    * [NH-3429] - Exception when debug logging is enabled when using a linq expression that requires a proxy class.
+    * [NH-3436] - Linq-Query with IList<X>.Contains fails with NotSupportedException(The constant for 'System.Collections.Generic.List`1[System.Guid]' is not supported) at HqlTreeBuilder.Constant
+
 Build 3.3.3.GA
 =============================