Skip to content

Commit 45df6e8

Browse files
alex-kulakovalex-kulakov
authored
Merge pull request #449 from DataObjects-NET/master-change-dotnet
Removed NET6, NET7, added NET10
2 parents 4675f05 + 42ff72b commit 45df6e8

File tree

58 files changed

+311
-604
lines changed

Some content is hidden

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

58 files changed

+311
-604
lines changed

‎Directory.Build.props‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,34 +41,28 @@
4141
<NoWarn Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">$(NoWarn);SYSLIB0011</NoWarn>
4242
<!-- Enable Usage of BinaryFormatter in test projects -->
4343
<EnableUnsafeBinaryFormatterSerialization
44-
Condition="'$(TargetFramework)'=='net8.0' AND $(MSBuildProjectName.Contains('Tests')) == 'true'">true</EnableUnsafeBinaryFormatterSerialization>
44+
Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">true</EnableUnsafeBinaryFormatterSerialization>
45+
</PropertyGroup>
46+
47+
<!-- Debug-NET10, Release-NET10 are mostly for development convenience -->
48+
<PropertyGroup Condition = "$(Configuration.Contains('NET10')) == 'true'">
49+
<!-- hard binding to net10, no property and env variable allowed-->
50+
<TargetFrameworks>net10.0</TargetFrameworks>
4551
</PropertyGroup>
4652

4753
<!-- Debug-NET8, Release-NET8 are mostly for development convenience -->
4854
<PropertyGroup Condition = "$(Configuration.Contains('NET8')) == 'true'">
4955
<!-- hard binding to net8, no property and env variable allowed-->
5056
<TargetFrameworks>net8.0</TargetFrameworks>
5157
</PropertyGroup>
52-
53-
<!-- Debug-NET7, Release-NET7 are mostly for development convenience -->
54-
<PropertyGroup Condition = "$(Configuration.Contains('NET7')) == 'true'">
55-
<!-- hard binding to net7, no property and env variable allowed-->
56-
<TargetFrameworks>net7.0</TargetFrameworks>
57-
</PropertyGroup>
58-
59-
<!-- Debug-NET6, Release-NET6 are mostly for development convenience -->
60-
<PropertyGroup Condition = "$(Configuration.Contains('NET6')) == 'true'">
61-
<!-- hard binding to net6, no property and env variable allowed -->
62-
<TargetFrameworks>net6.0</TargetFrameworks>
63-
</PropertyGroup>
6458

6559
<!--Release and Debug are for final builds, builds on build server, etc. Target frameworks are configurable here -->
6660
<PropertyGroup Label="Defaults"
67-
Condition="$(Configuration.Contains('NET8')) == 'false' AND $(Configuration.Contains('NET7')) == 'false' AND $(Configuration.Contains('NET6')) == 'false'">
61+
Condition="$(Configuration.Contains('NET10')) == 'false' AND $(Configuration.Contains('NET8')) == 'false'">
6862
<Configuration Condition="$(Configuration) == ''">Debug</Configuration>
6963
<TargetFrameworks>$(TargetFrameworks)</TargetFrameworks> <!-- the property -->
7064
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">$(DO_TargetFrameworks)</TargetFrameworks> <!-- env var -->
71-
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net8.0;net7.0;net6.0</TargetFrameworks> <!-- fallback to default -->
65+
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net8.0;net10.0</TargetFrameworks> <!-- fallback to default -->
7266
</PropertyGroup>
7367

7468
<PropertyGroup Condition = "$(Configuration.Contains('Debug')) == 'true'">
@@ -100,7 +94,7 @@
10094
<ProjectAssetsFile>$(MSBuildProjectExtensionsPath)project.assets.json</ProjectAssetsFile>
10195
<ProjectAssetsCacheFile>$(MSBuildProjectExtensionsPath)$(TargetFramework)\$(MSBuildProjectName).assets.cache</ProjectAssetsCacheFile>
10296
<OrmKeyFile>$(SolutionDir)Orm\Orm.snk</OrmKeyFile>
103-
<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
97+
<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
10498
</PropertyGroup>
10599

106100
<!-- Populate standard properties. -->

‎Extensions/TestCommon/TestCommon.csproj‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<DocumentationFile />
4-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
4+
<Configurations>Debug;Release;Debug-NET8;Release-NET8;Debug-NET10;Release-NET10</Configurations>
55
</PropertyGroup>
66
<PropertyGroup>
77
<SignAssembly>true</SignAssembly>
88
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
99
</PropertyGroup>
1010
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
11-
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
12-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
11+
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
12+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="8.0.0" />
1316
</ItemGroup>
14-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net8.0'">
15-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
17+
<ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
18+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="10.0.0" />
1622
</ItemGroup>
1723
<ItemGroup>
1824
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
1925
<PackageReference Include="NUnit" Version="3.13.2" />
2026
<PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
23-
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
2427
</ItemGroup>
2528
<ItemGroup>
2629
<ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<DocumentationFile />
4-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
4+
<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>

‎Extensions/Xtensive.Orm.BulkOperations/Internals/Operation.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,7 @@ protected void EnsureTransactionIsStarted()
6868
public QueryTranslationResult GetRequest(IQueryable<T> query) => QueryBuilder.TranslateQuery(query);
6969

7070
public QueryTranslationResult GetRequest(Type type, IQueryable query) =>
71-
#if NET8_0_OR_GREATER
7271
(QueryTranslationResult) WellKnownMembers.TranslateQueryMethod.CachedMakeGenericMethodInvoker(type).Invoke(QueryBuilder, query);
73-
#else
74-
(QueryTranslationResult) WellKnownMembers.TranslateQueryMethod.CachedMakeGenericMethod(type).Invoke(QueryBuilder, new object[] {query});
75-
#endif
7672

7773
public TypeInfo GetTypeInfo(Type entityType) =>
7874
Session.Domain.Model.Hierarchies.SelectMany(a => a.Types).Single(a => a.UnderlyingType == entityType);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<IsPackable>true</IsPackable>
44
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
5-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
5+
<Configurations>Debug;Release;Debug-NET8;Release-NET8;Debug-NET10;Release-NET10</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.BulkOperations</PackageId>

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<DocumentationFile />
4-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
4+
<Configurations>Debug;Release;Debug-NET8;Release-NET8;Debug-NET10;Release-NET10</Configurations>
55
</PropertyGroup>
66
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
7+
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
8+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
9+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="8.0.0" />
11+
</ItemGroup>
12+
<ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
13+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="10.0.0" />
16+
</ItemGroup>
717
<ItemGroup>
818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
919
<PackageReference Include="NUnit" Version="3.13.2" />
1020
<PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
11-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
1421
</ItemGroup>
1522
<ItemGroup>
1623
<ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

‎Extensions/Xtensive.Orm.Localization/Configuration/Elements/ConfigurationSection.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ namespace Xtensive.Orm.Localization.Configuration
1414
/// </summary>
1515
public class ConfigurationSection : System.Configuration.ConfigurationSection
1616
{
17-
/// <summary>
18-
/// Gets default section name for security configuration.
19-
/// Value is "Xtensive.Orm.Localization".
20-
/// </summary>
21-
[Obsolete("Use Localization.DefaultSectionName instead.")]
22-
public static readonly string DefaultSectionName = "Xtensive.Orm.Localization";
23-
2417
private const string DefaultCultureElementName = "defaultCulture";
2518

2619
/// <summary>

‎Extensions/Xtensive.Orm.Localization/Configuration/LocalizationConfiguration.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public static LocalizationConfiguration Load()
7979
/// </returns>
8080
public static LocalizationConfiguration Load(string sectionName)
8181
{
82-
var section = (ConfigurationSection) ConfigurationManager.GetSection(sectionName);
82+
var section = (ConfigurationSection) System.Configuration.ConfigurationManager.GetSection(sectionName);
8383
return GetConfigurationFromSection(section);
8484
}
8585

‎Extensions/Xtensive.Orm.Localization/Xtensive.Orm.Localization.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<IsPackable>true</IsPackable>
44
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
5-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
5+
<Configurations>Debug;Release;Debug-NET8;Release-NET8;Debug-NET10;Release-NET10</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.Localization</PackageId>
@@ -29,15 +29,15 @@
2929
</ItemGroup>
3030
<ItemGroup>
3131
</ItemGroup>
32-
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
33-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
32+
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
33+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
34+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
35+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
3436
</ItemGroup>
35-
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
36-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
37-
</ItemGroup>
38-
<ItemGroup>
39-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
40-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
37+
<ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
38+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
4141
</ItemGroup>
4242

4343
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<DocumentationFile />
4-
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
4+
<Configurations>Debug;Release;Debug-NET8;Release-NET8;Debug-NET10;Release-NET10</Configurations>
55
</PropertyGroup>
66
<ItemGroup>
77
<None Include="App.config" />

0 commit comments

Comments
 (0)