Skip to content

NHibernate 5.2.7 and SQL Anywhere 17 support #453

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

Merged
hazzik merged 8 commits into from
Sep 18, 2020
Merged

NHibernate 5.2.7 and SQL Anywhere 17 support #453

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d2c46ff
NHibernate 5.2.7.
May 19, 2020
ae90ccd
Removed specific version, using $(NHibernatePackageVersion)
pettersoft Sep 17, 2020
a9e77e0
5.2.7 > $(NHibernatePackageVersion)
pettersoft Sep 17, 2020
edc176a
5.2.7 > $(NHibernatePackageVersion)
pettersoft Sep 17, 2020
cbdd5c8
Merge branch 'master' into pettersoft-master
hazzik Sep 18, 2020
045915d
Revert changes
hazzik Sep 18, 2020
5178f35
Update to NHibernate 5.2.7
hazzik Sep 18, 2020
03ae595
Remove invalid using
hazzik Sep 18, 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 global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projects": [ "src" ],
"sdk": {
"version": "2.1.4"
"version": "2.1.700"
}
}
2 changes: 1 addition & 1 deletion src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<ItemGroup>
<PackageReference Include="EntityFramework" Version="6.2.0" />
<PackageReference Include="NHibernate" Version="$(NHibernatePackageVersion)" />
<PackageReference Include="NHibernate" Version="5.2.7" />
<PackageReference Include="System.Data.SQLite" Version="1.0.106.0" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.106.0" />
<PackageReference Include="System.Data.SQLite.EF6" Version="1.0.106.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Examples.FirstProject/Examples.FirstProject.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<ItemGroup>
<PackageReference Include="EntityFramework" Version="6.2.0" />
<PackageReference Include="NHibernate" Version="$(NHibernatePackageVersion)" />
<PackageReference Include="NHibernate" Version="5.2.7" />
<PackageReference Include="System.Data.SQLite" Version="1.0.106.0" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.106.0" />
<PackageReference Include="System.Data.SQLite.EF6" Version="1.0.106.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NHibernate" Version="$(NHibernatePackageVersion)" />
<PackageReference Include="NHibernate" Version="5.2.7" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="NHibernate" Version="$(NHibernatePackageVersion)" />
<PackageReference Include="NHibernate" Version="5.2.7" />
<PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
<PackageReference Include="FluentAssertions" Version="4.19.4" />
<PackageReference Include="Machine.Specifications" Version="0.12.0" />
Expand Down
8 changes: 8 additions & 0 deletions src/FluentNHibernate.Testing/Cfg/Db/SqlAnywhereConfigurationTester.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,13 @@ public void SqlAnywhere12_should_specify_Sybase12_dialect_and_net40driver()
properties["dialect"].ShouldEqual("NHibernate.Dialect.SybaseSQLAnywhere12Dialect, " + typeof(ISession).Assembly.FullName);
properties["connection.driver_class"].ShouldEqual("NHibernate.Driver.SybaseSQLAnywhereDotNet4Driver, " + typeof(ISession).Assembly.FullName);
}

[Test]
public void SqlAnywhere17_should_specify_SQLAnywhere17_dialect()
{
var properties = SQLAnywhereConfiguration.SQLAnywhere17.ToProperties();
properties["dialect"].ShouldEqual("NHibernate.Dialect.SapSQLAnywhere17Dialect, " + typeof(ISession).Assembly.FullName);
properties["connection.driver_class"].ShouldEqual("NHibernate.Driver.SapSQLAnywhere17Driver, " + typeof(ISession).Assembly.FullName);
}
}
}
2 changes: 1 addition & 1 deletion src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="FakeItEasy" Version="4.3.0" />
<PackageReference Include="FluentAssertions" Version="4.19.4" />
<PackageReference Include="NHibernate" Version="$(NHibernatePackageVersion)" />
<PackageReference Include="NHibernate" Version="5.2.7" />
<PackageReference Include="NUnit" Version="3.10.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
<PackageReference Include="System.Data.SQLite" Version="1.0.108" />
Expand Down
8 changes: 8 additions & 0 deletions src/FluentNHibernate/Cfg/Db/SQLAnywhereConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ public static SQLAnywhereConfiguration SQLAnywhere12
{
return new SQLAnywhereConfiguration().Dialect<SybaseSQLAnywhere12Dialect>().Driver<SybaseSQLAnywhereDotNet4Driver>();
}
}

public static SQLAnywhereConfiguration SQLAnywhere17
{
get
{
return new SQLAnywhereConfiguration().Dialect<SapSQLAnywhere17Dialect>().Driver<SapSQLAnywhere17Driver>();
}
}
}
}
1 change: 0 additions & 1 deletion src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System.Data.SqlClient;
using System.Text;

namespace FluentNHibernate.Cfg.Db
Expand Down
2 changes: 1 addition & 1 deletion src/FluentNHibernate/FluentNHibernate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<Import Project="$(MSBuildThisFileDirectory)..\Shared.msbuild" />

<ItemGroup>
<PackageReference Include="NHibernate" Version="$(NHibernatePackageVersion)" />
<PackageReference Include="NHibernate" Version="5.2.7" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
Expand Down