Skip to content

Commit 436afd9

Browse files
alex-kulakovalex-kulakov
authored
Merge pull request #451 from DataObjects-NET/master-packages-update
Update packages
2 parents e5d800e + 2d4c52d commit 436afd9

File tree

573 files changed

+8632
-8776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

573 files changed

+8632
-8776
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,3 +272,6 @@ dotnet_naming_symbols.type_parameter_group.applicable_kinds = type_parame
272272
dotnet_naming_rule.type_parameter_rule.symbols = type_parameter_group
273273
dotnet_naming_rule.type_parameter_rule.style = capital_t_prefix_style
274274
dotnet_naming_rule.type_parameter_rule.severity = warning
275+
276+
# IDE0040: Add accessibility modifiers
277+
dotnet_diagnostic.IDE0040.severity = suggestion

‎ChangeLog/7.3.0-Beta-1-dev.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
[bulkoperations] Switch to .NET8/.NET10-only support
1515
[localization] Switch to .NET8/.NET10-only support, nuget packages actualized
1616
[localization] Removed obsolete member of ConfigurationSection type
17-
[logging.log4net] Switch to .NET8/.NET10-only support
18-
[logging.NLog] Switch to .NET8/.NET10-only support
17+
[logging.log4net] Switch to .NET8/.NET10-only support, nuget packages actualize
18+
[logging.NLog] Switch to .NET8/.NET10-only support, nuget packages actualized
1919
[reprocessing] Switch to .NET8/.NET10-only support, nuget packages actualized
2020
[reprocessing] Removed obsolete member of ConfigurationSection type
2121
[security] Switch to .NET8/.NET10-only support, nuget packages actualized
2222
[security] Removed obsolete member of ConfigurationSection type
2323
[tracking] Switch to .NET8/.NET10-only support, nuget packages actualized
24-
[web] Switch to .NET8/.NET10-only support, nuget packages actualized
24+
[web] Switch to .NET8/.NET10-only support, nuget packages actualized
25+
[web] Project references actual shared libraries of the framework instead of stand-alone outdated packages

‎Extensions/TestCommon/TestCommon.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="10.0.0" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
25-
<PackageReference Include="NUnit" Version="3.13.2" />
26-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
25+
<PackageReference Include="NUnit" Version="4.4.0" />
26+
<PackageReference Include="NUnit3TestAdapter" Version="6.0.0" />
2727
</ItemGroup>
2828
<ItemGroup>
2929
<ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

‎Extensions/TestCommon/Tests/TestConfigurationTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ public class TestConfigurationTest
1111
public void Test()
1212
{
1313
var storage = TestConfiguration.Instance.Storage;
14-
Console.WriteLine("storage: {0}", storage);
14+
Console.WriteLine($"storage: {storage}");
1515
var configuration = DomainConfigurationFactory.Create();
16-
Console.WriteLine("connection: {0}", configuration.ConnectionInfo);
16+
Console.WriteLine($"connection: {configuration.ConnectionInfo}");
1717
}
1818
}
1919
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ public void DeleteOperationWithLimitation01()
161161
using (session.Activate())
162162
using (var transaction = session.OpenTransaction()) {
163163
var updated = session.Query.All<Bar>().Take(100).Delete();
164-
Assert.AreEqual(100, updated);
164+
Assert.That(updated, Is.EqualTo(100));
165165
var updatedList = session.Query.All<Bar>().ToList();
166-
Assert.AreEqual(150, updatedList.Count);
166+
Assert.That(updatedList.Count, Is.EqualTo(150));
167167
}
168168
}
169169

@@ -239,15 +239,15 @@ public void UpdateOperationTableAsSource()
239239
using (session.Activate())
240240
using (var transaction = session.OpenTransaction()) {
241241
var list = session.Query.All<Bar>().Take(200).ToList();
242-
Assert.AreEqual(200, list.Count);
242+
Assert.That(list.Count, Is.EqualTo(200));
243243
var updated = session.Query.All<Bar>().Take(200).Set(el => el.Description, "Updated").Update();
244-
Assert.AreEqual(200, updated);
244+
Assert.That(updated, Is.EqualTo(200));
245245
var updatedList = session.Query.All<Bar>().Where(el => el.Description == "Updated").ToList();
246-
Assert.AreEqual(200, updatedList.Count);
246+
Assert.That(updatedList.Count, Is.EqualTo(200));
247247
updated = session.Query.All<Bar>().Set(el => el.Description, "UpdatedAgain").Update();
248-
Assert.AreEqual(250, updated);
248+
Assert.That(updated, Is.EqualTo(250));
249249
updatedList = session.Query.All<Bar>().Where(el => el.Description == "UpdatedAgain").ToList();
250-
Assert.AreEqual(250, updatedList.Count);
250+
Assert.That(updatedList.Count, Is.EqualTo(250));
251251
}
252252
}
253253

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<DocumentationFile />
44
<Configurations>Debug;Release;Debug-NET8;Release-NET8;Debug-NET10;Release-NET10</Configurations>
55
</PropertyGroup>
66
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
9-
<PackageReference Include="NUnit" Version="3.13.2" />
10-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
9+
<PackageReference Include="NUnit" Version="4.4.0" />
10+
<PackageReference Include="NUnit3TestAdapter" Version="6.0.0" />
1111
</ItemGroup>
1212
<ItemGroup>
1313
<ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ public void MainTest()
3535
using (var session = Domain.OpenSession()) {
3636
using (var ts = session.OpenTransaction()) {
3737

38-
Assert.AreEqual(1, session.Query.All<Page>().Count());
39-
Assert.AreEqual(2, session.Query.All<PageLocalization>().Count());
38+
Assert.That(session.Query.All<Page>().Count(), Is.EqualTo(1));
39+
Assert.That(session.Query.All<PageLocalization>().Count(), Is.EqualTo(2));
4040

4141
var page = session.Query.All<Page>().First();
4242
Thread.CurrentThread.CurrentCulture = English.Culture;
43-
Assert.AreEqual(English.Title, page.Title);
44-
Assert.AreEqual(English.Content, page.Content);
43+
Assert.That(page.Title, Is.EqualTo(English.Title));
44+
Assert.That(page.Content, Is.EqualTo(English.Content));
4545

4646
Thread.CurrentThread.CurrentCulture = Spanish.Culture;
47-
Assert.AreEqual(Spanish.Title, page.Title);
48-
Assert.AreEqual(Spanish.Content, page.Content);
47+
Assert.That(page.Title, Is.EqualTo(Spanish.Title));
48+
Assert.That(page.Content, Is.EqualTo(Spanish.Content));
4949

5050
ts.Complete();
5151
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ public void MainTest()
2929
using (var session = Domain.OpenSession())
3030
using (var ts = session.OpenTransaction()) {
3131

32-
Assert.AreEqual(1, session.Query.All<Page>().Count());
33-
Assert.AreEqual(2, session.Query.All<PageLocalization>().Count());
32+
Assert.That(session.Query.All<Page>().Count(), Is.EqualTo(1));
33+
Assert.That(session.Query.All<PageLocalization>().Count(), Is.EqualTo(2));
3434

3535
var page = session.Query.All<Page>().First();
36-
Assert.AreEqual(English.Title, page.Localizations[English.Culture].Title);
37-
Assert.AreEqual(English.Content, page.Localizations[English.Culture].Content);
36+
Assert.That(page.Localizations[English.Culture].Title, Is.EqualTo(English.Title));
37+
Assert.That(page.Localizations[English.Culture].Content, Is.EqualTo(English.Content));
3838

39-
Assert.AreEqual(Spanish.Title, page.Localizations[Spanish.Culture].Title);
40-
Assert.AreEqual(Spanish.Content, page.Localizations[Spanish.Culture].Content);
39+
Assert.That(page.Localizations[Spanish.Culture].Title, Is.EqualTo(Spanish.Title));
40+
Assert.That(page.Localizations[Spanish.Culture].Content, Is.EqualTo(Spanish.Content));
4141

4242
ts.Complete();
4343
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ public void MainTest()
3535
using (var session = Domain.OpenSession())
3636
using (var ts = session.OpenTransaction()) {
3737

38-
Assert.AreEqual(1, session.Query.All<Page>().Count());
39-
Assert.AreEqual(2, session.Query.All<PageLocalization>().Count());
38+
Assert.That(session.Query.All<Page>().Count(), Is.EqualTo(1));
39+
Assert.That(session.Query.All<PageLocalization>().Count(), Is.EqualTo(2));
4040

4141
var page = session.Query.All<Page>().First();
4242
using (new LocalizationScope(English.Culture)) {
43-
Assert.AreEqual(English.Title, page.Title);
44-
Assert.AreEqual(English.Content, page.Content);
43+
Assert.That(page.Title, Is.EqualTo(English.Title));
44+
Assert.That(page.Content, Is.EqualTo(English.Content));
4545
}
4646

4747
using (new LocalizationScope(Spanish.Culture)) {
48-
Assert.AreEqual(Spanish.Title, page.Title);
49-
Assert.AreEqual(Spanish.Content, page.Content);
48+
Assert.That(page.Title, Is.EqualTo(Spanish.Title));
49+
Assert.That(page.Content, Is.EqualTo(Spanish.Content));
5050
}
5151

5252
ts.Complete();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void ImplicitJoinViaPreprocessorTest()
3838
var query = from p in session.Query.All<Page>()
3939
where p.Title == title
4040
select p;
41-
Assert.AreEqual(1, query.Count());
41+
Assert.That(query.Count(), Is.EqualTo(1));
4242

4343
ts.Complete();
4444
}
@@ -58,7 +58,7 @@ join pl in session.Query.All<PageLocalization>()
5858
on p equals pl.Target
5959
where pl.CultureName == LocalizationContext.Current.CultureName && pl.Title == Spanish.Title
6060
select p;
61-
Assert.AreEqual(1, query.Count());
61+
Assert.That(query.Count(), Is.EqualTo(1));
6262
}
6363

6464
ts.Complete();
@@ -75,7 +75,7 @@ public void QueryForLocalizationPairTest()
7575
var pairs = from pair in session.Query.All<Page, PageLocalization>()
7676
where pair.Localization.Title == English.Title
7777
select pair.Target;
78-
Assert.AreEqual(1, pairs.Count());
78+
Assert.That(pairs.Count(), Is.EqualTo(1));
7979

8080
ts.Complete();
8181
}
@@ -91,7 +91,7 @@ public void UnknownCultureTest()
9191
var query = from p in session.Query.All<Page>()
9292
select p.Title;
9393
Console.Write(query.First());
94-
Assert.AreEqual(1, query.Count());
94+
Assert.That(query.Count(), Is.EqualTo(1));
9595

9696
ts.Complete();
9797
}

0 commit comments

Comments
 (0)