Merge branch '4.0.x'

Author: hazzik

build-common/common.xml

@@ -60,7 +60,7 @@
 		effectively SP0).
 	-->
 
-	<property name="project.version" value="4.0.1.GA" overwrite="false" />
+	<property name="project.version" value="4.0.2.GA" overwrite="false" />
 
 	<!-- This version number should be changed if, but only if, there are incompatible
 	     changes compared to the previous version. -->

doc/reference/modules/performance.xml

@@ -1149,7 +1149,7 @@ sessionFactory.EvictCollection("Eg.Cat.Kittens"); //evict all kitten collections
             </para>
 
             <para>
-                one-shot-delete apply to collections mapped <literal>inverse="true"</literal>.
+                Of course, one-shot-delete does not apply to collections mapped <literal>inverse="true"</literal>.
             </para>
 
         </sect2>

lib/teamcity/firebird/NHibernate.Test.last-results.xml

@@ -1,3 +1,22 @@
+
+Build 4.0.2.GA
+=============================
+
+** Bug
+    * [NH-2779] - Session.Get() can throw InvalidCastException when log-level is set to DEBUG
+    * [NH-2782] - Linq: selecting into a new array doesn't work
+    * [NH-2831] - NH cannot load mapping assembly from GAC 
+    * [NH-3049] - Mapping by code to Field not working
+    * [NH-3222] - NHibernate Futures passes empty tuples to ResultSetTransformer
+    * [NH-3650] - ComponentAsId<T> used more than once, cache first mapping and produces  subsequently a sql select wrong
+    * [NH-3709] - Fix Reference to One Shot Delete and Inverse Collections
+    * [NH-3710] - Use of SetLockMode with DetachedCriteria causes null reference exception
+
+** Task
+    * [NH-3697] - Ignore Firebird in NHSpecificTest.NH1981
+    * [NH-3698] - NHSpecificTest.NH1989 fails for some drivers
+
+
 Build 4.0.1.GA
 =============================
 

lib/teamcity/mysql/NHibernate.Test.last-results.xml

@@ -103,5 +103,13 @@
 	</log4net>
 
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-2.6.1.12217" newVersion="2.6.1.12217"/>
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
 
 </configuration>

lib/teamcity/oracle/NHibernate.Test.last-results.xml

@@ -2983,5 +2983,27 @@ public void IgnoreCase()
 				t.Commit();
 			}
 		}
+
+		[Test]
+		public void CanSetLockModeOnDetachedCriteria()
+		{
+			//NH-3710
+			var dc = DetachedCriteria
+				.For(typeof(Student))
+				.SetLockMode(LockMode.Upgrade);
+
+			using (var session = OpenSession())
+			using (var tx = session.BeginTransaction())
+			{
+				session.Save(new Student { Name = "Ricardo Peres", StudentNumber = 666, CityState = new CityState("Coimbra", "Portugal") });
+				session.Flush();
+
+				var ec = dc.GetExecutableCriteria(session);
+				var countExec = CriteriaTransformer.TransformToRowCount(ec);
+				var countRes = countExec.UniqueResult();
+
+				Assert.AreEqual(countRes, 1);
+			}
+		}
 	}
 }