Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update NHibernate to 5.3.3 #475

Merged
merged 3 commits into from
Oct 14, 2020
Merged

Update NHibernate to 5.3.3 #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82bb75e
Update NHibernate to 5.3.3
hazzik Oct 9, 2020
a4da9fe
Fix NullReferenceException in tests
hazzik Oct 9, 2020
2a09c33
Just disable obsolete warning
hazzik Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</PropertyGroup>

<PropertyGroup Label="Package Versions">
<NHibernatePackageVersion>5.2.7</NHibernatePackageVersion>
<NHibernatePackageVersion>5.3.3</NHibernatePackageVersion>
</PropertyGroup>

<ItemGroup Condition="'$(IsPackable)' == 'true'">
Expand Down
4 changes: 2 additions & 2 deletions src/FluentNHibernate.Testing/Cfg/Db/OracleClientConfigurationTester.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using System;
using FluentNHibernate.Cfg.Db;
using NHibernate;
using NHibernate.Dialect;
using NHibernate.Driver;
using NUnit.Framework;

namespace FluentNHibernate.Testing.Cfg.Db
{
[TestFixture]
[TestFixture, Obsolete]
public class OracleClientConfigurationTester
{
[Test]
Expand Down
4 changes: 2 additions & 2 deletions src/FluentNHibernate.Testing/Cfg/Db/OracleDataClientConfigurationTester.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void ConnectionString_is_added_to_the_configuration()
[Test]
public void ConnectionString_leaving_out_the_StatementCacheSize_removes_from_string()
{
OracleClientConfiguration.Oracle9
OracleDataClientConfiguration.Oracle9
.ConnectionString(c => c
.Server("db-srv")
.Instance("mydatabase")
Expand All @@ -59,7 +59,7 @@ public void ConnectionString_leaving_out_the_StatementCacheSize_removes_from_str
[Test]
public void ConnectionString_pooling_defaults_to_false_when_not_set()
{
OracleClientConfiguration.Oracle9
OracleDataClientConfiguration.Oracle9
.ConnectionString(c => c
.Server("db-srv")
.Instance("mydatabase")
Expand Down
4 changes: 2 additions & 2 deletions src/FluentNHibernate.Testing/Cfg/Db/OracleManagedDataClientConfigurationTester.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void ConnectionString_is_added_to_the_configuration()
[Test]
public void ConnectionString_leaving_out_the_StatementCacheSize_removes_from_string()
{
OracleClientConfiguration.Oracle9
OracleManagedDataClientConfiguration.Oracle9
.ConnectionString(c => c
.Server("db-srv")
.Instance("mydatabase")
Expand All @@ -59,7 +59,7 @@ public void ConnectionString_leaving_out_the_StatementCacheSize_removes_from_str
[Test]
public void ConnectionString_pooling_defaults_to_false_when_not_set()
{
OracleClientConfiguration.Oracle9
OracleManagedDataClientConfiguration.Oracle9
.ConnectionString(c => c
.Server("db-srv")
.Instance("mydatabase")
Expand Down
2 changes: 2 additions & 0 deletions src/FluentNHibernate/Cfg/Db/OracleClientConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using System;
using NHibernate.Dialect;
using NHibernate.Driver;

namespace FluentNHibernate.Cfg.Db
{
[Obsolete("Use OracleManagedDataClientConfiguration or OracleDataClientConfiguration instead.")]
public class OracleClientConfiguration : PersistenceConfiguration<OracleClientConfiguration, OracleConnectionStringBuilder>
{
protected OracleClientConfiguration()
Expand Down
2 changes: 2 additions & 0 deletions src/FluentNHibernate/Testing/PersistenceSpecification.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ public PersistenceSpecification(ISession session)
public PersistenceSpecification(ISession session, IEqualityComparer entityEqualityComparer)
{
currentSession = session;
#pragma warning disable CS0618 // ISession.Transaction is obsolete
hasExistingTransaction = currentSession.Transaction != null && currentSession.Transaction.IsActive || System.Transactions.Transaction.Current != null;
#pragma warning restore CS0618
this.entityEqualityComparer = entityEqualityComparer;
}

Expand Down