Add .NET Standard 2.1 target (#3050)

hazzik · web-flow · commit 8e22b7021029 · 2022-08-29T13:22:51.000+12:00
diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props
@@ -15,7 +15,7 @@
     <FileVersion Condition="'$(FileVersion)' == ''">$(VersionPrefix).0</FileVersion>
 
     <NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net48;net6.0</NhAppTargetFrameworks>
-    <NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
+    <NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;netcoreapp2.0;netstandard2.0;netstandard2.1</NhLibTargetFrameworks>
     <NhNetFx>false</NhNetFx>
     <NhNetFx Condition="$(TargetFramework.StartsWith('net4'))">true</NhNetFx>
     <!-- Visual Basic requires to use coma (,) as a separator, other project types - semicolon (;) -->
diff --git a/default.build b/default.build
@@ -45,7 +45,7 @@
 			<arg value="/t:Restore" />
 			<arg value="/t:Rebuild" />
 			<arg value="/v:q" />
-			<arg value="/m" />
+			<arg value="/m:1" />
 		</exec> 
 	</target>
 
diff --git a/psake.ps1 b/psake.ps1
@@ -103,6 +103,7 @@ Task Build {
     Exec { 
         dotnet `
             build ./src/NHibernate.sln `
+            -m:1 `
             -c Release
     }
 }
diff --git 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_OR_GREATER
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_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_OR_GREATER
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 	[Serializable]
 	internal class SetSnapShot<T> : HashSet<T>, ICollection
 	{
diff --git a/src/NHibernate/Driver/DriverBase.cs b/src/NHibernate/Driver/DriverBase.cs
@@ -338,14 +338,14 @@ public DbParameter GenerateOutputParameter(DbCommand command)
 
 		public virtual bool RequiresTimeSpanForTime => false;
 
-#if NETCOREAPP2_0_OR_GREATER
-		public virtual bool SupportsSystemTransactions => false;
-
-		public virtual bool SupportsNullEnlistment => false;
-#else
+#if NETFX
 		public virtual bool SupportsSystemTransactions => true;
 
 		public virtual bool SupportsNullEnlistment => true;
+#else
+		public virtual bool SupportsSystemTransactions => false;
+
+		public virtual bool SupportsNullEnlistment => false;
 #endif
 
 		/// <inheritdoc />
diff --git a/src/NHibernate/Driver/ReflectionBasedDriver.cs b/src/NHibernate/Driver/ReflectionBasedDriver.cs
@@ -46,12 +46,12 @@ protected ReflectionBasedDriver(string providerInvariantName, string driverAssem
 
 			if (connectionType == null || commandType == null)
 			{
-#if NETFX
+#if NETFX || NETSTANDARD2_1_OR_GREATER
 				if (string.IsNullOrEmpty(providerInvariantName))
 				{
 #endif
 					throw new HibernateException(string.Format(ReflectionTypedProviderExceptionMessageTemplate, driverAssemblyName));
-#if NETFX
+#if NETFX || NETSTANDARD2_1_OR_GREATER
 				}
 				var factory = DbProviderFactories.GetFactory(providerInvariantName);
 				connectionCommandProvider = new DbProviderFactoryDriveConnectionCommandProvider(factory);
diff --git a/src/NHibernate/Linq/Functions/MathGenerator.cs b/src/NHibernate/Linq/Functions/MathGenerator.cs
@@ -55,7 +55,7 @@ public MathGenerator()
 
 				ReflectHelper.FastGetMethod(Math.Pow, default(double), default(double)),
 
-#if NETCOREAPP2_0_OR_GREATER
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 				ReflectHelper.FastGetMethod(MathF.Sin, default(float)),
 				ReflectHelper.FastGetMethod(MathF.Cos, default(float)),
 				ReflectHelper.FastGetMethod(MathF.Tan, default(float)),
diff --git a/src/NHibernate/Linq/Functions/RoundGenerator.cs b/src/NHibernate/Linq/Functions/RoundGenerator.cs
@@ -21,7 +21,7 @@ public RoundGenerator()
 				ReflectHelper.FastGetMethod(decimal.Round, default(decimal)),
 				ReflectHelper.FastGetMethod(decimal.Round, default(decimal), default(int)),
 
-#if NETCOREAPP2_0_OR_GREATER
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 				ReflectHelper.FastGetMethod(MathF.Round, default(float)),
 				ReflectHelper.FastGetMethod(MathF.Round, default(float), default(int)),
 #endif
diff --git a/src/NHibernate/Linq/Functions/StringGenerator.cs b/src/NHibernate/Linq/Functions/StringGenerator.cs
@@ -269,7 +269,7 @@ public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject,
 
 	public class ReplaceGenerator : BaseHqlGeneratorForMethod
 	{
-#if NETCOREAPP2_0_OR_GREATER  
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER  
 		private static readonly MethodInfo MethodWithComparer = ReflectHelper.GetMethodDefinition<string>(x => x.Replace(string.Empty, string.Empty, default(StringComparison)));
 #endif
 
@@ -279,15 +279,15 @@ public ReplaceGenerator()
 			{
 				ReflectHelper.GetMethodDefinition<string>(s => s.Replace(' ', ' ')),
 				ReflectHelper.GetMethodDefinition<string>(s => s.Replace("", "")),
-#if NETCOREAPP2_0_OR_GREATER
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 				MethodWithComparer,
 #endif
 			};
 		}
 
 		public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject, ReadOnlyCollection<Expression> arguments, HqlTreeBuilder treeBuilder, IHqlExpressionVisitor visitor)
 		{
-#if NETCOREAPP2_0_OR_GREATER
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 			LogIgnoredStringComparisonParameter(method, MethodWithComparer);
 #endif
 			return treeBuilder.MethodCall(
diff --git a/src/NHibernate/Linq/Functions/TruncateGenerator.cs b/src/NHibernate/Linq/Functions/TruncateGenerator.cs
@@ -18,7 +18,7 @@ public TruncateGenerator()
 				ReflectHelper.FastGetMethod(Math.Truncate, default(double)),
 				ReflectHelper.FastGetMethod(decimal.Truncate, default(decimal)),
 
-#if NETCOREAPP2_0_OR_GREATER
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 				ReflectHelper.FastGetMethod(MathF.Truncate, default(float)),
 #endif
 			};
diff --git a/src/NHibernate/Linq/Visitors/ExpressionKeyVisitor.cs b/src/NHibernate/Linq/Visitors/ExpressionKeyVisitor.cs
@@ -207,7 +207,7 @@ protected override Expression VisitMember(MemberExpression expression)
 			return expression;
 		}
 
-#if NETCOREAPP2_0_OR_GREATER
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 		protected override Expression VisitInvocation(InvocationExpression expression)
 		{
 			if (ExpressionsHelper.TryGetDynamicMemberBinder(expression, out var memberBinder))
diff --git a/src/NHibernate/Linq/Visitors/ExpressionParameterVisitor.cs b/src/NHibernate/Linq/Visitors/ExpressionParameterVisitor.cs
@@ -118,7 +118,7 @@ protected override Expression VisitMethodCall(MethodCallExpression expression)
 			return base.VisitMethodCall(expression);
 		}
 
-#if NETCOREAPP2_0_OR_GREATER
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 		protected override Expression VisitInvocation(InvocationExpression expression)
 		{
 			if (ExpressionsHelper.TryGetDynamicMemberBinder(expression, out _))
diff --git a/src/NHibernate/Linq/Visitors/HqlGeneratorExpressionVisitor.cs b/src/NHibernate/Linq/Visitors/HqlGeneratorExpressionVisitor.cs
@@ -228,7 +228,7 @@ private HqlTreeNode VisitNhNominated(NhNominatedExpression nhNominatedExpression
 
 		private HqlTreeNode VisitInvocationExpression(InvocationExpression expression)
 		{
-#if NETCOREAPP2_0_OR_GREATER
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 			if (ExpressionsHelper.TryGetDynamicMemberBinder(expression, out var binder))
 			{
 				return _hqlTreeBuilder.Dot(
diff --git a/src/NHibernate/Linq/Visitors/ParameterTypeLocator.cs b/src/NHibernate/Linq/Visitors/ParameterTypeLocator.cs
@@ -390,7 +390,7 @@ private bool IsDynamicMember(Expression expression)
 			{
 				switch (expression)
 				{
-#if NETCOREAPP2_0_OR_GREATER
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 					case InvocationExpression invocationExpression:
 						// session.Query<Product>().Where("Properties.Name == @0", "First Product")
 						return ExpressionsHelper.TryGetDynamicMemberBinder(invocationExpression, out _);
diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj
@@ -60,6 +60,11 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Include="*.xsd">
       <PackagePath>./</PackagePath>
diff --git a/src/NHibernate/Proxy/FieldInterceptorProxyBuilder.cs b/src/NHibernate/Proxy/FieldInterceptorProxyBuilder.cs
@@ -57,7 +57,7 @@ public static TypeInfo CreateProxyType(System.Type baseType)
 
 			var assemblyBuilder = ProxyBuilderHelper.DefineDynamicAssembly(AppDomain.CurrentDomain, name);
 
-#if NETFX || NETCOREAPP2_0_OR_GREATER
+#if NETFX || NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 			if (!baseType.IsVisible)
 				ProxyBuilderHelper.GenerateInstanceOfIgnoresAccessChecksToAttribute(assemblyBuilder, baseType.Assembly.GetName().Name);
 #endif
diff --git a/src/NHibernate/Proxy/NHibernateProxyBuilder.cs b/src/NHibernate/Proxy/NHibernateProxyBuilder.cs
@@ -76,7 +76,7 @@ public TypeInfo CreateProxyType(System.Type baseType, IReadOnlyCollection<System
 				interfaces.Add(baseType);
 			}
 
-#if NETFX || NETCOREAPP2_0_OR_GREATER
+#if NETFX || NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 			var assemblyNamesToIgnoreAccessCheck =
 				new[] {baseType}
 					.Concat(interfaces).Where(i => !i.IsVisible)
diff --git a/src/NHibernate/Util/ExpressionsHelper.cs b/src/NHibernate/Util/ExpressionsHelper.cs
@@ -33,7 +33,7 @@ public static MemberInfo DecodeMemberAccessExpression<TEntity, TResult>(Expressi
 			return ((MemberExpression)expression.Body).Member;
 		}
 
-#if NETCOREAPP2_0_OR_GREATER
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 		/// <summary>
 		/// Try to retrieve <see cref="GetMemberBinder"/> from a reduced <see cref="ExpressionType.Dynamic"/> expression.
 		/// </summary>
@@ -721,7 +721,7 @@ protected override Expression VisitMember(MemberExpression node)
 				return base.Visit(node.Expression);
 			}
 
-#if NETCOREAPP2_0_OR_GREATER
+#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 			protected override Expression VisitInvocation(InvocationExpression node)
 			{
 				if (TryGetDynamicMemberBinder(node, out var binder))

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ Task Build {`
`103`	`103`	`Exec {`
`104`	`104`	dotnet `
`105`	`105`	build ./src/NHibernate.sln `
	`106`	+ -m:1 `
`106`	`107`	`-c Release`
`107`	`108`	`}`
`108`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,12 @@ protected ReflectionBasedDriver(string providerInvariantName, string driverAssem`
`46`	`46`
`47`	`47`	`if (connectionType == null \|\| commandType == null)`
`48`	`48`	`{`
`49`		`-#if NETFX`
	`49`	`+#if NETFX \|\| NETSTANDARD2_1_OR_GREATER`
`50`	`50`	`if (string.IsNullOrEmpty(providerInvariantName))`
`51`	`51`	`{`
`52`	`52`	`#endif`
`53`	`53`	`throw new HibernateException(string.Format(ReflectionTypedProviderExceptionMessageTemplate, driverAssemblyName));`
`54`		`-#if NETFX`
	`54`	`+#if NETFX \|\| NETSTANDARD2_1_OR_GREATER`
`55`	`55`	`}`
`56`	`56`	`var factory = DbProviderFactories.GetFactory(providerInvariantName);`
`57`	`57`	`connectionCommandProvider = new DbProviderFactoryDriveConnectionCommandProvider(factory);`
Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject,`
`269`	`269`
`270`	`270`	`public class ReplaceGenerator : BaseHqlGeneratorForMethod`
`271`	`271`	`{`
`272`		`-#if NETCOREAPP2_0_OR_GREATER`
	`272`	`+#if NETCOREAPP2_0_OR_GREATER \|\| NETSTANDARD2_1_OR_GREATER`
`273`	`273`	`private static readonly MethodInfo MethodWithComparer = ReflectHelper.GetMethodDefinition<string>(x => x.Replace(string.Empty, string.Empty, default(StringComparison)));`
`274`	`274`	`#endif`
`275`	`275`
`@@ -279,15 +279,15 @@ public ReplaceGenerator()`
`279`	`279`	`{`
`280`	`280`	`ReflectHelper.GetMethodDefinition<string>(s => s.Replace(' ', ' ')),`
`281`	`281`	`ReflectHelper.GetMethodDefinition<string>(s => s.Replace("", "")),`
`282`		`-#if NETCOREAPP2_0_OR_GREATER`
	`282`	`+#if NETCOREAPP2_0_OR_GREATER \|\| NETSTANDARD2_1_OR_GREATER`
`283`	`283`	`MethodWithComparer,`
`284`	`284`	`#endif`
`285`	`285`	`};`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject, ReadOnlyCollection<Expression> arguments, HqlTreeBuilder treeBuilder, IHqlExpressionVisitor visitor)`
`289`	`289`	`{`
`290`		`-#if NETCOREAPP2_0_OR_GREATER`
	`290`	`+#if NETCOREAPP2_0_OR_GREATER \|\| NETSTANDARD2_1_OR_GREATER`
`291`	`291`	`LogIgnoredStringComparisonParameter(method, MethodWithComparer);`
`292`	`292`	`#endif`
`293`	`293`	`return treeBuilder.MethodCall(`