Skip to content

Commit 9f3d6c1

Browse files
committed
Update-package FirebirdSql.Data.FirebirdClient
1 parent 292b5e8 commit 9f3d6c1

File tree

3 files changed

+17
-22
lines changed

3 files changed

+17
-22
lines changed

src/NHibernate.TestDatabaseSetup/App.config

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<section name="hibernate-configuration" type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate"/>
5-
<section name="oracle.manageddataaccess.client"
6-
type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
4+
<section name="hibernate-configuration" type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate" />
5+
<section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" />
76
</configSections>
87

98
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
@@ -14,32 +13,28 @@
1413
</property>
1514
</session-factory>
1615
</hibernate-configuration>
17-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup><system.data>
16+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup><system.data>
1817
<DbProviderFactories>
19-
<remove invariant="FirebirdSql.Data.FirebirdClient"/>
20-
<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird"
21-
type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient"/>
22-
<remove invariant="MySql.Data.MySqlClient"/><add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient"
23-
description=".Net Framework Data Provider for MySQL"
24-
type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
25-
<remove invariant="Oracle.ManagedDataAccess.Client"/>
26-
<add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver"
27-
type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
28-
</DbProviderFactories>
18+
19+
20+
<remove invariant="MySql.Data.MySqlClient" /><add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
21+
<remove invariant="Oracle.ManagedDataAccess.Client" />
22+
<add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342" />
23+
<remove invariant="FirebirdSql.Data.FirebirdClient" /><add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" /></DbProviderFactories>
2924
</system.data>
3025
<runtime>
3126
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
3227
<dependentAssembly>
33-
<publisherPolicy apply="no"/>
34-
<assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral"/>
35-
<bindingRedirect oldVersion="4.121.0.0 - 4.65535.65535.65535" newVersion="4.121.2.0"/>
28+
<publisherPolicy apply="no" />
29+
<assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral" />
30+
<bindingRedirect oldVersion="4.121.0.0 - 4.65535.65535.65535" newVersion="4.121.2.0" />
3631
</dependentAssembly>
3732
</assemblyBinding>
3833
</runtime>
3934
<oracle.manageddataaccess.client>
4035
<version number="*">
4136
<dataSources>
42-
<dataSource alias="SampleDataSource" descriptor="(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) "/>
37+
<dataSource alias="SampleDataSource" descriptor="(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) " />
4338
</dataSources>
4439
</version>
4540
</oracle.manageddataaccess.client>

src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
<Prefer32Bit>false</Prefer32Bit>
6363
</PropertyGroup>
6464
<ItemGroup>
65-
<Reference Include="FirebirdSql.Data.FirebirdClient, Version=5.0.5.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
66-
<HintPath>..\packages\FirebirdSql.Data.FirebirdClient.5.0.5\lib\net45\FirebirdSql.Data.FirebirdClient.dll</HintPath>
65+
<Reference Include="FirebirdSql.Data.FirebirdClient, Version=5.7.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
66+
<HintPath>..\packages\FirebirdSql.Data.FirebirdClient.5.7.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
6767
<Private>True</Private>
6868
</Reference>
6969
<Reference Include="Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="FirebirdSql.Data.FirebirdClient" version="5.0.5" targetFramework="net461" />
3+
<package id="FirebirdSql.Data.FirebirdClient" version="5.7.0" targetFramework="net461" />
44
<package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net461" />
55
<package id="MySql.Data" version="6.9.9" targetFramework="net461" />
66
<package id="Npgsql" version="2.2.7" targetFramework="net461" />
7+
<package id="NUnit" version="3.6.0" targetFramework="net461" />
78
<package id="Oracle.ManagedDataAccess" version="12.1.24160719" targetFramework="net461" />
89
<package id="System.Data.SQLite.Core" version="1.0.104.0" targetFramework="net461" />
9-
<package id="NUnit" version="3.6.0" targetFramework="net461" />
1010
</packages>

0 commit comments

Comments
 (0)