From d2c46ff48e17dbadb4e63fc09812aa5c6834546a Mon Sep 17 00:00:00 2001 From: Petter Date: Tue, 19 May 2020 09:32:08 +0200 Subject: [PATCH 1/7] NHibernate 5.2.7. SQL Anywhere 17. --- global.json | 2 +- .../Examples.FirstAutomappedProject.csproj | 2 +- src/Examples.FirstProject/Examples.FirstProject.csproj | 2 +- .../FluentNHibernate.Specs.ExternalFixtures.csproj | 2 +- src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj | 2 +- .../Cfg/Db/SqlAnywhereConfigurationTester.cs | 8 ++++++++ .../FluentNHibernate.Testing.csproj | 2 +- src/FluentNHibernate/Cfg/Db/SQLAnywhereConfiguration.cs | 8 ++++++++ .../Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs | 1 - src/FluentNHibernate/FluentNHibernate.csproj | 2 +- 10 files changed, 23 insertions(+), 8 deletions(-) diff --git a/global.json b/global.json index 062202e97..2982b88a6 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "2.1.4" + "version": "2.1.700" } } \ No newline at end of file diff --git a/src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj b/src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj index 19891b109..3a6119752 100644 --- a/src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj +++ b/src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Examples.FirstProject/Examples.FirstProject.csproj b/src/Examples.FirstProject/Examples.FirstProject.csproj index 25cc8f5fb..e12baf190 100644 --- a/src/Examples.FirstProject/Examples.FirstProject.csproj +++ b/src/Examples.FirstProject/Examples.FirstProject.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj b/src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj index 6f116a154..166c60a7d 100644 --- a/src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj +++ b/src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj @@ -15,7 +15,7 @@ - + \ No newline at end of file diff --git a/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj b/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj index ea72a3ec7..824d8a0d2 100644 --- a/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj +++ b/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/FluentNHibernate.Testing/Cfg/Db/SqlAnywhereConfigurationTester.cs b/src/FluentNHibernate.Testing/Cfg/Db/SqlAnywhereConfigurationTester.cs index ff94a928d..b18ef4834 100644 --- a/src/FluentNHibernate.Testing/Cfg/Db/SqlAnywhereConfigurationTester.cs +++ b/src/FluentNHibernate.Testing/Cfg/Db/SqlAnywhereConfigurationTester.cs @@ -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); + } } } diff --git a/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj b/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj index 3466423fd..80a701af4 100644 --- a/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj +++ b/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/FluentNHibernate/Cfg/Db/SQLAnywhereConfiguration.cs b/src/FluentNHibernate/Cfg/Db/SQLAnywhereConfiguration.cs index 5e3daf3e3..e1b9f2529 100644 --- a/src/FluentNHibernate/Cfg/Db/SQLAnywhereConfiguration.cs +++ b/src/FluentNHibernate/Cfg/Db/SQLAnywhereConfiguration.cs @@ -37,6 +37,14 @@ public static SQLAnywhereConfiguration SQLAnywhere12 { return new SQLAnywhereConfiguration().Dialect().Driver(); } + } + + public static SQLAnywhereConfiguration SQLAnywhere17 + { + get + { + return new SQLAnywhereConfiguration().Dialect().Driver(); + } } } } \ No newline at end of file diff --git a/src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs b/src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs index 05f202abf..3a1e4d4a5 100644 --- a/src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs +++ b/src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs @@ -1,4 +1,3 @@ -using System.Data.SqlClient; using System.Text; namespace FluentNHibernate.Cfg.Db diff --git a/src/FluentNHibernate/FluentNHibernate.csproj b/src/FluentNHibernate/FluentNHibernate.csproj index f6a08c559..db948e1c3 100644 --- a/src/FluentNHibernate/FluentNHibernate.csproj +++ b/src/FluentNHibernate/FluentNHibernate.csproj @@ -21,7 +21,7 @@ - + From ae90ccd0cf20f2031e22e017dab8cbe9e55d0af1 Mon Sep 17 00:00:00 2001 From: Petter Date: Thu, 17 Sep 2020 13:29:27 +0200 Subject: [PATCH 2/7] Removed specific version, using $(NHibernatePackageVersion) --- src/FluentNHibernate/FluentNHibernate.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FluentNHibernate/FluentNHibernate.csproj b/src/FluentNHibernate/FluentNHibernate.csproj index db948e1c3..21b0cd4b7 100644 --- a/src/FluentNHibernate/FluentNHibernate.csproj +++ b/src/FluentNHibernate/FluentNHibernate.csproj @@ -21,7 +21,7 @@ - + @@ -39,4 +39,4 @@ - \ No newline at end of file + From a9e77e072b0bdd37dfee315662747b2387055890 Mon Sep 17 00:00:00 2001 From: Petter Date: Thu, 17 Sep 2020 13:29:51 +0200 Subject: [PATCH 3/7] 5.2.7 > $(NHibernatePackageVersion) --- src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj b/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj index 80a701af4..591a28a67 100644 --- a/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj +++ b/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj @@ -26,7 +26,7 @@ - + @@ -60,4 +60,4 @@ - \ No newline at end of file + From edc176a7b28b43b15d71dfba249add13a39b6b74 Mon Sep 17 00:00:00 2001 From: Petter Date: Thu, 17 Sep 2020 13:30:12 +0200 Subject: [PATCH 4/7] 5.2.7 > $(NHibernatePackageVersion) --- src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj b/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj index 824d8a0d2..95a8a1394 100644 --- a/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj +++ b/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj @@ -15,7 +15,7 @@ - + @@ -42,4 +42,4 @@ - \ No newline at end of file + From 045915db460ac40dd7bc86c6caae2d49231fc15f Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 18 Sep 2020 15:58:40 +1200 Subject: [PATCH 5/7] Revert changes --- global.json | 2 +- .../Examples.FirstAutomappedProject.csproj | 2 +- src/Examples.FirstProject/Examples.FirstProject.csproj | 2 +- .../FluentNHibernate.Specs.ExternalFixtures.csproj | 2 +- src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj | 2 +- src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj | 2 +- .../Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs | 1 + src/FluentNHibernate/FluentNHibernate.csproj | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/global.json b/global.json index 2982b88a6..062202e97 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "2.1.700" + "version": "2.1.4" } } \ No newline at end of file diff --git a/src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj b/src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj index 3a6119752..19891b109 100644 --- a/src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj +++ b/src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Examples.FirstProject/Examples.FirstProject.csproj b/src/Examples.FirstProject/Examples.FirstProject.csproj index e12baf190..25cc8f5fb 100644 --- a/src/Examples.FirstProject/Examples.FirstProject.csproj +++ b/src/Examples.FirstProject/Examples.FirstProject.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj b/src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj index 166c60a7d..6f116a154 100644 --- a/src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj +++ b/src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj @@ -15,7 +15,7 @@ - + \ No newline at end of file diff --git a/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj b/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj index 95a8a1394..ea72a3ec7 100644 --- a/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj +++ b/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj @@ -42,4 +42,4 @@ - + \ No newline at end of file diff --git a/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj b/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj index 591a28a67..3466423fd 100644 --- a/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj +++ b/src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj @@ -60,4 +60,4 @@ - + \ No newline at end of file diff --git a/src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs b/src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs index 3a1e4d4a5..05f202abf 100644 --- a/src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs +++ b/src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs @@ -1,3 +1,4 @@ +using System.Data.SqlClient; using System.Text; namespace FluentNHibernate.Cfg.Db diff --git a/src/FluentNHibernate/FluentNHibernate.csproj b/src/FluentNHibernate/FluentNHibernate.csproj index 21b0cd4b7..f6a08c559 100644 --- a/src/FluentNHibernate/FluentNHibernate.csproj +++ b/src/FluentNHibernate/FluentNHibernate.csproj @@ -39,4 +39,4 @@ - + \ No newline at end of file From 5178f35a347fff921fbead9de939971402080fe3 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 18 Sep 2020 15:59:50 +1200 Subject: [PATCH 6/7] Update to NHibernate 5.2.7 --- src/Shared.msbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shared.msbuild b/src/Shared.msbuild index c596727a7..25c279d1b 100644 --- a/src/Shared.msbuild +++ b/src/Shared.msbuild @@ -41,7 +41,7 @@ - 5.1.1 + 5.2.7 \ No newline at end of file From 03ae595b0d44ba5896168aece30dab756bafe1c4 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 18 Sep 2020 16:46:10 +1200 Subject: [PATCH 7/7] Remove invalid using --- .../Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs b/src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs index 05f202abf..3a1e4d4a5 100644 --- a/src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs +++ b/src/FluentNHibernate/Cfg/Db/SybaseSQLAnywhereConnectionStringBuilder.cs @@ -1,4 +1,3 @@ -using System.Data.SqlClient; using System.Text; namespace FluentNHibernate.Cfg.Db