From fe181b98ccc89a3fe9a2e5e7cc37cd14c63b18cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?=
 <12201973+fredericdelaporte@users.noreply.github.com>
Date: Sun, 14 Feb 2021 19:42:30 +0100
Subject: [PATCH 1/3] Release 5.3.6

---
 build-common/NHibernate.props |  2 +-
 releasenotes.txt              | 29 ++++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props
index 11b94810165..fb6930bd2b9 100644
--- a/build-common/NHibernate.props
+++ b/build-common/NHibernate.props
@@ -5,7 +5,7 @@
     <NhVersion     Condition="'$(NhVersion)' == ''"    >5.3</NhVersion>
     <VersionPatch  Condition="'$(VersionPatch)'  == ''">6</VersionPatch>
     <!-- Clear VersionSuffix for making release and set it to dev for making development builds -->
-    <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
+    <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 
     <VersionPrefix Condition="'$(VersionPrefix)' == ''">$(NhVersion).$(VersionPatch)</VersionPrefix>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
diff --git a/releasenotes.txt b/releasenotes.txt
index 92f92abb7a0..dcb989ba591 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -1,4 +1,31 @@
-Build 5.3.5
+Build 5.3.6
+=============================
+
+Release notes - NHibernate - Version 5.3.6
+
+11 issues were resolved in this release.
+
+** Bug
+
+   * #2659 IQueryable<T> filter by subquery gives "Item with Same Key has already been added"
+   * #2649 Invalid parameter conversion for enums mapped in sub-classes
+   * #2646 Invalid generated sql with linq any in select and composite keys
+   * #2642 Linq expression parser removes required Convert nodes
+   * #2631 IndexOutOfRange exception with One-to-One mapping
+   * #2627 Null reference on Merge for detached unsaved entity
+   * #2626 WHERE IN SELECT uses wrong column
+   * #2608 Delay entity insert may fail with Merge
+   * #2544 Recognition error occurs using System.Linq.Queryable.Contains
+
+** Improvement
+
+   * #2656 Make sure dbcommand is disposed
+
+** Task
+
+   * #2676 Release 5.3.6
+
+Build 5.3.5
 =============================
 
 Release notes - NHibernate - Version 5.3.5

From ef1759c1036bafb9401058e6a3fd2e9465f0f1cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?=
 <12201973+fredericdelaporte@users.noreply.github.com>
Date: Sun, 14 Feb 2021 20:16:03 +0100
Subject: [PATCH 2/3] Document a missing breaking change for Merge

See #2632
---
 releasenotes.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/releasenotes.txt b/releasenotes.txt
index dcb989ba591..edb3de4f95d 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -25,6 +25,9 @@ Release notes - NHibernate - Version 5.3.6
 
    * #2676 Release 5.3.6
 
+As part of releasing 5.3.6, one missing 5.3.0 possible breaking change has been added, about
+Merge no more triggering immediate generation of identifier. See 5.3.0 possible breaking changes.
+
 Build 5.3.5
 =============================
 
@@ -148,7 +151,7 @@ Release notes - NHibernate - Version 5.3.0
         * `update` and `delete` statements will now take into account any enabled filter on the entities
           they update or delete, while previously they were ignoring them. (`insert` statements will also take
           them into account, but previously they were failing instead of ignoring enabled filters.)
-        * ISession.Persist will no more trigger immediate generation of identifier.
+        * ISession.Persist and ISession.Merge will no more trigger immediate generation of identifier.
         * Bags will no more be loaded with "null" entities, they will be filtered out.
         * Setting the value of an uninitialized lazy property will no more trigger loading of all the lazy
           properties of the entity.

From a799d99b66e6862eb00c04904b00178971bc3693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?=
 <12201973+fredericdelaporte@users.noreply.github.com>
Date: Tue, 16 Feb 2021 00:00:11 +0100
Subject: [PATCH 3/3] fixup! Release 5.3.6

---
 releasenotes.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/releasenotes.txt b/releasenotes.txt
index edb3de4f95d..db1f7b74c6c 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -3,7 +3,7 @@
 
 Release notes - NHibernate - Version 5.3.6
 
-11 issues were resolved in this release.
+12 issues were resolved in this release.
 
 ** Bug
 
@@ -19,6 +19,7 @@ Release notes - NHibernate - Version 5.3.6
 
 ** Improvement
 
+   * #2677 Missing ConfigureAwait in FutureEnumerable.GetEnumerableAsync
    * #2656 Make sure dbcommand is disposed
 
 ** Task