Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions Dapper.StrongName/Dapper.StrongName.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@

<ItemGroup Condition=" '$(TargetFramework)' == 'net461'">
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
<PackageReference Include="System.Threading.Tasks.Extensions" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
<PackageReference Include="System.Reflection.Emit.Lightweight" />
<PackageReference Include="System.Threading.Tasks.Extensions" />
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions Dapper/Dapper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@

<ItemGroup Condition=" '$(TargetFramework)' == 'net461'">
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
<PackageReference Include="System.Threading.Tasks.Extensions" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
<PackageReference Include="System.Reflection.Emit.Lightweight" />
<PackageReference Include="System.Threading.Tasks.Extensions" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/DapperLib/Dapper</RepositoryUrl>
<Deterministic>false</Deterministic>
<NoWarn>$(NOWARN);IDE0056;IDE0057;IDE0079</NoWarn>
<NoWarn>$(NOWARN);IDE0056;IDE0057;IDE0079;DX1001</NoWarn>
<DebugSymbols>true</DebugSymbols>
<DebugType>embedded</DebugType>
<DefaultLanguage>en-US</DefaultLanguage>
Expand Down
53 changes: 28 additions & 25 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,50 +3,53 @@
<!-- note: 6.2.0 has regressions; don't force the update -->
<PackageVersion Include="EntityFramework" Version="6.1.3" />
<PackageVersion Include="FastMember" Version="1.5.0" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.7" />
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.203" />
<PackageVersion Include="Microsoft.SqlServer.Types" Version="14.0.1016.290" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.7.115" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.1" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50" />
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
<PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
<!-- tests -->
<PackageVersion Include="Azure.Identity" Version="1.13.2" />
<PackageVersion Include="Azure.Identity" Version="1.21.0" />
<PackageVersion Include="Belgrade.Sql.Client" Version="1.1.4" />
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
<PackageVersion Include="Dashing" Version="2.10.1" />
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
<PackageVersion Include="Dashing" Version="3.0.0" />
<PackageVersion Include="Dapper.Contrib" Version="2.0.78" />
<PackageVersion Include="DuckDB.NET.Data.Full" Version="1.1.3" />
<PackageVersion Include="DevExpress.Xpo" Version="24.2.3" />
<PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="10.3.2" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
<PackageVersion Include="DuckDB.NET.Data.Full" Version="1.4.4" />
<PackageVersion Include="DevExpress.Xpo" Version="25.2.6" />
<PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="10.3.4" />
<PackageVersion Include="GitHubActionsTestLogger" Version="3.0.3" />
<PackageVersion Include="Iesi.Collections" Version="4.1.1" />
<PackageVersion Include="linq2db.SqlServer" Version="5.4.1" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.1" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="linq2db.SqlServer" Version="5.4.1.9" />
<PackageVersion Include="log4net" Version="3.3.1" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="7.0.1" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.7" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.7" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
<PackageVersion Include="Mighty" Version="3.3.0" />
<PackageVersion Include="MySqlConnector" Version="2.4.0" />
<PackageVersion Include="NHibernate" Version="5.5.2" />
<PackageVersion Include="MySqlConnector" Version="2.5.0" />
<PackageVersion Include="NHibernate" Version="5.6.0" />
<PackageVersion Include="Norm.net" Version="5.4.0" />
<PackageVersion Include="Npgsql" Version="9.0.2" />
<PackageVersion Include="Npgsql" Version="10.0.2" />
<PackageVersion Include="PetaPoco" Version="5.1.306" />
<PackageVersion Include="RepoDb.SqlServer" Version="1.13.1" />
<PackageVersion Include="ServiceStack.OrmLite.SqlServer" Version="8.5.2" />
<PackageVersion Include="Snowflake.Data" Version="4.5.0" />
<PackageVersion Include="ServiceStack.OrmLite.SqlServer" Version="10.0.6" />
<PackageVersion Include="Snowflake.Data" Version="5.5.0" />
<PackageVersion Include="SqlMarshal" Version="0.5.0" />
<PackageVersion Include="SubSonic" Version="3.0.0.4" />
<PackageVersion Include="Susanoo.SqlServer" Version="1.2.4.2" />
<PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
<PackageVersion Include="System.Data.SQLite" Version="1.0.119" />
<PackageVersion Include="System.Data.SqlClient" Version="4.9.1" />
<PackageVersion Include="System.Data.SQLite" Version="2.0.3" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
<PackageVersion Include="System.Reflection.Metadata" Version="9.0.1" />
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.7" />
<PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.7" />
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
<PackageVersion Include="System.ValueTuple" Version="4.6.2" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<AssemblyName>Dapper.Tests.Performance</AssemblyName>
<Description>Dapper Core Performance Suite</Description>
<OutputType>Exe</OutputType>
<TargetFrameworks>net462;net8.0</TargetFrameworks>
<TargetFrameworks>net472;net10.0</TargetFrameworks>
<IsTestProject>false</IsTestProject>
<NoWarn>$(NoWarn);IDE0063;IDE0034;IDE0059;IDE0060</NoWarn>
</PropertyGroup>
Expand All @@ -27,14 +27,16 @@
<PackageReference Include="SqlMarshal" />
<PackageReference Include="System.Data.SQLite" />
<PackageReference Include="System.Reflection.Metadata" />
<PackageReference Include="System.Data.SqlClient" />
<PackageReference Include="System.Security.Cryptography.Xml" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
<PackageReference Include="Npgsql" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<PackageReference Include="Npgsql" VersionOverride="8.0.6"/>
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<PackageReference Include="Npgsql" VersionOverride="8.0.9"/>
</ItemGroup>

<ItemGroup>
Expand All @@ -50,20 +52,20 @@
<Compile Update="Benchmarks.*.cs" DependentUpon="Benchmarks.cs" />
</ItemGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
<DefineConstants>$(DefineConstants);NET4X</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<ProjectReference Include="../../Dapper.EntityFramework/Dapper.EntityFramework.csproj" />
<PackageReference Include="Microsoft.SqlServer.Types" />
<PackageReference Include="SubSonic" />
<PackageReference Include="Susanoo.SqlServer" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" VersionOverride="[3.1.10]" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" VersionOverride="[3.1.32]" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data.Linq" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
<PackageReference Include="Norm.net" />
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion tests/Dapper.Tests/Dapper.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<PackageReference Include="MySqlConnector" />
<PackageReference Include="System.Data.SqlClient" />
<PackageReference Include="System.ValueTuple" />
<PackageReference Include="log4net" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net481'">
Expand All @@ -32,7 +33,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net481'">
<PackageReference Include="Npgsql" VersionOverride="8.0.6"/>
<PackageReference Include="Npgsql" VersionOverride="8.0.9"/>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net481'">
Expand Down
2 changes: 1 addition & 1 deletion tests/Dapper.Tests/MiscTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using Microsoft.CSharp.RuntimeBinder;
using Xunit;

#if NETCOREAPP3_1 || NET462 || NET472
#if NET472
namespace System.Runtime.CompilerServices
{
[EditorBrowsable(EditorBrowsableState.Never)]
Expand Down
Loading