Skip to content

Commit 5d10b90

Browse files
fredericDelaportefredericDelaporte
authored
Merge branch 'master' into GH1413Tests
2 parents f44223f + c89bd84 commit 5d10b90

File tree

136 files changed

+3015
-9140
lines changed

Some content is hidden

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

136 files changed

+3015
-9140
lines changed

‎.editorconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ indent_size = 2
2020
indent_style = space
2121
indent_size = 2
2222

23+
[*.csproj]
24+
indent_style = space
25+
indent_size = 2
26+
27+
[*.vbproj]
28+
indent_style = space
29+
indent_size = 2
2330

2431
[*.cshtml]
2532
indent_style = space

‎GitReleaseManager.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
create:
2+
include-footer: false
3+
issue-labels-include:
4+
- "t: Bug"
5+
- "t: New Feature"
6+
- "t: Improvement"
7+
- "t: Task"
8+
issue-labels-exclude:
9+
- "r: Rejected"
10+
- "r: Replaced"
11+
issue-labels-alias:
12+
- name: "t: Bug"
13+
header: Bug
14+
plural: Bug
15+
- name: "t: New Feature"
16+
header: New Feature
17+
plural: New Feature
18+
- name: "t: Improvement"
19+
header: Improvement
20+
plural: Improvement
21+
- name: "t: Task"
22+
header: Task
23+
plural: Task

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ Bug Reports
3838

3939
If you find any bugs, please report them using the [GitHub issue tracker][C1]. A
4040
test-case that demonstrates the issue is usually required. Instructions on providing a test-case
41-
can be found [here][C2].
41+
can be found in [contributing guidelines][C3] or [here][C2].
4242

4343
[C1]: http://github.com/nhibernate/nhibernate-core/issues
44-
[C2]: http://nhibernate.info/blog/2008/10/03/the-best-way-to-solve-nhibernate-bugs-submit-good-unit-test.html
44+
[C2]: http://nhibernate.info/blog/2008/10/04/the-best-way-to-solve-nhibernate-bugs-submit-good-unit-test.html
45+
[C3]: CONTRIBUTING.md
4546

4647
Licenses
4748
--------

‎ShowBuildMenu.bat

Lines changed: 62 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ set NUNIT="%~dp0Tools\NUnit.ConsoleRunner.3.7.0\tools\nunit3-console.exe"
1010
:main-menu
1111
echo ========================= NHIBERNATE BUILD MENU ==========================
1212
echo --- TESTING ---
13-
echo B. (Step 1) Set up a new test configuration for a particular database.
14-
echo C. (Step 2) Activate a test configuration.
15-
echo D. (Step 3) Run tests using active configuration (Needs built in Visual Studio).
13+
echo A. (Step 1) Set up a new test configuration for a particular database.
14+
echo B. (Step 2) Activate a test configuration.
15+
echo C. (Step 3) Run tests using active configuration with 32bits runner (Needs built in Visual Studio).
16+
echo D. Or run tests using active configuration with 64bits runner (Needs built in Visual Studio).
1617
echo.
1718
echo --- BUILD ---
1819
echo E. Build NHibernate (Debug)
@@ -29,117 +30,102 @@ echo --- Exit ---
2930
echo X. Make the beautiful build menu go away.
3031
echo.
3132

32-
%BUILDTOOL% prompt BCDEFGHIX
33-
if errorlevel 8 goto end
34-
if errorlevel 7 goto teamcity-menu
35-
if errorlevel 6 goto build-async
36-
if errorlevel 5 goto build-release-package
37-
if errorlevel 4 goto build-release
38-
if errorlevel 3 goto build-debug
39-
if errorlevel 2 goto test-run
33+
%BUILDTOOL% prompt ABCDEFGHIX
34+
if errorlevel 9 goto end
35+
if errorlevel 8 goto teamcity-menu
36+
if errorlevel 7 goto build-async
37+
if errorlevel 6 goto build-release-package
38+
if errorlevel 5 goto build-release
39+
if errorlevel 4 goto build-debug
40+
if errorlevel 3 goto test-run-64
41+
if errorlevel 2 goto test-run-32
4042
if errorlevel 1 goto test-activate
4143
if errorlevel 0 goto test-setup-menu
4244

4345
:test-setup-menu
4446
echo A. Add a test configuration for SQL Server.
45-
echo B. Add a test configuration for Firebird (x86).
46-
echo C. Add a test configuration for Firebird (x64). [not recommended]
47-
echo D. Add a test configuration for SQLite (x86).
48-
echo E. Add a test configuration for SQLite (x64). [not recommended]
49-
echo F. Add a test configuration for PostgreSQL.
50-
echo G. Add a test configuration for Oracle.
51-
echo H. Add a test configuration for SQL Server Compact (x86).
52-
echo I. Add a test configuration for SQL Server Compact (x64).
53-
echo J. Add a test configuration for MySql.
47+
echo B. Add a test configuration for Firebird.
48+
echo C. Add a test configuration for SQLite.
49+
echo D. Add a test configuration for PostgreSQL.
50+
echo E. Add a test configuration for Oracle.
51+
echo F. Add a test configuration for Oracle with managed driver.
52+
echo G. Add a test configuration for SQL Server Compact.
53+
echo H. Add a test configuration for MySql.
5454
echo.
5555
echo X. Exit to main menu.
5656
echo.
5757

58-
%BUILDTOOL% prompt ABCDEFGHIJX
59-
if errorlevel 10 goto main-menu
60-
if errorlevel 9 goto test-setup-mysql
61-
if errorlevel 8 goto test-setup-sqlservercex64
62-
if errorlevel 7 goto test-setup-sqlservercex86
63-
if errorlevel 6 goto test-setup-oracle
64-
if errorlevel 5 goto test-setup-postgresql
65-
if errorlevel 4 goto test-setup-sqlitex64
66-
if errorlevel 3 goto test-setup-sqlitex86
67-
if errorlevel 2 goto test-setup-firebirdx64
68-
if errorlevel 1 goto test-setup-firebirdx86
58+
%BUILDTOOL% prompt ABCDEFGHX
59+
if errorlevel 8 goto main-menu
60+
if errorlevel 7 goto test-setup-mysql
61+
if errorlevel 6 goto test-setup-sqlserverce
62+
if errorlevel 5 goto test-setup-oracle-managed
63+
if errorlevel 4 goto test-setup-oracle
64+
if errorlevel 3 goto test-setup-postgresql
65+
if errorlevel 2 goto test-setup-sqlite
66+
if errorlevel 1 goto test-setup-firebird
6967
if errorlevel 0 goto test-setup-sqlserver
7068

7169
:test-setup-sqlserver
7270
set CONFIG_NAME=MSSQL
73-
set PLATFORM=AnyCPU
71+
set TEST_PLATFORM=AnyCPU
7472
set LIB_FILES=
7573
set LIB_FILES2=
7674
goto test-setup-generic
7775

78-
:test-setup-sqlservercex86
79-
set CONFIG_NAME=SqlServerCe32
80-
set PLATFORM=AnyCPU
81-
set LIB_FILES=lib\teamcity\SqlServerCe\*.dll
82-
set LIB_FILES2=lib\teamcity\SqlServerCe\X86\*.dll
83-
goto test-setup-generic
84-
85-
:test-setup-sqlservercex64
86-
set CONFIG_NAME=SqlServerCe64
87-
set PLATFORM=AnyCPU
88-
set LIB_FILES=lib\teamcity\sqlServerCe\*.dll
89-
set LIB_FILES2=lib\teamcity\sqlServerCe\AMD64\*.dll
90-
goto test-setup-generic
91-
92-
:test-setup-firebirdx86
93-
set CONFIG_NAME=FireBird
94-
set PLATFORM=x86
95-
set LIB_FILES=lib\teamcity\firebird\*.dll
76+
:test-setup-sqlserverce
77+
set CONFIG_NAME=SqlServerCe
78+
set TEST_PLATFORM=AnyCPU
79+
set LIB_FILES=
80+
set LIB_FILES2=
9681
goto test-setup-generic
9782

98-
:test-setup-firebirdx64
83+
:test-setup-firebird
9984
set CONFIG_NAME=FireBird
100-
set PLATFORM=x64
101-
set LIB_FILES=lib\teamcity\firebird\*.dll
102-
goto test-setup-generic
103-
104-
:test-setup-sqlitex86
105-
set CONFIG_NAME=SQLite
106-
set PLATFORM=x86
107-
set LIB_FILES=lib\teamcity\sqlite\x86\*
85+
set TEST_PLATFORM=AnyCPU
86+
set LIB_FILES=
10887
set LIB_FILES2=
10988
goto test-setup-generic
11089

111-
:test-setup-sqlitex64
90+
:test-setup-sqlite
11291
set CONFIG_NAME=SQLite
113-
set PLATFORM=x64
114-
set LIB_FILES=lib\teamcity\sqlite\x64\*
92+
set TEST_PLATFORM=AnyCPU
93+
set LIB_FILES=
11594
set LIB_FILES2=
11695
goto test-setup-generic
11796

11897
:test-setup-postgresql
11998
set CONFIG_NAME=PostgreSQL
120-
set PLATFORM=AnyCPU
121-
set LIB_FILES=lib\teamcity\postgresql\*.dll
99+
set TEST_PLATFORM=AnyCPU
100+
set LIB_FILES=
122101
set LIB_FILES2=
123102
goto test-setup-generic
124103

125104
:test-setup-mysql
126105
set CONFIG_NAME=MySql
127-
set PLATFORM=AnyCPU
128-
set LIB_FILES=lib\teamcity\mysql\*.dll
106+
set TEST_PLATFORM=AnyCPU
107+
set LIB_FILES=
129108
set LIB_FILES2=
130109
goto test-setup-generic
131110

132111
:test-setup-oracle
133112
set CONFIG_NAME=Oracle
134-
set PLATFORM=x86
113+
set TEST_PLATFORM=x86
135114
set LIB_FILES=lib\teamcity\oracle\x86\*.dll
136115
set LIB_FILES2=
137116
goto test-setup-generic
138117

118+
:test-setup-oracle-managed
119+
set CONFIG_NAME=Oracle-Managed
120+
set TEST_PLATFORM=AnyCPU
121+
set LIB_FILES=
122+
set LIB_FILES2=
123+
goto test-setup-generic
124+
139125
:test-setup-generic
140126
set CFGNAME=
141127
set /p CFGNAME=Enter a name for your test configuration or press enter to use default name:
142-
if /I "%CFGNAME%"=="" set CFGNAME=%CONFIG_NAME%-%PLATFORM%
128+
if /I "%CFGNAME%"=="" set CFGNAME=%CONFIG_NAME%-%TEST_PLATFORM%
143129
mkdir "%AVAILABLE_CONFIGURATIONS%\%CFGNAME%"
144130
if /I "%LIB_FILES%"=="" goto test-setup-generic-skip-copy
145131
copy %LIB_FILES% "%AVAILABLE_CONFIGURATIONS%\%CFGNAME%"
@@ -164,9 +150,15 @@ copy "%FOLDER%\*" "%CURRENT_CONFIGURATION%"
164150
echo Configuration activated.
165151
goto main-menu
166152

167-
:test-run
153+
:test-run-32
154+
SET NUNITPLATFORM=--x86
155+
goto test-run
156+
157+
:test-run-64
168158
SET NUNITPLATFORM=
169-
IF /I "%PLATFORM%" NEQ "x64" set NUNITPLATFORM=--x86
159+
goto test-run
160+
161+
:test-run
170162
start "nunit3-console" cmd /K %NUNIT% %NUNITPLATFORM% --agents=1 --process=separate NHibernate.nunit
171163
goto main-menu
172164

‎Tools/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
88
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
99
<package id="NUnit.Extension.VSProjectLoader" version="3.6.0" targetFramework="net461" />
10-
<package id="CSharpAsyncGenerator.CommandLine" version="0.5.1" targetFramework="net461" />
10+
<package id="CSharpAsyncGenerator.CommandLine" version="0.6.0" targetFramework="net461" />
1111
<package id="vswhere" version="2.1.4" targetFramework="net461" />
1212
</packages>

‎build-common/NHibernate.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
44
<VersionMinor Condition="'$(VersionMinor)' == ''">0</VersionMinor>
5-
<VersionPatch Condition="'$(VersionPatch)' == ''">0</VersionPatch>
5+
<VersionPatch Condition="'$(VersionPatch)' == ''">1</VersionPatch>
66
<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
77

88
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>

‎build-common/common.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
<!-- This is used only for build folder -->
3232
<!-- TODO: Either remove or refactor to use NHibernate.props -->
33-
<property name="project.version" value="5.0.0" overwrite="false" />
34-
<property name="project.version.numeric" value="5.0.0" overwrite="false" />
33+
<property name="project.version" value="5.0.1" overwrite="false" />
34+
<property name="project.version.numeric" value="5.0.1" overwrite="false" />
3535

3636
<!-- properties used to connect to database for testing -->
3737
<include buildfile="nhibernate-properties.xml" />

‎doc/reference/modules/configuration.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,29 @@ var session = sessions.OpenSession(conn);
10261026
</para>
10271027
</entry>
10281028
</row>
1029+
<row>
1030+
<entry>
1031+
<literal>track_session_id</literal>
1032+
</entry>
1033+
<entry>
1034+
Set whether the session id should be tracked in logs or not. When <literal>true</literal>, each
1035+
session will have an unique <literal>Guid</literal> that can be retrieved with
1036+
<literal>ISessionImplementor.SessionId</literal>, otherwise <literal>ISessionImplementor.SessionId</literal>
1037+
will be <literal>Guid.Empty</literal>.
1038+
<para>
1039+
Session id is used for logging purpose and can also be retrieved on the static property
1040+
<literal>NHibernate.Impl.SessionIdLoggingContext.SessionId</literal>, when tracking is enabled.
1041+
</para>
1042+
<para>
1043+
Disabling tracking by setting <literal>track_session_id</literal> to <literal>false</literal>
1044+
increases performances. Default is <literal>true</literal>.
1045+
</para>
1046+
<para>
1047+
<emphasis role="strong">eg.</emphasis>
1048+
<literal>true</literal> | <literal>false</literal>
1049+
</para>
1050+
</entry>
1051+
</row>
10291052
<row>
10301053
<entry>
10311054
<literal>sql_types.keep_datetime</literal>

‎doc/reference/modules/nhibernate_caches.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@
209209
<section id="NHibernate.Caches.SysCache">
210210
<title>SysCache Configuration</title>
211211
<para>
212-
As SysCache relies on <classname>System.Web.Caching.Cache</classname> for the underlying implementation.
213-
Following NHibernate configuration settings are available:
212+
SysCache relies on <classname>System.Web.Caching.Cache</classname> for the underlying implementation.
213+
The following NHibernate configuration settings are available:
214214
</para>
215215

216216
<variablelist>
@@ -265,13 +265,13 @@
265265

266266
<para>
267267
SysCache2 can use SqlCacheDependencies to invalidate cache regions when data in an underlying SQL Server
268-
table or query changes. Query dependencies are only available for SQL Server 2005. To use the cache
268+
table or query changes. Query dependencies are only available for SQL Server 2005 or higher. To use the cache
269269
provider, the application must be setup and configured to support SQL notifications as described in the
270270
MSDN documentation.
271271
</para>
272272

273273
<para>
274-
Following NHibernate configuration settings are available:
274+
The following NHibernate configuration settings are available:
275275
</para>
276276

277277
<variablelist>
@@ -568,11 +568,11 @@
568568
</section>
569569

570570
<section id="NHibernate.Caches.RtMemoryCache">
571-
<title>Runtime Memory Configuration</title>
571+
<title>RtMemoryCache Configuration</title>
572572
<para>
573-
As runtime memory relies on <classname>System.Runtime.Caching.MemoryCache</classname> for the
573+
RtMemoryCache relies on <classname>System.Runtime.Caching.MemoryCache</classname> for the
574574
underlying implementation.
575-
Following NHibernate configuration settings are available:
575+
The following NHibernate configuration settings are available:
576576
</para>
577577

578578
<variablelist>
@@ -602,14 +602,14 @@
602602
<programlisting><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
603603
<configuration>
604604
<configSections>
605-
<section name="syscache"
606-
type="NHibernate.Caches.SysCache.SysCacheSectionHandler,NHibernate.Caches.SysCache" />
605+
<section name="rtmemorycache"
606+
type="NHibernate.Caches.RtMemoryCache.RtMemoryCacheSectionHandler,NHibernate.Caches.RtMemoryCache" />
607607
</configSections>
608608
609-
<syscache>
609+
<rtmemorycache>
610610
<cache region="foo" expiration="500" />
611611
<cache region="bar" expiration="300" sliding="true" />
612-
</syscache>
612+
</rtmemorycache>
613613
</configuration>]]></programlisting>
614614
</example>
615615
</section>

‎doc/reference/modules/query_linq.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ using NHibernate.Linq;]]></programlisting>
331331
<sect2 id="querylinq-supportedmethods-string">
332332
<title>Strings</title>
333333
<para>
334-
Following properties and methods are supported on strings:
334+
The following properties and methods are supported on strings:
335335
</para>
336336
<itemizedlist>
337337
<listitem>

‎lib/teamcity/firebird/FirebirdSql.Data.FirebirdClient.dll

-837 KB
Binary file not shown.

‎lib/teamcity/mysql/mysql.data.dll

-415 KB
Binary file not shown.

‎lib/teamcity/oracle-managed/common/Oracle.ManagedDataAccess.Catalog.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)