Fix issues

Author: SergeiPavlov

Orm/Xtensive.Orm/Caching/WeakCache.cs

@@ -100,8 +100,6 @@ public virtual bool TryGetItem(TKey key, bool markAsHit, out TItem item)
     /// <inheritdoc/>
     public void Add(TItem item) => Add(item, true);
 
-    private static Dictionary<TKey, GCHandle> CreateDictionary() => new Dictionary<TKey, GCHandle>();
-
     /// <inheritdoc/>
     [SecuritySafeCritical]
     public virtual TItem Add(TItem item, bool replaceIfExists)
@@ -235,6 +233,8 @@ public virtual IEnumerator<TItem> GetEnumerator()
 
     #region Private / internal methods
 
+    private static Dictionary<TKey, GCHandle> CreateDictionary() => new Dictionary<TKey, GCHandle>();
+
     private void RegisterOperation(int weight)
     {
       time += weight;

Orm/Xtensive.Orm/IoC/ServiceContainer.cs

@@ -27,7 +27,7 @@ namespace Xtensive.IoC
   [Serializable]
   public class ServiceContainer : ServiceContainerBase
   {
-    private static Type typeofIServiceContainer =   typeof(IServiceContainer);
+    private static readonly Type typeofIServiceContainer = typeof(IServiceContainer);
 
     private readonly Dictionary<Key, List<ServiceRegistration>> types =
       new Dictionary<Key, List<ServiceRegistration>>();

Orm/Xtensive.Orm/IoC/ServiceRegistration.cs

@@ -9,11 +9,10 @@
 using System.Collections.Generic;
 using Xtensive.Core;
 using Xtensive.Reflection;
+using ServiceRegistrationKey = System.ValueTuple<System.Type, bool>;
 
 namespace Xtensive.IoC
 {
-  using ServiceRegistrationKey = ValueTuple<Type, bool>;
-
   /// <summary>
   /// Describes single service mapping entry for <see cref="ServiceContainer"/>.
   /// </summary>

Orm/Xtensive.Orm/Orm/Internals/FieldAccessors/EntityFieldAccessor.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2008-2021 Xtensive LLC.
+// Copyright (C) 2008-2020 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Alexey Gamzov
@@ -54,4 +54,4 @@ public override T GetValue(Persistent obj)
       return (T) (object) obj.Session.Query.SingleOrDefault(key);
     }
   }
-}
+}

Orm/Xtensive.Orm/Orm/Model/TypeInfo.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2021 Xtensive LLC.
+// Copyright (C) 2007-2020 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Dmitri Maximov

Orm/Xtensive.Orm/Orm/Session.Cache.cs

@@ -21,10 +21,11 @@ namespace Xtensive.Orm
 {
   public partial class Session
   {
+    private static readonly Converter<EntityState, Key> keyExtractor = i => i.Key;
+
     // EntitySets with cached items that filled their cache
     // within DisableSaveChanges() scope.
     private HashSet<EntitySetBase> entitySetsWithInvalidState;
-    private static readonly Converter<EntityState, Key> keyExtractor = i => i.Key;
 
     internal ICache<Key, EntityState> EntityStateCache { get; private set; }
     internal EntityChangeRegistry EntityChangeRegistry { get; private set; }

Orm/Xtensive.Orm/Reflection/AttributeHelper.cs

@@ -9,12 +9,11 @@
 using System.Collections.Concurrent;
 using System.Linq;
 using System.Reflection;
+using AttributesKey = System.ValueTuple<System.Reflection.MemberInfo, System.Type, Xtensive.Reflection.AttributeSearchOptions>;
+using PerAttributeKey = System.ValueTuple<System.Reflection.MemberInfo, Xtensive.Reflection.AttributeSearchOptions>;
 
 namespace Xtensive.Reflection
 {
-  using AttributesKey = ValueTuple<MemberInfo, Type, AttributeSearchOptions>;
-  using PerAttributeKey = ValueTuple<MemberInfo, AttributeSearchOptions>;
-
   /// <summary>
   /// <see cref="Attribute"/> related helper \ extension methods.
   /// </summary>

Orm/Xtensive.Orm/Reflection/TypeHelper.cs

@@ -27,23 +27,6 @@ namespace Xtensive.Reflection
   /// </summary>
   public static class TypeHelper
   {
-    private const string invokeMethodName = "Invoke";
-
-    private static readonly object emitLock = new object();
-    private static readonly int NullableTypeMetadataToken = WellKnownTypes.NullableOfT.MetadataToken;
-    private static readonly Module NullableTypeModule = WellKnownTypes.NullableOfT.Module;
-    private static readonly Type CompilerGeneratedAttributeType = typeof(CompilerGeneratedAttribute);
-    private static readonly string TypeHelperNamespace = typeof(TypeHelper).Namespace;
-
-    private static readonly ConcurrentDictionary<Type, Type[]> orderedInterfaces =
-      new ConcurrentDictionary<Type, Type[]>();
-
-    private static readonly ConcurrentDictionary<Type, Type[]> orderedCompatibles =
-      new ConcurrentDictionary<Type, Type[]>();
-
-    private static readonly ConcurrentDictionary<Pair<Type, Type>, InterfaceMapping> interfaceMaps =
-      new ConcurrentDictionary<Pair<Type, Type>, InterfaceMapping>();
-
     private class TypesEqualityComparer : IEqualityComparer<(Type, Type[])>
     {
       public bool Equals((Type, Type[]) x, (Type, Type[]) y) =>
@@ -59,9 +42,26 @@ public int GetHashCode((Type, Type[]) obj)
       }
     }
 
+    private const string invokeMethodName = "Invoke";
+
     private static readonly ConcurrentDictionary<(Type, Type[]), ConstructorInfo> constructorInfoByTypes =
       new ConcurrentDictionary<(Type, Type[]), ConstructorInfo>(new TypesEqualityComparer());
 
+    private static readonly object emitLock = new object();
+    private static readonly int NullableTypeMetadataToken = WellKnownTypes.NullableOfT.MetadataToken;
+    private static readonly Module NullableTypeModule = WellKnownTypes.NullableOfT.Module;
+    private static readonly Type CompilerGeneratedAttributeType = typeof(CompilerGeneratedAttribute);
+    private static readonly string TypeHelperNamespace = typeof(TypeHelper).Namespace;
+
+    private static readonly ConcurrentDictionary<Type, Type[]> orderedInterfaces =
+      new ConcurrentDictionary<Type, Type[]>();
+
+    private static readonly ConcurrentDictionary<Type, Type[]> orderedCompatibles =
+      new ConcurrentDictionary<Type, Type[]>();
+
+    private static readonly ConcurrentDictionary<Pair<Type, Type>, InterfaceMapping> interfaceMaps =
+      new ConcurrentDictionary<Pair<Type, Type>, InterfaceMapping>();
+
     private static int createDummyTypeNumber = 0;
     private static AssemblyBuilder assemblyBuilder;
     private static ModuleBuilder moduleBuilder;
@@ -610,14 +610,17 @@ public static object Activate(this Type type, Type[] genericArguments, params ob
 
     /// <summary>
     /// Gets the public constructor of type <paramref name="type"/>
-    /// accepting specified <paramref name="argumentTypes"/>.
+    /// accepting specified <paramref name="arguments"/>.
     /// </summary>
     /// <param name="type">The type to get the constructor for.</param>
-    /// <param name="argumentTypes">The argument types.</param>
+    /// <param name="arguments">The arguments.</param>
     /// <returns>
     /// Appropriate constructor, if a single match is found;
     /// otherwise, <see langword="null"/>.
     /// </returns>
+    public static ConstructorInfo GetConstructor(this Type type, object[] arguments) =>
+      GetSingleConstructor(type, arguments.Select(a => a?.GetType()).ToArray());
+
     public static ConstructorInfo GetSingleConstructor(this Type type, Type[] argumentTypes) =>
       constructorInfoByTypes.GetOrAdd((type, argumentTypes), ConstructorExtractor);