Revert "net5 compilation and delete obsolete code" (#200)

Author: alex-kulakov

Containers/do-sqlserver2019

@@ -32,15 +32,12 @@
     <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>
     <NoLogo>true</NoLogo>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>9.0</LangVersion>
     <SolutionDir Condition="$(SolutionDir) == ''">$([MSBuild]::EnsureTrailingSlash(
       $([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)', 'Orm.sln'))))</SolutionDir>

Directory.Build.props

@@ -73,18 +73,16 @@ 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 last = f;
-                var fields = new List<FieldInfo> { last };
-                while (last.Parent != setDescriptor.Field) {
-                  last = f.Parent;
-                  fields.Add(last);
-                }
+                var list = new List<FieldInfo> { f };
+                while (list.Last().Parent != setDescriptor.Field)
+                  list.Add(f.Parent);
+                list.Reverse();
                 Expression member = ex;
-                for (var i = fields.Count; i-- > 0;) {
-                  member = Expression.MakeMemberAccess(member, fields[i].UnderlyingProperty);
-                }
+                foreach (FieldInfo f2 in list)
+                  member = Expression.MakeMemberAccess(member, f2.UnderlyingProperty);
                 ex = member;
               }
               Descriptors.Add(new SetDescriptor(f, setDescriptor.Parameter, ex));

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

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

Extensions/Xtensive.Orm.Reprocessing/ExecuteActionStrategy.cs

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

Extensions/Xtensive.Orm.Security/Role.cs

@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <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.Tests/Xtensive.Orm.Web.Tests.csproj

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

Extensions/Xtensive.Orm.Web/SessionManager.cs

@@ -13,7 +13,6 @@ 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/Orm.Providers.Firebird/DomainHandler.cs

@@ -42,7 +42,6 @@ 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)
     {

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

@@ -17,6 +17,9 @@ internal class ServerInfoProvider : Info.ServerInfoProvider
     // The limit is 64kB for statement text, 64kB for compiled BLR and 48kB for execution plan.
     private const int MaxTextLength = int.MaxValue;
 
+    private readonly string databaseName;
+    private readonly string defaultSchemaName;
+
     public override EntityInfo GetCollationInfo()
     {
       return null;