Skip to content

Commit 5c5e6c9

Browse files
committed
NH-4008 - Split out drivers into own projects.
1 parent f0a67ca commit 5c5e6c9

File tree

164 files changed

+1710
-8831
lines changed

Some content is hidden

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

164 files changed

+1710
-8831
lines changed

ShowBuildMenu.bat

+13-11
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)
@@ -76,47 +76,47 @@ goto test-setup-generic
7676
:test-setup-sqlservercex86
7777
set CONFIG_NAME=SqlServerCe32
7878
set PLATFORM=AnyCPU
79-
set LIB_FILES=lib\teamcity\SqlServerCe\*.dll
80-
set LIB_FILES2=lib\teamcity\SqlServerCe\X86\*.dll
79+
set LIB_FILES=
80+
set LIB_FILES2=
8181
goto test-setup-generic
8282

8383
:test-setup-sqlservercex64
8484
set CONFIG_NAME=SqlServerCe64
8585
set PLATFORM=AnyCPU
86-
set LIB_FILES=lib\teamcity\sqlServerCe\*.dll
87-
set LIB_FILES2=lib\teamcity\sqlServerCe\AMD64\*.dll
86+
set LIB_FILES=
87+
set LIB_FILES2=
8888
goto test-setup-generic
8989

9090
:test-setup-firebirdx86
9191
set CONFIG_NAME=FireBird
9292
set PLATFORM=x86
93-
set LIB_FILES=lib\teamcity\firebird\*.dll
93+
set LIB_FILES=
9494
goto test-setup-generic
9595

9696
:test-setup-firebirdx64
9797
set CONFIG_NAME=FireBird
9898
set PLATFORM=x64
99-
set LIB_FILES=lib\teamcity\firebird\*.dll
99+
set LIB_FILES=
100100
goto test-setup-generic
101101

102102
:test-setup-sqlitex86
103103
set CONFIG_NAME=SQLite
104104
set PLATFORM=x86
105-
set LIB_FILES=lib\teamcity\sqlite\x86\*
105+
set LIB_FILES=
106106
set LIB_FILES2=
107107
goto test-setup-generic
108108

109109
:test-setup-sqlitex64
110110
set CONFIG_NAME=SQLite
111111
set PLATFORM=x64
112-
set LIB_FILES=lib\teamcity\sqlite\x64\*
112+
set LIB_FILES=
113113
set LIB_FILES2=
114114
goto test-setup-generic
115115

116116
:test-setup-postgresql
117117
set CONFIG_NAME=PostgreSQL
118118
set PLATFORM=AnyCPU
119-
set LIB_FILES=lib\teamcity\postgresql\*.dll
119+
set LIB_FILES=
120120
set LIB_FILES2=
121121
goto test-setup-generic
122122

@@ -156,7 +156,9 @@ echo Configuration activated.
156156
goto main-menu
157157

158158
:test-run
159-
start "nunit3-console" cmd /K %NUNIT% --x86 --agents=1 --process=separate NHibernate.nunit
159+
SET NUNITPLATFORM=
160+
IF /I "%PLATFORM%" NEQ "x64" set NUNITPLATFORM=--x86
161+
start "nunit3-console" cmd /K %NUNIT% %NUNITPLATFORM% --agents=1 --process=separate NHibernate.nunit
160162
goto main-menu
161163

162164
rem :build-test

build-common/nhibernate-properties.xml

+1-1
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.SqlClientDriver, NHibernate.Driver.SqlClient" 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

+1-1
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>
Binary file not shown.

lib/teamcity/mysql/mysql.data.dll

-376 KB
Binary file not shown.

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

-4
This file was deleted.

0 commit comments

Comments
 (0)