merge BenchmarkDotNet and BenchmarkDotNet.Core

dotnet · Mar 23, 2018 · 96dd4fe · 96dd4fe
1 parent bc9975b
commit 96dd4fe
Show file tree

Hide file tree

Showing 427 changed files with 521 additions and 614 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,11 +48,12 @@ tests/output/*
 artifacts/*
 BDN.Generated
 BenchmarkDotNet.Samples/Properties/launchSettings.json
-src/BenchmarkDotNet.Core/Disassemblers/*
+src/BenchmarkDotNet/Disassemblers/*
 
 # Visual Studio 2015 cache/options directory
 .vs/
 
 # Cake
 tools/**
-.dotnet
+.dotnet
+/src/BenchmarkDotNet/Disassemblers/*
diff --git a/BenchmarkDotNet.sln b/BenchmarkDotNet.sln
@@ -15,18 +15,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenchmarkDotNet.Diagnostics
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenchmarkDotNet.IntegrationTests.CustomPaths", "tests\BenchmarkDotNet.IntegrationTests.CustomPaths\BenchmarkDotNet.IntegrationTests.CustomPaths.csproj", "{0031728E-A5D4-47C1-9C1A-6C859A765C9D}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "BenchmarkDotNet.Samples.FSharp", "samples\BenchmarkDotNet.Samples.FSharp\BenchmarkDotNet.Samples.FSharp.fsproj", "{A329F00E-4B9D-4BC6-B688-92698D773CBF}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "BenchmarkDotNet.Samples.FSharp", "samples\BenchmarkDotNet.Samples.FSharp\BenchmarkDotNet.Samples.FSharp.fsproj", "{A329F00E-4B9D-4BC6-B688-92698D773CBF}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "BenchmarkDotNet.IntegrationTests.FSharp", "tests\BenchmarkDotNet.IntegrationTests.FSharp\BenchmarkDotNet.IntegrationTests.FSharp.fsproj", "{367FAFE1-A1C8-4AA1-9334-F4762E128DBB}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "BenchmarkDotNet.IntegrationTests.FSharp", "tests\BenchmarkDotNet.IntegrationTests.FSharp\BenchmarkDotNet.IntegrationTests.FSharp.fsproj", "{367FAFE1-A1C8-4AA1-9334-F4762E128DBB}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BenchmarkDotNet.IntegrationTests.VisualBasic", "tests\BenchmarkDotNet.IntegrationTests.VisualBasic\BenchmarkDotNet.IntegrationTests.VisualBasic.vbproj", "{D8803ECA-4ABF-45B8-BD1D-7C637416C448}"
+Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "BenchmarkDotNet.IntegrationTests.VisualBasic", "tests\BenchmarkDotNet.IntegrationTests.VisualBasic\BenchmarkDotNet.IntegrationTests.VisualBasic.vbproj", "{D8803ECA-4ABF-45B8-BD1D-7C637416C448}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenchmarkDotNet.IntegrationTests.DisabledOptimizations", "tests\BenchmarkDotNet.IntegrationTests.DisabledOptimizations\BenchmarkDotNet.IntegrationTests.DisabledOptimizations.csproj", "{AC2188E5-A140-43E2-8A76-4BDABFE30ABA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenchmarkDotNet.IntegrationTests.EnabledOptimizations", "tests\BenchmarkDotNet.IntegrationTests.EnabledOptimizations\BenchmarkDotNet.IntegrationTests.EnabledOptimizations.csproj", "{873581FF-DB9D-42E5-8F11-32A4B7BB28EC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenchmarkDotNet.Core", "src\BenchmarkDotNet.Core\BenchmarkDotNet.Core.csproj", "{95F5D645-19E3-432F-95D4-C5EA374DD15B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenchmarkDotNet.Samples", "samples\BenchmarkDotNet.Samples\BenchmarkDotNet.Samples.csproj", "{EB38672B-12AB-465E-8132-B0E323A510C8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenchmarkDotNet.Tests", "tests\BenchmarkDotNet.Tests\BenchmarkDotNet.Tests.csproj", "{45FE17A7-0E04-48C0-8CDC-493CDA449F7A}"
@@ -77,10 +75,6 @@ Global
 		{873581FF-DB9D-42E5-8F11-32A4B7BB28EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{873581FF-DB9D-42E5-8F11-32A4B7BB28EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{873581FF-DB9D-42E5-8F11-32A4B7BB28EC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{95F5D645-19E3-432F-95D4-C5EA374DD15B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{95F5D645-19E3-432F-95D4-C5EA374DD15B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{95F5D645-19E3-432F-95D4-C5EA374DD15B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{95F5D645-19E3-432F-95D4-C5EA374DD15B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EB38672B-12AB-465E-8132-B0E323A510C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EB38672B-12AB-465E-8132-B0E323A510C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EB38672B-12AB-465E-8132-B0E323A510C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -118,7 +112,6 @@ Global
 		{D8803ECA-4ABF-45B8-BD1D-7C637416C448} = {14195214-591A-45B7-851A-19D3BA2413F9}
 		{AC2188E5-A140-43E2-8A76-4BDABFE30ABA} = {14195214-591A-45B7-851A-19D3BA2413F9}
 		{873581FF-DB9D-42E5-8F11-32A4B7BB28EC} = {14195214-591A-45B7-851A-19D3BA2413F9}
-		{95F5D645-19E3-432F-95D4-C5EA374DD15B} = {D6597E3A-6892-4A68-8E14-042FC941FDA2}
 		{EB38672B-12AB-465E-8132-B0E323A510C8} = {602236FF-A83D-43BA-9EE7-A4B0BE2CA4B3}
 		{45FE17A7-0E04-48C0-8CDC-493CDA449F7A} = {14195214-591A-45B7-851A-19D3BA2413F9}
 		{6A3CBB07-E337-488E-BDAC-ED96AF8ED608} = {14195214-591A-45B7-851A-19D3BA2413F9}

diff --git a/build/build-and-pack.cmd b/build/build-and-pack.cmd
@@ -2,12 +2,8 @@
 
 git clean -xfd
 dotnet restore
-dotnet build .\src\BenchmarkDotNet.Core\BenchmarkDotNet.Core.csproj -c Release
-dotnet build .\src\BenchmarkDotNet.Toolchains.Roslyn\BenchmarkDotNet.Toolchains.Roslyn.csproj -c Release
 dotnet build .\src\BenchmarkDotNet\BenchmarkDotNet.csproj -c Release
 dotnet build .\src\BenchmarkDotNet.Diagnostics.Windows\BenchmarkDotNet.Diagnostics.Windows.csproj  -c Release
-dotnet pack .\src\BenchmarkDotNet.Core\BenchmarkDotNet.Core.csproj -c Release
-dotnet pack .\src\BenchmarkDotNet.Toolchains.Roslyn\BenchmarkDotNet.Toolchains.Roslyn.csproj -c Release
 dotnet pack .\src\BenchmarkDotNet\BenchmarkDotNet.csproj -c Release
 dotnet pack .\src\BenchmarkDotNet.Diagnostics.Windows\BenchmarkDotNet.Diagnostics.Windows.csproj  -c Release
 rmdir artifacts /s /q

diff --git a/build/pack.bat b/build/pack.bat
@@ -1,5 +1,3 @@
-dotnet pack .\src\BenchmarkDotNet.Core\BenchmarkDotNet.Core.csproj -c Release
-dotnet pack .\src\BenchmarkDotNet.Toolchains.Roslyn\BenchmarkDotNet.Toolchains.Roslyn.csproj -c Release
 dotnet pack .\src\BenchmarkDotNet\BenchmarkDotNet.csproj -c Release
 dotnet pack .\src\BenchmarkDotNet.Diagnostics.Windows\BenchmarkDotNet.Diagnostics.Windows.csproj  -c Release
 rmdir artifacts /s /q

diff --git a/docs/guide/Guides/NuGet.md b/docs/guide/Guides/NuGet.md
@@ -4,9 +4,7 @@
 
 We have the following set of NuGet packages (you can install it directly from `nuget.org`):
 
-* `BenchmarkDotNet.Core`: basic BenchmarkDotNet infrastructure and logic. Doesn't have any dependencies.
-* `BenchmarkDotNet.Toolchains.Roslyn`: a package that includes `RoslynToolchain` which adds an ability to build your benchmarks with the Roslyn compiler. Depends on a set of additional NuGet packages.
-* `BenchmarkDotNet`: an ultimate package that depends on `BenchmarkDotNet.Core` and `BenchmarkDotNet.Toolchains.Roslyn`: provides the `BenchmarkRunner`. In 99% of situations, you should start with this package.
+* `BenchmarkDotNet`: Basic BenchmarkDotNet infrastructure and logic. Doesn't have any dependencies. This is all you need to run benchmarks.
 * `BenchmarkDotNet.Diagnostics.Windows`: an additional optional package that provides a set of Windows diagnosers.
 
 ## Versioning system and feeds

diff --git a/samples/BenchmarkDotNet.Samples.FSharp/BenchmarkDotNet.Samples.FSharp.fsproj b/samples/BenchmarkDotNet.Samples.FSharp/BenchmarkDotNet.Samples.FSharp.fsproj
@@ -7,20 +7,10 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\BenchmarkDotNet.Core\BenchmarkDotNet.Core.csproj">
-      <Project>{95f5d645-19e3-432f-95d4-c5ea374dd15b}</Project>
-      <Name>BenchmarkDotNet.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\BenchmarkDotNet\BenchmarkDotNet.csproj">
-      <Project>{af1e6f8a-5c63-465f-96f4-5e5f183a33b9}</Project>
-      <Name>BenchmarkDotNet</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\BenchmarkDotNet\BenchmarkDotNet.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
-    <ProjectReference Include="..\..\src\BenchmarkDotNet.Diagnostics.Windows\BenchmarkDotNet.Diagnostics.Windows.csproj">
-      <Name>BenchmarkDotNet.Diagnostics.Windows</Name>
-      <Project>{b61a2815-4e2f-42f7-a87c-973c488b11ca}</Project>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\BenchmarkDotNet.Diagnostics.Windows\BenchmarkDotNet.Diagnostics.Windows.csproj" />
   </ItemGroup>
 </Project>
diff --git a/samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj b/samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj
@@ -21,7 +21,4 @@
     <ProjectReference Include="..\..\src\BenchmarkDotNet\BenchmarkDotNet.csproj" />
     <ProjectReference Include="..\..\src\BenchmarkDotNet.Diagnostics.Windows\BenchmarkDotNet.Diagnostics.Windows.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' ">
-    <PackageReference Include="System.ComponentModel.EventBasedAsync" Version="4.3.0" />
-  </ItemGroup>
 </Project>
diff --git a/src/BenchmarkDotNet.Core/BenchmarkDotNet.Core.csproj b/src/BenchmarkDotNet.Core/BenchmarkDotNet.Core.csproj
diff --git a/src/BenchmarkDotNet.Core/Properties/AssemblyInfo.cs b/src/BenchmarkDotNet.Core/Properties/AssemblyInfo.cs