Merge branch 'master' into criteriaFetchCache

Author: hazzik

Tools/packages.config

@@ -7,7 +7,7 @@
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
   <package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
   <package id="NUnit.Extension.VSProjectLoader" version="3.6.0" targetFramework="net461" />
-  <package id="CSharpAsyncGenerator.CommandLine" version="0.13.2" targetFramework="net461" />
+  <package id="CSharpAsyncGenerator.CommandLine" version="0.14.0" targetFramework="net461" />
   <package id="vswhere" version="2.1.4" targetFramework="net461" />
   <package id="gitreleasemanager" version="0.7.0" targetFramework="net461" />
 </packages>

appveyor.yml

@@ -1,4 +1,4 @@
-version: 5.2.3.{build}
+version: 5.2.5.{build}
 image: Visual Studio 2017
 environment:
   matrix:

build-common/NHibernate.props

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
     <VersionMinor Condition="'$(VersionMinor)' == ''">2</VersionMinor>
-    <VersionPatch Condition="'$(VersionPatch)' == ''">3</VersionPatch>
+    <VersionPatch Condition="'$(VersionPatch)' == ''">5</VersionPatch>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>

build-common/common.xml

@@ -13,8 +13,8 @@
 
 	<!-- This is used only for build folder -->
 	<!-- TODO: Either remove or refactor to use NHibernate.props -->
-	<property name="project.version" value="5.2.3" overwrite="false" />
-	<property name="project.version.numeric" value="5.2.3" overwrite="false" />
+	<property name="project.version" value="5.2.5" overwrite="false" />
+	<property name="project.version.numeric" value="5.2.5" overwrite="false" />
 
 	<!-- properties used to connect to database for testing -->
 	<include buildfile="nhibernate-properties.xml" />

releasenotes.txt

@@ -1,3 +1,47 @@
+Build 5.2.5
+=============================
+
+Release notes - NHibernate - Version 5.2.5
+
+5 issues were resolved in this release.
+
+** Bug
+
+   * #2075 Missing cast when comparing a guid and string columns in SAP SQL Anywhere
+   * #2046 Fix nullable Guid ToString is not translated correctly on some dialects
+   * #2043 System.Reflection.TargetException when an interface is used as class mapping proxy definition
+   * #2040 Incorrect SQL when comparing a guid and string column in Sql Server
+
+** Task
+
+   * #2086 Release 5.2.5
+
+Build 5.2.4
+=============================
+
+Release notes - NHibernate - Version 5.2.4
+
+3 issues were resolved in this release. The dialect change has the side effect of
+re-enabling a hack used by NHibernate.Spatial, allowing Spatial users to upgrade
+to NHibernate 5.2.x. See NHibernate.Spatial#104.
+
+    ##### Possible Breaking Changes #####
+        * Using DML on an entity collection was applying the changes without
+          filtering according to the entity. It will now throw a
+          NotSupportedException.
+
+** Bug
+
+   * #2020 Throw for DML on filter
+   * #2011 Use a statically resolved dialect when building the session factory
+
+** Task
+
+   * #2030 Release 5.2.4
+
+As part of releasing 5.2.4, a missing 5.2.0 possible breaking change has been added about
+property-ref on null values. See 5.2.0 possible breaking changes.
+
 Build 5.2.3
 =============================
 
@@ -74,6 +118,9 @@ Release notes - NHibernate - Version 5.2.0
           IDictionary is no more supported.
         * Querying a dynamic entity as a Hashtable instead of an IDictionary is no more
           supported.
+        * A collection mapped with a `property-ref` will no more support being accessed
+          when the referenced property is null. It will throw. Previously, the collection
+          was not throwing but was always loaded empty.
         * With PostgreSQL, a HQL query using the bitwise xor operator "^" or "bxor"
           was exponentiating the arguments instead. It will now correctly apply the xor
           operator. (# operator in PostgreSQL SQL.)
@@ -295,6 +342,24 @@ Release notes - NHibernate - Version 5.2.0
 As part of releasing 5.2.0, a misnamed setting in 5.0.0 release notes has been fixed:
 transaction.use_connection_on_system_events correct name is transaction.use_connection_on_system_prepare
 
+Build 5.1.5
+=============================
+
+Release notes - NHibernate - Version 5.1.5
+
+    ##### Possible Breaking Changes #####
+        * Using DML on an entity collection was applying the changes without
+          filtering according to the entity. It will now throw a
+          NotSupportedException.
+
+** Bug
+
+   * #2043 System.Reflection.TargetException when an interface is used as class mapping proxy definition
+   * #2020 Throw for DML on filter
+
+** Task
+   * #2074 Release 5.1.5
+
 Build 5.1.4
 =============================
 
@@ -540,6 +605,24 @@ Release notes - NHibernate - Version 5.1.0
 As part of releasing 5.1.0, a missing 5.0.0 possible breaking change has been added about inequality semantic in LINQ
 queries. See 5.0.0 possible breaking changes.
 
+Build 5.0.7
+=============================
+
+Release notes - NHibernate - Version 5.0.7
+
+    ##### Possible Breaking Changes #####
+        * Using DML on an entity collection was applying the changes without
+          filtering according to the entity. It will now throw a
+          NotSupportedException.
+
+** Bug
+
+   * #2043 System.Reflection.TargetException when an interface is used as class mapping proxy definition
+   * #2020 Throw for DML on filter
+
+** Task
+   * #2073 Release 5.0.7
+
 Build 5.0.6
 =============================
 

src/AsyncGenerator.yml

@@ -181,30 +181,10 @@
     methodConversion:
     - conversion: Copy
       name: AfterTransactionCompletionProcess_EvictsFromCache
-    - conversion: Copy
-      hasAttributeName: OneTimeSetUpAttribute
-    - conversion: Copy
-      hasAttributeName: OneTimeTearDownAttribute
-    - conversion: Copy
-      hasAttributeName: SetUpAttribute
-    - conversion: Copy
-      hasAttributeName: TearDownAttribute
-    - conversion: Smart
-      hasAttributeName: TestAttribute
-    - conversion: Smart
-      hasAttributeName: TheoryAttribute
     asyncExtensionMethods:
       projectFiles:
       - fileName: LinqExtensionMethods.cs
         projectName: NHibernate
-    preserveReturnType:
-    - hasAttributeName: TestAttribute
-    - hasAttributeName: TheoryAttribute
-    alwaysAwait:
-    - hasAttributeName: TestAttribute
-    - hasAttributeName: TheoryAttribute
-    - hasAttributeName: SetUpAttribute
-    - hasAttributeName: TearDownAttribute
     typeConversion:
     - conversion: Ignore
       name: ObjectAssert
@@ -214,32 +194,24 @@
       name: MultiThreadRunner
     - conversion: Ignore
       name: PeVerifier
-    - conversion: Ignore
-      hasAttributeName: IgnoreAttribute
-    - conversion: NewType
-      hasAttributeName: TestFixtureAttribute
-    - conversion: NewType
-      anyBaseTypeRule: HasTestFixtureAttribute
     - conversion: Ignore
       rule: IsTestCase
     - conversion: Ignore
       anyBaseTypeRule: IsTestCase
-    ignoreSearchForMethodReferences:
-    - hasAttributeName: TheoryAttribute
-    - hasAttributeName: TestAttribute
     ignoreDocuments:
     - filePathEndsWith: Linq/MathTests.cs
     - filePathEndsWith: Linq/ExpressionSessionLeakTest.cs
     - filePathEndsWith: Linq/NorthwindDbCreator.cs
     cancellationTokens:
-      withoutCancellationToken:
-      - hasAttributeName: TestAttribute
-      - hasAttributeName: TheoryAttribute
+      enabled: true
     scanMethodBody: true
     scanForMissingAsyncMembers:
     - all: true
   registerPlugin:
-  - type: AsyncGenerator.Core.Plugins.NUnitAsyncCounterpartsFinder
+  - type: AsyncGenerator.Core.Plugins.NUnitPlugin
+    parameters:
+    - name: createNewTypes
+      value: true
     assemblyName: AsyncGenerator.Core
   - type: AsyncGenerator.Core.Plugins.TransactionScopeAsyncFlowAdder
     assemblyName: AsyncGenerator.Core
@@ -302,6 +274,3 @@ typeRules:
 - filters:
   - name: TestCase
   name: IsTestCase
-- filters:
-  - hasAttributeName: TestFixtureAttribute
-  name: HasTestFixtureAttribute

src/NHibernate.Test/Async/Ado/BatcherFixture.cs

@@ -102,44 +102,7 @@ public async Task OneRoundTripUpdateAsync()
 			await (CleanupAsync());
 		}
 
-#if NETFX
-		[Test, Ignore("Not fixed yet.")]
-		[Description("SqlClient: The batcher should run all different INSERT queries in only one roundtrip.")]
-		public async Task SqlClientOneRoundTripForUpdateAndInsertAsync()
-		{
-			if (Sfi.Settings.BatcherFactory is SqlClientBatchingBatcherFactory == false)
-				Assert.Ignore("This test is for SqlClientBatchingBatcher only");
-
-			await (FillDbAsync());
-
-			using (var sqlLog = new SqlLogSpy())
-			using (ISession s = Sfi.OpenSession())
-			using (ITransaction tx = s.BeginTransaction())
-			{
-				await (s.SaveAsync(new VerySimple
-				{
-					Name = "test441",
-					Weight = 894
-				}));
-
-				await (s.SaveAsync(new AlmostSimple
-				{
-					Name = "test441",
-					Weight = 894
-				}));
-
-				await (tx.CommitAsync());
-
-				var log = sqlLog.GetWholeLog();
-				//log should only contain NHibernate.SQL once, because that means 
-				//that we ony generated a single batch (NHibernate.SQL log will output
-				//once per batch)
-				Assert.AreEqual(0, log.IndexOf("NHibernate.SQL"), "log should start with NHibernate.SQL");
-				Assert.AreEqual(-1, log.IndexOf("NHibernate.SQL", "NHibernate.SQL".Length), "NHibernate.SQL should only appear once in the log");
-			}
-
-			await (CleanupAsync());
-		}
+		#if NETFX
 
 		[Test]
 		[Description("SqlClient: The batcher log output should be formatted")]