Skip to content

Commit caf2083

Browse files
ngbrownngbrown
committed
Merge branch NH-4008 into NH-3807
2 parents 3c5f0fb + 57fd898 commit caf2083

File tree

201 files changed

+2610
-8938
lines changed

Some content is hidden

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

201 files changed

+2610
-8938
lines changed

‎ShowBuildMenu.bat

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ echo.
1515
echo --- TESTING ---
1616
echo B. (Step 1) Set up a new test configuration for a particular database.
1717
echo C. (Step 2) Activate a test configuration.
18-
echo D. (Step 3) Run tests using active configuration.
18+
echo D. (Step 3) Run tests using active configuration (Build in Visual Studio).
1919
echo.
2020
echo --- BUILD ---
2121
echo E. Build NHibernate (Debug)
@@ -78,47 +78,47 @@ goto test-setup-generic
7878
:test-setup-sqlservercex86
7979
set CONFIG_NAME=SqlServerCe32
8080
set PLATFORM=AnyCPU
81-
set LIB_FILES=lib\teamcity\SqlServerCe\*.dll
82-
set LIB_FILES2=lib\teamcity\SqlServerCe\X86\*.dll
81+
set LIB_FILES=
82+
set LIB_FILES2=
8383
goto test-setup-generic
8484

8585
:test-setup-sqlservercex64
8686
set CONFIG_NAME=SqlServerCe64
8787
set PLATFORM=AnyCPU
88-
set LIB_FILES=lib\teamcity\sqlServerCe\*.dll
89-
set LIB_FILES2=lib\teamcity\sqlServerCe\AMD64\*.dll
88+
set LIB_FILES=
89+
set LIB_FILES2=
9090
goto test-setup-generic
9191

9292
:test-setup-firebirdx86
9393
set CONFIG_NAME=FireBird
9494
set PLATFORM=x86
95-
set LIB_FILES=lib\teamcity\firebird\*.dll
95+
set LIB_FILES=
9696
goto test-setup-generic
9797

9898
:test-setup-firebirdx64
9999
set CONFIG_NAME=FireBird
100100
set PLATFORM=x64
101-
set LIB_FILES=lib\teamcity\firebird\*.dll
101+
set LIB_FILES=
102102
goto test-setup-generic
103103

104104
:test-setup-sqlitex86
105105
set CONFIG_NAME=SQLite
106106
set PLATFORM=x86
107-
set LIB_FILES=lib\teamcity\sqlite\x86\*
107+
set LIB_FILES=
108108
set LIB_FILES2=
109109
goto test-setup-generic
110110

111111
:test-setup-sqlitex64
112112
set CONFIG_NAME=SQLite
113113
set PLATFORM=x64
114-
set LIB_FILES=lib\teamcity\sqlite\x64\*
114+
set LIB_FILES=
115115
set LIB_FILES2=
116116
goto test-setup-generic
117117

118118
:test-setup-postgresql
119119
set CONFIG_NAME=PostgreSQL
120120
set PLATFORM=AnyCPU
121-
set LIB_FILES=lib\teamcity\postgresql\*.dll
121+
set LIB_FILES=
122122
set LIB_FILES2=
123123
goto test-setup-generic
124124

@@ -165,7 +165,9 @@ echo Configuration activated.
165165
goto main-menu
166166

167167
:test-run
168-
start "nunit3-console" cmd /K %NUNIT% --x86 --agents=1 --process=separate NHibernate.nunit
168+
SET NUNITPLATFORM=
169+
IF /I "%PLATFORM%" NEQ "x64" set NUNITPLATFORM=--x86
170+
start "nunit3-console" cmd /K %NUNIT% %NUNITPLATFORM% --agents=1 --process=separate NHibernate.nunit
169171
goto main-menu
170172

171173
rem :build-test

‎build-common/nhibernate-properties.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<project xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
33
<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSql2008Dialect" overwrite="false"/>
44
<property name="nhibernate.command_timeout" value="444" overwrite="false"/>
5-
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlClientDriver" overwrite="false"/>
5+
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlServerDriver, NHibernate.Driver.SqlServer" overwrite="false"/>
66
<property name="nhibernate.connection.connection_string" value="Server=.\SQLExpress;initial catalog=nhibernate;Integrated Security=SSPI" overwrite="false"/>
77
</project>

‎build-common/teamcity-hibernate.cfg.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<property name="format_sql">true</property>
1616

1717
<!-- This is the System.Data.dll provider for MSSQL Server -->
18-
<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property>
18+
<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver, NHibernate.Driver.SqlClient</property>
1919
<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
2020
<property name="connection.connection_string">Server=.\SQLExpress;initial catalog=nhibernate;Integrated Security=SSPI</property>
2121
<property name="show_sql">false</property>

‎default.build

Lines changed: 85 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@
164164
<property name="bin-pack.tmpdir" value="${build.dir}/tmp-bin" />
165165
<property name="bin-pack.conf-template" value="${bin-pack.tmpdir}/Configuration_Templates" />
166166
<property name="bin-pack.required" value="${bin-pack.tmpdir}/Required_Bins" />
167+
<property name="bin-pack.drivers" value="${bin-pack.tmpdir}/Select_Single_Driver" />
167168
<property name="bin-pack.tests" value="${bin-pack.tmpdir}/Tests" />
168169

169170
<copy file="releasenotes.txt" todir="${bin-pack.tmpdir}"/>
@@ -192,23 +193,27 @@
192193
<include name="NHibernate.???" />
193194
</fileset>
194195
</copy>
195-
<!--Required Bins for lazy loading NHibernate.ByteCode.Castle.dll-->
196+
<copy todir="${bin-pack.drivers}">
197+
<fileset basedir="${bin.dir}">
198+
<include name="NHibernate.Driver.*.???" />
199+
</fileset>
200+
</copy>
196201
<!-- Tests -->
197202
<copy file="${bin.dir}/TestEnbeddedConfig.cfg.xml" todir="${bin-pack.tests}"/>
198203
<copy file="${bin.dir}/ABC.hbm.xml" todir="${bin-pack.tests}"/>
199-
<copy todir="${bin-pack.tests}/DbScripts">
200-
<fileset basedir="${root.dir}/src/NHibernate.Test/DbScripts">
201-
<include name="*.sql" />
202-
</fileset>
203-
</copy>
204-
<copy todir="${bin-pack.tests}">
204+
<copy todir="${bin-pack.tests}/DbScripts">
205+
<fileset basedir="${root.dir}/src/NHibernate.Test/DbScripts">
206+
<include name="*.sql" />
207+
</fileset>
208+
</copy>
209+
<copy todir="${bin-pack.tests}">
205210
<fileset basedir="${bin.dir}">
206211
<include name="nunit*" />
207-
<include name="SharpTestsEx*" />
208-
<include name="NHibernate.Domain*" />
212+
<include name="SharpTestsEx*" />
213+
<include name="NHibernate.Domain*" />
209214
<include name="NHibernate.Test*" />
210-
<include name="log4net*" />
211-
</fileset>
215+
<include name="log4net*" />
216+
</fileset>
212217
</copy>
213218
</target>
214219

@@ -242,65 +247,75 @@
242247

243248
</target>
244249

245-
<fileset id="nugetfiles.all" basedir="src">
246-
<include name="NHibernate/NHibernate.build" />
247-
</fileset>
248-
249-
<target name="nuspec" depends="init nuget.set-properties" description="Create nuspec files">
250-
<nant target="nuspec">
251-
<buildfiles refid="nugetfiles.all" />
252-
</nant>
253-
</target>
254-
255-
<target name="nuget" depends="init binaries nuget.set-properties nuspec"
256-
description="Creates files for the release on nuget gallery.">
250+
<fileset id="nugetfiles.all" basedir="src">
251+
<include name="NHibernate/NHibernate.build" />
252+
<include name="NHibernate.Driver.AdoNet/NHibernate.Driver.AdoNet.build" />
253+
<include name="NHibernate.Driver.FirebirdClient/NHibernate.Driver.FirebirdClient.build" />
254+
<include name="NHibernate.Driver.MySql/NHibernate.Driver.MySql.build" />
255+
<include name="NHibernate.Driver.Npgsql/NHibernate.Driver.Npgsql.build" />
256+
<include name="NHibernate.Driver.Odbc/NHibernate.Driver.Odbc.build" />
257+
<include name="NHibernate.Driver.OleDb/NHibernate.Driver.OleDb.build" />
258+
<include name="NHibernate.Driver.Oracle.ManagedDataAccess/NHibernate.Driver.Oracle.ManagedDataAccess.build" />
259+
<include name="NHibernate.Driver.SQLite/NHibernate.Driver.SQLite.build" />
260+
<include name="NHibernate.Driver.SqlServer/NHibernate.Driver.SqlServer.build" />
261+
<include name="NHibernate.Driver.SqlServer.Compact/NHibernate.Driver.SqlServer.Compact.build" />
262+
</fileset>
263+
264+
<target name="nuspec" depends="init nuget.set-properties" description="Create nuspec files">
265+
<nant target="nuspec">
266+
<buildfiles refid="nugetfiles.all" />
267+
</nant>
268+
</target>
269+
270+
<target name="nuget" depends="init binaries nuget.set-properties nuspec"
271+
description="Creates files for the release on nuget gallery.">
257272

258-
<nant target="nuget">
259-
<buildfiles refid="nugetfiles.all" />
260-
</nant>
261-
262-
<mkdir dir="${nuget.nupackages.dir}" />
263-
<move todir="${nuget.nupackages.dir}">
264-
<fileset basedir="${nuget.workingdir}">
265-
<include name="*.nupkg" />
266-
</fileset>
267-
</move>
268-
</target>
269-
270-
<target name="nugetpushbat" depends="init binaries common.download-nuget nuget.set-properties nuspec nuget"
271-
description="Creates files for the release on nuget gallery.">
272-
273-
<copy file="${tools.dir}/NuGet.exe" todir="${nuget.nupackages.dir}"/>
274-
275-
<echo message="rem In order to use this bat you have to be sure you have executed 'nuget SetApiKey' ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="false"/>
276-
<foreach item="File" property="filename">
277-
<in>
278-
<items>
279-
<include name="${nuget.nupackages.dir}/*.nupkg"/>
280-
</items>
281-
</in>
282-
<do>
283-
<echo message="nuget push ${filename} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
284-
</do>
285-
</foreach>
286-
</target>
287-
288-
<target name="nugetpush" depends="init binaries common.download-nuget nuget.set-properties nuspec nuget"
289-
description="Push packages on nuget gallery.">
290-
<!-- In order to use this task you have to be sure you have executed 'nuget SetApiKey' -->
291-
<foreach item="File" property="filename">
292-
<in>
293-
<items>
294-
<include name="${nuget.nupackages.dir}/*.nupkg"/>
295-
</items>
296-
</in>
297-
<do>
298-
<exec basedir="${tools.dir}" workingdir="${nuget.nupackages.dir}" program="NuGet.exe">
299-
<arg value="push" />
300-
<arg value="${filename}" />
301-
</exec>
302-
</do>
303-
</foreach>
304-
</target>
273+
<nant target="nuget">
274+
<buildfiles refid="nugetfiles.all" />
275+
</nant>
276+
277+
<mkdir dir="${nuget.nupackages.dir}" />
278+
<move todir="${nuget.nupackages.dir}">
279+
<fileset basedir="${nuget.workingdir}">
280+
<include name="*.nupkg" />
281+
</fileset>
282+
</move>
283+
</target>
284+
285+
<target name="nugetpushbat" depends="init binaries common.download-nuget nuget.set-properties nuspec nuget"
286+
description="Creates files for the release on nuget gallery.">
287+
288+
<copy file="${tools.dir}/NuGet.exe" todir="${nuget.nupackages.dir}"/>
289+
290+
<echo message="rem In order to use this bat you have to be sure you have executed 'nuget SetApiKey' ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="false"/>
291+
<foreach item="File" property="filename">
292+
<in>
293+
<items>
294+
<include name="${nuget.nupackages.dir}/*.nupkg"/>
295+
</items>
296+
</in>
297+
<do>
298+
<echo message="nuget push ${filename} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
299+
</do>
300+
</foreach>
301+
</target>
302+
303+
<target name="nugetpush" depends="init binaries common.download-nuget nuget.set-properties nuspec nuget"
304+
description="Push packages on nuget gallery.">
305+
<!-- In order to use this task you have to be sure you have executed 'nuget SetApiKey' -->
306+
<foreach item="File" property="filename">
307+
<in>
308+
<items>
309+
<include name="${nuget.nupackages.dir}/*.nupkg"/>
310+
</items>
311+
</in>
312+
<do>
313+
<exec basedir="${tools.dir}" workingdir="${nuget.nupackages.dir}" program="NuGet.exe">
314+
<arg value="push" />
315+
<arg value="${filename}" />
316+
</exec>
317+
</do>
318+
</foreach>
319+
</target>
305320

306321
</project>

‎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)