Skip to content

Commit bd4f75b

Browse files
authored
normalize async API surface over all TFMs (#2144)
* - normalize async API surface over all TFMs (fix #2143) - target net8.0 instead of net5.0 - lib updates * net9 SDK * perf tests: clean up SqlClient warning * CI fix: test concurrency * rev snowflake
1 parent 4e57602 commit bd4f75b

34 files changed

+116
-79
lines changed

Dapper.ProviderTools/Dapper.ProviderTools.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Title>Dapper Provider Tools</Title>
66
<Description>Provider-agnostic ADO.NET helper utilities</Description>
77
<Authors>Marc Gravell</Authors>
8-
<TargetFrameworks>net461;netstandard2.0;net5.0</TargetFrameworks>
8+
<TargetFrameworks>net461;netstandard2.0;net8.0</TargetFrameworks>
99
<SignAssembly>true</SignAssembly>
1010
<Nullable>enable</Nullable>
1111
</PropertyGroup>

Dapper.SqlBuilder/Dapper.SqlBuilder.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Title>Dapper SqlBuilder component</Title>
66
<Description>The Dapper SqlBuilder component, for building SQL queries dynamically.</Description>
77
<Authors>Sam Saffron, Johan Danforth</Authors>
8-
<TargetFrameworks>net461;netstandard2.0;net5.0</TargetFrameworks>
8+
<TargetFrameworks>net461;netstandard2.0;net8.0</TargetFrameworks>
99
<GenerateDocumentationFile>false</GenerateDocumentationFile>
1010
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
1111
<Nullable>enable</Nullable>

Dapper.StrongName/Dapper.StrongName.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Title>Dapper (Strong Named)</Title>
66
<Description>A high performance Micro-ORM supporting SQL Server, MySQL, Sqlite, SqlCE, Firebird etc. Major Sponsor: Dapper Plus from ZZZ Projects.</Description>
77
<Authors>Sam Saffron;Marc Gravell;Nick Craver</Authors>
8-
<TargetFrameworks>net461;netstandard2.0;net5.0;net7.0</TargetFrameworks>
8+
<TargetFrameworks>net461;netstandard2.0;net8.0</TargetFrameworks>
99
<SignAssembly>true</SignAssembly>
1010
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1111
<Nullable>enable</Nullable>
@@ -17,7 +17,12 @@
1717
<Compile Include="..\Dapper\**\*.cs" Exclude="..\Dapper\obj\**\*.cs" />
1818
</ItemGroup>
1919

20+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461'">
21+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
22+
</ItemGroup>
23+
2024
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
25+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
2126
<PackageReference Include="System.Reflection.Emit.Lightweight" />
2227
</ItemGroup>
2328
</Project>

Dapper/Dapper.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PackageTags>orm;sql;micro-orm</PackageTags>
66
<Description>A high performance Micro-ORM supporting SQL Server, MySQL, Sqlite, SqlCE, Firebird etc. Major Sponsor: Dapper Plus from ZZZ Projects.</Description>
77
<Authors>Sam Saffron;Marc Gravell;Nick Craver</Authors>
8-
<TargetFrameworks>net461;netstandard2.0;net5.0;net6.0;net7.0</TargetFrameworks>
8+
<TargetFrameworks>net461;netstandard2.0;net8.0</TargetFrameworks>
99
<Nullable>enable</Nullable>
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1111
</PropertyGroup>
@@ -24,7 +24,12 @@
2424
</PackageReference>
2525
</ItemGroup>
2626

27+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461'">
28+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
29+
</ItemGroup>
30+
2731
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
32+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
2833
<PackageReference Include="System.Reflection.Emit.Lightweight" />
2934
</ItemGroup>
3035
</Project>

Dapper/PublicAPI.Shipped.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ Dapper.SqlMapper.GridReader.CancellationToken.get -> System.Threading.Cancellati
6969
Dapper.SqlMapper.GridReader.Command.get -> System.Data.IDbCommand!
7070
Dapper.SqlMapper.GridReader.Command.set -> void
7171
Dapper.SqlMapper.GridReader.Dispose() -> void
72+
Dapper.SqlMapper.GridReader.DisposeAsync() -> System.Threading.Tasks.ValueTask
7273
Dapper.SqlMapper.GridReader.GridReader(System.Data.IDbCommand! command, System.Data.Common.DbDataReader! reader, Dapper.SqlMapper.Identity? identity, System.Action<object?>? onCompleted = null, object? state = null, bool addToCache = false, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void
7374
Dapper.SqlMapper.GridReader.IsConsumed.get -> bool
7475
Dapper.SqlMapper.GridReader.OnAfterGrid(int index) -> void
@@ -112,6 +113,8 @@ Dapper.SqlMapper.GridReader.ReadSingleOrDefault<T>() -> T?
112113
Dapper.SqlMapper.GridReader.ReadSingleOrDefaultAsync() -> System.Threading.Tasks.Task<dynamic?>!
113114
Dapper.SqlMapper.GridReader.ReadSingleOrDefaultAsync(System.Type! type) -> System.Threading.Tasks.Task<object?>!
114115
Dapper.SqlMapper.GridReader.ReadSingleOrDefaultAsync<T>() -> System.Threading.Tasks.Task<T?>!
116+
Dapper.SqlMapper.GridReader.ReadUnbufferedAsync() -> System.Collections.Generic.IAsyncEnumerable<dynamic!>!
117+
Dapper.SqlMapper.GridReader.ReadUnbufferedAsync<T>() -> System.Collections.Generic.IAsyncEnumerable<T>!
115118
Dapper.SqlMapper.GridReader.ResultIndex.get -> int
116119
Dapper.SqlMapper.ICustomQueryParameter
117120
Dapper.SqlMapper.ICustomQueryParameter.AddParameter(System.Data.IDbCommand! command, string! name) -> void
@@ -295,6 +298,8 @@ static Dapper.SqlMapper.QuerySingleOrDefaultAsync(this System.Data.IDbConnection
295298
static Dapper.SqlMapper.QuerySingleOrDefaultAsync(this System.Data.IDbConnection! cnn, System.Type! type, string! sql, object? param = null, System.Data.IDbTransaction? transaction = null, int? commandTimeout = null, System.Data.CommandType? commandType = null) -> System.Threading.Tasks.Task<object?>!
296299
static Dapper.SqlMapper.QuerySingleOrDefaultAsync<T>(this System.Data.IDbConnection! cnn, Dapper.CommandDefinition command) -> System.Threading.Tasks.Task<T?>!
297300
static Dapper.SqlMapper.QuerySingleOrDefaultAsync<T>(this System.Data.IDbConnection! cnn, string! sql, object? param = null, System.Data.IDbTransaction? transaction = null, int? commandTimeout = null, System.Data.CommandType? commandType = null) -> System.Threading.Tasks.Task<T?>!
301+
static Dapper.SqlMapper.QueryUnbufferedAsync(this System.Data.Common.DbConnection! cnn, string! sql, object? param = null, System.Data.Common.DbTransaction? transaction = null, int? commandTimeout = null, System.Data.CommandType? commandType = null) -> System.Collections.Generic.IAsyncEnumerable<dynamic!>!
302+
static Dapper.SqlMapper.QueryUnbufferedAsync<T>(this System.Data.Common.DbConnection! cnn, string! sql, object? param = null, System.Data.Common.DbTransaction? transaction = null, int? commandTimeout = null, System.Data.CommandType? commandType = null) -> System.Collections.Generic.IAsyncEnumerable<T>!
298303
static Dapper.SqlMapper.ReadChar(object! value) -> char
299304
static Dapper.SqlMapper.ReadNullableChar(object! value) -> char?
300305
static Dapper.SqlMapper.RemoveTypeMap(System.Type! type) -> void

Dapper/PublicAPI/net5.0/PublicAPI.Shipped.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

Dapper/PublicAPI/net6.0/PublicAPI.Shipped.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

Dapper/PublicAPI/net6.0/PublicAPI.Unshipped.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

Dapper/PublicAPI/net7.0/PublicAPI.Shipped.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

Dapper/PublicAPI/net7.0/PublicAPI.Unshipped.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)