Skip to content

Commit ededf50

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

File tree

163 files changed

+1727
-8829
lines changed

Some content is hidden

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

163 files changed

+1727
-8829
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)
@@ -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

+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

-415 KB
Binary file not shown.

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

-4
This file was deleted.

0 commit comments

Comments
 (0)