Fix build

SergeiPavlov · SergeiPavlov · commit e8df11cd0eae · 2022-08-16T16:40:42.000-07:00
diff --git a/Orm/Xtensive.Orm/Core/LockableBase.cs b/Orm/Xtensive.Orm/Core/LockableBase.cs
@@ -45,7 +45,7 @@ public void EnsureNotLocked()
     /// Initializes new instance of this type.
     /// </summary>
     /// <param name="isLocked">Initial <see cref="IsLocked"/> property value.</param>
-    protected LockableBase(bool isLocked)
+    protected LockableBase(bool isLocked = false)
     {
       IsLocked = isLocked;
     }
diff --git a/Orm/Xtensive.Orm/Linq/ExpressionWriter.cs b/Orm/Xtensive.Orm/Linq/ExpressionWriter.cs
@@ -300,7 +300,7 @@ protected virtual string GetTypeName(Type type)
 
       if (name.IndexOf("__AnonymousType", StringComparison.Ordinal) > 0 &&
         type.GetAttributes<CompilerGeneratedAttribute>(AttributeSearchOptions.InheritNone).Count > 0) {
-        return $"@<{(from pi in TypeHelper.GetProperties(type) select pi.Name).ToCommaDelimitedString()}>";
+        return $"@<{(from pi in type.GetProperties() select pi.Name).ToCommaDelimitedString()}>";
       }
 
       return name;
diff --git a/Orm/Xtensive.Orm/Modelling/Node.cs b/Orm/Xtensive.Orm/Modelling/Node.cs
@@ -864,7 +864,7 @@ static Lazy<PropertyAccessorDictionary> PropertyAccessorExtractor(Type entityTyp
 
           const BindingFlags propertyBindingFlags =
             BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly;
-          foreach (var p in TypeHelper.GetProperties(entityType, propertyBindingFlags)) {
+          foreach (var p in entityType.GetProperties(propertyBindingFlags)) {
             if (p.GetAttribute<PropertyAttribute>(AttributeSearchOptions.InheritNone) != null) {
               d.Add(p.Name, new PropertyAccessor(p));
             }
diff --git a/Orm/Xtensive.Orm/Orm/Building/Builders/ModelBuilder.cs b/Orm/Xtensive.Orm/Orm/Building/Builders/ModelBuilder.cs
@@ -188,7 +188,8 @@ private void BuildTypes(IReadOnlyList<TypeDef> typeDefs)
           typeBuilder.BuildType(typeDef);
         }
       }
-      using (BuildLog.InfoRegion(nameof(Strings.LogBuildingX), "Fields"))
+      var typeInfoCollection = context.Model.Types;
+      using (BuildLog.InfoRegion(nameof(Strings.LogBuildingX), "Fields")) {
         foreach (var typeDef in typeDefs) {
           var typeInfo = typeInfoCollection[typeDef.UnderlyingType];
           typeBuilder.BuildFields(typeDef, typeInfo);
diff --git a/Orm/Xtensive.Orm/Orm/Building/Builders/ModelDefBuilder.cs b/Orm/Xtensive.Orm/Orm/Building/Builders/ModelDefBuilder.cs
@@ -136,7 +136,7 @@ private void ProcessFullTextIndexes(TypeDef typeDef)
 
     public void ProcessProperties(TypeDef typeDef, HierarchyDef hierarchyDef)
     {
-      var properties = TypeHelper.GetProperties(typeDef.UnderlyingType, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+      var properties = typeDef.UnderlyingType.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
 
       foreach (var propertyInfo in properties
           .Where(IsFieldAvailable)) {   // Domain builder stage-related filter
diff --git a/Orm/Xtensive.Orm/Orm/Linq/QueryHelper.cs b/Orm/Xtensive.Orm/Orm/Linq/QueryHelper.cs
@@ -90,7 +90,7 @@ public static Expression CreateDirectEntitySetQuery(EntitySetBase entitySet)
       if (!entitySet.Field.IsDynamicallyDefined) {
         return Expression.Property(wrappedOwner, entitySet.Field.UnderlyingProperty);
       }
-      var indexers = TypeHelper.GetProperties(owner.GetType(), BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public)
+      var indexers = owner.GetType().GetProperties(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public)
         .Where(p => p.GetIndexParameters().Any())
         .Select(p => p.GetGetMethod());
       return Expression.Convert(Expression.Call(Expression.Constant(owner),indexers.Single(), new []{Expression.Constant(entitySet.Field.Name)}), entitySet.Field.ValueType);
diff --git a/Orm/Xtensive.Orm/Orm/Linq/Rewriters/PersistentIndexerRewriter.cs b/Orm/Xtensive.Orm/Orm/Linq/Rewriters/PersistentIndexerRewriter.cs
@@ -72,7 +72,7 @@ private Expression GetMemberExpression(MethodCallExpression mc)
       if (mc.Object != visitedObject)
         mc = Expression.Call(visitedObject, mc.Method, mc.Arguments);
       
-      var propertyInfo = TypeHelper.GetProperties(mc.Object.Type, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+      var propertyInfo = mc.Object.Type.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
         .SingleOrDefault(property => property.Name==name);
       if (propertyInfo!=null)
         return Expression.MakeMemberAccess(mc.Object, propertyInfo);
diff --git a/Orm/Xtensive.Orm/Orm/Linq/Translator.Expressions.cs b/Orm/Xtensive.Orm/Orm/Linq/Translator.Expressions.cs
@@ -1027,7 +1027,7 @@ private IList<Expression> GetStructureFields(
 
       var result = new List<Expression>();
       foreach (PersistentFieldExpression fieldExpression in structureFields) {
-        if (!TypeHelper.GetProperties(structureType, BindingFlags.Instance | BindingFlags.Public).Contains(fieldExpression.UnderlyingProperty)) {
+        if (!structureType.GetProperties(BindingFlags.Instance | BindingFlags.Public).Contains(fieldExpression.UnderlyingProperty)) {
           if (!context.Model.Types[structureType].Fields[fieldExpression.Name].IsDynamicallyDefined) {
             continue;
           }
@@ -1282,15 +1282,15 @@ private static IList<Expression> GetAnonymousArguments(Expression expression, Ty
         if (constantExpression.Value==null && constantExpression.Type==WellKnownTypes.Object) {
           var newConstantExpressionType = anonymousTypeForNullValues ?? constantExpression.Type;
           constantExpression = Expression.Constant(null, newConstantExpressionType);
-          return TypeHelper.GetProperties(constantExpression.Type)
+          return constantExpression.Type.GetProperties()
             .OrderBy(property => property.Name)
             .Select(p => Expression.MakeMemberAccess(constantExpression, p))
             .Cast<Expression>()
             .ToList();
         }
       }
 
-      return TypeHelper.GetProperties(expression.Type)
+      return expression.Type.GetProperties()
         .OrderBy(property => property.Name)
         .Select(p => Expression.MakeMemberAccess(expression, p))
         .Select(e => (Expression) e)
diff --git a/Orm/Xtensive.Orm/Orm/Logging/IndentManager.cs b/Orm/Xtensive.Orm/Orm/Logging/IndentManager.cs
@@ -21,9 +21,6 @@ public struct IndentScope : IDisposable
 
       public void Dispose()
       {
-        if (disposed)
-          return;
-        disposed = true;
         CurrentIndentLengthAsync.Value = oldIndent;
         endAction?.Invoke();
       }
@@ -32,7 +29,6 @@ public IndentScope(int oldIndent, Action endAction)
       {
         this.oldIndent = oldIndent;
         this.endAction = endAction;
-        disposed = false;
       }
     }
 
diff --git a/Orm/Xtensive.Orm/Orm/Upgrade/UpgradeHandler.cs b/Orm/Xtensive.Orm/Orm/Upgrade/UpgradeHandler.cs
@@ -371,7 +371,7 @@ from h in hints
 
       var recycledProperties =
         from t in registeredTypes
-        from p in TypeHelper.GetProperties(t, BindingFlags.DeclaredOnly | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+        from p in t.GetProperties(BindingFlags.DeclaredOnly | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
         let pa = p.GetAttribute<FieldAttribute>()
         let ra = p.GetAttribute<RecycledAttribute>()
         where pa!=null && ra!=null
diff --git a/Orm/Xtensive.Orm/Reflection/TypeHelper.cs b/Orm/Xtensive.Orm/Reflection/TypeHelper.cs
@@ -58,9 +58,11 @@ public int GetHashCode((Type, Type[]) obj)
 
     private static readonly ConcurrentDictionary<Type, Type[]> OrderedInterfaces = new();
 
+    private static readonly ConcurrentDictionary<Type, Type[]> UnorderedInterfaces = new();
+
     private static readonly ConcurrentDictionary<Type, Type[]> OrderedCompatibles = new();
 
-    private static readonly ConcurrentDictionary<Pair<Type, Type>, InterfaceMapping> interfaceMaps = new();
+    private static readonly ConcurrentDictionary<(Type, Type), InterfaceMapping> interfaceMaps = new();
 
     private static readonly ConcurrentDictionary<(MethodInfo, Type), MethodInfo> GenericMethodInstances1 = new();
 
@@ -713,7 +715,7 @@ public static IEnumerable<Type> OrderByInheritance(this IEnumerable<Type> types)
     /// <param name="targetInterface">The target interface.</param>
     /// <returns>Interface map for the specified interface.</returns>
     public static InterfaceMapping GetInterfaceMapFast(this Type type, Type targetInterface) =>
-      InterfaceMaps.GetOrAdd((type, targetInterface), static pair => new InterfaceMapping(pair.Item1.GetInterfaceMap(pair.Item2)));
+      interfaceMaps.GetOrAdd((type, targetInterface), static pair => new InterfaceMapping(pair.Item1.GetInterfaceMap(pair.Item2)));
 
     /// <summary>
     /// Gets the interfaces of the specified type.
diff --git a/Orm/Xtensive.Orm/Tuples/TupleDescriptor.cs b/Orm/Xtensive.Orm/Tuples/TupleDescriptor.cs
@@ -86,11 +86,7 @@ IEnumerator IEnumerable.GetEnumerator()
     /// <inheritdoc/>
     public bool Equals(TupleDescriptor other)
     {
-      if (other is null)
-        return false;
-      if (ReferenceEquals(other, this))
-        return true;
-      if (FieldCount!=other.FieldCount)
+      if (FieldCount!=other.FieldCount) {
         return false;
       }
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public void EnsureNotLocked()`
`45`	`45`	`/// Initializes new instance of this type.`
`46`	`46`	`/// </summary>`
`47`	`47`	`/// <param name="isLocked">Initial <see cref="IsLocked"/> property value.</param>`
`48`		`- protected LockableBase(bool isLocked)`
	`48`	`+ protected LockableBase(bool isLocked = false)`
`49`	`49`	`{`
`50`	`50`	`IsLocked = isLocked;`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ protected virtual string GetTypeName(Type type)`
`300`	`300`
`301`	`301`	`if (name.IndexOf("__AnonymousType", StringComparison.Ordinal) > 0 &&`
`302`	`302`	`type.GetAttributes<CompilerGeneratedAttribute>(AttributeSearchOptions.InheritNone).Count > 0) {`
`303`		`- return $"@<{(from pi in TypeHelper.GetProperties(type) select pi.Name).ToCommaDelimitedString()}>";`
	`303`	`+ return $"@<{(from pi in type.GetProperties() select pi.Name).ToCommaDelimitedString()}>";`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`return name;`
Original file line number	Diff line number	Diff line change
`@@ -864,7 +864,7 @@ static Lazy<PropertyAccessorDictionary> PropertyAccessorExtractor(Type entityTyp`
`864`	`864`
`865`	`865`	`const BindingFlags propertyBindingFlags =`
`866`	`866`	`BindingFlags.Public \| BindingFlags.Instance \| BindingFlags.DeclaredOnly;`
`867`		`- foreach (var p in TypeHelper.GetProperties(entityType, propertyBindingFlags)) {`
	`867`	`+ foreach (var p in entityType.GetProperties(propertyBindingFlags)) {`
`868`	`868`	`if (p.GetAttribute<PropertyAttribute>(AttributeSearchOptions.InheritNone) != null) {`
`869`	`869`	`d.Add(p.Name, new PropertyAccessor(p));`
`870`	`870`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,8 @@ private void BuildTypes(IReadOnlyList<TypeDef> typeDefs)`
`188`	`188`	`typeBuilder.BuildType(typeDef);`
`189`	`189`	`}`
`190`	`190`	`}`
`191`		`- using (BuildLog.InfoRegion(nameof(Strings.LogBuildingX), "Fields"))`
	`191`	`+ var typeInfoCollection = context.Model.Types;`
	`192`	`+ using (BuildLog.InfoRegion(nameof(Strings.LogBuildingX), "Fields")) {`
`192`	`193`	`foreach (var typeDef in typeDefs) {`
`193`	`194`	`var typeInfo = typeInfoCollection[typeDef.UnderlyingType];`
`194`	`195`	`typeBuilder.BuildFields(typeDef, typeInfo);`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ private void ProcessFullTextIndexes(TypeDef typeDef)`
`136`	`136`
`137`	`137`	`public void ProcessProperties(TypeDef typeDef, HierarchyDef hierarchyDef)`
`138`	`138`	`{`
`139`		`- var properties = TypeHelper.GetProperties(typeDef.UnderlyingType, BindingFlags.Instance \| BindingFlags.Public \| BindingFlags.NonPublic);`
	`139`	`+ var properties = typeDef.UnderlyingType.GetProperties(BindingFlags.Instance \| BindingFlags.Public \| BindingFlags.NonPublic);`
`140`	`140`
`141`	`141`	`foreach (var propertyInfo in properties`
`142`	`142`	`.Where(IsFieldAvailable)) { // Domain builder stage-related filter`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public static Expression CreateDirectEntitySetQuery(EntitySetBase entitySet)`
`90`	`90`	`if (!entitySet.Field.IsDynamicallyDefined) {`
`91`	`91`	`return Expression.Property(wrappedOwner, entitySet.Field.UnderlyingProperty);`
`92`	`92`	`}`
`93`		`- var indexers = TypeHelper.GetProperties(owner.GetType(), BindingFlags.Instance \| BindingFlags.NonPublic \| BindingFlags.Public)`
	`93`	`+ var indexers = owner.GetType().GetProperties(BindingFlags.Instance \| BindingFlags.NonPublic \| BindingFlags.Public)`
`94`	`94`	`.Where(p => p.GetIndexParameters().Any())`
`95`	`95`	`.Select(p => p.GetGetMethod());`
`96`	`96`	`return Expression.Convert(Expression.Call(Expression.Constant(owner),indexers.Single(), new []{Expression.Constant(entitySet.Field.Name)}), entitySet.Field.ValueType);`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,6 @@ public struct IndentScope : IDisposable`
`21`	`21`
`22`	`22`	`public void Dispose()`
`23`	`23`	`{`
`24`		`- if (disposed)`
`25`		`- return;`
`26`		`- disposed = true;`
`27`	`24`	`CurrentIndentLengthAsync.Value = oldIndent;`
`28`	`25`	`endAction?.Invoke();`
`29`	`26`	`}`
`@@ -32,7 +29,6 @@ public IndentScope(int oldIndent, Action endAction)`
`32`	`29`	`{`
`33`	`30`	`this.oldIndent = oldIndent;`
`34`	`31`	`this.endAction = endAction;`
`35`		`- disposed = false;`
`36`	`32`	`}`
`37`	`33`	`}`
`38`	`34`