Merge branch 'master' into upstream/covariantReturnTypes

Author: SergeiPavlov

ChangeLog/7.1.0-Beta-2-dev.txt

@@ -1,2 +1,18 @@
+[main] Obsolete CatalogHelper class has been removed
+[main] Obsolete ReacreateTableHint has been removed
+[main] Obsolete Session.SelectStorageNode() method is removed
+[main] Obsolete methods from ArrayExtensions, EnumerableExtensions and QueryableExtensions have been removed
+[main] Obsolete DeleteDataHint.PostCopy property has been removed
+[main] Obsolete QueryEndpoint's members have been removed
+[main] Obsolete Query's members have been removed
+[main] Obsolete members of DelayedScalarQuery<T> have been removed
+[main] Obsolete FieldInfo.IsDynalicallyDefined property's been removed (FieldInfo.IsDynamicallyDefined is still there)
+[main] Some EventArgs inheritors that were sealed classes transformed to read-only structures
+[main] DbCommandEventArgs became read-only structure
+[main] Xtensive.Sql.Dml.Extensions.IsNullReference() extension method is marked obsolete, use 'is null' operator instead
 [main] BitFaster.Caching package reference is updated to 1.0.7
-[main] No error caused by ambiguity due to new IQueryable extension methods of .Net 6
+[main] No error caused by ambiguity due to new IQueryable extension methods of .Net 6
+[reprocessing] DomainBuildErrorEventArgs (not sealed) became read-only structure
+[reprocessing] ExecuteErrorEventArgs (not sealed) became read-only structure
+[tracking] TrackingCompletedEventArgs (sealed) became read-only structure
+[Web] Removed Obsolete SessionManager and StartupConfigurationExtension

Directory.Build.props

@@ -40,23 +40,25 @@
   <PropertyGroup>
     <NoLogo>true</NoLogo>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>$(TargetFrameworks)</TargetFrameworks> <!-- the property -->
+    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">$(DO_TargetFrameworks)</TargetFrameworks> <!-- env var -->
+    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net5.0</TargetFrameworks> <!-- fallback to default -->
     <LangVersion>9.0</LangVersion>
     <SolutionDir Condition="$(SolutionDir) == ''">$([MSBuild]::EnsureTrailingSlash(
       $([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)', 'Orm.sln'))))</SolutionDir>
     <Configuration Condition="$(Configuration) == ''">Debug</Configuration>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <ArtifactsDir Condition="'$(ArtifactsDir)'==''">$(SolutionDir)_Build\</ArtifactsDir>
     <BaseIntermediateOutputPath>$(ArtifactsDir)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework)\</IntermediateOutputPath>
     <BaseOutputPath>$(ArtifactsDir)bin\$(Configuration)\</BaseOutputPath>
     <BaseOutputPath Condition="$(MSBuildProjectName.Contains('Tests'))
       OR $(MSBuildProjectName) == 'TestCommon'
       OR $(MSBuildProjectName) == 'Xtensive.Orm.Manual'">$(ArtifactsDir)tests\$(Configuration)\</BaseOutputPath>
     <OutputPath>$(BaseOutputPath)lib\</OutputPath>
     <MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
     <ProjectAssetsFile>$(MSBuildProjectExtensionsPath)project.assets.json</ProjectAssetsFile>
-    <ProjectAssetsCacheFile>$(MSBuildProjectExtensionsPath)$(MSBuildProjectName).assets.cache</ProjectAssetsCacheFile>
+    <ProjectAssetsCacheFile>$(MSBuildProjectExtensionsPath)$(TargetFramework)\$(MSBuildProjectName).assets.cache</ProjectAssetsCacheFile>
     <OrmKeyFile>$(SolutionDir)Orm\Orm.snk</OrmKeyFile>
   </PropertyGroup>
 

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

@@ -142,14 +142,14 @@ private void JoinViaIn(SqlStatement statement, SqlSelect select)
         var s = (SqlSelect) select.Clone();
         foreach (var column in columns) {
           var ex = SqlDml.Equals(s.From.Columns[column.Name], table.Columns[column.Name]);
-          s.Where = s.Where.IsNullReference() ? ex : SqlDml.And(s.Where, ex);
+          s.Where = s.Where is null ? ex : SqlDml.And(s.Where, ex);
         }
         var existingColumns = s.Columns.ToChainedBuffer();
         s.Columns.Clear();
         var columnToAdd = existingColumns.First(c => c.Name.Equals(columnInfo.Name, StringComparison.Ordinal));
         s.Columns.Add(columnToAdd);
         var @in = SqlDml.In(SqlDml.TableColumn(table, columnInfo.Name), s);
-        where = where.IsNullReference() ? @in : SqlDml.And(where, @in);
+        where = where is null ? @in : SqlDml.And(where, @in);
         columns.Add(columnInfo);
       }
 

Extensions/Xtensive.Orm.Logging.NLog/Log.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2020 Xtensive LLC.
+// Copyright (C) 2013-2022 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
@@ -17,37 +17,37 @@ public class Log : BaseLog
   {
     private readonly Logger target;
 
-    private static NLogLevel ConvertLevel(LogLevel level)
-    {
-      switch (level) {
-      case LogLevel.Debug:
-        return NLogLevel.Debug;
-      case LogLevel.Error:
-        return NLogLevel.Error;
-      case LogLevel.FatalError:
-        return NLogLevel.Fatal;
-      case LogLevel.Warning:
-        return NLogLevel.Warn;
-      default:
-        return NLogLevel.Info;
-      }
-    }
-
     /// <inheritdoc/>
     public override bool IsLogged(LogLevel level)
     {
       return target.IsEnabled(ConvertLevel(level));
     }
 
     /// <inheritdoc/>
-    public override void Write(LogEventInfo info)
+    public override void Write(in LogEventInfo info)
     {
       if (info.Exception!=null)
         target.Log(ConvertLevel(info.Level), info.Exception, info.FormattedMessage);
       else
         target.Log(ConvertLevel(info.Level), info.FormattedMessage);
     }
 
+    private static NLogLevel ConvertLevel(in LogLevel level)
+    {
+      switch (level) {
+        case LogLevel.Debug:
+          return NLogLevel.Debug;
+        case LogLevel.Error:
+          return NLogLevel.Error;
+        case LogLevel.FatalError:
+          return NLogLevel.Fatal;
+        case LogLevel.Warning:
+          return NLogLevel.Warn;
+        default:
+          return NLogLevel.Info;
+      }
+    }
+
     /// <summary>
     /// Creates instance of <see cref="Log"/> class.
     /// </summary>

Extensions/Xtensive.Orm.Logging.log4net/Log.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020 Xtensive LLC.
+// Copyright (C) 2014-2022 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 Kulakov
@@ -16,25 +16,7 @@ namespace Xtensive.Orm.Logging.log4net
   /// </summary>
   public class Log : BaseLog
   {
-    private log4netLog target;
-
-    private Level ConvertLevel(LogLevel level)
-    {
-      switch (level) {
-      case LogLevel.Debug:
-        return Level.Debug;
-      case LogLevel.Info:
-        return Level.Info;
-      case LogLevel.Warning:
-        return Level.Warn;
-      case LogLevel.Error:
-        return Level.Error;
-      case LogLevel.FatalError:
-        return Level.Fatal;
-      default:
-        return Level.Info;
-      }
-    }
+    private readonly log4netLog target;
 
     /// <inheritdoc />
     public override bool IsLogged(LogLevel level)
@@ -43,11 +25,29 @@ public override bool IsLogged(LogLevel level)
     }
 
     /// <inheritdoc />
-    public override void Write(LogEventInfo info)
+    public override void Write(in LogEventInfo info)
     {
       target.Logger.Log(target.Logger.GetType(), ConvertLevel(info.Level), info.FormattedMessage, info.Exception);
     }
 
+    private Level ConvertLevel(in LogLevel level)
+    {
+      switch (level) {
+        case LogLevel.Debug:
+          return Level.Debug;
+        case LogLevel.Info:
+          return Level.Info;
+        case LogLevel.Warning:
+          return Level.Warn;
+        case LogLevel.Error:
+          return Level.Error;
+        case LogLevel.FatalError:
+          return Level.Fatal;
+        default:
+          return Level.Info;
+      }
+    }
+
     /// <summary>
     /// Creates instance of <see cref="Log"/> class.
     /// </summary>
@@ -57,6 +57,7 @@ public override void Write(LogEventInfo info)
     public Log(Assembly repositoryAssembly, string name)
     {
       target = log4netLogManager.GetLogger(repositoryAssembly, name);
+
     }
   }
 }

Extensions/Xtensive.Orm.Reprocessing/DomainBuildErrorEventArgs.cs

@@ -1,12 +1,24 @@
-using System;
+// Copyright (C) 2012-2022 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
+using System;
 
 namespace Xtensive.Orm.Reprocessing
 {
   /// <summary>
   /// Contains <see cref="ReprocessableDomainBuilder.Error"/> event data.
   /// </summary>
-  public class DomainBuildErrorEventArgs : EventArgs
+  public readonly struct DomainBuildErrorEventArgs
   {
+    /// <summary>
+    /// Gets the exception.
+    /// </summary>
+    public Exception Exception { get; }
+    /// <summary>
+    /// Gets the attempt number.
+    /// </summary>
+    public int Attempt { get; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="DomainBuildErrorEventArgs"/> class.
     /// </summary>
@@ -17,14 +29,5 @@ public DomainBuildErrorEventArgs(Exception exception, int attempt)
       Exception = exception;
       Attempt = attempt;
     }
-
-    /// <summary>
-    /// Gets the exception.
-    /// </summary>
-    public Exception Exception { get; private set; }
-    /// <summary>
-    /// Gets the attempt number.
-    /// </summary>
-    public int Attempt { get; private set; }
   }
 }

Extensions/Xtensive.Orm.Reprocessing/ExecuteErrorEventArgs.cs

@@ -1,31 +1,35 @@
-using System;
+// Copyright (C) 2012-2022 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
+
+using System;
 
 namespace Xtensive.Orm.Reprocessing
 {
   /// <summary>
   /// Provides data for the <see cref="IExecuteActionStrategy.Error"/> event
   /// </summary>
-  public class ExecuteErrorEventArgs : EventArgs
+  public readonly struct ExecuteErrorEventArgs
   {
     /// <summary>
     /// Gets the attempt number of this task.
     /// </summary>
-    public int Attempt { get; private set; }
+    public int Attempt { get; }
 
     /// <summary>
     /// Gets the exception of this task.
     /// </summary>
-    public Exception Exception { get; private set; }
+    public Exception Exception { get; }
 
     /// <summary>
     /// Gets the session of this task. Session will have outer transaction.
     /// </summary>
-    public Session Session { get; private set; }
+    public Session Session { get; }
 
     /// <summary>
     /// Gets the transaction of this task.
     /// </summary>
-    public Transaction Transaction { get; private set; }
+    public Transaction Transaction { get; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ExecuteErrorEventArgs"/> class.
@@ -42,4 +46,4 @@ public ExecuteErrorEventArgs(Exception exception, Session session, Transaction t
       Transaction = transaction;
     }
   }
-}
+}

Extensions/Xtensive.Orm.Security/Permission.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2011 Xtensive LLC.
+// Copyright (C) 2011 Xtensive LLC.
 // All rights reserved.
 // For conditions of distribution and use, see license.
 // Created by: Dmitri Maximov
@@ -41,15 +41,15 @@ public abstract class Permission
     /// <inheritdoc/>
     public bool Equals(Permission other)
     {
-      if (ReferenceEquals(null, other)) return false;
+      if (other is null) return false;
       if (ReferenceEquals(this, other)) return true;
       return Equals(other.Type, Type) && other.CanRead.Equals(CanRead) && other.CanWrite.Equals(CanWrite) && Equals(other.Query, Query);
     }
 
     /// <inheritdoc/>
     public override bool Equals(object obj)
     {
-      if (ReferenceEquals(null, obj)) return false;
+      if (obj is null) return false;
       if (ReferenceEquals(this, obj)) return true;
       if (obj.GetType() != typeof (Permission)) return false;
       return Equals((Permission) obj);

Extensions/Xtensive.Orm.Tracking/TrackingCompletedEventArgs.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2020 Xtensive LLC.
+// Copyright (C) 2012-2022 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 
@@ -10,17 +10,17 @@ namespace Xtensive.Orm.Tracking
   /// <summary>
   /// Event arguments for <see cref="ITrackingMonitor.TrackingCompleted"/> event.
   /// </summary>
-  public sealed class TrackingCompletedEventArgs : EventArgs
+  public readonly struct TrackingCompletedEventArgs
   {
     /// <summary>
     /// Gets session this changes occured in.
     /// </summary>
-    public Session Session { get; private set; }
+    public Session Session { get; }
 
     /// <summary>
     /// Gets the changes.
     /// </summary>
-    public IEnumerable<ITrackingItem> Changes { get; private set; }
+    public IEnumerable<ITrackingItem> Changes { get; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="TrackingCompletedEventArgs"/> class.
@@ -30,13 +30,8 @@ public sealed class TrackingCompletedEventArgs : EventArgs
     /// <param name="changes">The changes.</param>
     public TrackingCompletedEventArgs(Session session, IEnumerable<ITrackingItem> changes)
     {
-      if (session==null)
-        throw new ArgumentNullException("session");
-      if (changes == null)
-        throw new ArgumentNullException("changes");
-
-      Session = session;
-      Changes = changes;
+      Session = session ?? throw new ArgumentNullException("session");
+      Changes = changes ?? throw new ArgumentNullException("changes");
     }
   }
 }