Update packages

.editorconfig

@@ -272,3 +272,6 @@ dotnet_naming_symbols.type_parameter_group.applicable_kinds        = type_parame
 dotnet_naming_rule.type_parameter_rule.symbols                     = type_parameter_group
 dotnet_naming_rule.type_parameter_rule.style                       = capital_t_prefix_style
 dotnet_naming_rule.type_parameter_rule.severity                    = warning
+
+# IDE0040: Add accessibility modifiers
+dotnet_diagnostic.IDE0040.severity = suggestion

ChangeLog/7.3.0-Beta-1-dev.txt

@@ -14,11 +14,12 @@
 [bulkoperations] Switch to .NET8/.NET10-only support
 [localization] Switch to .NET8/.NET10-only support, nuget packages actualized
 [localization] Removed obsolete member of ConfigurationSection type
-[logging.log4net] Switch to .NET8/.NET10-only support
-[logging.NLog] Switch to .NET8/.NET10-only support
+[logging.log4net] Switch to .NET8/.NET10-only support, nuget packages actualize
+[logging.NLog] Switch to .NET8/.NET10-only support, nuget packages actualized
 [reprocessing] Switch to .NET8/.NET10-only support, nuget packages actualized
 [reprocessing] Removed obsolete member of ConfigurationSection type
 [security] Switch to .NET8/.NET10-only support, nuget packages actualized
 [security] Removed obsolete member of ConfigurationSection type
 [tracking] Switch to .NET8/.NET10-only support, nuget packages actualized
-[web] Switch to .NET8/.NET10-only support, nuget packages actualized
+[web] Switch to .NET8/.NET10-only support, nuget packages actualized
+[web] Project references actual shared libraries of the framework instead of stand-alone outdated packages

Extensions/TestCommon/TestCommon.csproj

@@ -21,9 +21,9 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="10.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="NUnit" Version="4.4.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

Extensions/TestCommon/Tests/TestConfigurationTest.cs

@@ -11,9 +11,9 @@ public class TestConfigurationTest
      public void Test()
      {
        var storage = TestConfiguration.Instance.Storage;
-       Console.WriteLine("storage: {0}", storage);
+       Console.WriteLine($"storage: {storage}");
        var configuration = DomainConfigurationFactory.Create();
-       Console.WriteLine("connection: {0}", configuration.ConnectionInfo);
+       Console.WriteLine($"connection: {configuration.ConnectionInfo}");
      }
   }
 }

Extensions/Xtensive.Orm.BulkOperations.Tests/Issues/IssueJira0565_IgnoringTakeMethodOnTranslation.cs

@@ -161,9 +161,9 @@ public void DeleteOperationWithLimitation01()
       using (session.Activate())
       using (var transaction = session.OpenTransaction()) {
         var updated = session.Query.All<Bar>().Take(100).Delete();
-        Assert.AreEqual(100, updated);
+        Assert.That(updated, Is.EqualTo(100));
         var updatedList = session.Query.All<Bar>().ToList();
-        Assert.AreEqual(150, updatedList.Count);
+        Assert.That(updatedList.Count, Is.EqualTo(150));
       }
     }
 
@@ -239,15 +239,15 @@ public void UpdateOperationTableAsSource()
       using (session.Activate())
       using (var transaction = session.OpenTransaction()) {
         var list = session.Query.All<Bar>().Take(200).ToList();
-        Assert.AreEqual(200, list.Count);
+        Assert.That(list.Count, Is.EqualTo(200));
         var updated = session.Query.All<Bar>().Take(200).Set(el => el.Description, "Updated").Update();
-        Assert.AreEqual(200, updated);
+        Assert.That(updated, Is.EqualTo(200));
         var updatedList = session.Query.All<Bar>().Where(el => el.Description == "Updated").ToList();
-        Assert.AreEqual(200, updatedList.Count);
+        Assert.That(updatedList.Count, Is.EqualTo(200));
         updated = session.Query.All<Bar>().Set(el => el.Description, "UpdatedAgain").Update();
-        Assert.AreEqual(250, updated);
+        Assert.That(updated, Is.EqualTo(250));
         updatedList = session.Query.All<Bar>().Where(el => el.Description == "UpdatedAgain").ToList();
-        Assert.AreEqual(250, updatedList.Count);
+        Assert.That(updatedList.Count, Is.EqualTo(250));
       }
     }
 

Extensions/Xtensive.Orm.BulkOperations.Tests/Xtensive.Orm.BulkOperations.Tests.csproj

@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DocumentationFile />
     <Configurations>Debug;Release;Debug-NET8;Release-NET8;Debug-NET10;Release-NET10</Configurations>
   </PropertyGroup>
   <Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="NUnit" Version="4.4.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

Extensions/Xtensive.Orm.Localization.Tests/CurrentThreadTest.cs

@@ -35,17 +35,17 @@ public void MainTest()
       using (var session = Domain.OpenSession()) {
         using (var ts = session.OpenTransaction()) {
 
-          Assert.AreEqual(1, session.Query.All<Page>().Count());
-          Assert.AreEqual(2, session.Query.All<PageLocalization>().Count());
+          Assert.That(session.Query.All<Page>().Count(), Is.EqualTo(1));
+          Assert.That(session.Query.All<PageLocalization>().Count(), Is.EqualTo(2));
 
           var page = session.Query.All<Page>().First();
           Thread.CurrentThread.CurrentCulture = English.Culture;
-          Assert.AreEqual(English.Title, page.Title);
-          Assert.AreEqual(English.Content, page.Content);
+          Assert.That(page.Title, Is.EqualTo(English.Title));
+          Assert.That(page.Content, Is.EqualTo(English.Content));
 
           Thread.CurrentThread.CurrentCulture = Spanish.Culture;
-          Assert.AreEqual(Spanish.Title, page.Title);
-          Assert.AreEqual(Spanish.Content, page.Content);
+          Assert.That(page.Title, Is.EqualTo(Spanish.Title));
+          Assert.That(page.Content, Is.EqualTo(Spanish.Content));
 
           ts.Complete();
         }

Extensions/Xtensive.Orm.Localization.Tests/DirectEditTest.cs

@@ -29,15 +29,15 @@ public void MainTest()
       using (var session = Domain.OpenSession())
       using (var ts = session.OpenTransaction()) {
 
-        Assert.AreEqual(1, session.Query.All<Page>().Count());
-        Assert.AreEqual(2, session.Query.All<PageLocalization>().Count());
+        Assert.That(session.Query.All<Page>().Count(), Is.EqualTo(1));
+        Assert.That(session.Query.All<PageLocalization>().Count(), Is.EqualTo(2));
 
         var page = session.Query.All<Page>().First();
-        Assert.AreEqual(English.Title, page.Localizations[English.Culture].Title);
-        Assert.AreEqual(English.Content, page.Localizations[English.Culture].Content);
+        Assert.That(page.Localizations[English.Culture].Title, Is.EqualTo(English.Title));
+        Assert.That(page.Localizations[English.Culture].Content, Is.EqualTo(English.Content));
 
-        Assert.AreEqual(Spanish.Title, page.Localizations[Spanish.Culture].Title);
-        Assert.AreEqual(Spanish.Content, page.Localizations[Spanish.Culture].Content);
+        Assert.That(page.Localizations[Spanish.Culture].Title, Is.EqualTo(Spanish.Title));
+        Assert.That(page.Localizations[Spanish.Culture].Content, Is.EqualTo(Spanish.Content));
 
         ts.Complete();
       }

Extensions/Xtensive.Orm.Localization.Tests/LocalizationScopeTest.cs

@@ -35,18 +35,18 @@ public void MainTest()
       using (var session = Domain.OpenSession())
       using (var ts = session.OpenTransaction()) {
 
-        Assert.AreEqual(1, session.Query.All<Page>().Count());
-        Assert.AreEqual(2, session.Query.All<PageLocalization>().Count());
+        Assert.That(session.Query.All<Page>().Count(), Is.EqualTo(1));
+        Assert.That(session.Query.All<PageLocalization>().Count(), Is.EqualTo(2));
 
         var page = session.Query.All<Page>().First();
         using (new LocalizationScope(English.Culture)) {
-          Assert.AreEqual(English.Title, page.Title);
-          Assert.AreEqual(English.Content, page.Content);
+          Assert.That(page.Title, Is.EqualTo(English.Title));
+          Assert.That(page.Content, Is.EqualTo(English.Content));
         }
 
         using (new LocalizationScope(Spanish.Culture)) {
-          Assert.AreEqual(Spanish.Title, page.Title);
-          Assert.AreEqual(Spanish.Content, page.Content);
+          Assert.That(page.Title, Is.EqualTo(Spanish.Title));
+          Assert.That(page.Content, Is.EqualTo(Spanish.Content));
         }
 
         ts.Complete();

Extensions/Xtensive.Orm.Localization.Tests/QueryTests.cs

@@ -38,7 +38,7 @@ public void ImplicitJoinViaPreprocessorTest()
           var query = from p in session.Query.All<Page>()
           where p.Title == title
           select p;
-          Assert.AreEqual(1, query.Count());
+          Assert.That(query.Count(), Is.EqualTo(1));
 
           ts.Complete();
         }
@@ -58,7 +58,7 @@ join pl in session.Query.All<PageLocalization>()
                         on p equals pl.Target
                       where pl.CultureName == LocalizationContext.Current.CultureName && pl.Title == Spanish.Title
                       select p;
-          Assert.AreEqual(1, query.Count());
+          Assert.That(query.Count(), Is.EqualTo(1));
         }
 
         ts.Complete();
@@ -75,7 +75,7 @@ public void QueryForLocalizationPairTest()
         var pairs = from pair in session.Query.All<Page, PageLocalization>()
                     where pair.Localization.Title == English.Title
                     select pair.Target;
-        Assert.AreEqual(1, pairs.Count());
+        Assert.That(pairs.Count(), Is.EqualTo(1));
 
         ts.Complete();
       }
@@ -91,7 +91,7 @@ public void UnknownCultureTest()
         var query = from p in session.Query.All<Page>()
                     select p.Title;
         Console.Write(query.First());
-        Assert.AreEqual(1, query.Count());
+        Assert.That(query.Count(), Is.EqualTo(1));
 
         ts.Complete();
       }

Extensions/Xtensive.Orm.Localization.Tests/Xtensive.Orm.Localization.Tests.csproj

@@ -15,9 +15,9 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="10.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="NUnit" Version="4.4.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

Extensions/Xtensive.Orm.Localization/NugetContent/ReadMe.md

@@ -100,13 +100,14 @@ Examples of usage
   var query = from p in session.Query.All<Page>()
     where p.Title=="Welcome"
     select p;
+  Assert.That(query.Count(), Is.EqualTo(1));
   Assert.AreEqual(1, query.Count());
 
   Thread.CurrentThread.CurrentCulture = new CultureInfo("es-ES");
   var query = from p in session.Query.All<Page>()
     where p.Title=="Bienvenido"
     select p;
-  Assert.AreEqual(1, query.Count());
+  Assert.That(query.Count(), Is.EqualTo(1));
 ```
 
 

Extensions/Xtensive.Orm.Logging.NLog.Tests/TestFixture.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2003-2013 Xtensive LLC.
+// Copyright (C) 2003-2013 Xtensive LLC.
 // All rights reserved.
 // For conditions of distribution and use, see license.
 // Created by: Dmitri Maximov
@@ -17,7 +17,7 @@ public void LogManagerTest()
       var logManager = LogManager.Default;
       logManager.Initialize(new LogProvider());
       var logger = LogManager.Default.GetLog("Xtensive.Orm");
-      Assert.IsInstanceOf<Log>(logger);
+      Assert.That(logger, Is.InstanceOf<Log>());
     }
   }
 }

Extensions/Xtensive.Orm.Logging.NLog.Tests/Xtensive.Orm.Logging.NLog.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DocumentationFile />
     <Configurations>Debug;Release;Debug-NET8;Release-NET8;Debug-NET10;Release-NET10</Configurations>
@@ -10,9 +10,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="NUnit" Version="4.4.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

Extensions/Xtensive.Orm.Logging.NLog/Xtensive.Orm.Logging.NLog.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -16,7 +16,7 @@
     <PackageReadmeFile>ReadMe.md</PackageReadmeFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NLog" Version="5.3.4" />
+    <PackageReference Include="NLog" Version="6.0.7" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />

Extensions/Xtensive.Orm.Logging.log4net.Tests/TestFixture.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Xtensive LLC.
+// Copyright (C) 2014 Xtensive LLC.
 // All rights reserved.
 // For conditions of distribution and use, see license.
 // Created by: Alexey Kulakov
@@ -7,7 +7,9 @@
 using NUnit.Framework;
 
 
+#pragma warning disable IDE1006 // Naming Styles
 namespace Xtensive.Orm.Logging.log4net.Tests
+#pragma warning restore IDE1006 // Naming Styles
 {
   [TestFixture]
   public class TestFixture
@@ -18,7 +20,7 @@ public void LogManagerTest()
       var logManager = LogManager.Default;
       logManager.Initialize(new LogProvider());
       var logger = LogManager.Default.GetLog("Xtensive.Orm");
-      Assert.IsInstanceOf<Log>(logger);
+      Assert.That(logger, Is.InstanceOf<Log>());
     }
   }
 }

Extensions/Xtensive.Orm.Logging.log4net.Tests/Xtensive.Orm.Logging.log4net.Tests.csproj

@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DocumentationFile />
     <Configurations>Debug;Release;Debug-NET8;Release-NET8;Debug-NET10;Release-NET10</Configurations>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="NUnit" Version="4.4.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

Extensions/Xtensive.Orm.Logging.log4net/Xtensive.Orm.Logging.log4net.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -16,7 +16,7 @@
     <PackageReadmeFile>ReadMe.md</PackageReadmeFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="log4net" Version="3.0.3" />
+    <PackageReference Include="log4net" Version="3.2.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />

Extensions/Xtensive.Orm.Reprocessing.Tests/Tests/DeadlockReprocessing.cs

@@ -23,7 +23,7 @@ protected override void CheckRequirements()
       Require.ProviderIsNot(StorageProvider.Firebird, "Throws timeout operation instead of deadlock, which is not reprocessible.");
     }
 
-    [Test, Timeout(DefaultTestTimeout)]
+    [Test, CancelAfter(DefaultTestTimeout)]
     public void SimpleDeadlockTest()
     {
       using (var context = new Context(Domain)) {
@@ -33,7 +33,7 @@ public void SimpleDeadlockTest()
       }
     }
 
-    [Test, Timeout(DefaultTestTimeout)]
+    [Test, CancelAfter(DefaultTestTimeout)]
     public void NestedSerializableDeadlockTest()
     {
       using (var context = new Context(Domain)) {
@@ -46,7 +46,7 @@ public void NestedSerializableDeadlockTest()
       }
     }
 
-    [Test, Timeout(DefaultTestTimeout)]
+    [Test, CancelAfter(DefaultTestTimeout)]
     public void NestedSnapshotDeadlockTest()
     {
       using (var context = new Context(Domain)) {
@@ -59,7 +59,7 @@ public void NestedSnapshotDeadlockTest()
       }
     }
 
-    [Test, Timeout(DefaultTestTimeout)]
+    [Test, CancelAfter(DefaultTestTimeout)]
     public void NestedNestedSerializableSerializableTest()
     {
       //nested nested serializable deadlock