Remove obsolete conditional compilation + errors fixed

alex-kulakov · alex-kulakov · commit 0f6c8aec3ee8 · 2025-12-08T14:13:02.000+05:00
diff --git a/Extensions/Xtensive.Orm.BulkOperations/Internals/Operation.cs b/Extensions/Xtensive.Orm.BulkOperations/Internals/Operation.cs
@@ -68,11 +68,7 @@ protected void EnsureTransactionIsStarted()
     public QueryTranslationResult GetRequest(IQueryable<T> query) => QueryBuilder.TranslateQuery(query);
 
     public QueryTranslationResult GetRequest(Type type, IQueryable query) =>
-#if NET8_0_OR_GREATER
       (QueryTranslationResult) WellKnownMembers.TranslateQueryMethod.CachedMakeGenericMethodInvoker(type).Invoke(QueryBuilder, query);
-#else
-      (QueryTranslationResult) WellKnownMembers.TranslateQueryMethod.CachedMakeGenericMethod(type).Invoke(QueryBuilder, new object[] {query});
-#endif
 
     public TypeInfo GetTypeInfo(Type entityType) =>
       Session.Domain.Model.Hierarchies.SelectMany(a => a.Types).Single(a => a.UnderlyingType == entityType);
diff --git a/Extensions/Xtensive.Orm.Localization/Configuration/LocalizationConfiguration.cs b/Extensions/Xtensive.Orm.Localization/Configuration/LocalizationConfiguration.cs
@@ -79,7 +79,7 @@ public static LocalizationConfiguration Load()
     /// </returns>
     public static LocalizationConfiguration Load(string sectionName)
     {
-      var section = (ConfigurationSection) ConfigurationManager.GetSection(sectionName);
+      var section = (ConfigurationSection) System.Configuration.ConfigurationManager.GetSection(sectionName);
       return GetConfigurationFromSection(section);
     }
 
diff --git a/Extensions/Xtensive.Orm.Reprocessing/Configuration/ReprocessingConfiguration.cs b/Extensions/Xtensive.Orm.Reprocessing/Configuration/ReprocessingConfiguration.cs
@@ -84,7 +84,7 @@ public static ReprocessingConfiguration Load()
     /// <returns>The reprocessing configuration.</returns>
     public static ReprocessingConfiguration Load(string sectionName)
     {
-      var section = (ConfigurationSection) ConfigurationManager.GetSection(sectionName);
+      var section = (ConfigurationSection) System.Configuration.ConfigurationManager.GetSection(sectionName);
       return GetConfigurationFromSection(section);
     }
 
diff --git a/Extensions/Xtensive.Orm.Security/Configuration/SecurityConfiguration.cs b/Extensions/Xtensive.Orm.Security/Configuration/SecurityConfiguration.cs
@@ -83,7 +83,7 @@ public static SecurityConfiguration Load()
     /// </returns>
     public static SecurityConfiguration Load(string sectionName)
     {
-      var section = (ConfigurationSection) ConfigurationManager.GetSection(sectionName);
+      var section = (ConfigurationSection) System.Configuration.ConfigurationManager.GetSection(sectionName);
       return GetConfigurationFromSection(section);
     }
 
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/PostgreSqlHelper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/PostgreSqlHelper.cs
@@ -21,11 +21,7 @@ internal static NpgsqlInterval CreateNativeIntervalFromTimeSpan(in TimeSpan time
 
       var days = timeSpan.Days;
       var timeTicks = ticks - (days * TimeSpan.TicksPerDay);
-#if NET7_0_OR_GREATER
       var microseconds = timeTicks / TimeSpan.TicksPerMicrosecond;
-#else
-      var microseconds = timeTicks / 10L; // same as TimeSpan.TicksPerMicrosecond available in .NET7+
-#endif
       // no months!
       return new NpgsqlInterval(0, days, microseconds);
     }
@@ -43,11 +39,7 @@ internal static TimeSpan ResurrectTimeSpanFromNpgsqlInterval(in NpgsqlInterval n
         : npgsqlInterval.Days;
 
       var ticksOfDays = days * TimeSpan.TicksPerDay;
-#if NET7_0_OR_GREATER
       var overallTicks = ticksOfDays + (npgsqlInterval.Time * TimeSpan.TicksPerMicrosecond);
-#else
-      var overallTicks = ticksOfDays + (npgsqlInterval.Time * 10); //same as TimeSpan.TicksPerMicrosecond available in .NET7+
-#endif
       return TimeSpan.FromTicks(overallTicks);
     }
 
@@ -115,18 +107,7 @@ public static TimeZoneInfo GetTimeZoneInfoForServerTimeZone(string connectionTim
 
     private static bool TryFindSystemTimeZoneById(string id, out TimeZoneInfo timeZoneInfo)
     {
-#if NET8_0_OR_GREATER
       return TimeZoneInfo.TryFindSystemTimeZoneById(id, out timeZoneInfo);
-#else
-      try {
-        timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById(id);
-        return true;
-      }
-      catch {
-        timeZoneInfo = null;
-        return false;
-      }
-#endif
     }
   }
 }
diff --git a/Orm/Xtensive.Orm.Tests.Core/DotNetFramework/AllocationTest.cs b/Orm/Xtensive.Orm.Tests.Core/DotNetFramework/AllocationTest.cs
@@ -92,9 +92,6 @@ private void TestClassAllocation(double speedFactor)
       // Warmup
       int iterations = 100;
       AllocateClass_SlimObject(iterations);
-#if !NET8_0_OR_GREATER
-      AllocateClass_SlimObject_ByFormatterServices(iterations);
-#endif
       AllocateClass_FinalizableSlimObject(iterations);
       AllocateClass_InheritedObject3(iterations);
       AllocateClass<SlimObject>(iterations);
@@ -112,11 +109,6 @@ private void TestClassAllocation(double speedFactor)
           using (new Measurement("SlimObject", MeasurementOptions.Log, iterations))
             AllocateClass_SlimObject(iterations);
           TestHelper.CollectGarbage();
-#if !NET8_0_OR_GREATER
-          using (new Measurement("SlimObject (using FormatterServices)", MeasurementOptions.Log, iterations))
-            AllocateClass_SlimObject_ByFormatterServices(iterations);
-#endif
-          TestHelper.CollectGarbage();
           using (new Measurement("FinalizableSlimObject", MeasurementOptions.Log, iterations))
             AllocateClass_FinalizableSlimObject(iterations);
           TestHelper.CollectGarbage();
@@ -213,25 +205,6 @@ private void AllocateClass_InheritedObject3(int iterationCount)
         new InheritedObject3();
       }
     }
-#if !NET8_0_OR_GREATER
-
-    private void AllocateClass_SlimObject_ByFormatterServices(int iterationCount)
-    {
-      var type = typeof(SlimObject);
-      for (int i = 0; i<iterationCount; i+=10) {
-        FormatterServices.GetUninitializedObject(type);
-        FormatterServices.GetUninitializedObject(type);
-        FormatterServices.GetUninitializedObject(type);
-        FormatterServices.GetUninitializedObject(type);
-        FormatterServices.GetUninitializedObject(type);
-        FormatterServices.GetUninitializedObject(type);
-        FormatterServices.GetUninitializedObject(type);
-        FormatterServices.GetUninitializedObject(type);
-        FormatterServices.GetUninitializedObject(type);
-        FormatterServices.GetUninitializedObject(type);
-      }
-    }
-#endif
 
     private void AllocateClass_FinalizableSlimObject(int iterationCount)
     {
diff --git a/Orm/Xtensive.Orm.Tests.Sql/PostgreSql/PostgreSqlHelperTest.cs b/Orm/Xtensive.Orm.Tests.Sql/PostgreSql/PostgreSqlHelperTest.cs
@@ -176,18 +176,7 @@ private static void LoadServerTimeZones(Xtensive.Sql.SqlConnection connection,
 
     private static bool TryFindSystemTimeZoneById(string id, out TimeZoneInfo timeZoneInfo)
     {
-#if NET8_0_OR_GREATER
       return TimeZoneInfo.TryFindSystemTimeZoneById(id, out timeZoneInfo);
-#else
-      try {
-        timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById(id);
-        return true;
-      }
-      catch {
-        timeZoneInfo = null;
-        return false;
-      }
-#endif
     }
   }
 }
diff --git a/Orm/Xtensive.Orm/Core/Exceptions/AggregateException.cs b/Orm/Xtensive.Orm/Core/Exceptions/AggregateException.cs
@@ -61,7 +61,7 @@ public override string ToString()
         .AppendFormat("{0}:", Strings.OriginalExceptions);
       int i = 1;
       foreach (Exception exception in exceptions)
-        sb.AppendLine().AppendFormat("{0}: {1}", i++, exception);
+        _ = sb.AppendLine().AppendFormat("{0}: {1}", i++, exception);
       return sb.ToString();
     }
 
diff --git a/Orm/Xtensive.Orm/Core/Internals/ValueStringBuilder.cs b/Orm/Xtensive.Orm/Core/Internals/ValueStringBuilder.cs
@@ -102,11 +102,7 @@ public void Insert(int index, string? s)
 
       var remaining = position - index;
       chars.Slice(index, remaining).CopyTo(chars.Slice(index + count));
-#if NET6_0_OR_GREATE
       s.CopyTo(chars.Slice(index));
-#else
-      s.AsSpan().CopyTo(chars.Slice(index));
-#endif
       position += count;
     }
 
diff --git a/Orm/Xtensive.Orm/IoC/ServiceContainer.cs b/Orm/Xtensive.Orm/IoC/ServiceContainer.cs
@@ -29,37 +29,24 @@ public class ServiceContainer : ServiceContainerBase
   {
     private static readonly Type iServiceContainerType = typeof(IServiceContainer);
 
-#if NET8_0_OR_GREATER
     private static readonly Func<ServiceRegistration, Pair<ConstructorInvoker, ParameterInfo[]>> ConstructorFactory = serviceInfo => {
-#else
-    private static readonly Func<ServiceRegistration, Pair<ConstructorInfo, ParameterInfo[]>> ConstructorFactory = serviceInfo => {
-#endif
       var mappedType = serviceInfo.MappedType;
       var ctor = (
         from c in mappedType.GetConstructors()
         where c.GetAttribute<ServiceConstructorAttribute>(AttributeSearchOptions.InheritNone) != null
         select c
         ).SingleOrDefault() ?? mappedType.GetConstructor(Array.Empty<Type>());
       var @params = ctor?.GetParameters();
-#if NET8_0_OR_GREATER
       return new(ctor is null ? null : ConstructorInvoker.Create(ctor), @params);
-#else
-      return new(ctor, @params);
-#endif
     };
 
     private readonly IReadOnlyDictionary<Key, List<ServiceRegistration>> types;
 
-    private readonly ConcurrentDictionary<ServiceRegistration, Lazy<object>> instances =
-      new ConcurrentDictionary<ServiceRegistration, Lazy<object>>();
+    private readonly ConcurrentDictionary<ServiceRegistration, Lazy<object>> instances = new();
 
-#if NET8_0_OR_GREATER
     private readonly ConcurrentDictionary<ServiceRegistration, Pair<ConstructorInvoker, ParameterInfo[]>> constructorCache = new();
-#else
-    private readonly ConcurrentDictionary<ServiceRegistration, Pair<ConstructorInfo, ParameterInfo[]>> constructorCache = new();
-#endif
 
-    private readonly ConcurrentDictionary<(Type, int), bool> creating = new ConcurrentDictionary<(Type, int), bool>();
+    private readonly ConcurrentDictionary<(Type, int), bool> creating = new();
 
     #region Protected virtual methods (to override)
 
@@ -118,14 +105,10 @@ protected virtual object CreateInstance(ServiceRegistration serviceInfo)
       finally {
         _ = creating.TryRemove(key, out _);
       }
-#if NET8_0_OR_GREATER
       return cInfo.Invoke(args.AsSpan());
-#else
-      return cInfo.Invoke(args);
-#endif
     }
 
-#endregion
+    #endregion
 
     #region Private \ internal methods
 
@@ -210,28 +193,15 @@ public static IServiceContainer Create(Type containerType, object configuration,
       Type configurationType = configuration?.GetType(),
         parentType = parent?.GetType();
       return (IServiceContainer) (
-#if NET8_0_OR_GREATER
         FindConstructorInvoker(containerType, configurationType, parentType)?.Invoke(configuration, parent)
         ?? FindConstructorInvoker(containerType, configurationType)?.Invoke(configuration)
         ?? FindConstructorInvoker(containerType, parentType)?.Invoke(parent)
-#else
-        FindConstructor(containerType, configurationType, parentType)?.Invoke(new[] { configuration, parent })
-        ?? FindConstructor(containerType, configurationType)?.Invoke(new[] { configuration })
-        ?? FindConstructor(containerType, parentType)?.Invoke(new[] { parent })
-#endif
         ?? throw new ArgumentException(Strings.ExContainerTypeDoesNotProvideASuitableConstructor, "containerType")
       );
     }
 
-#if NET8_0_OR_GREATER
     private static ConstructorInvoker FindConstructorInvoker(Type containerType, params Type[] argumentTypes) =>
       containerType.GetSingleConstructorInvokerOrDefault(argumentTypes);
-#else
-#pragma warning disable CS0612 // Type or member is obsolete
-    private static ConstructorInfo FindConstructor(Type containerType, params Type[] argumentTypes) =>
-      containerType.GetSingleConstructorOrDefault(argumentTypes);
-#pragma warning restore CS0612 // Type or member is obsolete
-#endif
 
     #endregion
 
@@ -304,7 +274,7 @@ public static IServiceContainer Create(ConfigurationSection section, string name
       var typeRegistry = new TypeRegistry(new ServiceTypeRegistrationProcessor());
 
       foreach (var typeRegistrationElement in configuration.Auto)
-        typeRegistry.Register(typeRegistrationElement.ToNative());
+        _ = typeRegistry.Register(typeRegistrationElement.ToNative());
       foreach (var type in typeRegistry)
         registrations.AddRange(ServiceRegistration.CreateAll(type));
       foreach (var serviceRegistrationElement in configuration.Explicit)
@@ -347,7 +317,7 @@ public override void Dispose()
       using (var toDispose = new DisposableSet()) {
         foreach (var lazy in instances.Values) {
           if (lazy.IsValueCreated && lazy.Value is IDisposable disposable) {
-            toDispose.Add(disposable);
+            _ = toDispose.Add(disposable);
           }
         }
       }
diff --git a/Orm/Xtensive.Orm/Modelling/PropertyAccessor.cs b/Orm/Xtensive.Orm/Modelling/PropertyAccessor.cs
@@ -174,11 +174,7 @@ private void Initialize()
         dependencyRootType = pa.DependencyRootType;
         compareCaseInsensitive = tProperty == WellKnownTypes.String && pa.CaseInsensitiveComparison;
       }
-#if NET8_0_OR_GREATER
-      InnerInitializeMethodDefinition.CachedMakeGenericMethodInvoker(tType, tProperty).Invoke(this);
-#else
-      InnerInitializeMethodDefinition.CachedMakeGenericMethod(tType, tProperty).Invoke(this, null);
-#endif
+      _ = InnerInitializeMethodDefinition.CachedMakeGenericMethodInvoker(tType, tProperty).Invoke(this);
     }
 
     private void InnerInitialize<TType, TProperty>()
diff --git a/Orm/Xtensive.Orm/Orm/Configuration/DomainConfiguration.cs b/Orm/Xtensive.Orm/Orm/Configuration/DomainConfiguration.cs
@@ -848,7 +848,7 @@ protected override void CopyFrom(ConfigurationBase source)
     /// the <see cref="Domain"/> with specified <paramref name="name"/>.</exception>
     public static DomainConfiguration Load(string sectionName, string name)
     {
-      var section = (ConfigurationSection)ConfigurationManager.GetSection(sectionName);
+      var section = (ConfigurationSection)System.Configuration.ConfigurationManager.GetSection(sectionName);
       if (section == null) {
         throw new InvalidOperationException(string.Format(
           Strings.ExSectionIsNotFoundInApplicationConfigurationFile, sectionName));
diff --git a/Orm/Xtensive.Orm/Orm/Configuration/LoggingConfiguration.cs b/Orm/Xtensive.Orm/Orm/Configuration/LoggingConfiguration.cs
@@ -89,7 +89,7 @@ public static LoggingConfiguration Load(string sectionName)
     {
       ArgumentValidator.EnsureArgumentNotNullOrEmpty(sectionName, nameof(sectionName));
 
-      var section = (ConfigurationSection)ConfigurationManager.GetSection(sectionName);
+      var section = (ConfigurationSection)System.Configuration.ConfigurationManager.GetSection(sectionName);
       if (section==null)
         throw new InvalidOperationException(string.Format(Strings.ExSectionIsNotFoundInApplicationConfigurationFile, sectionName));
       var configuration = section.Logging.ToNative();
diff --git a/Orm/Xtensive.Orm/Orm/Linq/QueryProvider.cs b/Orm/Xtensive.Orm/Orm/Linq/QueryProvider.cs
@@ -53,21 +53,12 @@ public IQueryable<TElement> CreateQuery<TElement>(Expression expression) =>
     object IQueryProvider.Execute(Expression expression)
     {
       var resultType = expression.Type;
-#if NET8_0_OR_GREATER
       var executeMethod = resultType.IsOfGenericInterface(WellKnownInterfaces.EnumerableOfT)
         ? WellKnownMembers.QueryProvider.ExecuteSequence.CachedMakeGenericMethodInvoker(SequenceHelper.GetElementType(resultType))
         : WellKnownMembers.QueryProvider.ExecuteScalar.CachedMakeGenericMethodInvoker(resultType);
       try {
         return executeMethod.Invoke(this, expression);
       }
-#else
-      var executeMethod = resultType.IsOfGenericInterface(WellKnownInterfaces.EnumerableOfT)
-        ? WellKnownMembers.QueryProvider.ExecuteSequence.CachedMakeGenericMethod(SequenceHelper.GetElementType(resultType))
-        : WellKnownMembers.QueryProvider.ExecuteScalar.CachedMakeGenericMethod(resultType);
-      try {
-        return executeMethod.Invoke(this, new object[] { expression });
-      }
-#endif
       catch (TargetInvocationException e) {
         if (e.InnerException != null) {
           ExceptionDispatchInfo.Throw(e.InnerException);
diff --git a/Orm/Xtensive.Orm/Orm/Providers/StorageDriver.cs b/Orm/Xtensive.Orm/Orm/Providers/StorageDriver.cs
@@ -146,7 +146,7 @@ private void FixExtractionResultSqlServerFamily(SqlExtractionResult result)
         var tables = schema.Tables;
         var sysdiagrams = tables["sysdiagrams"];
         if (sysdiagrams!=null)
-          tables.Remove(sysdiagrams);
+          _ = tables.Remove(sysdiagrams);
       }
     }
 
@@ -190,11 +190,7 @@ private static IReadOnlyCollection<IDbConnectionAccessor> CreateConnectionAccess
           throw new NotSupportedException(string.Format(Strings.ExConnectionAccessorXHasNoParameterlessConstructor, type));
         }
 
-#if NET8_0_OR_GREATER
         var accessorFactory = (Func<IDbConnectionAccessor>) FactoryCreatorMethod.CachedMakeGenericMethodInvoker(type).Invoke(null);
-#else
-        var accessorFactory = (Func<IDbConnectionAccessor>) FactoryCreatorMethod.CachedMakeGenericMethod(type).Invoke(null, null);
-#endif
         instances.Add(accessorFactory());
         factoriesLocal[type] = accessorFactory;
       }
diff --git a/Orm/Xtensive.Orm/Reflection/TypeHelper.cs b/Orm/Xtensive.Orm/Reflection/TypeHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public static LocalizationConfiguration Load()`
`79`	`79`	`/// </returns>`
`80`	`80`	`public static LocalizationConfiguration Load(string sectionName)`
`81`	`81`	`{`
`82`		`- var section = (ConfigurationSection) ConfigurationManager.GetSection(sectionName);`
	`82`	`+ var section = (ConfigurationSection) System.Configuration.ConfigurationManager.GetSection(sectionName);`
`83`	`83`	`return GetConfigurationFromSection(section);`
`84`	`84`	`}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public static ReprocessingConfiguration Load()`
`84`	`84`	`/// <returns>The reprocessing configuration.</returns>`
`85`	`85`	`public static ReprocessingConfiguration Load(string sectionName)`
`86`	`86`	`{`
`87`		`- var section = (ConfigurationSection) ConfigurationManager.GetSection(sectionName);`
	`87`	`+ var section = (ConfigurationSection) System.Configuration.ConfigurationManager.GetSection(sectionName);`
`88`	`88`	`return GetConfigurationFromSection(section);`
`89`	`89`	`}`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public static SecurityConfiguration Load()`
`83`	`83`	`/// </returns>`
`84`	`84`	`public static SecurityConfiguration Load(string sectionName)`
`85`	`85`	`{`
`86`		`- var section = (ConfigurationSection) ConfigurationManager.GetSection(sectionName);`
	`86`	`+ var section = (ConfigurationSection) System.Configuration.ConfigurationManager.GetSection(sectionName);`
`87`	`87`	`return GetConfigurationFromSection(section);`
`88`	`88`	`}`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -176,18 +176,7 @@ private static void LoadServerTimeZones(Xtensive.Sql.SqlConnection connection,`
`176`	`176`
`177`	`177`	`private static bool TryFindSystemTimeZoneById(string id, out TimeZoneInfo timeZoneInfo)`
`178`	`178`	`{`
`179`		`-#if NET8_0_OR_GREATER`
`180`	`179`	`return TimeZoneInfo.TryFindSystemTimeZoneById(id, out timeZoneInfo);`
`181`		`-#else`
`182`		`- try {`
`183`		`- timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById(id);`
`184`		`- return true;`
`185`		`- }`
`186`		`- catch {`
`187`		`- timeZoneInfo = null;`
`188`		`- return false;`
`189`		`- }`
`190`		`-#endif`
`191`	`180`	`}`
`192`	`181`	`}`
`193`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public override string ToString()`
`61`	`61`	`.AppendFormat("{0}:", Strings.OriginalExceptions);`
`62`	`62`	`int i = 1;`
`63`	`63`	`foreach (Exception exception in exceptions)`
`64`		`- sb.AppendLine().AppendFormat("{0}: {1}", i++, exception);`
	`64`	`+ _ = sb.AppendLine().AppendFormat("{0}: {1}", i++, exception);`
`65`	`65`	`return sb.ToString();`
`66`	`66`	`}`
`67`	`67`