Unverified Commit f486848e authored by Nick Craver's avatar Nick Craver Committed by GitHub

Update benchmarks (#1451)

This fixes things for `netcoreapp3.1` and fixes the outstanding #1205.
parent 601a5c28
......@@ -14,6 +14,7 @@ public class MassiveBenchmarks : BenchmarkBase
public void Setup()
{
BaseSetup();
RegisterSqlFactory();
_model = new DynamicModel(ConnectionString);
}
......
......@@ -14,6 +14,7 @@ public class PetaPocoBenchmarks : BenchmarkBase
public void Setup()
{
BaseSetup();
RegisterSqlFactory();
_db = new Database(ConnectionString, "System.Data.SqlClient");
_db.OpenSharedConnection();
_dbFast = new Database(ConnectionString, "System.Data.SqlClient");
......
using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Order;
using System;
using System.Configuration;
using System.Data.SqlClient;
......@@ -22,6 +21,13 @@ protected void BaseSetup()
_connection.Open();
}
protected void RegisterSqlFactory()
{
#if NETCOREAPP
System.Data.Common.DbProviderFactories.RegisterFactory("System.Data.SqlClient", SqlClientFactory.Instance);
#endif
}
protected void Step()
{
i++;
......
......@@ -16,24 +16,24 @@ public class Config : ManualConfig
public Config()
{
Add(ConsoleLogger.Default);
AddLogger(ConsoleLogger.Default);
Add(CsvExporter.Default);
Add(MarkdownExporter.GitHub);
Add(HtmlExporter.Default);
AddExporter(CsvExporter.Default);
AddExporter(MarkdownExporter.GitHub);
AddExporter(HtmlExporter.Default);
var md = MemoryDiagnoser.Default;
Add(md);
Add(new ORMColum());
Add(TargetMethodColumn.Method);
Add(new ReturnColum());
Add(StatisticColumn.Mean);
Add(StatisticColumn.StdDev);
Add(StatisticColumn.Error);
Add(BaselineRatioColumn.RatioMean);
Add(DefaultColumnProviders.Metrics);
AddDiagnoser(md);
AddColumn(new ORMColum());
AddColumn(TargetMethodColumn.Method);
AddColumn(new ReturnColum());
AddColumn(StatisticColumn.Mean);
AddColumn(StatisticColumn.StdDev);
AddColumn(StatisticColumn.Error);
AddColumn(BaselineRatioColumn.RatioMean);
AddColumnProvider(DefaultColumnProviders.Metrics);
Add(Job.ShortRun
AddJob(Job.ShortRun
.WithLaunchCount(1)
.WithWarmupCount(2)
.WithUnrollFactor(Iterations)
......
......@@ -13,7 +13,7 @@
<ProjectReference Include="..\Dapper.Contrib\Dapper.Contrib.csproj" />
<PackageReference Include="Dashing" Version="2.2.0" />
<PackageReference Include="Belgrade.Sql.Client" Version="1.1.4" />
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
<PackageReference Include="DevExpress.Xpo" Version="19.1.5" />
<!--<PackageReference Include="BLToolkit" Version="4.3.6" />-->
<PackageReference Include="EntityFramework" Version="6.3.0" />
......@@ -27,6 +27,7 @@
<PackageReference Include="Npgsql" Version="4.0.9" />
<PackageReference Include="PetaPoco" Version="5.1.306" />
<PackageReference Include="ServiceStack.OrmLite.SqlServer" Version="5.6.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
<PackageReference Include="System.Data.SQLite" Version="1.0.111" />
</ItemGroup>
<ItemGroup>
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment