Skip to content

Commit 68dc75e

Browse files
nsarrisnsarris
authored
Merge pull request #73 from LinqToDB4iSeries/release/v5.1.0
Release/v5.1.0
2 parents e8d1545 + f998c0f commit 68dc75e

File tree

54 files changed

+1017
-263
lines changed

Some content is hidden

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

54 files changed

+1017
-263
lines changed

‎Build/linq2db.Default.props‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<Version>5.0.0</Version>
3+
<Version>5.1.0</Version>
44

55
<Description>LINQ to DB is a data access technology that provides a run-time infrastructure for managing relational data as objects. This package is a provider for DB2 on the IBM iSeries.</Description>
66
<Authors>Roy Chase, Nikos Sarris</Authors>
@@ -34,10 +34,6 @@
3434
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3535
</PropertyGroup>
3636

37-
<PropertyGroup Condition="'$(TargetFramework)' != 'net45' AND '$(TargetFramework)' != 'net46'">
38-
<DefineConstants>NATIVE_ASYNC;$(DefineConstants)</DefineConstants>
39-
</PropertyGroup>
40-
4137
<ItemGroup>
4238
<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" />
4339
<AdditionalFiles Include="$(MSBuildThisFileDirectory)/BannedSymbols.txt" />

‎Build/linq2db.Source.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</PropertyGroup>
2424

2525
<PropertyGroup>
26-
<TargetFrameworks>net45;net472;netstandard2.0</TargetFrameworks>
26+
<TargetFrameworks>net45;net472;netstandard2.0;net6.0</TargetFrameworks>
2727
<Configurations>Debug;Release</Configurations>
2828
</PropertyGroup>
2929

‎Build/linq2db.Tests.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="linq2db.Default.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
6+
<TargetFrameworks>net6.0;net472</TargetFrameworks>
77
<Configurations>Debug;Release;</Configurations>
88
<DefineConstants>$(DefineConstants)</DefineConstants>
99
<DefineConstants Condition="$(X86) != ''">$(DefineConstants);X86</DefineConstants>

‎Directory.Packages.props‎

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,35 @@
1010
-->
1111
<ItemGroup>
1212
<!--as stated in issue 1 - packages in this item group shouldn't be duplicated in other groups-->
13-
<PackageVersion Include="linq2db" Version="5.0.0" />
14-
<PackageVersion Include="linq2db.Tools" Version="5.0.0" />
15-
<PackageVersion Include="linq2db.AspNet" Version="5.0.0" />
16-
<PackageVersion Include="linq2db.Remote.Grpc" Version="5.0.0" />
17-
<PackageVersion Include="linq2db.Remote.Wcf" Version="5.0.0" />
18-
<!--generic packages for source projects-->
13+
<PackageVersion Include="linq2db" Version="5.1.0" />
14+
<PackageVersion Include="linq2db.Tools" Version="5.1.0" />
15+
<PackageVersion Include="linq2db.AspNet" Version="5.1.0" />
16+
<PackageVersion Include="linq2db.Remote.Grpc" Version="5.1.0" />
17+
<PackageVersion Include="linq2db.Remote.Wcf" Version="5.1.0" />
1918
<!--generic packages for source projects-->
2019
<PackageVersion Include="System.Data.DataSetExtensions" Version="4.5.0" />
2120
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
2221
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
2322
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
23+
<!--Source of NullabilityInfoContext for runtimes before .net 6-->
24+
<PackageVersion Include="Nullability.Source" Version="2.1.0" />
2425
<!--build support-->
25-
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
26-
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0" />
26+
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.5-beta1.23080.2" />
27+
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1" />
2728
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
2829
<PackageVersion Include="Mono.TextTemplating" Version="2.3.1" />
29-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
30-
<!--<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />-->
30+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
3131
<!--data providers-->
32-
<PackageVersion Include="MySql.Data" Version="8.0.32" />
32+
<PackageVersion Include="MySql.Data" Version="8.0.32.1" />
3333
<PackageVersion Include="AdoNetCore.AseClient" Version="0.19.2" />
3434
<PackageVersion Include="System.Data.SqlClient" Version="4.8.5" />
3535
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.0" />
36+
<!--don't use 5.0.1 version due to critical bug in it-->
3637
<PackageVersion Include="Oracle.ManagedDataAccess" Version="21.9.0" />
37-
<!--3.21 provider currently contains bug which leads to test failures with oracle 12-->
38+
<!--3.21 provider currently contains bug which leads to test failures with oracle 12+-->
3839
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="2.19.180" />
39-
<!--<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.70" />-->
40-
<PackageVersion Include="Devart.Data.Oracle" Version="10.0.0" />
40+
<!--<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.90" />-->
41+
<PackageVersion Include="Devart.Data.Oracle" Version="10.1.134" />
4142
<PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="9.1.1" />
4243
<PackageVersion Include="System.Data.SQLite.Core" Version="1.0.117" />
4344
<PackageVersion Include="IBM.Data.DB.Provider" Version="11.5.5010.4" />
@@ -47,43 +48,40 @@
4748
<PackageVersion Include="Net.IBM.Data.Db2" Version="6.0.0.300" />
4849
<PackageVersion Include="Net.IBM.Data.Db2-lnx" Version="6.0.0.300" />
4950
<PackageVersion Include="Net.IBM.Data.Db2-osx" Version="6.0.0.300" />
50-
<PackageVersion Include="Npgsql" Version="7.0.1" />
51-
<PackageVersion Include="ClickHouse.Client" Version="6.3.0" />
5251
<PackageVersion Include="Octonica.ClickHouseClient" Version="2.2.9" />
53-
<PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.2" />
54-
<PackageVersion Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
52+
<PackageVersion Include="Npgsql" Version="7.0.2" />
53+
<PackageVersion Include="ClickHouse.Client" Version="6.5.0" />
54+
<PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.3" />
55+
<PackageVersion Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
5556
<!--tests support-->
5657
<PackageVersion Include="NUnit" Version="3.13.3" />
57-
<PackageVersion Include="NUnit3TestAdapter" Version="4.3.1" />
58-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
59-
<PackageVersion Include="FluentAssertions" Version="6.9.0" />
60-
<PackageVersion Include="BenchmarkDotNet" Version="0.13.4" />
58+
<PackageVersion Include="NUnit3TestAdapter" Version="4.4.2" />
59+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
60+
<PackageVersion Include="FluentAssertions" Version="6.10.0" />
61+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
6162
<PackageVersion Include="JetBrains.Profiler.Api" Version="1.1.8" />
62-
<PackageVersion Include="FSharp.Core" Version="7.0.0" />
63+
<PackageVersion Include="FSharp.Core" Version="7.0.200" />
6364
<!--packages for test projects-->
6465
<PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
6566
<PackageVersion Include="MiniProfiler.Shared" Version="4.2.22" />
66-
<!--don't update due to https://github.com/OData/WebApi/issues/2653-->
67-
<PackageVersion Include="Microsoft.AspNet.OData" Version="7.6.3" />
67+
<PackageVersion Include="Microsoft.AspNet.OData" Version="7.6.4" />
6868
<!--don't update due to https://github.com/OData/AspNetCoreOData/issues/420#issuecomment-1219208060-->
6969
<PackageVersion Include="Microsoft.AspNetCore.OData" Version="8.0.4" />
7070
<PackageVersion Include="NodaTime" Version="3.1.6" />
7171
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
72-
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.2.24" />
73-
<PackageVersion Include="dotMorten.Microsoft.SqlServer.Types" Version="1.5.0" />
72+
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.3.1" />
73+
<PackageVersion Include="dotMorten.Microsoft.SqlServer.Types" Version="1.5.0" />
7474
<!--
7575
<PackageVersion Include="dotMorten.Microsoft.SqlServer.Types" Version="2.5.0" />
7676
-->
7777
<!--remote targets + remote examples targets-->
7878
<!--source-->
79-
<PackageVersion Include="protobuf-net.Grpc" Version="1.0.179" />
8079
<PackageVersion Include="Grpc.Net.Client" Version="2.51.0" />
8180
<!--examples-->
82-
<PackageVersion Include="linq2db.t4models" Version="4.3.0" />
81+
<PackageVersion Include="linq2db.t4models" Version="4.3.0" />
8382
<!--tests-->
8483
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
85-
<PackageVersion Include="protobuf-net.Grpc.AspNetCore" Version="1.0.179" />
86-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
84+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
8785
</ItemGroup>
8886

8987
<!--linq2db source-->
@@ -94,35 +92,35 @@
9492
</ItemGroup>
9593

9694
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
97-
<!--main version-->
98-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
99-
<!--<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />-->
100-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
101-
10295
<!--test v1.x compatibility, required for Pomelo EF.Core provider v5 -->
10396
<PackageVersion Include="MySqlConnector" Version="1.3.14" />
10497
<!--v7+ dropped support of netcoreapp3.1 and ns2.0 build is useless as it throws PNSE ¯\_(ツ)_/¯ -->
10598
<PackageVersion Include="System.Data.Odbc" Version="6.0.1" />
10699
<PackageVersion Include="System.Data.OleDb" Version="6.0.0" />
107100
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
108101
<PackageVersion Include="System.Text.Json" Version="6.0.7" />
102+
<PackageVersion Include="protobuf-net.Grpc" Version="1.0.179" />
103+
<PackageVersion Include="protobuf-net.Grpc.AspNetCore" Version="1.0.179" />
104+
</ItemGroup>
105+
106+
<ItemGroup Condition=" '$(TargetFramework)' != 'net45' AND '$(TargetFramework)' != 'net46' ">
107+
<!--main version-->
108+
<!--
109+
pin abstractions packages to lowest supported runtime (.net 6 currently)
110+
https://github.com/linq2db/linq2db/issues/3953
111+
-->
112+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
113+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
109114
</ItemGroup>
110115

111116
<!--test dependencies-->
112117
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
113118
<!--test v0.x compatibility, required for Pomelo EF.Core provider v3 -->
114119
<PackageVersion Include="MySqlConnector" Version="0.69.10" />
115-
<PackageVersion Include="System.Text.Json" Version="6.0.7" />
116-
117-
<!--<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />-->
118-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
120+
<PackageVersion Include="System.Text.Json" Version="7.0.2" />
119121
</ItemGroup>
120122

121123
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' ">
122-
<!--main version-->
123-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
124-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
125-
126124
<PackageVersion Include="System.Data.Odbc" Version="7.0.0" />
127125
<PackageVersion Include="System.Data.OleDb" Version="7.0.0" />
128126
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
@@ -132,4 +130,9 @@
132130
<PackageVersion Include="MySqlConnector" Version="2.2.5" />
133131
</ItemGroup>
134132

133+
<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
134+
<PackageVersion Include="protobuf-net.Grpc" Version="1.1.1" />
135+
<PackageVersion Include="protobuf-net.Grpc.AspNetCore" Version="1.1.1" />
136+
</ItemGroup>
137+
135138
</Project>

‎Source/ISeriesProvider/DB2iSeriesAccessClientProviderAdapter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace LinqToDB.DataProvider.DB2iSeries
1010
using LinqToDB.Expressions;
1111
using LinqToDB.Mapping;
1212

13-
public class DB2iSeriesAccessClientProviderAdapter : IDynamicProviderAdapter
13+
internal class DB2iSeriesAccessClientProviderAdapter : IDynamicProviderAdapter
1414
{
1515
public const string AssemblyName = "IBM.Data.DB2.iSeries";
1616
public const string ProviderFactoryName = "IBM.Data.DB2.iSeries";

‎Source/ISeriesProvider/DB2iSeriesBulkCopy.AccessClient.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace LinqToDB.DataProvider.DB2iSeries
1010
using System.Diagnostics;
1111
using System.Data.Common;
1212

13-
partial class DB2iSeriesBulkCopy : BasicBulkCopy
13+
internal partial class DB2iSeriesBulkCopy : BasicBulkCopy
1414
{
1515
private const int MAX_ACCESS_CLIENT_BATCH_SIZE = 10000;
1616

‎Source/ISeriesProvider/DB2iSeriesBulkCopy.DB2Connect.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ namespace LinqToDB.DataProvider.DB2iSeries
1010
using LinqToDB;
1111
using LinqToDB.Common;
1212
using DB2BulkCopyOptions = DB2.DB2ProviderAdapter.DB2BulkCopyOptions;
13-
14-
partial class DB2iSeriesBulkCopy : BasicBulkCopy
13+
14+
internal partial class DB2iSeriesBulkCopy : BasicBulkCopy
1515
{
1616
//Copied from DB2BulkCopy
1717
private static BulkCopyRowsCopied ProviderSpecificCopyImpl_DB2<T>(

‎Source/ISeriesProvider/DB2iSeriesBulkCopy.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace LinqToDB.DataProvider.DB2iSeries
77
{
88
using Data;
99

10-
partial class DB2iSeriesBulkCopy : BasicBulkCopy
10+
internal partial class DB2iSeriesBulkCopy : BasicBulkCopy
1111
{
1212
const int MAX_ALLOWABLE_MULTIPLE_ROWS_BATCH_SIZE = 100;
1313

@@ -110,7 +110,7 @@ protected override Task<BulkCopyRowsCopied> ProviderSpecificCopyAsync<T>(ITable<
110110
return MultipleRowsCopyAsync(table, options, source, cancellationToken);
111111
}
112112

113-
#if NATIVE_ASYNC
113+
#if NET472_OR_GREATER
114114
protected override async Task<BulkCopyRowsCopied> ProviderSpecificCopyAsync<T>(ITable<T> table, DataOptions options, IAsyncEnumerable<T> source, CancellationToken cancellationToken)
115115
{
116116
if (table.DataContext is DataConnection dataConnection)
@@ -165,7 +165,7 @@ protected override Task<BulkCopyRowsCopied> MultipleRowsCopyAsync<T>(ITable<T> t
165165
return MultipleRowsCopy2Async(new DB2iSeriesMultipleRowsHelper<T>(table, options, dB2ISeriesSqlProviderFlags) { BatchSize = GetMultipleRowsMaxBatchSize(options) }, source, " FROM " + Constants.SQL.DummyTableName(), cancellationToken);
166166
}
167167

168-
#if NATIVE_ASYNC
168+
#if NET472_OR_GREATER
169169
protected override Task<BulkCopyRowsCopied> MultipleRowsCopyAsync<T>(ITable<T> table, DataOptions options, IAsyncEnumerable<T> source, CancellationToken cancellationToken)
170170
{
171171
return MultipleRowsCopy2Async(new DB2iSeriesMultipleRowsHelper<T>(table, options, dB2ISeriesSqlProviderFlags) { BatchSize = GetMultipleRowsMaxBatchSize(options) }, source, " FROM " + Constants.SQL.DummyTableName(), cancellationToken);

0 commit comments

Comments
 (0)