Skip to content

Merge upstream #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4d7191d
Remove net5 from projects + add net7
alex-kulakov Aug 18, 2023
bae1898
Fix NET7 compilation error
alex-kulakov Aug 18, 2023
99e7484
No usage of NET6_0_OR_GREATER compilation variable
alex-kulakov Aug 18, 2023
ec08b68
Remove old workaround which has no effect now
alex-kulakov Aug 18, 2023
a2c8300
Merge branch 'master' into master-net5-to-net7
alex-kulakov Aug 22, 2023
8afb098
Merge branch 'master' into master-net5-to-net7
alex-kulakov Sep 5, 2023
5c4dba6
Merge branch 'master' into master-net5-to-net7
alex-kulakov Nov 16, 2023
057c2fc
Merge branch 'master' into master-net5-to-net7
alex-kulakov Nov 23, 2023
5bca154
Merge branch 'master' into master-net5-to-net7
alex-kulakov Dec 7, 2023
1236845
Net8 compilation
alex-kulakov Dec 8, 2023
f77ceef
net8 compilation warnings resolved
alex-kulakov Dec 8, 2023
0afd9d0
Revert disabling of Object Reference implementation by EntityReference
alex-kulakov Dec 11, 2023
301cdfa
Allow BinaryFormatter serialization in tests (used by Cloner)
alex-kulakov Dec 11, 2023
2898a2b
Move EnableUnsafeBinaryFormatterSerialization to global props
alex-kulakov Dec 12, 2023
1437474
MemoryStream is disposed in every usage
alex-kulakov Dec 12, 2023
5e73803
Nuget package 'build' folder content updated
alex-kulakov Dec 14, 2023
85388d3
Use alternative build folders of nuget package
alex-kulakov Dec 15, 2023
53cc0a7
Merge branch 'master' into master-net5-to-net7
alex-kulakov Dec 18, 2023
882317f
Remove net5.0 from build folders of nuget package content
alex-kulakov Dec 18, 2023
55a0532
Merge branch 'master' into master-net5-to-net7
alex-kulakov Dec 18, 2023
0338eec
Merge branch 'master' into master-net5-to-net7
alex-kulakov Dec 18, 2023
1342b9e
Fix default case of target frameworks for projects
alex-kulakov Dec 18, 2023
2e2191e
Correct configurations for Localization.Tests project
alex-kulakov Dec 18, 2023
32a2b5c
Improve changelog
alex-kulakov Dec 19, 2023
435a27d
Merge pull request #336 from DataObjects-NET/master-net5-to-net7
alex-kulakov Dec 19, 2023
16ce1d8
Merge remote-tracking branch 'upstream/master' into mergeUpstream
SergeiPavlov Dec 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ChangeLog/7.2.0-Beta-1-dev.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[main] NET5 is removed from target frameworks, NET7 and NET8 are added instead
[main] Some exceptions' serialization members were marked obsolete in NET8 library
[main] Unused Xtensive.Collections.PriorityQueue is removed
[main] Xtensive.Orm.Rse.Providers.Provider.Sources has changed return type to IReadOnlyList<T>, as well as ctor parameter
[main] SqlInsert.Values became obsolete and no longer in use. Use ValueRows collection to add value rows
Expand All @@ -23,5 +25,11 @@
[main] Obsolete SqlNodeActualizer class is removed
[main] Obsolete SqlCompilerContext.SqlNodeActualizer property is removed
[main] Obsolete XtensiveSql.Dml.Extensions.IsNullReference() extension method is removed
[firebird] NET5 is removed from target frameworks, NET7 and NET8 are added instead
[mysql] NET5 is removed from target frameworks, NET7 and NET8 are added instead
[oracle] QueryInfo.MaxQueryParameterCount actualized, it is 65535 now
[oracle] NET5 is removed from target frameworks, NET7 and NET8 are added instead
[postgresql] NET5 is removed from target frameworks, NET7 and NET8 are added instead
[postgresql] QueryInfo.MaxQueryParameterCount actualized, it is 65535 now
[oracle] QueryInfo.MaxQueryParameterCount actualized, it is 65535 now
[sqlserver] NET5 is removed from target frameworks, NET7 and NET8 are added instead
[sqlite] NET5 is removed from target frameworks, NET7 and NET8 are added instead
29 changes: 25 additions & 4 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,36 @@
<!-- Disable "BinaryFormatter is obsolete" warnings for test projects -->
<NoWarn>$(NoWarn);CS0618;CS0672;CS1570;CS1572;CS1573;CS1574;CS1587;CS1734;SYSLIB0050;SYSLIB0051;</NoWarn>
<NoWarn Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">$(NoWarn);SYSLIB0011</NoWarn>
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
<!-- Enable Usage of BinaryFormatter in test projects -->
<EnableUnsafeBinaryFormatterSerialization
Condition="'$(TargetFramework)'=='net8.0' AND $(MSBuildProjectName.Contains('Tests')) == 'true'">true</EnableUnsafeBinaryFormatterSerialization>
</PropertyGroup>

<!-- Debug-NET8, Release-NET8 are mostly for development convenience -->
<PropertyGroup Condition = "$(Configuration.Contains('NET8')) == 'true'">
<!-- hard binding to net8, no property and env variable allowed-->
<TargetFrameworks>net8.0</TargetFrameworks>
</PropertyGroup>

<!-- Debug-NET7, Release-NET7 are mostly for development convenience -->
<PropertyGroup Condition = "$(Configuration.Contains('NET7')) == 'true'">
<!-- hard binding to net7, no property and env variable allowed-->
<TargetFrameworks>net7.0</TargetFrameworks>
</PropertyGroup>

<!-- Debug-NET6, Release-NET6 are mostly for development convenience -->
<PropertyGroup Condition = "$(Configuration.Contains('NET6')) == 'true'">
<!-- hard binding to net6, no property and env variable allowed -->
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>

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

<PropertyGroup Condition = "$(Configuration.Contains('Debug')) == 'true'">
Expand All @@ -67,7 +88,7 @@
<TargetFrameworks>$(TargetFrameworks)</TargetFrameworks> <!-- the property -->
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">$(DO_TargetFrameworks)</TargetFrameworks> <!-- env var -->
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net8.0</TargetFrameworks> <!-- fallback to default -->
<LangVersion>9.0</LangVersion>
<LangVersion>10.0</LangVersion> <!-- version assigned to net6.0 -->
<SolutionDir Condition="$(SolutionDir) == ''">$([MSBuild]::EnsureTrailingSlash(
$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)', 'Orm.sln'))))</SolutionDir>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
Expand Down
7 changes: 2 additions & 5 deletions Extensions/TestCommon/TestCommon.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<DocumentationFile />
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
Expand All @@ -11,10 +11,7 @@
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<ItemGroup Condition="'$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net8.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<DocumentationFile />
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<IsPackable>true</IsPackable>
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<PropertyGroup>
<PackageId>Xtensive.Orm.BulkOperations</PackageId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<DocumentationFile />
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<IsPackable>true</IsPackable>
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<PropertyGroup>
<PackageId>Xtensive.Orm.Localization</PackageId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<DocumentationFile />
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<ItemGroup>
<None Include="App.config" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<IsPackable>true</IsPackable>
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<PropertyGroup>
<PackageId>Xtensive.Orm.Logging.NLog</PackageId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<DocumentationFile />
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<IsPackable>true</IsPackable>
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<PropertyGroup>
<PackageId>Xtensive.Orm.Logging.log4net</PackageId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<DocumentationFile />
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<IsPackable>true</IsPackable>
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<PropertyGroup>
<PackageId>Xtensive.Orm.Reprocessing</PackageId>
Expand All @@ -15,10 +15,7 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net8.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<DocumentationFile />
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
<ItemGroup>
Expand Down
7 changes: 2 additions & 5 deletions Extensions/Xtensive.Orm.Security/Xtensive.Orm.Security.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<IsPackable>true</IsPackable>
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<PropertyGroup>
<PackageId>Xtensive.Orm.Security</PackageId>
Expand All @@ -16,10 +16,7 @@
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<ItemGroup Condition="'$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net8.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Optimize>false</Optimize>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\Extensions.snk</AssemblyOriginatorKeyFile>
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
<ItemGroup>
Expand Down
7 changes: 2 additions & 5 deletions Extensions/Xtensive.Orm.Tracking/Xtensive.Orm.Tracking.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<IsPackable>true</IsPackable>
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<PropertyGroup>
<PackageId>Xtensive.Orm.Tracking</PackageId>
Expand All @@ -15,10 +15,7 @@
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<ItemGroup Condition="'$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net8.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<IsPackable>false</IsPackable>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
<ItemGroup>
Expand Down
7 changes: 2 additions & 5 deletions Extensions/Xtensive.Orm.Web/Xtensive.Orm.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<IsPackable>true</IsPackable>
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<Configurations>Debug;Release;Debug-NET5;Release-NET5;Debug-NET6;Release-NET6;</Configurations>
<Configurations>Debug;Release;Debug-NET6;Release-NET6;Debug-NET7;Release-NET7;Debug-NET8;Release-NET8</Configurations>
</PropertyGroup>
<PropertyGroup>
<PackageId>Xtensive.Orm.Web</PackageId>
Expand All @@ -18,10 +18,7 @@
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<ItemGroup Condition="'$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net8.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
Expand Down
Loading