Merge remote-tracking branch 'upstream/master' into upstream/staticInitializers

Author: SergeiPavlov

ChangeLog/7.1.0-dev.txt

@@ -1 +1,67 @@
-[main] Introduced IQueryable<T>.Tag() extensions allowing to add tags to result SQL statement
+[main] ThreadSafeCache is removed
+[main] INamedValueCollection and its the only implementer NamedValueCollection are removed
+[main] ICollectionChangeNotifier, CollectionChangeNotifierEventArgs are removed
+[main] ArrayUtils class is removed
+[main] ISet<T> interface is removed and all usages are replaced with .Net ISet<T>
+[main] Set<T>, SetSlim<T>, ReadOnlySet<T> collections and abstract SetBase are removed
+[main] ReadOnlyList<T> is removed
+[main] ReadOnlyCollection<T>
+[main] ReadOnlyDictionary<TKey, TValue> is removed
+[main] ThreadSafeDictionary is removed
+[main] ThreadSafeList struct is removed
+[main] TypeClassifier collection is removed
+[main] LazyDictionary is removed
+[main] FlagRegistry is removed
+[main] EnumerableUtils<T> is removed
+[main] DifferentialDictionary and DifferentialDictionaryDifference are removed
+[main] CollectionBase<T> is removed
+[main] StringExtensions.Join() methods are removed
+[main] CollectionExtensions.ReverseList() method is removed
+[main] ThreadSafeCached type is removed
+[main] Triplet<T> and Triplet<TFirst,TSecond,TThird> are removed
+[main] Introduced IQueryable<T>.Tag() extensions allowing to add tags to result SQL statement
+[main] ReadOnlyHashSet<T> now implements .Net ISet and IReadOnlySet instead of removed ISet and IReadOnly
+[main] NativeTypeClassifier collection now inherits ClassifiedCollection directly
+[main] FlagCollection.Keys return type has changed from removed ReadOnlyList<T> to .Net IReadOnlyList<T>
+[main] CollectionBaseSlim<T> no longer implements IList<T> and ICollection but implements ICollection<T> and IReadOnlyList<T>
+[main] AggregateException.Exceptions property changed its return type to IReadOnlyList<Exception>
+[main] AggregateException constuctors get array of exceptions instead of IEnumerable<Exception>
+[main] CopyDataHint.CopiedColumns property changed its return type to IReadOnlyList<Pair<string>>
+[main] DateHint.Identitites property changed its return type to IReadOnlyList<IdentityPair>
+[main] UpdateDataHint.UpdateParameter property changed its return type to IReadOnlyList<Pair<string, object>>
+[main] IUpgrader methods now return IReadOnlyList<NodeAction>
+[main] PropertyAccessorDictionary has changed API due to change its base type and interfaces
+[main] FullTextIndexDefCollection changed its base type to CollectionBaseSlim<FullTextIndexDef>
+[main] HierarchyDefCollection changed its base type to CollectionBaseSlim<HierarchyDef>
+[main] HierarchyDefCollection and TypeDefCollection changed events set due to change of base type
+[main] SessionConfiguration collection API changed due to changes in base type CollectionBaseSlim<T>
+[main] IGenerationTerm.Terms changed its return type to IReadOnlyList<string>
+[main] IProximityTerm.Terms changed its return type to IReadOnlyList<IProximityOperand>
+[main] IOperation properties (PrecedingOperations, FollowingOperations, UndoOperations, IdentifiedEntities) changed return type
+[main] HierarchyInfo.Types changed its return type to IReadOnlyList<TypeInfo>
+[main] IndexInfo.Columns changed its return type to IReadOnlyList<ColumnInfo>
+[main] KeyInfo's Fields and Columns properties changed to ReadOnlyList<FieldInfo> and IReadOnlyList<ColumnInfo> respectively
+[main] TypeIndexInfoCollection.RealPrimaryIndexes property changed its return type to IReadOnlyList<IndexInfo>
+[main] TypeIndexInfoCollection.GetIndexesContainingAllData() method changed its return type to IReadOnlyList<IndexInfo>
+[main] TypeInfo members that returned IList<T> changed return type to IReadOnlyList<TypeInfo>
+[main] PersistRequestBuilderContext.AffectedIndexes changed return type to IReadOnlyList<IndexInfo>
+[main] QueryRowFilterParameterBinding.RowTypeMapping changed return type to IReadOnlyList<TypeMapping>
+[main] ProviderInfo.SupportedTypes changed return type to IReadOnlySet<Type>
+[main] SessionHandler.Prefetch/PrefetchAsync changed type of one of incoming parameters from IList<T> to IReadOnlyList<T>
+[main] ContainsTableProvider.TargetColumns changed return type to IReadOnlyList<FullTextColumnInfo>
+[main] ColumnCollection is no longer inherited from ReadOnlyList<Column> but implements IReadOnlyList<Column>
+[main] ColumnGroupCollection is no longer inherited from ReadOnlyCollection<Column> but implements IReadOnlyList<ColumnGroup>
+[main] ChangeFieldTypeHint.AffectedColumns changed return type to IReadOnlyList<string>
+[main] RemoveFieldHint.AffectedColumns changed return type to IReadOnlyList<string>
+[main] RemoveTypeHint.AffectedTables changed return type to IReadOnlyList<string>
+[main] SchemaComparisonResult.UnsafeActions changed return type to IReadOnlyList<NodeAction>
+[main] UpgradeContext.Hints changed return type to ISet<UpgradeHint>
+[main] UpgradeContext.Modules changed return type to IReadOnlyList<IModule>
+[main] UpgradeContext.OrderedUpgradeHandlers changed return type to IReadOnlyList<IUpgradeHandler>
+[main] UpgradeContext.UpgradeHandlers changed return type to IReadOnlyDictionary<Assembly, IUpgradeHandler>
+[main] UpgradeHandler.AddUpgradeHints() and .AddAutoHints() now take ISet<T> from .Net instead of ORM's ISet<T>
+[main] KeyMapping.Map changed type to IReadOnlyDictionary<Key, Key>
+[main] InterfaceMapping's properties of ReadOnlyList<T> type changed the type to IReadOnlyList<T>
+[main] Node's IncomingConnections and OutgoingConnections properties changed types to IReadOnlyList<NodeConnection<TNodeItem, TConnectionItem>>
+[main] SqlCompilerConfiguration's SchemaMapping and DatabaseMapping changed return types to IReadOnlyDictionary<string, string>
+[main] TypeMappingRegistry.Mappings and .ReverseMappings changed return types to IReadOnlyDictionary<TKey, TValue>

Containers/do-sqlserver2019

@@ -0,0 +1,12 @@
+FROM mcr.microsoft.com/mssql/server:2019-CU12-ubuntu-20.04
+USER root
+RUN apt-get -y update && \
+    apt-get install -yq curl apt-transport-https && \
+    apt-get install -y gnupg2 && \
+    curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
+    curl https://packages.microsoft.com/config/ubuntu/20.04/mssql-server-2019.list | tee /etc/apt/sources.list.d/mssql-server.list && \
+    apt-get update && \
+    apt-get install -y mssql-server-fts && \
+    apt-get clean && \ 
+    rm -rf /var/lib/apt/lists
+USER mssql

Directory.Build.props

@@ -32,6 +32,9 @@
     <DoGeneratePackage Condition="$(MSBuildProjectName) == 'Xtensive.Orm.Manual'">false</DoGeneratePackage>
     <DoGeneratePackage Condition="$(MSBuildProjectName) == 'TestCommon'">false</DoGeneratePackage>
     <DoGeneratePackage Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">false</DoGeneratePackage>
+
+    <!-- Disable "BinaryFormatter is obsolete" warnings for test projects -->
+    <NoWarn Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">$(NoWarn);SYSLIB0011</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>

Extensions/Xtensive.Orm.BulkOperations/Internals/SetOperation.cs

@@ -73,16 +73,18 @@ private void PreprocessStructures()
         ex = Expression.Call(
             typeof (Queryable), "Select", new[] {parameter.Type, f.ValueType}, ex, lambda);
         ex = Expression.Call(typeof (Queryable), call.Method.Name, new[] {f.ValueType}, ex);*/
-              else
-              {
+              else {
                 //ex = Expression.Convert(ex, typeof(Structure));
-                var list = new List<FieldInfo> { f };
-                while (list.Last().Parent != setDescriptor.Field)
-                  list.Add(f.Parent);
-                list.Reverse();
+                var last = f;
+                var fields = new List<FieldInfo> { last };
+                while (last.Parent != setDescriptor.Field) {
+                  last = f.Parent;
+                  fields.Add(last);
+                }
                 Expression member = ex;
-                foreach (FieldInfo f2 in list)
-                  member = Expression.MakeMemberAccess(member, f2.UnderlyingProperty);
+                for (var i = fields.Count; i-- > 0;) {
+                  member = Expression.MakeMemberAccess(member, fields[i].UnderlyingProperty);
+                }
                 ex = member;
               }
               Descriptors.Add(new SetDescriptor(f, setDescriptor.Parameter, ex));

Extensions/Xtensive.Orm.Reprocessing/ExecuteActionStrategy.cs

@@ -11,8 +11,8 @@ namespace Xtensive.Orm.Reprocessing
   /// </summary>
   public abstract class ExecuteActionStrategy : IExecuteActionStrategy
   {
-    private static readonly ConcurrentDictionary<Type, IExecuteActionStrategy> Singletons =
-      new ConcurrentDictionary<Type, IExecuteActionStrategy>();
+    private static readonly ConcurrentDictionary<Type, Lazy<IExecuteActionStrategy>> Singletons =
+      new ConcurrentDictionary<Type, Lazy<IExecuteActionStrategy>>();
 
     /// <summary>
     /// Gets singleton of the <see cref="HandleReprocessableExceptionStrategy"/>.
@@ -137,7 +137,13 @@ public static IExecuteActionStrategy GetSingleton(Type type)
       if (type == typeof(NoReprocessStrategy)) {
         return NoReprocess;
       }
-      return Singletons.GetOrAdd(type, a => (IExecuteActionStrategy) Activator.CreateInstance(type));
+
+      return Singletons.GetOrAdd(type, ActionStrategyFactory).Value;
+
+      static Lazy<IExecuteActionStrategy> ActionStrategyFactory(Type t)
+      {
+        return new Lazy<IExecuteActionStrategy>(() => (IExecuteActionStrategy) Activator.CreateInstance(t));
+      }
     }
 
     #region Non-public methods

Extensions/Xtensive.Orm.Security/Role.cs

@@ -11,7 +11,7 @@ namespace Xtensive.Orm.Security
   public abstract class Role : Entity, IRole
   {
     private List<Permission> permissions;
-    private ReadOnlyList<Permission> readOnlyPermissions;
+    private IList<Permission> readOnlyPermissions;
 
     /// <inheritdoc/>
     [NotNullConstraint(IsImmediate = true)]
@@ -57,7 +57,7 @@ protected override void OnInitialize()
     {
       base.OnInitialize();
       permissions = new List<Permission>();
-      readOnlyPermissions = new ReadOnlyList<Permission>(permissions);
+      readOnlyPermissions = permissions.AsReadOnly();
       RegisterPermissions();
     }
 

Extensions/Xtensive.Orm.Web.Tests/Xtensive.Orm.Web.Tests.csproj

@@ -4,6 +4,8 @@
     <IsPackable>false</IsPackable>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
   </PropertyGroup>
   <Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
   <ItemGroup>

Extensions/Xtensive.Orm.Web/SessionManager.cs

@@ -75,7 +75,7 @@ public static SessionManager Demand()
     /// </summary>
     public bool HasSession
     {
-      get { return sessionAndTransactionPair.Value != null && sessionAndTransactionPair.Value.First != null; }
+      get { return sessionAndTransactionPair.Value.First != null; }
     }
 
     /// <summary>

Orm/Xtensive.Orm.Firebird/Orm.Providers.Firebird/DomainHandler.cs

@@ -13,6 +13,7 @@ namespace Xtensive.Orm.Providers.Firebird
   /// </summary>
   public class DomainHandler : Providers.DomainHandler
   {
+    /// <inheritdoc/>
     protected override ICompiler CreateCompiler(CompilerConfiguration configuration)
     {
       return new SqlCompiler(Handlers, configuration);

Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/DriverFactory.cs

@@ -42,6 +42,7 @@ protected override SqlDriver CreateDriver(string connectionString, SqlDriverConf
         connectionString, GetVersionFromServerVersionString(connection.ServerVersion), defaultSchema);
     }
 
+    /// <inheritdoc/>
     protected override async Task<SqlDriver> CreateDriverAsync(
       string connectionString, SqlDriverConfiguration configuration, CancellationToken token)
     {