Skip to content

Commit 138651c

Browse files
fredericDelaportefredericDelaporte
committed
Merge master branch.
2 parents b4dd864 + 9527cb0 commit 138651c

File tree

587 files changed

+13138
-84555
lines changed

Some content is hidden

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

587 files changed

+13138
-84555
lines changed

‎Contributor Guide.html

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

‎NHibernate.nunit

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<NUnitProject>
22
<Settings activeconfig="Debug" processModel="Multiple" />
33
<Config name="Debug" binpathtype="Auto" runtimeFramework="net-4.0">
4-
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\NHibernate.TestDatabaseSetup.dll" />
5-
<assembly path="src\NHibernate.Test\bin\Debug-2.0\NHibernate.Test.dll" />
4+
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\net461\NHibernate.TestDatabaseSetup.dll" />
5+
<assembly path="src\NHibernate.Test\bin\Debug\net461\NHibernate.Test.dll" />
66
<assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\NHibernate.Test.VisualBasic.dll" />
77
</Config>
88
<Config name="Release" binpathtype="Auto" runtimeFramework="net-4.0">
9-
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\NHibernate.TestDatabaseSetup.dll" />
10-
<assembly path="src\NHibernate.Test\bin\Release-2.0\NHibernate.Test.dll" />
9+
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\net461\NHibernate.TestDatabaseSetup.dll" />
10+
<assembly path="src\NHibernate.Test\bin\Release\net461\NHibernate.Test.dll" />
1111
<assembly path="src\NHibernate.Test.VisualBasic\bin\Release\NHibernate.Test.VisualBasic.dll" />
1212
</Config>
13-
</NUnitProject>
13+
</NUnitProject>

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ NuGet (<http://nuget.org/List/Packages/NHibernate>).
1919

2020
Alternatively binaries are available from SourceForge at <http://sourceforge.net/projects/nhibernate>.
2121

22-
You are encouraged to review the release notes (releasenotes.txt), particularly when upgrading to a
22+
You are encouraged to review the release notes ([releasenotes.txt](releasenotes.txt)), particularly when upgrading to a
2323
later version. The release notes will generally document any breaking changes.
2424

2525
Community Forums

‎ShowBuildMenu.bat

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,14 @@ echo F. Add a test configuration for PostgreSQL.
5050
echo G. Add a test configuration for Oracle.
5151
echo H. Add a test configuration for SQL Server Compact (x86).
5252
echo I. Add a test configuration for SQL Server Compact (x64).
53+
echo J. Add a test configuration for MySql.
5354
echo.
5455
echo X. Exit to main menu.
5556
echo.
5657

57-
%BUILDTOOL% prompt ABCDEFGHIX
58-
if errorlevel 9 goto main-menu
58+
%BUILDTOOL% prompt ABCDEFGHIJX
59+
if errorlevel 10 goto main-menu
60+
if errorlevel 9 goto test-setup-mysql
5961
if errorlevel 8 goto test-setup-sqlservercex64
6062
if errorlevel 7 goto test-setup-sqlservercex86
6163
if errorlevel 6 goto test-setup-oracle
@@ -91,14 +93,12 @@ goto test-setup-generic
9193
set CONFIG_NAME=FireBird
9294
set PLATFORM=x86
9395
set LIB_FILES=lib\teamcity\firebird\*.dll
94-
set LIB_FILES2=lib\teamcity\firebird\x86\*
9596
goto test-setup-generic
9697

9798
:test-setup-firebirdx64
9899
set CONFIG_NAME=FireBird
99100
set PLATFORM=x64
100101
set LIB_FILES=lib\teamcity\firebird\*.dll
101-
set LIB_FILES2=lib\teamcity\firebird\x64\*
102102
goto test-setup-generic
103103

104104
:test-setup-sqlitex86
@@ -122,6 +122,13 @@ set LIB_FILES=lib\teamcity\postgresql\*.dll
122122
set LIB_FILES2=
123123
goto test-setup-generic
124124

125+
:test-setup-mysql
126+
set CONFIG_NAME=MySql
127+
set PLATFORM=AnyCPU
128+
set LIB_FILES=lib\teamcity\mysql\*.dll
129+
set LIB_FILES2=
130+
goto test-setup-generic
131+
125132
:test-setup-oracle
126133
set CONFIG_NAME=Oracle
127134
set PLATFORM=x86

‎Tools/ilrepack/ILRepack.exe

-1.44 MB
Binary file not shown.

‎Tools/msbuild.cmd

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1 @@
1-
@echo off
2-
set pre=Microsoft.VisualStudio.Product.
3-
set ids=%pre%Community %pre%Professional %pre%Enterprise %pre%BuildTools
4-
5-
for /f "usebackq tokens=1* delims=: " %%i in (`%~dp0\vswhere.1.0.58\tools\vswhere.exe -latest -products %ids% -requires Microsoft.Component.MSBuild`) do (
6-
if /i "%%i"=="installationPath" set InstallDir=%%j
7-
)
8-
9-
if exist "%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" (
10-
"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" %*
11-
) else (
12-
exit /b -1
13-
)
1+
dotnet msbuild %*

‎Tools/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.5.0" targetFramework="net461" />
88
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
99
<package id="NUnit.Extension.VSProjectLoader" version="3.5.0" targetFramework="net461" />
10-
<package id="vswhere" version="1.0.58" targetFramework="net461" />
1110
</packages>

‎build-common/common-project.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@
5353
</target>
5454

5555
<target name="common.nuget-restore" depends="common.init common.download-nuget">
56-
<exec basedir="${tools.dir}" workingdir="${root.dir}/src" program="NuGet.exe">
57-
<arg value="restore" />
58-
<arg value="NHibernate.sln" />
59-
</exec>
6056
<exec basedir="${tools.dir}" workingdir="${root.dir}/Tools" program="NuGet.exe">
6157
<arg value="install" />
6258
</exec>
@@ -70,6 +66,7 @@
7066
<arg value="/p:Platform=&quot;Any CPU&quot;" />
7167
<arg value="/p:Configuration=&quot;Debug&quot;" if="${build.debug == 'true'}" />
7268
<arg value="/p:Configuration=&quot;Release&quot;" if="${build.release == 'true'}" />
69+
<arg value="/t:Restore" />
7370
<arg value="/t:Rebuild" />
7471
<arg value="/v:q" />
7572
<arg value="/m" />

‎default.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
</copy>
195195
<!--Required Bins for lazy loading NHibernate.ByteCode.Castle.dll-->
196196
<!-- Tests -->
197-
<copy file="${bin.dir}/TestEnbeddedConfig.cfg.xml" todir="${bin-pack.tests}"/>
197+
<copy file="${bin.dir}/TestEmbeddedConfig.cfg.xml" todir="${bin-pack.tests}"/>
198198
<copy file="${bin.dir}/ABC.hbm.xml" todir="${bin-pack.tests}"/>
199199
<copy todir="${bin-pack.tests}/DbScripts">
200200
<fileset basedir="${root.dir}/src/NHibernate.Test/DbScripts">

‎doc/reference/modules/architecture.xml

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -239,44 +239,54 @@
239239
</para>
240240

241241
<itemizedlist>
242+
<listitem>
243+
<para>
244+
<literal>NHibernate.Context.AsyncLocalSessionContext</literal> - current sessions are tracked
245+
by current asynchronous flow. You are responsible to bind and unbind an
246+
<literal>ISession</literal> instance with static methods of class
247+
<literal>CurrentSessionContext</literal>. Binding operations from inner flows will not be
248+
propagated to outer or siblings flows.
249+
</para>
250+
</listitem>
242251
<listitem>
243252
<para>
244253
<literal>NHibernate.Context.CallSessionContext</literal> - current sessions are tracked
245-
by <literal>CallContext</literal>. You are responsible to bind and unbind an <literal>
246-
ISession</literal> instance with static methods of class <literal>CurrentSessionContext
247-
</literal>.
254+
by <literal>CallContext</literal>. You are responsible to bind and unbind an
255+
<literal>ISession</literal> instance with static methods of class
256+
<literal>CurrentSessionContext</literal>.
248257
</para>
249258
</listitem>
250259
<listitem>
251260
<para>
252261
<literal>NHibernate.Context.ThreadStaticSessionContext</literal> - current session is
253-
stored in a thread-static variable. This context only supports one session factory.
262+
stored in a thread-static variable. This context supports multiple session factory only
263+
since NHibernate v5.
254264
You are responsible to bind and unbind an <literal>ISession</literal> instance with
255265
static methods of class <literal>CurrentSessionContext</literal>.
256266
</para>
257267
</listitem>
258268
<listitem>
259269
<para>
260-
<literal>NHibernate.Context.WebSessionContext</literal> -
261-
stores the current session in <literal>HttpContext</literal>.
262-
You are responsible to bind and unbind an <literal>ISession</literal>
263-
instance with static methods of class <literal>CurrentSessionContext</literal>.
270+
<literal>NHibernate.Context.WebSessionContext</literal> -
271+
stores the current session in <literal>HttpContext</literal>.
272+
You are responsible to bind and unbind an <literal>ISession</literal>
273+
instance with static methods of class <literal>CurrentSessionContext</literal>.
264274
</para>
265275
</listitem>
266276
<listitem>
267277
<para>
268278
<literal>NHibernate.Context.WcfOperationSessionContext</literal> - current sessions are tracked
269279
by WCF <literal>OperationContext</literal>. You need to register the <literal>WcfStateExtension</literal>
270-
extension in WCF. You are responsible to bind and unbind an <literal>ISession
271-
</literal> instance with static methods of class <literal>CurrentSessionContext</literal>.
280+
extension in WCF. You are responsible to bind and unbind an <literal>ISession</literal>
281+
instance with static methods of class <literal>CurrentSessionContext</literal>.
272282
</para>
273283
</listitem>
274284
<listitem>
275285
<para>
276286
<literal>NHibernate.Context.ManagedWebSessionContext</literal> - current
277-
sessions are tracked by <literal>HttpContext</literal>. Removed in NHibernate 4.0
278-
- <literal>NHibernate.Context.WebSessionContext</literal> should be used instead.
279-
You are responsible to bind and unbind an <literal>ISession</literal> instance with static methods
287+
sessions are tracked by <literal>HttpContext</literal>. Removed in NHibernate 4.0
288+
- <literal>NHibernate.Context.WebSessionContext</literal> should be used instead.
289+
You are responsible to bind and unbind an <literal>ISession</literal> instance with static methods
280290
on this class, it never opens, flushes, or closes an <literal>ISession</literal> itself.
281291
</para>
282292
</listitem>
@@ -287,7 +297,8 @@
287297
defines which <literal>NHibernate.Context.ICurrentSessionContext</literal> implementation
288298
should be used. Typically, the value of this parameter would just name the implementation
289299
class to use (including the assembly name); for the out-of-the-box implementations, however,
290-
there are corresponding short names: "call", "thread_static", "web" and "wcf_operation",
300+
there are corresponding short names: <literal>async_local</literal>, <literal>call</literal>,
301+
<literal>thread_static</literal>, <literal>web</literal> and <literal>wcf_operation</literal>,
291302
respectively.
292303
</para>
293304
</sect1>

0 commit comments

Comments
 (0)