Skip to content

Commit 435a27d

Browse files
alex-kulakovalex-kulakov
authored
Merge pull request #336 from DataObjects-NET/master-net5-to-net7
Removes NET5 from target frameworks and adds NET7, NET8
2 parents 62d5e09 + 32a2b5c commit 435a27d

File tree

185 files changed

+740
-1042
lines changed

Some content is hidden

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

185 files changed

+740
-1042
lines changed

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[main] NET5 is removed from target frameworks, NET7 and NET8 are added instead
2+
[main] Some exceptions' serialization members were marked obsolete in NET8 library
13
[main] Unused Xtensive.Collections.PriorityQueue is removed
24
[main] Xtensive.Orm.Rse.Providers.Provider.Sources has changed return type to IReadOnlyList<T>, as well as ctor parameter
35
[main] SqlInsert.Values became obsolete and no longer in use. Use ValueRows collection to add value rows
@@ -23,5 +25,11 @@
2325
[main] Obsolete SqlNodeActualizer class is removed
2426
[main] Obsolete SqlCompilerContext.SqlNodeActualizer property is removed
2527
[main] Obsolete XtensiveSql.Dml.Extensions.IsNullReference() extension method is removed
28+
[firebird] NET5 is removed from target frameworks, NET7 and NET8 are added instead
29+
[mysql] NET5 is removed from target frameworks, NET7 and NET8 are added instead
30+
[oracle] QueryInfo.MaxQueryParameterCount actualized, it is 65535 now
31+
[oracle] NET5 is removed from target frameworks, NET7 and NET8 are added instead
32+
[postgresql] NET5 is removed from target frameworks, NET7 and NET8 are added instead
2633
[postgresql] QueryInfo.MaxQueryParameterCount actualized, it is 65535 now
27-
[oracle] QueryInfo.MaxQueryParameterCount actualized, it is 65535 now
34+
[sqlserver] NET5 is removed from target frameworks, NET7 and NET8 are added instead
35+
[sqlite] NET5 is removed from target frameworks, NET7 and NET8 are added instead

‎Directory.Build.props

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,21 @@
3939

4040
<!-- Disable "BinaryFormatter is obsolete" warnings for test projects -->
4141
<NoWarn Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">$(NoWarn);SYSLIB0011</NoWarn>
42+
<!-- Enable Usage of BinaryFormatter in test projects -->
43+
<EnableUnsafeBinaryFormatterSerialization
44+
Condition="'$(TargetFramework)'=='net8.0' AND $(MSBuildProjectName.Contains('Tests')) == 'true'">true</EnableUnsafeBinaryFormatterSerialization>
45+
</PropertyGroup>
46+
47+
<!-- Debug-NET8, Release-NET8 are mostly for development convenience -->
48+
<PropertyGroup Condition = "$(Configuration.Contains('NET8')) == 'true'">
49+
<!-- hard binding to net8, no property and env variable allowed-->
50+
<TargetFrameworks>net8.0</TargetFrameworks>
51+
</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>
4257
</PropertyGroup>
4358

4459
<!-- Debug-NET6, Release-NET6 are mostly for development convenience -->
@@ -47,18 +62,13 @@
4762
<TargetFrameworks>net6.0</TargetFrameworks>
4863
</PropertyGroup>
4964

50-
<!-- Debug-NET5, Release-NET5 are mostly for development convenience -->
51-
<PropertyGroup Condition = "$(Configuration.Contains('NET5')) == 'true'">
52-
<!-- hard binding to net5, no property and env variable allowed-->
53-
<TargetFrameworks>net5.0</TargetFrameworks>
54-
</PropertyGroup>
55-
5665
<!--Release and Debug are for final builds, builds on build server, etc. Target frameworks are configurable here -->
57-
<PropertyGroup Label="Defaults" Condition="$(Configuration.Contains('NET5')) == 'false' AND $(Configuration.Contains('NET6')) == 'false'">
66+
<PropertyGroup Label="Defaults"
67+
Condition="$(Configuration.Contains('NET8')) == 'false' AND $(Configuration.Contains('NET7')) == 'false' AND $(Configuration.Contains('NET6')) == 'false'">
5868
<Configuration Condition="$(Configuration) == ''">Debug</Configuration>
5969
<TargetFrameworks>$(TargetFrameworks)</TargetFrameworks> <!-- the property -->
6070
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">$(DO_TargetFrameworks)</TargetFrameworks> <!-- env var -->
61-
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net6.0;net5.0</TargetFrameworks> <!-- fallback to default -->
71+
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net8.0;net7.0;net6.0</TargetFrameworks> <!-- fallback to default -->
6272
</PropertyGroup>
6373

6474
<PropertyGroup Condition = "$(Configuration.Contains('Debug')) == 'true'">
@@ -74,7 +84,7 @@
7484
<PropertyGroup>
7585
<NoLogo>true</NoLogo>
7686
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
77-
<LangVersion>9.0</LangVersion>
87+
<LangVersion>10.0</LangVersion> <!-- version assigned to net6.0 -->
7888
<SolutionDir Condition="$(SolutionDir) == ''">$([MSBuild]::EnsureTrailingSlash(
7989
$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)', 'Orm.sln'))))</SolutionDir>
8090
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>

‎Extensions/TestCommon/TestCommon.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<DocumentationFile />
4-
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</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)'=='net5.0'">
12-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
13-
</ItemGroup>
1411
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
1512
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
1613
</ItemGroup>
14+
<ItemGroup Condition="'$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net8.0'">
15+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
16+
</ItemGroup>
1717
<ItemGroup>
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
1919
<PackageReference Include="NUnit" Version="3.13.2" />

‎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-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
55
</PropertyGroup>
66
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
77
<ItemGroup>

‎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-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
5+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.BulkOperations</PackageId>

‎Extensions/Xtensive.Orm.Localization.Tests/Xtensive.Orm.Localization.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-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
55
</PropertyGroup>
66
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
77
<ItemGroup>

‎Extensions/Xtensive.Orm.Localization/Xtensive.Orm.Localization.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-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
5+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.Localization</PackageId>

‎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-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
55
</PropertyGroup>
66
<ItemGroup>
77
<None Include="App.config" />

‎Extensions/Xtensive.Orm.Logging.NLog/Xtensive.Orm.Logging.NLog.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-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
5+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
66
</PropertyGroup>
77
<PropertyGroup>
88
<PackageId>Xtensive.Orm.Logging.NLog</PackageId>

‎Extensions/Xtensive.Orm.Logging.log4net.Tests/Xtensive.Orm.Logging.log4net.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-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
4+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />

0 commit comments

Comments
 (0)