Merge pull request #173 from servicetitan/mergeUpstream

Merge upstream

Author: SergeiPavlov

Orm/Xtensive.Orm/IoC/ServiceContainer.cs

@@ -119,7 +119,7 @@ protected virtual object CreateInstance(ServiceRegistration serviceInfo)
         _ = creating.TryRemove(key, out _);
       }
 #if NET8_0_OR_GREATER
-      return cInfo.Invoke(new Span<object>(args));
+      return cInfo.Invoke(args.AsSpan());
 #else
       return cInfo.Invoke(args);
 #endif

Orm/Xtensive.Orm/Orm/Linq/QueryProvider.cs

@@ -53,17 +53,21 @@ public IQueryable<TElement> CreateQuery<TElement>(Expression expression) =>
     object IQueryProvider.Execute(Expression expression)
     {
       var resultType = expression.Type;
+#if NET8_0_OR_GREATER
       var executeMethod = resultType.IsOfGenericInterface(WellKnownInterfaces.EnumerableOfT)
-        ? WellKnownMembers.QueryProvider.ExecuteSequence.CachedMakeGenericMethodInvoker(
-          SequenceHelper.GetElementType(resultType))
+        ? WellKnownMembers.QueryProvider.ExecuteSequence.CachedMakeGenericMethodInvoker(SequenceHelper.GetElementType(resultType))
         : WellKnownMembers.QueryProvider.ExecuteScalar.CachedMakeGenericMethodInvoker(resultType);
       try {
-#if NET8_0_OR_GREATER
         return executeMethod.Invoke(this, expression);
+      }
 #else
+      var executeMethod = resultType.IsOfGenericInterface(WellKnownInterfaces.EnumerableOfT)
+        ? WellKnownMembers.QueryProvider.ExecuteSequence.CachedMakeGenericMethod(SequenceHelper.GetElementType(resultType))
+        : WellKnownMembers.QueryProvider.ExecuteScalar.CachedMakeGenericMethod(resultType);
+      try {
         return executeMethod.Invoke(this, new object[] { expression });
-#endif
       }
+#endif
       catch (TargetInvocationException e) {
         if (e.InnerException != null) {
           ExceptionDispatchInfo.Throw(e.InnerException);

Orm/Xtensive.Orm/Reflection/TypeHelper.cs

@@ -54,7 +54,7 @@ public int GetHashCode((Type, Type[]) obj)
     private static readonly string TypeHelperNamespace = typeof(TypeHelper).Namespace;
 
 #if NET8_0_OR_GREATER
-    private static readonly ConcurrentDictionary<(Type, Type[]), ConstructorInvoker> ConstructorInfoByTypes =
+    private static readonly ConcurrentDictionary<(Type, Type[]), ConstructorInvoker> ConstructorInvokerByTypes =
 #else
     private static readonly ConcurrentDictionary<(Type, Type[]), ConstructorInfo> ConstructorInfoByTypes =
 #endif
@@ -666,7 +666,7 @@ public static object Activate(this Type type, Type[] genericArguments, params ob
     /// </exception>
 #if NET8_0_OR_GREATER
     public static ConstructorInvoker GetSingleConstructorInvoker(this Type type, Type[] argumentTypes) =>
-      ConstructorInfoByTypes.GetOrAdd((type, argumentTypes),
+      ConstructorInvokerByTypes.GetOrAdd((type, argumentTypes),
         static t => ConstructorExtractor(t) is ConstructorInfo ctor
          ? ConstructorInvoker.Create(ctor)
          : throw new InvalidOperationException(Strings.ExGivenTypeHasNoOrMoreThanOneCtorWithGivenParameters));
@@ -689,7 +689,7 @@ public static ConstructorInfo GetSingleConstructor(this Type type, Type[] argume
     [CanBeNull]
 #if NET8_0_OR_GREATER
     public static ConstructorInvoker GetSingleConstructorInvokerOrDefault(this Type type, Type[] argumentTypes) =>
-      ConstructorInfoByTypes.GetOrAdd((type, argumentTypes),
+      ConstructorInvokerByTypes.GetOrAdd((type, argumentTypes),
         static t => ConstructorExtractor(t) is ConstructorInfo ctor ? ConstructorInvoker.Create(ctor) : null);
 #else
     public static ConstructorInfo GetSingleConstructorOrDefault(this Type type, Type[] argumentTypes) =>
@@ -970,12 +970,6 @@ public static MethodInvoker CachedMakeGenericMethodInvoker(this MethodInfo gener
 
     public static MethodInvoker CachedMakeGenericMethodInvoker(this MethodInfo genericDefinition, Type typeArgument1, Type typeArgument2) =>
       GenericMethodInvokers2.GetOrAdd((genericDefinition, typeArgument1, typeArgument2), GenericMethodInvokerFactory2);
-#else
-    public static MethodInfo CachedMakeGenericMethodInvoker(this MethodInfo genericDefinition, Type typeArgument) =>
-      CachedMakeGenericMethod(genericDefinition, typeArgument);
-
-    public static MethodInfo CachedMakeGenericMethodInvoker(this MethodInfo genericDefinition, Type typeArgument1, Type typeArgument2) =>
-      CachedMakeGenericMethod(genericDefinition, typeArgument1, typeArgument2);
 #endif
 
     public static Type CachedMakeGenericType(this Type genericDefinition, Type typeArgument) =>