Skip to content

Commit ebdbb6e

Browse files
Merge 5.5.2 into master
2 parents a998c11 + 39de4d9 commit ebdbb6e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1316
-189
lines changed

build-common/NHibernate.props

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
<NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net48;net8.0</NhAppTargetFrameworks>
1818
<NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;net48;netcoreapp2.0;netstandard2.0;netstandard2.1;net6.0;net8.0</NhLibTargetFrameworks>
19+
<RuntimeFrameworkVersion Condition="'$(TargetFramework)' == 'netcoreapp2.0'">2.0.3</RuntimeFrameworkVersion>
1920
<NhNetFx>false</NhNetFx>
2021
<NhNetFx Condition="$(TargetFramework.StartsWith('net4'))">true</NhNetFx>
2122
<!-- Visual Basic requires to use coma (,) as a separator, other project types - semicolon (;) -->

doc/reference/modules/configuration.xml

+14
Original file line numberDiff line numberDiff line change
@@ -871,6 +871,20 @@ var session = sessions.OpenSession(conn);
871871
</para>
872872
</entry>
873873
</row>
874+
<row>
875+
<entry>
876+
<literal>escape_backslash_in_strings</literal>
877+
</entry>
878+
<entry>
879+
Indicates if the database needs to have backslash escaped in string literals.
880+
The default value is dialect dependant. That is <literal>false</literal> for
881+
most dialects.
882+
<para>
883+
<emphasis role="strong">eg.</emphasis>
884+
<literal>true</literal> | <literal>false</literal>
885+
</para>
886+
</entry>
887+
</row>
874888
<row>
875889
<entry>
876890
<literal>show_sql</literal>
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Installation steps for PostgreSQL for NH TeamCity:
33

4-
1. Download PostgreSQL (postgresql-9.0.3-1-windows_x64.exe): http://www.enterprisedb.com/products-services-training/pgdownload#windows;
4+
1. Download PostgreSQL: https://www.enterprisedb.com/downloads/postgres-postgresql-downloads;
55
2. Run the installer ... when prompted to make a password for the service account, make it 'password';
66
3. Leave the port number at the default (5432), and leave the default locale;
77
4. The setup should install PostgreSQL on the machine;
@@ -12,8 +12,8 @@ Installation steps for PostgreSQL for NH TeamCity:
1212

1313
Creating the NH user:
1414

15-
a. Open pgAdmin III (start -> programs -> PostgreSQL 9.0 -> pgAdmin III);
16-
b. right-click the PostgreSQL 9.0 database, select connect, and enter the password from step 2 above;
17-
c. right-clilck the Login Roles, and select "New Login Role ...";
18-
d. create a login with "Role name=nhibernate", "Password=nhibernate", and select Superuser on the Role privileges tab.
15+
a. Open pgAdmin 4;
16+
b. Right-click the PostgreSQL database, select connect, and enter the password from step 2 above;
17+
c. Right-clilck the Login Roles, and select "New Login Role ...";
18+
d. Create a login with "Role name=nhibernate", "Password=nhibernate", and select Superuser on the Role privileges tab.
1919

releasenotes.txt

+38-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
Build 5.5.1
1+
Build 5.5.2
2+
=============================
3+
4+
Release notes - NHibernate - Version 5.5.2
5+
6+
3 issues were resolved in this release, including CVE CVE-2024-39677 through the merge of 5.4.9.
7+
8+
** Bug
9+
10+
* #3536 MemberwiseClone should be virtual error in dotnet 9 preview 3
11+
12+
** Task
13+
14+
* #3578 Release 5.5.1
15+
* #3577 Merge 5.4.9 into 5.5.x
16+
17+
18+
Build 5.5.1
219
=============================
320

421
Release notes - NHibernate - Version 5.5.1
@@ -105,6 +122,26 @@ Release notes - NHibernate - Version 5.5.0
105122
* #3412 Revive hql ParsingFixture
106123

107124

125+
Build 5.4.9
126+
=============================
127+
128+
Release notes - NHibernate - Version 5.4.9
129+
130+
6 issues were resolved in this release, including CVE-2024-39677.
131+
132+
** Bug
133+
134+
* #3547 Handle SQL injection vulnerabilities within ObjectToSQLString
135+
136+
** Task
137+
138+
* #3576 Release 5.4.9
139+
* #3558 Migrate AppVeyor & TC builds to PostgreSQL 13
140+
* #3545 Upgrade Npgsql to a non vulnerable version
141+
* #3544 Upgrade vulnerable test dependencies
142+
* #3517 Obsolete vulnerable literal AddColumn
143+
144+
108145
Build 5.4.8
109146
=============================
110147

src/NHibernate.Config.Templates/SapSQLAnywhere.cfg.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ for your own use before compiling tests in Visual Studio.
1515
<property name="connection.connection_string">
1616
UID=DBA;PWD=sql;Server=localhost;DBN=nhibernate;DBF=c:\nhibernate.db;ASTOP=No;Enlist=false;
1717
</property>
18-
<property name="dialect">NHibernate.Dialect.SybaseSQLAnywhere12Dialect</property>
18+
<property name="dialect">NHibernate.Dialect.SapSQLAnywhere17Dialect</property>
1919
<property name="query.substitutions">true=1;false=0</property>
2020
<property name="transaction.ignore_session_synchronization_failures">true</property>
2121
<property name="transaction.system_completion_lock_timeout">200</property>

0 commit comments

Comments
 (0)