Skip to content

Commit f109f0c

Browse files
bgraingerbgrainger
committed
Remove side-by-side benchmark with MySql.Data.
Run benchmarks just against MySqlConnector, testing both .NET Core and the full .NET Framework.
1 parent 12fd57d commit f109f0c

File tree

6 files changed

+57
-331
lines changed

6 files changed

+57
-331
lines changed

‎.ci/test.ps1

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$ErrorActionPreference = "Stop"
1+
$ErrorActionPreference = "Stop"
22

33
# restore
44
dotnet restore
@@ -54,9 +54,8 @@ if ($LASTEXITCODE -ne 0){
5454

5555
echo "Building Benchmark"
5656

57-
& "nuget.exe" restore tests\Benchmark\Benchmark.sln
58-
& "msbuild.exe" tests\Benchmark\Benchmark.sln /p:Configuration=Release
57+
dotnet restore tests\Benchmark\Benchmark.csproj
58+
dotnet run -p tests\Benchmark\Benchmark.csproj -c Release -f net462
5959
if ($LASTEXITCODE -ne 0){
6060
exit $LASTEXITCODE;
6161
}
62-
.\tests\Benchmark\bin\Release\Benchmark.exe

‎tests/Benchmark/App.config

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

‎tests/Benchmark/Benchmark.csproj

Lines changed: 5 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -1,173 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{102C06D1-ADB7-4661-9EC5-F6460BFEDB2A}</ProjectGuid>
83
<OutputType>Exe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Benchmark</RootNamespace>
11-
<AssemblyName>Benchmark</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
4+
<TargetFrameworks>netcoreapp1.1;net462</TargetFrameworks>
155
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
<Prefer32Bit>false</Prefer32Bit>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<PlatformTarget>AnyCPU</PlatformTarget>
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
<Prefer32Bit>false</Prefer32Bit>
36-
</PropertyGroup>
37-
<ItemGroup>
38-
<Reference Include="BenchmarkDotNet, Version=0.10.3.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
39-
<HintPath>packages\BenchmarkDotNet.0.10.3\lib\net45\BenchmarkDotNet.dll</HintPath>
40-
<Private>True</Private>
41-
</Reference>
42-
<Reference Include="BenchmarkDotNet.Core, Version=0.10.3.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
43-
<HintPath>packages\BenchmarkDotNet.Core.0.10.3\lib\net45\BenchmarkDotNet.Core.dll</HintPath>
44-
<Private>True</Private>
45-
</Reference>
46-
<Reference Include="BenchmarkDotNet.Toolchains.Roslyn, Version=0.10.3.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
47-
<HintPath>packages\BenchmarkDotNet.Toolchains.Roslyn.0.10.3\lib\net45\BenchmarkDotNet.Toolchains.Roslyn.dll</HintPath>
48-
<Private>True</Private>
49-
</Reference>
50-
<Reference Include="Microsoft.CodeAnalysis, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51-
<HintPath>packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
52-
<Private>True</Private>
53-
</Reference>
54-
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55-
<HintPath>packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
56-
<Private>True</Private>
57-
</Reference>
58-
<Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
59-
<HintPath>packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
60-
<Private>True</Private>
61-
<Aliases>MySqlData</Aliases>
62-
</Reference>
63-
<Reference Include="System" />
64-
<Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
65-
<HintPath>packages\System.AppContext.4.1.0\lib\net46\System.AppContext.dll</HintPath>
66-
<Private>True</Private>
67-
</Reference>
68-
<Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
69-
<HintPath>packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
70-
<Private>True</Private>
71-
</Reference>
72-
<Reference Include="System.ComponentModel.Composition" />
73-
<Reference Include="System.Console, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
74-
<HintPath>packages\System.Console.4.0.0\lib\net46\System.Console.dll</HintPath>
75-
<Private>True</Private>
76-
</Reference>
77-
<Reference Include="System.Core" />
78-
<Reference Include="System.Diagnostics.FileVersionInfo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
79-
<HintPath>packages\System.Diagnostics.FileVersionInfo.4.0.0\lib\net46\System.Diagnostics.FileVersionInfo.dll</HintPath>
80-
<Private>True</Private>
81-
</Reference>
82-
<Reference Include="System.Diagnostics.StackTrace, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
83-
<HintPath>packages\System.Diagnostics.StackTrace.4.0.1\lib\net46\System.Diagnostics.StackTrace.dll</HintPath>
84-
<Private>True</Private>
85-
</Reference>
86-
<Reference Include="System.IO.FileSystem, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
87-
<HintPath>packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll</HintPath>
88-
<Private>True</Private>
89-
</Reference>
90-
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
91-
<HintPath>packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
92-
<Private>True</Private>
93-
</Reference>
94-
<Reference Include="System.Numerics" />
95-
<Reference Include="System.Reflection.Metadata, Version=1.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
96-
<HintPath>packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
97-
<Private>True</Private>
98-
</Reference>
99-
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
100-
<HintPath>packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
101-
<Private>True</Private>
102-
</Reference>
103-
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
104-
<HintPath>packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
105-
<Private>True</Private>
106-
</Reference>
107-
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
108-
<HintPath>packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
109-
<Private>True</Private>
110-
</Reference>
111-
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
112-
<HintPath>packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
113-
<Private>True</Private>
114-
</Reference>
115-
<Reference Include="System.Text.Encoding.CodePages, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
116-
<HintPath>packages\System.Text.Encoding.CodePages.4.0.1\lib\net46\System.Text.Encoding.CodePages.dll</HintPath>
117-
<Private>True</Private>
118-
</Reference>
119-
<Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
120-
<HintPath>packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
121-
<Private>True</Private>
122-
</Reference>
123-
<Reference Include="System.Threading.Thread, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
124-
<HintPath>packages\System.Threading.Thread.4.0.0\lib\net46\System.Threading.Thread.dll</HintPath>
125-
<Private>True</Private>
126-
</Reference>
127-
<Reference Include="System.Xml.Linq" />
128-
<Reference Include="System.Data.DataSetExtensions" />
129-
<Reference Include="Microsoft.CSharp" />
130-
<Reference Include="System.Data" />
131-
<Reference Include="System.Net.Http" />
132-
<Reference Include="System.Xml" />
133-
<Reference Include="System.Xml.XmlDocument, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
134-
<HintPath>packages\System.Xml.XmlDocument.4.0.1\lib\net46\System.Xml.XmlDocument.dll</HintPath>
135-
<Private>True</Private>
136-
</Reference>
137-
<Reference Include="System.Xml.XPath, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
138-
<HintPath>packages\System.Xml.XPath.4.0.1\lib\net46\System.Xml.XPath.dll</HintPath>
139-
<Private>True</Private>
140-
</Reference>
141-
<Reference Include="System.Xml.XPath.XDocument, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
142-
<HintPath>packages\System.Xml.XPath.XDocument.4.0.1\lib\net46\System.Xml.XPath.XDocument.dll</HintPath>
143-
<Private>True</Private>
144-
</Reference>
145-
</ItemGroup>
146-
<ItemGroup>
147-
<Compile Include="Program.cs" />
148-
<Compile Include="Properties\AssemblyInfo.cs" />
149-
</ItemGroup>
150-
<ItemGroup>
151-
<None Include="App.config" />
152-
<None Include="packages.config" />
153-
</ItemGroup>
1546
<ItemGroup>
155-
<Analyzer Include="packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
156-
<Analyzer Include="packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
7+
<PackageReference Include="BenchmarkDotNet" Version="0.10.8" />
1578
</ItemGroup>
1589
<ItemGroup>
159-
<ProjectReference Include="..\..\src\MySqlConnector\MySqlConnector.csproj">
160-
<Project>{6b4fea15-4504-4bf7-b157-cef9b60cfe13}</Project>
161-
<Name>MySqlConnector</Name>
162-
<Aliases>MySqlConnector</Aliases>
163-
</ProjectReference>
10+
<ProjectReference Include="..\..\src\MySqlConnector\MySqlConnector.csproj" />
16411
</ItemGroup>
165-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
166-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
167-
Other similar extension points exist, see Microsoft.Common.targets.
168-
<Target Name="BeforeBuild">
169-
</Target>
170-
<Target Name="AfterBuild">
171-
</Target>
172-
-->
173-
</Project>
12+
</Project>

0 commit comments

Comments
 (0)