From a28a395309e206347eced6d9caa005dc95f5b264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?= <12201973+fredericdelaporte@users.noreply.github.com> Date: Sun, 13 Mar 2022 21:27:41 +0100 Subject: [PATCH 1/8] Supports tests in VS 2022 fix #3035 --- build-common/NHibernate.props | 2 +- psake.ps1 | 2 +- src/AsyncGenerator.yml | 2 +- .../NHibernate.Test.VisualBasic.vbproj | 14 +++++++------- src/NHibernate.Test.VisualBasic/Program.vb | 4 ++-- src/NHibernate.Test/Async/Linq/WhereTests.cs | 2 +- src/NHibernate.Test/Linq/MathFTests.cs | 2 +- src/NHibernate.Test/Linq/WhereTests.cs | 2 +- src/NHibernate.Test/NHibernate.Test.csproj | 12 ++++++------ src/NHibernate.Test/Program.cs | 4 ++-- .../NHibernate.TestDatabaseSetup.csproj | 10 +++++----- src/NHibernate.TestDatabaseSetup/Program.cs | 4 ++-- .../Collection/Generic/SetHelpers/SetSnapShot.cs | 4 ++-- 13 files changed, 32 insertions(+), 32 deletions(-) diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props index 4d25f049970..822aed4d315 100644 --- a/build-common/NHibernate.props +++ b/build-common/NHibernate.props @@ -13,7 +13,7 @@ $(VersionPrefix).$(BuildNumber) $(VersionPrefix).0 - net461;netcoreapp2.0 + net461;netcoreapp2.1 net461;netcoreapp2.0;netstandard2.0 false true diff --git a/psake.ps1 b/psake.ps1 index e9cd52d7081..08978673557 100644 --- a/psake.ps1 +++ b/psake.ps1 @@ -108,7 +108,7 @@ Task Test -depends Build { 'NHibernate.Test', 'NHibernate.Test.VisualBasic' ) | ForEach-Object { - $assembly = [IO.Path]::Combine("src", $_, "bin", "Release", "netcoreapp2.0", "$_.dll") + $assembly = [IO.Path]::Combine("src", $_, "bin", "Release", "netcoreapp2.1", "$_.dll") Exec { dotnet $assembly --labels=before --nocolor "--result=$_-TestResult.xml" } diff --git a/src/AsyncGenerator.yml b/src/AsyncGenerator.yml index 97e7104beff..568295553dc 100644 --- a/src/AsyncGenerator.yml +++ b/src/AsyncGenerator.yml @@ -183,7 +183,7 @@ scanForMissingAsyncMembers: - all: true - filePath: NHibernate.Test/NHibernate.Test.csproj - targetFramework: netcoreapp2.0 + targetFramework: netcoreapp2.1 concurrentRun: true applyChanges: true suppressDiagnosticFailures: diff --git a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj index 9fca761b567..2868e52cbb5 100644 --- a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj +++ b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj @@ -11,8 +11,8 @@ On On - - NETCOREAPP2_0,$(DefineConstants) + + NETCOREAPP2_1,$(DefineConstants) Exe false @@ -22,7 +22,7 @@ - + @@ -34,11 +34,11 @@ - - + + - - + + diff --git a/src/NHibernate.Test.VisualBasic/Program.vb b/src/NHibernate.Test.VisualBasic/Program.vb index 362743c97ef..a54b33c1d68 100644 --- a/src/NHibernate.Test.VisualBasic/Program.vb +++ b/src/NHibernate.Test.VisualBasic/Program.vb @@ -1,7 +1,7 @@ -#If NETCOREAPP2_0 +#If NETCOREAPP2_1 Public Class Program Public Shared Function Main(args As String()) As Integer Return New NUnitLite.AutoRun(GetType(Program).Assembly).Execute(args) End Function End Class -#End If \ No newline at end of file +#End If diff --git a/src/NHibernate.Test/Async/Linq/WhereTests.cs b/src/NHibernate.Test/Async/Linq/WhereTests.cs index b357edc1c82..31810c5cf12 100644 --- a/src/NHibernate.Test/Async/Linq/WhereTests.cs +++ b/src/NHibernate.Test/Async/Linq/WhereTests.cs @@ -444,7 +444,7 @@ public void StringComparisonParamEmitsWarningAsync() await (AssertStringComparisonWarningAsync(x => x.CustomerId.EndsWith("ANATR", StringComparison.Ordinal), 1)); await (AssertStringComparisonWarningAsync(x => x.CustomerId.IndexOf("ANATR", StringComparison.Ordinal) == 0, 1)); await (AssertStringComparisonWarningAsync(x => x.CustomerId.IndexOf("ANATR", 0, StringComparison.Ordinal) == 0, 1)); -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 await (AssertStringComparisonWarningAsync(x => x.CustomerId.Replace("AN", "XX", StringComparison.Ordinal) == "XXATR", 1)); #endif }); diff --git a/src/NHibernate.Test/Linq/MathFTests.cs b/src/NHibernate.Test/Linq/MathFTests.cs index 8dd21f8de24..5826ff8237e 100644 --- a/src/NHibernate.Test/Linq/MathFTests.cs +++ b/src/NHibernate.Test/Linq/MathFTests.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 using System; using System.Linq; using System.Linq.Expressions; diff --git a/src/NHibernate.Test/Linq/WhereTests.cs b/src/NHibernate.Test/Linq/WhereTests.cs index 78c5290064e..7ceedeee37c 100644 --- a/src/NHibernate.Test/Linq/WhereTests.cs +++ b/src/NHibernate.Test/Linq/WhereTests.cs @@ -432,7 +432,7 @@ public void StringComparisonParamEmitsWarning() AssertStringComparisonWarning(x => x.CustomerId.EndsWith("ANATR", StringComparison.Ordinal), 1); AssertStringComparisonWarning(x => x.CustomerId.IndexOf("ANATR", StringComparison.Ordinal) == 0, 1); AssertStringComparisonWarning(x => x.CustomerId.IndexOf("ANATR", 0, StringComparison.Ordinal) == 0, 1); -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 AssertStringComparisonWarning(x => x.CustomerId.Replace("AN", "XX", StringComparison.Ordinal) == "XXATR", 1); #endif }); diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj index e73002ebb6e..45955260558 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -7,7 +7,7 @@ $(NoWarn);3001;3002;3003;3005 true - + Exe false @@ -35,7 +35,7 @@ Always - + @@ -60,8 +60,8 @@ - - + + @@ -76,13 +76,13 @@ - + - + diff --git a/src/NHibernate.Test/Program.cs b/src/NHibernate.Test/Program.cs index bee78f9d955..598b063b982 100644 --- a/src/NHibernate.Test/Program.cs +++ b/src/NHibernate.Test/Program.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 namespace NHibernate.Test { public class Program @@ -9,4 +9,4 @@ public static int Main(string[] args) } } } -#endif \ No newline at end of file +#endif diff --git a/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj b/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj index e4639a49a03..7f8d0f64345 100644 --- a/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj +++ b/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj @@ -7,7 +7,7 @@ true $(NoWarn);3001;3002;3003;3005 - + Exe false @@ -15,11 +15,11 @@ - - + + - - + + diff --git a/src/NHibernate.TestDatabaseSetup/Program.cs b/src/NHibernate.TestDatabaseSetup/Program.cs index c85444f1fe4..5fa606e4644 100644 --- a/src/NHibernate.TestDatabaseSetup/Program.cs +++ b/src/NHibernate.TestDatabaseSetup/Program.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 namespace NHibernate.TestDatabaseSetup { public class Program @@ -9,4 +9,4 @@ public static int Main(string[] args) } } } -#endif \ No newline at end of file +#endif diff --git a/src/NHibernate/Collection/Generic/SetHelpers/SetSnapShot.cs b/src/NHibernate/Collection/Generic/SetHelpers/SetSnapShot.cs index 54524e56f36..0a4d4d18059 100644 --- a/src/NHibernate/Collection/Generic/SetHelpers/SetSnapShot.cs +++ b/src/NHibernate/Collection/Generic/SetHelpers/SetSnapShot.cs @@ -1,7 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; -#if NETCOREAPP2_0 +#if NETCOREAPP2_0 || NETCOREAPP2_1 using System.Runtime.Serialization; using System.Threading; #endif @@ -132,7 +132,7 @@ void ICollection.CopyTo(Array array, int index) } #endif -#if NETCOREAPP2_0 +#if NETCOREAPP2_0 || NETCOREAPP2_1 [Serializable] internal class SetSnapShot : HashSet, ICollection { From 8176ac8ec8a3c1a1d7ab9ee84cf33765e2f22c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?= <12201973+fredericdelaporte@users.noreply.github.com> Date: Sat, 26 Mar 2022 22:25:22 +0100 Subject: [PATCH 2/8] Fix async generation --- build-common/NHibernate.props | 4 +++- src/AsyncGenerator.yml | 2 +- .../NHibernate.Test.VisualBasic.vbproj | 18 ++++++++++++++---- src/NHibernate.Test.VisualBasic/Program.vb | 2 +- .../Async/Linq/LinqQuerySamples.cs | 14 -------------- src/NHibernate.Test/Async/Linq/WhereTests.cs | 2 +- src/NHibernate.Test/Linq/MathFTests.cs | 2 +- src/NHibernate.Test/Linq/WhereTests.cs | 2 +- src/NHibernate.Test/NHibernate.Test.csproj | 11 +++++++---- src/NHibernate.Test/Program.cs | 2 +- .../NHibernate.TestDatabaseSetup.csproj | 9 +++++++-- src/NHibernate.TestDatabaseSetup/Program.cs | 2 +- 12 files changed, 38 insertions(+), 32 deletions(-) diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props index 822aed4d315..40228d1f19b 100644 --- a/build-common/NHibernate.props +++ b/build-common/NHibernate.props @@ -13,11 +13,13 @@ $(VersionPrefix).$(BuildNumber) $(VersionPrefix).0 - net461;netcoreapp2.1 + net461;netcoreapp2.0;netcoreapp2.1 net461;netcoreapp2.0;netstandard2.0 false true NETFX;$(DefineConstants) + false + true NHibernate NHibernate.info diff --git a/src/AsyncGenerator.yml b/src/AsyncGenerator.yml index 568295553dc..97e7104beff 100644 --- a/src/AsyncGenerator.yml +++ b/src/AsyncGenerator.yml @@ -183,7 +183,7 @@ scanForMissingAsyncMembers: - all: true - filePath: NHibernate.Test/NHibernate.Test.csproj - targetFramework: netcoreapp2.1 + targetFramework: netcoreapp2.0 concurrentRun: true applyChanges: true suppressDiagnosticFailures: diff --git a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj index 2868e52cbb5..99202752f3a 100644 --- a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj +++ b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj @@ -11,18 +11,23 @@ On On - - NETCOREAPP2_1,$(DefineConstants) + Exe false + + NETCOREAPP2_0,$(DefineConstants) + + + NETCOREAPP2_1,$(DefineConstants) + NETFX,$(DefineConstants) - + @@ -35,11 +40,16 @@ + + - + + + + diff --git a/src/NHibernate.Test.VisualBasic/Program.vb b/src/NHibernate.Test.VisualBasic/Program.vb index a54b33c1d68..581ed90a157 100644 --- a/src/NHibernate.Test.VisualBasic/Program.vb +++ b/src/NHibernate.Test.VisualBasic/Program.vb @@ -1,4 +1,4 @@ -#If NETCOREAPP2_1 +#If NETCOREAPP2_0 Or NETCOREAPP2_1 Public Class Program Public Shared Function Main(args As String()) As Integer Return New NUnitLite.AutoRun(GetType(Program).Assembly).Execute(args) diff --git a/src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs b/src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs index 5912c7c3d0f..c46d6545c33 100644 --- a/src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs +++ b/src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs @@ -1372,20 +1372,6 @@ from s2 in sup2.DefaultIfEmpty() } } - [Test] - public void ReplaceFunctionWithNullArgumentAsync() - { - var query = from e in db.Employees - select e.FirstName.Replace(e.LastName, null); - List results = null; - Assert.That( - async () => - { - results = await (query.ToListAsync()); - }, Throws.Nothing, "Expected REPLACE(FirstName, LastName, NULL) to be supported"); - Assert.That(results, Is.Not.Null); - } - [Test(Description = "GH-2860")] public async Task StringFormatWithTrimAsync() { diff --git a/src/NHibernate.Test/Async/Linq/WhereTests.cs b/src/NHibernate.Test/Async/Linq/WhereTests.cs index 31810c5cf12..d9f969dbfac 100644 --- a/src/NHibernate.Test/Async/Linq/WhereTests.cs +++ b/src/NHibernate.Test/Async/Linq/WhereTests.cs @@ -444,7 +444,7 @@ public void StringComparisonParamEmitsWarningAsync() await (AssertStringComparisonWarningAsync(x => x.CustomerId.EndsWith("ANATR", StringComparison.Ordinal), 1)); await (AssertStringComparisonWarningAsync(x => x.CustomerId.IndexOf("ANATR", StringComparison.Ordinal) == 0, 1)); await (AssertStringComparisonWarningAsync(x => x.CustomerId.IndexOf("ANATR", 0, StringComparison.Ordinal) == 0, 1)); -#if NETCOREAPP2_1 +#if NETCOREAPP2_0 || NETCOREAPP2_1 await (AssertStringComparisonWarningAsync(x => x.CustomerId.Replace("AN", "XX", StringComparison.Ordinal) == "XXATR", 1)); #endif }); diff --git a/src/NHibernate.Test/Linq/MathFTests.cs b/src/NHibernate.Test/Linq/MathFTests.cs index 5826ff8237e..15c09ed16e7 100644 --- a/src/NHibernate.Test/Linq/MathFTests.cs +++ b/src/NHibernate.Test/Linq/MathFTests.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP2_1 +#if NETCOREAPP2_0 || NETCOREAPP2_1 using System; using System.Linq; using System.Linq.Expressions; diff --git a/src/NHibernate.Test/Linq/WhereTests.cs b/src/NHibernate.Test/Linq/WhereTests.cs index 7ceedeee37c..0f09dd2b0c4 100644 --- a/src/NHibernate.Test/Linq/WhereTests.cs +++ b/src/NHibernate.Test/Linq/WhereTests.cs @@ -432,7 +432,7 @@ public void StringComparisonParamEmitsWarning() AssertStringComparisonWarning(x => x.CustomerId.EndsWith("ANATR", StringComparison.Ordinal), 1); AssertStringComparisonWarning(x => x.CustomerId.IndexOf("ANATR", StringComparison.Ordinal) == 0, 1); AssertStringComparisonWarning(x => x.CustomerId.IndexOf("ANATR", 0, StringComparison.Ordinal) == 0, 1); -#if NETCOREAPP2_1 +#if NETCOREAPP2_0 || NETCOREAPP2_1 AssertStringComparisonWarning(x => x.CustomerId.Replace("AN", "XX", StringComparison.Ordinal) == "XXATR", 1); #endif }); diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj index 45955260558..3d659e32c56 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -7,7 +7,7 @@ $(NoWarn);3001;3002;3003;3005 true - + Exe false @@ -35,7 +35,7 @@ Always - + @@ -61,7 +61,6 @@ - @@ -72,11 +71,12 @@ + - + @@ -85,6 +85,9 @@ + + + diff --git a/src/NHibernate.Test/Program.cs b/src/NHibernate.Test/Program.cs index 598b063b982..034d69d0747 100644 --- a/src/NHibernate.Test/Program.cs +++ b/src/NHibernate.Test/Program.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP2_1 +#if NETCOREAPP2_0 || NETCOREAPP2_1 namespace NHibernate.Test { public class Program diff --git a/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj b/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj index 7f8d0f64345..b61cbc4216b 100644 --- a/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj +++ b/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj @@ -7,7 +7,7 @@ true $(NoWarn);3001;3002;3003;3005 - + Exe false @@ -16,11 +16,16 @@ + + - + + + + diff --git a/src/NHibernate.TestDatabaseSetup/Program.cs b/src/NHibernate.TestDatabaseSetup/Program.cs index 5fa606e4644..d4062a89c31 100644 --- a/src/NHibernate.TestDatabaseSetup/Program.cs +++ b/src/NHibernate.TestDatabaseSetup/Program.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP2_1 +#if NETCOREAPP2_0 || NETCOREAPP2_1 namespace NHibernate.TestDatabaseSetup { public class Program From 1ecf4d13dafd4bf32337db14ba51adad2eb9b0f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?= <12201973+fredericdelaporte@users.noreply.github.com> Date: Sun, 27 Mar 2022 22:41:18 +0200 Subject: [PATCH 3/8] Simplify conditional statements in tests --- .../NHibernate.Test.VisualBasic.vbproj | 7 +------ src/NHibernate.Test.VisualBasic/Program.vb | 2 +- src/NHibernate.Test/Async/Linq/WhereTests.cs | 2 +- src/NHibernate.Test/Linq/MathFTests.cs | 2 +- src/NHibernate.Test/Linq/WhereTests.cs | 2 +- src/NHibernate.Test/Program.cs | 2 +- src/NHibernate.TestDatabaseSetup/Program.cs | 2 +- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj index 99202752f3a..563a1b717cb 100644 --- a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj +++ b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj @@ -12,15 +12,10 @@ On + NETCOREAPP,$(DefineConstants) Exe false - - NETCOREAPP2_0,$(DefineConstants) - - - NETCOREAPP2_1,$(DefineConstants) - NETFX,$(DefineConstants) diff --git a/src/NHibernate.Test.VisualBasic/Program.vb b/src/NHibernate.Test.VisualBasic/Program.vb index 581ed90a157..2e9eef71a91 100644 --- a/src/NHibernate.Test.VisualBasic/Program.vb +++ b/src/NHibernate.Test.VisualBasic/Program.vb @@ -1,4 +1,4 @@ -#If NETCOREAPP2_0 Or NETCOREAPP2_1 +#If NETCOREAPP Public Class Program Public Shared Function Main(args As String()) As Integer Return New NUnitLite.AutoRun(GetType(Program).Assembly).Execute(args) diff --git a/src/NHibernate.Test/Async/Linq/WhereTests.cs b/src/NHibernate.Test/Async/Linq/WhereTests.cs index d9f969dbfac..d214ef5b3c7 100644 --- a/src/NHibernate.Test/Async/Linq/WhereTests.cs +++ b/src/NHibernate.Test/Async/Linq/WhereTests.cs @@ -444,7 +444,7 @@ public void StringComparisonParamEmitsWarningAsync() await (AssertStringComparisonWarningAsync(x => x.CustomerId.EndsWith("ANATR", StringComparison.Ordinal), 1)); await (AssertStringComparisonWarningAsync(x => x.CustomerId.IndexOf("ANATR", StringComparison.Ordinal) == 0, 1)); await (AssertStringComparisonWarningAsync(x => x.CustomerId.IndexOf("ANATR", 0, StringComparison.Ordinal) == 0, 1)); -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP await (AssertStringComparisonWarningAsync(x => x.CustomerId.Replace("AN", "XX", StringComparison.Ordinal) == "XXATR", 1)); #endif }); diff --git a/src/NHibernate.Test/Linq/MathFTests.cs b/src/NHibernate.Test/Linq/MathFTests.cs index 15c09ed16e7..40ac767a83f 100644 --- a/src/NHibernate.Test/Linq/MathFTests.cs +++ b/src/NHibernate.Test/Linq/MathFTests.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP using System; using System.Linq; using System.Linq.Expressions; diff --git a/src/NHibernate.Test/Linq/WhereTests.cs b/src/NHibernate.Test/Linq/WhereTests.cs index 0f09dd2b0c4..d0d3b786e78 100644 --- a/src/NHibernate.Test/Linq/WhereTests.cs +++ b/src/NHibernate.Test/Linq/WhereTests.cs @@ -432,7 +432,7 @@ public void StringComparisonParamEmitsWarning() AssertStringComparisonWarning(x => x.CustomerId.EndsWith("ANATR", StringComparison.Ordinal), 1); AssertStringComparisonWarning(x => x.CustomerId.IndexOf("ANATR", StringComparison.Ordinal) == 0, 1); AssertStringComparisonWarning(x => x.CustomerId.IndexOf("ANATR", 0, StringComparison.Ordinal) == 0, 1); -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP AssertStringComparisonWarning(x => x.CustomerId.Replace("AN", "XX", StringComparison.Ordinal) == "XXATR", 1); #endif }); diff --git a/src/NHibernate.Test/Program.cs b/src/NHibernate.Test/Program.cs index 034d69d0747..f7f762cf556 100644 --- a/src/NHibernate.Test/Program.cs +++ b/src/NHibernate.Test/Program.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP namespace NHibernate.Test { public class Program diff --git a/src/NHibernate.TestDatabaseSetup/Program.cs b/src/NHibernate.TestDatabaseSetup/Program.cs index d4062a89c31..4c785767d10 100644 --- a/src/NHibernate.TestDatabaseSetup/Program.cs +++ b/src/NHibernate.TestDatabaseSetup/Program.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP namespace NHibernate.TestDatabaseSetup { public class Program From 9f9b0c376d0b13b06c0a2af3a9a0f01506e5ec1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?= <12201973+fredericdelaporte@users.noreply.github.com> Date: Mon, 28 Mar 2022 01:22:18 +0200 Subject: [PATCH 4/8] Upgrade async generator and regenerate --- Tools/packages.csproj | 2 +- src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Tools/packages.csproj b/Tools/packages.csproj index 0a4547e3262..8c9afac9fed 100644 --- a/Tools/packages.csproj +++ b/Tools/packages.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs b/src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs index c46d6545c33..5912c7c3d0f 100644 --- a/src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs +++ b/src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs @@ -1372,6 +1372,20 @@ from s2 in sup2.DefaultIfEmpty() } } + [Test] + public void ReplaceFunctionWithNullArgumentAsync() + { + var query = from e in db.Employees + select e.FirstName.Replace(e.LastName, null); + List results = null; + Assert.That( + async () => + { + results = await (query.ToListAsync()); + }, Throws.Nothing, "Expected REPLACE(FirstName, LastName, NULL) to be supported"); + Assert.That(results, Is.Not.Null); + } + [Test(Description = "GH-2860")] public async Task StringFormatWithTrimAsync() { From 820aca1d63b402002b28d6529666e49254137e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?= <12201973+fredericdelaporte@users.noreply.github.com> Date: Sun, 3 Apr 2022 12:41:54 +0200 Subject: [PATCH 5/8] Switch to NETCOREAPP2_0_OR_GREATER --- build-common/NHibernate.props | 1 + .../NHibernate.Test.VisualBasic.vbproj | 2 +- src/NHibernate.Test.VisualBasic/Program.vb | 2 +- src/NHibernate.Test/Async/Linq/WhereTests.cs | 2 +- src/NHibernate.Test/Linq/MathFTests.cs | 2 +- src/NHibernate.Test/Linq/WhereTests.cs | 2 +- src/NHibernate.Test/Program.cs | 2 +- src/NHibernate.TestDatabaseSetup/Program.cs | 2 +- src/NHibernate/Collection/Generic/SetHelpers/SetSnapShot.cs | 4 ++-- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props index 40228d1f19b..65d3129811b 100644 --- a/build-common/NHibernate.props +++ b/build-common/NHibernate.props @@ -20,6 +20,7 @@ NETFX;$(DefineConstants) false true + NETCOREAPP2_0_OR_GREATER;$(DefineConstants) NHibernate NHibernate.info diff --git a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj index 563a1b717cb..d9b09633e3d 100644 --- a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj +++ b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj @@ -12,7 +12,7 @@ On - NETCOREAPP,$(DefineConstants) + NETCOREAPP2_0_OR_GREATER,$(DefineConstants) Exe false diff --git a/src/NHibernate.Test.VisualBasic/Program.vb b/src/NHibernate.Test.VisualBasic/Program.vb index 2e9eef71a91..3074a075545 100644 --- a/src/NHibernate.Test.VisualBasic/Program.vb +++ b/src/NHibernate.Test.VisualBasic/Program.vb @@ -1,4 +1,4 @@ -#If NETCOREAPP +#If NETCOREAPP2_0_OR_GREATER Public Class Program Public Shared Function Main(args As String()) As Integer Return New NUnitLite.AutoRun(GetType(Program).Assembly).Execute(args) diff --git a/src/NHibernate.Test/Async/Linq/WhereTests.cs b/src/NHibernate.Test/Async/Linq/WhereTests.cs index d214ef5b3c7..56d183e49c9 100644 --- a/src/NHibernate.Test/Async/Linq/WhereTests.cs +++ b/src/NHibernate.Test/Async/Linq/WhereTests.cs @@ -444,7 +444,7 @@ public void StringComparisonParamEmitsWarningAsync() await (AssertStringComparisonWarningAsync(x => x.CustomerId.EndsWith("ANATR", StringComparison.Ordinal), 1)); await (AssertStringComparisonWarningAsync(x => x.CustomerId.IndexOf("ANATR", StringComparison.Ordinal) == 0, 1)); await (AssertStringComparisonWarningAsync(x => x.CustomerId.IndexOf("ANATR", 0, StringComparison.Ordinal) == 0, 1)); -#if NETCOREAPP +#if NETCOREAPP2_0_OR_GREATER await (AssertStringComparisonWarningAsync(x => x.CustomerId.Replace("AN", "XX", StringComparison.Ordinal) == "XXATR", 1)); #endif }); diff --git a/src/NHibernate.Test/Linq/MathFTests.cs b/src/NHibernate.Test/Linq/MathFTests.cs index 40ac767a83f..ad27c8b4f0c 100644 --- a/src/NHibernate.Test/Linq/MathFTests.cs +++ b/src/NHibernate.Test/Linq/MathFTests.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP +#if NETCOREAPP2_0_OR_GREATER using System; using System.Linq; using System.Linq.Expressions; diff --git a/src/NHibernate.Test/Linq/WhereTests.cs b/src/NHibernate.Test/Linq/WhereTests.cs index d0d3b786e78..02dc58b34b7 100644 --- a/src/NHibernate.Test/Linq/WhereTests.cs +++ b/src/NHibernate.Test/Linq/WhereTests.cs @@ -432,7 +432,7 @@ public void StringComparisonParamEmitsWarning() AssertStringComparisonWarning(x => x.CustomerId.EndsWith("ANATR", StringComparison.Ordinal), 1); AssertStringComparisonWarning(x => x.CustomerId.IndexOf("ANATR", StringComparison.Ordinal) == 0, 1); AssertStringComparisonWarning(x => x.CustomerId.IndexOf("ANATR", 0, StringComparison.Ordinal) == 0, 1); -#if NETCOREAPP +#if NETCOREAPP2_0_OR_GREATER AssertStringComparisonWarning(x => x.CustomerId.Replace("AN", "XX", StringComparison.Ordinal) == "XXATR", 1); #endif }); diff --git a/src/NHibernate.Test/Program.cs b/src/NHibernate.Test/Program.cs index f7f762cf556..a40f73d6b74 100644 --- a/src/NHibernate.Test/Program.cs +++ b/src/NHibernate.Test/Program.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP +#if NETCOREAPP2_0_OR_GREATER namespace NHibernate.Test { public class Program diff --git a/src/NHibernate.TestDatabaseSetup/Program.cs b/src/NHibernate.TestDatabaseSetup/Program.cs index 4c785767d10..57137c5bc6c 100644 --- a/src/NHibernate.TestDatabaseSetup/Program.cs +++ b/src/NHibernate.TestDatabaseSetup/Program.cs @@ -1,4 +1,4 @@ -#if NETCOREAPP +#if NETCOREAPP2_0_OR_GREATER namespace NHibernate.TestDatabaseSetup { public class Program diff --git a/src/NHibernate/Collection/Generic/SetHelpers/SetSnapShot.cs b/src/NHibernate/Collection/Generic/SetHelpers/SetSnapShot.cs index 0a4d4d18059..0c052a67ba8 100644 --- a/src/NHibernate/Collection/Generic/SetHelpers/SetSnapShot.cs +++ b/src/NHibernate/Collection/Generic/SetHelpers/SetSnapShot.cs @@ -1,7 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP2_0_OR_GREATER using System.Runtime.Serialization; using System.Threading; #endif @@ -132,7 +132,7 @@ void ICollection.CopyTo(Array array, int index) } #endif -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP2_0_OR_GREATER [Serializable] internal class SetSnapShot : HashSet, ICollection { From 76176c28bdf402b4ef7b45d18a3adfccb86d635f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?= <12201973+fredericdelaporte@users.noreply.github.com> Date: Sun, 3 Apr 2022 13:00:23 +0200 Subject: [PATCH 6/8] Avoid mixing condition types for references --- .../NHibernate.Test.VisualBasic.vbproj | 3 ++- src/NHibernate.Test/NHibernate.Test.csproj | 11 +++++++++-- .../NHibernate.TestDatabaseSetup.csproj | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj index d9b09633e3d..3ddb9bc38f8 100644 --- a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj +++ b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj @@ -39,10 +39,11 @@ - + + diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj index 3d659e32c56..e095bcfd8d1 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -76,16 +76,23 @@ - + - + + + + + + + + diff --git a/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj b/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj index b61cbc4216b..05c68f3157b 100644 --- a/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj +++ b/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj @@ -20,10 +20,11 @@ - + + From 93e44fdeec0e5f7ade7cc2029749b277997fd6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?= <12201973+fredericdelaporte@users.noreply.github.com> Date: Sun, 3 Apr 2022 13:01:57 +0200 Subject: [PATCH 7/8] Downgrade test adapter to master version --- .../NHibernate.Test.VisualBasic.vbproj | 4 ++-- src/NHibernate.Test/NHibernate.Test.csproj | 4 ++-- .../NHibernate.TestDatabaseSetup.csproj | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj index 3ddb9bc38f8..d7974f6c521 100644 --- a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj +++ b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj @@ -37,14 +37,14 @@ - + - + diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj index e095bcfd8d1..978afb580f2 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -71,7 +71,7 @@ - + @@ -93,7 +93,7 @@ - + diff --git a/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj b/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj index 05c68f3157b..7ee0637e38f 100644 --- a/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj +++ b/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj @@ -18,14 +18,14 @@ - + - + From 19cf016be9213a082456447afbc55ce3a527cdc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?= <12201973+fredericdelaporte@users.noreply.github.com> Date: Sun, 3 Apr 2022 13:12:51 +0200 Subject: [PATCH 8/8] Adjust a spacing discrepancy --- .../NHibernate.TestDatabaseSetup.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj b/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj index 7ee0637e38f..c4f41cb2fb2 100644 --- a/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj +++ b/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj @@ -20,7 +20,7 @@ - +