From 6f4afd39cddbd7538597aaf7532fd471bf8d6cfa Mon Sep 17 00:00:00 2001 From: Roman Artiukhin Date: Wed, 19 Jan 2022 13:38:11 +0200 Subject: [PATCH 1/6] Add .net 6 and net48 targets --- build-common/NHibernate.props | 5 ++++- src/NHibernate.Test/NHibernate.Test.csproj | 2 +- src/NHibernate/NHibernate.csproj | 4 ++++ src/NHibernate/Type/SerializableType.cs | 4 ++++ src/NHibernate/Util/SerializationHelper.cs | 6 +++++- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props index be1846b0d37..627482c1c30 100644 --- a/build-common/NHibernate.props +++ b/build-common/NHibernate.props @@ -13,13 +13,16 @@ $(VersionPrefix).$(BuildNumber) $(VersionPrefix).0 + ;net6.0;net48 net461;net6.0 - net461;netcoreapp2.0;netstandard2.0 + net461;netcoreapp2.0;netstandard2.0$(NhLibPackableTargetFrameworks) + false true NETFX;$(DefineConstants) NETFX,$(DefineConstants) + $(NoWarn);SYSLIB0011 NHibernate NHibernate.info diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj index a0acd638c6b..a89d92767b2 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -4,7 +4,7 @@ The Unit Tests for NHibernate. $(NhAppTargetFrameworks) true - $(NoWarn);3001;3002;3003;3005;SYSLIB0003;SYSLIB0011;SYSLIB0012 + $(NoWarn);3001;3002;3003;3005;SYSLIB0003;SYSLIB0012 true diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj index c4e0065a429..1a92fa10a3a 100644 --- a/src/NHibernate/NHibernate.csproj +++ b/src/NHibernate/NHibernate.csproj @@ -50,6 +50,10 @@ + + + + diff --git a/src/NHibernate/Type/SerializableType.cs b/src/NHibernate/Type/SerializableType.cs index 31017691017..54b85ecc3cb 100644 --- a/src/NHibernate/Type/SerializableType.cs +++ b/src/NHibernate/Type/SerializableType.cs @@ -7,6 +7,10 @@ using NHibernate.Engine; using NHibernate.SqlTypes; +#if NET6_0_OR_GREATER +#pragma warning disable CS0618 //Serialization is obsolete +#endif + namespace NHibernate.Type { /// diff --git a/src/NHibernate/Util/SerializationHelper.cs b/src/NHibernate/Util/SerializationHelper.cs index 39ceb830b01..36184c5c816 100644 --- a/src/NHibernate/Util/SerializationHelper.cs +++ b/src/NHibernate/Util/SerializationHelper.cs @@ -2,6 +2,10 @@ using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters.Binary; +#if NET6_0_OR_GREATER +#pragma warning disable CS0618 //Serialization is obsolete +#endif + namespace NHibernate.Util { public static partial class SerializationHelper @@ -62,4 +66,4 @@ private static BinaryFormatter CreateFormatter() }; } } -} \ No newline at end of file +} From df7edf3f60df3cecd157fc2fbeaedc22e5e8bdb5 Mon Sep 17 00:00:00 2001 From: Roman Artiukhin Date: Wed, 19 Jan 2022 17:18:33 +0200 Subject: [PATCH 2/6] Remove NhLibPackableTargetFrameworks and use net48 for tests --- build-common/NHibernate.props | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props index 627482c1c30..87fb26e2c6a 100644 --- a/build-common/NHibernate.props +++ b/build-common/NHibernate.props @@ -13,9 +13,8 @@ $(VersionPrefix).$(BuildNumber) $(VersionPrefix).0 - ;net6.0;net48 - net461;net6.0 - net461;netcoreapp2.0;netstandard2.0$(NhLibPackableTargetFrameworks) + net48;net6.0 + net461;net48;netcoreapp2.0;netstandard2.0;net6.0 false true From aad4fc807783536559bda4a750590e2808a38f2f Mon Sep 17 00:00:00 2001 From: Roman Artiukhin Date: Wed, 19 Jan 2022 18:24:14 +0200 Subject: [PATCH 3/6] Fix TeamCity build --- default.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.build b/default.build index 8ea8ec5e4f9..c1770b4f108 100644 --- a/default.build +++ b/default.build @@ -6,7 +6,7 @@ > - + From 7f39fada7368ffe844e6f5515c098eaa422481c0 Mon Sep 17 00:00:00 2001 From: Roman Artiukhin Date: Wed, 19 Jan 2022 18:26:53 +0200 Subject: [PATCH 4/6] Try to fix ANTLR concurrency issue by setting maxcpucount:3 --- psake.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/psake.ps1 b/psake.ps1 index c7fe8592e44..d6794fe4330 100644 --- a/psake.ps1 +++ b/psake.ps1 @@ -103,7 +103,7 @@ Task Build { Exec { dotnet ` build ./src/NHibernate.sln ` - -c Release + -c Release -maxcpucount:3 } } From 94beed61b4db88fcc377eaa22f7abbd8de146e68 Mon Sep 17 00:00:00 2001 From: Roman Artiukhin Date: Thu, 20 Jan 2022 09:20:29 +0200 Subject: [PATCH 5/6] Try to fix ANTLR concurrency issue by setting 2 --- psake.ps1 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/psake.ps1 b/psake.ps1 index d6794fe4330..8c4eca29da2 100644 --- a/psake.ps1 +++ b/psake.ps1 @@ -101,9 +101,8 @@ Task Set-Configuration { Task Build { Exec { - dotnet ` - build ./src/NHibernate.sln ` - -c Release -maxcpucount:3 + dotnet build ./src/NHibernate/NHibernate.csproj -c Release + dotnet build ./src/NHibernate.sln -c Release } } From 4b9b844261e0521f2a11b1e9db37c2c624bb560f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 29 Aug 2022 08:09:17 +0000 Subject: [PATCH 6/6] Generate async files --- src/NHibernate/Async/Type/SerializableType.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/NHibernate/Async/Type/SerializableType.cs b/src/NHibernate/Async/Type/SerializableType.cs index b4ee750691f..2691fdd35c8 100644 --- a/src/NHibernate/Async/Type/SerializableType.cs +++ b/src/NHibernate/Async/Type/SerializableType.cs @@ -17,6 +17,10 @@ using NHibernate.Engine; using NHibernate.SqlTypes; +#if NET6_0_OR_GREATER +#pragma warning disable CS0618 //Serialization is obsolete +#endif + namespace NHibernate.Type { using System.Threading.Tasks;