Skip to content

Commit 16ce1d8

Browse files
committed
Merge remote-tracking branch 'upstream/master' into mergeUpstream
2 parents dc6346f + 435a27d commit 16ce1d8

File tree

185 files changed

+732
-1070
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

+732
-1070
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: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,36 @@
4040
<!-- Disable "BinaryFormatter is obsolete" warnings for test projects -->
4141
<NoWarn>$(NoWarn);CS0618;CS0672;CS1570;CS1572;CS1573;CS1574;CS1587;CS1734;SYSLIB0050;SYSLIB0051;</NoWarn>
4242
<NoWarn Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">$(NoWarn);SYSLIB0011</NoWarn>
43-
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
43+
<!-- Enable Usage of BinaryFormatter in test projects -->
44+
<EnableUnsafeBinaryFormatterSerialization
45+
Condition="'$(TargetFramework)'=='net8.0' AND $(MSBuildProjectName.Contains('Tests')) == 'true'">true</EnableUnsafeBinaryFormatterSerialization>
46+
</PropertyGroup>
47+
48+
<!-- Debug-NET8, Release-NET8 are mostly for development convenience -->
49+
<PropertyGroup Condition = "$(Configuration.Contains('NET8')) == 'true'">
50+
<!-- hard binding to net8, no property and env variable allowed-->
51+
<TargetFrameworks>net8.0</TargetFrameworks>
52+
</PropertyGroup>
53+
54+
<!-- Debug-NET7, Release-NET7 are mostly for development convenience -->
55+
<PropertyGroup Condition = "$(Configuration.Contains('NET7')) == 'true'">
56+
<!-- hard binding to net7, no property and env variable allowed-->
57+
<TargetFrameworks>net7.0</TargetFrameworks>
58+
</PropertyGroup>
59+
60+
<!-- Debug-NET6, Release-NET6 are mostly for development convenience -->
61+
<PropertyGroup Condition = "$(Configuration.Contains('NET6')) == 'true'">
62+
<!-- hard binding to net6, no property and env variable allowed -->
63+
<TargetFrameworks>net6.0</TargetFrameworks>
4464
</PropertyGroup>
4565

4666
<!--Release and Debug are for final builds, builds on build server, etc. Target frameworks are configurable here -->
47-
<PropertyGroup Label="Defaults" Condition="$(Configuration.Contains('NET5')) == 'false' AND $(Configuration.Contains('NET6')) == 'false'">
67+
<PropertyGroup Label="Defaults"
68+
Condition="$(Configuration.Contains('NET8')) == 'false' AND $(Configuration.Contains('NET7')) == 'false' AND $(Configuration.Contains('NET6')) == 'false'">
4869
<Configuration Condition="$(Configuration) == ''">Debug</Configuration>
4970
<TargetFrameworks>$(TargetFrameworks)</TargetFrameworks> <!-- the property -->
5071
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">$(DO_TargetFrameworks)</TargetFrameworks> <!-- env var -->
51-
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net7.0</TargetFrameworks> <!-- fallback to default -->
72+
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net8.0</TargetFrameworks> <!-- fallback to default -->
5273
</PropertyGroup>
5374

5475
<PropertyGroup Condition = "$(Configuration.Contains('Debug')) == 'true'">
@@ -67,7 +88,7 @@
6788
<TargetFrameworks>$(TargetFrameworks)</TargetFrameworks> <!-- the property -->
6889
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">$(DO_TargetFrameworks)</TargetFrameworks> <!-- env var -->
6990
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net8.0</TargetFrameworks> <!-- fallback to default -->
70-
<LangVersion>9.0</LangVersion>
91+
<LangVersion>10.0</LangVersion> <!-- version assigned to net6.0 -->
7192
<SolutionDir Condition="$(SolutionDir) == ''">$([MSBuild]::EnsureTrailingSlash(
7293
$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)', 'Orm.sln'))))</SolutionDir>
7394
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>

Extensions/TestCommon/TestCommon.csproj

Lines changed: 2 additions & 5 deletions
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
<PropertyGroup>
77
<SignAssembly>true</SignAssembly>
@@ -11,10 +11,7 @@
1111
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
1212
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
1313
</ItemGroup>
14-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
15-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
16-
</ItemGroup>
17-
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
14+
<ItemGroup Condition="'$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net8.0'">
1815
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
1916
</ItemGroup>
2017
<ItemGroup>

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" />

Extensions/Xtensive.Orm.Logging.log4net/Xtensive.Orm.Logging.log4net.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.log4net</PackageId>

Extensions/Xtensive.Orm.Reprocessing.Tests/Xtensive.Orm.Reprocessing.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.Reprocessing/Xtensive.Orm.Reprocessing.csproj

Lines changed: 2 additions & 5 deletions
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.Reprocessing</PackageId>
@@ -15,10 +15,7 @@
1515
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
1616
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
1717
</ItemGroup>
18-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
19-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
20-
</ItemGroup>
21-
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
18+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net8.0'">
2219
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
2320
</ItemGroup>
2421
<ItemGroup>

Extensions/Xtensive.Orm.Security.Tests/Xtensive.Orm.Security.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.Security/Xtensive.Orm.Security.csproj

Lines changed: 2 additions & 5 deletions
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.Security</PackageId>
@@ -16,10 +16,7 @@
1616
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
1717
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
1818
</ItemGroup>
19-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
20-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
21-
</ItemGroup>
22-
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
19+
<ItemGroup Condition="'$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net8.0'">
2320
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
2421
</ItemGroup>
2522
<ItemGroup>

Extensions/Xtensive.Orm.Tracking.Tests/Xtensive.Orm.Tracking.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Optimize>false</Optimize>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\Extensions.snk</AssemblyOriginatorKeyFile>
7-
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
7+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
88
</PropertyGroup>
99
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
1010
<ItemGroup>

Extensions/Xtensive.Orm.Tracking/Xtensive.Orm.Tracking.csproj

Lines changed: 2 additions & 5 deletions
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.Tracking</PackageId>
@@ -15,10 +15,7 @@
1515
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
1616
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
1717
</ItemGroup>
18-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
19-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
20-
</ItemGroup>
21-
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
18+
<ItemGroup Condition="'$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net8.0'">
2219
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
2320
</ItemGroup>
2421
<ItemGroup>

Extensions/Xtensive.Orm.Web.Tests/Xtensive.Orm.Web.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<IsPackable>false</IsPackable>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
7-
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
7+
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
88
</PropertyGroup>
99
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
1010
<ItemGroup>

Extensions/Xtensive.Orm.Web/Xtensive.Orm.Web.csproj

Lines changed: 2 additions & 5 deletions
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.Web</PackageId>
@@ -18,10 +18,7 @@
1818
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
1919
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
2020
</ItemGroup>
21-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
22-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
23-
</ItemGroup>
24-
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
21+
<ItemGroup Condition="'$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net8.0'">
2522
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
2623
</ItemGroup>
2724
<ItemGroup>

0 commit comments

Comments
 (0)