Skip to content

Commit c2ce847

Browse files
committed
NH-4008 - Split out drivers into own projects.
1 parent 0c60e0a commit c2ce847

File tree

145 files changed

+1260
-8827
lines changed

Some content is hidden

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

145 files changed

+1260
-8827
lines changed

ShowBuildMenu.bat

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ echo ========================= NHIBERNATE BUILD MENU ==========================
1212
echo --- TESTING ---
1313
echo B. (Step 1) Set up a new test configuration for a particular database.
1414
echo C. (Step 2) Activate a test configuration.
15-
echo D. (Step 3) Run tests using active configuration.
15+
echo D. (Step 3) Run tests using active configuration (Needs built in Visual Studio).
1616
echo.
1717
echo --- BUILD ---
1818
echo E. Build NHibernate (Debug)
@@ -74,47 +74,47 @@ goto test-setup-generic
7474
:test-setup-sqlservercex86
7575
set CONFIG_NAME=SqlServerCe32
7676
set PLATFORM=AnyCPU
77-
set LIB_FILES=lib\teamcity\SqlServerCe\*.dll
78-
set LIB_FILES2=lib\teamcity\SqlServerCe\X86\*.dll
77+
set LIB_FILES=
78+
set LIB_FILES2=
7979
goto test-setup-generic
8080

8181
:test-setup-sqlservercex64
8282
set CONFIG_NAME=SqlServerCe64
8383
set PLATFORM=AnyCPU
84-
set LIB_FILES=lib\teamcity\sqlServerCe\*.dll
85-
set LIB_FILES2=lib\teamcity\sqlServerCe\AMD64\*.dll
84+
set LIB_FILES=
85+
set LIB_FILES2=
8686
goto test-setup-generic
8787

8888
:test-setup-firebirdx86
8989
set CONFIG_NAME=FireBird
9090
set PLATFORM=x86
91-
set LIB_FILES=lib\teamcity\firebird\*.dll
91+
set LIB_FILES=
9292
goto test-setup-generic
9393

9494
:test-setup-firebirdx64
9595
set CONFIG_NAME=FireBird
9696
set PLATFORM=x64
97-
set LIB_FILES=lib\teamcity\firebird\*.dll
97+
set LIB_FILES=
9898
goto test-setup-generic
9999

100100
:test-setup-sqlitex86
101101
set CONFIG_NAME=SQLite
102102
set PLATFORM=x86
103-
set LIB_FILES=lib\teamcity\sqlite\x86\*
103+
set LIB_FILES=
104104
set LIB_FILES2=
105105
goto test-setup-generic
106106

107107
:test-setup-sqlitex64
108108
set CONFIG_NAME=SQLite
109109
set PLATFORM=x64
110-
set LIB_FILES=lib\teamcity\sqlite\x64\*
110+
set LIB_FILES=
111111
set LIB_FILES2=
112112
goto test-setup-generic
113113

114114
:test-setup-postgresql
115115
set CONFIG_NAME=PostgreSQL
116116
set PLATFORM=AnyCPU
117-
set LIB_FILES=lib\teamcity\postgresql\*.dll
117+
set LIB_FILES=
118118
set LIB_FILES2=
119119
goto test-setup-generic
120120

@@ -161,7 +161,9 @@ echo Configuration activated.
161161
goto main-menu
162162

163163
:test-run
164-
start "nunit3-console" cmd /K %NUNIT% --x86 --agents=1 --process=separate NHibernate.nunit
164+
SET NUNITPLATFORM=
165+
IF /I "%PLATFORM%" NEQ "x64" set NUNITPLATFORM=--x86
166+
start "nunit3-console" cmd /K %NUNIT% %NUNITPLATFORM% --agents=1 --process=separate NHibernate.nunit
165167
goto main-menu
166168

167169
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.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

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