Skip to content

Commit b94950d

Browse files
LeeCampbellLeeCampbell
committed
Migrate to VS2017
1 parent 3e7ad9d commit b94950d

59 files changed

Lines changed: 842 additions & 1201 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
gh-pages
22
Working/
33
build/runbuild.txt
4+
BenchmarkDotNet.Artifacts/
45

56
# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
67
[Bb]in/

‎src/HdrHistogram.Benchmarking/App.config‎

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

‎src/HdrHistogram.Benchmarking/ExhuastiveJobWithMemoryDiagnosisConfig.cs‎

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

‎src/HdrHistogram.Benchmarking/HdrHistogram.Benchmarking.csproj‎

Lines changed: 13 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,22 @@
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">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{8AAE86BE-5ABC-4902-B48B-20DCDBB93C7B}</ProjectGuid>
84
<OutputType>Exe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>HdrHistogram.Benchmarking</RootNamespace>
11-
<AssemblyName>HdrHistogram.Benchmarking</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
<NuGetPackageImportStamp>
16-
</NuGetPackageImportStamp>
17-
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<PlatformTarget>AnyCPU</PlatformTarget>
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<PlatformTarget>AnyCPU</PlatformTarget>
30-
<DebugType>pdbonly</DebugType>
31-
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
5+
<TargetFrameworks>net47;netcoreapp1.1</TargetFrameworks>
366
</PropertyGroup>
7+
378
<ItemGroup>
38-
<Reference Include="BenchmarkDotNet, Version=0.9.7.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
39-
<HintPath>..\packages\BenchmarkDotNet.0.9.7-beta\lib\net40\BenchmarkDotNet.dll</HintPath>
40-
<Private>True</Private>
41-
</Reference>
42-
<Reference Include="BenchmarkDotNet.Diagnostics.Windows, Version=0.9.6.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
43-
<HintPath>..\packages\BenchmarkDotNet.Diagnostics.Windows.0.9.6\lib\net40\BenchmarkDotNet.Diagnostics.Windows.dll</HintPath>
44-
<Private>True</Private>
45-
</Reference>
46-
<Reference Include="Microsoft.Diagnostics.Tracing.TraceEvent, Version=1.0.41.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\lib\net40\Microsoft.Diagnostics.Tracing.TraceEvent.dll</HintPath>
48-
<Private>True</Private>
49-
</Reference>
50-
<Reference Include="System" />
51-
<Reference Include="System.Core" />
52-
<Reference Include="System.Management" />
53-
<Reference Include="System.Xml.Linq" />
54-
<Reference Include="System.Data.DataSetExtensions" />
55-
<Reference Include="Microsoft.CSharp" />
56-
<Reference Include="System.Data" />
57-
<Reference Include="System.Net.Http" />
58-
<Reference Include="System.Xml" />
9+
<PackageReference Include="BenchmarkDotNet" Version="0.10.6" />
5910
</ItemGroup>
60-
<ItemGroup>
61-
<Compile Include="..\HdrHistogram\Utilities\Bitwise.cs">
62-
<Link>LeadingZeroCount\Bitwise.cs</Link>
63-
</Compile>
64-
<Compile Include="ExhuastiveJobWithMemoryDiagnosisConfig.cs" />
65-
<Compile Include="LeadingZeroCount\DeBruijn128Bits.cs" />
66-
<Compile Include="LeadingZeroCount\DeBruijn64Bits.cs" />
67-
<Compile Include="LeadingZeroCount\IfAndShift.cs" />
68-
<Compile Include="LeadingZeroCount\LeadingZeroCount32BitBenchmark.cs" />
69-
<Compile Include="LeadingZeroCount\LeadingZeroCount64BitBenchmark.cs" />
70-
<Compile Include="LeadingZeroCount\LeadingZeroCountBenchmarkBase.cs" />
71-
<Compile Include="LeadingZeroCount\Magic32Bit.cs" />
72-
<Compile Include="LeadingZeroCount\MathLog.cs" />
73-
<Compile Include="LeadingZeroCount\StringManipulation.cs" />
74-
<Compile Include="Program.cs" />
75-
<Compile Include="Properties\AssemblyInfo.cs" />
76-
<Compile Include="Recording\Recording32BitBenchmark.cs" />
77-
<Compile Include="WithMemoryDiagnosisConfig.cs" />
78-
</ItemGroup>
79-
<ItemGroup>
80-
<None Include="App.config" />
81-
<None Include="packages.config" />
11+
12+
<ItemGroup Condition="'$(TargetFramework)' == 'net47'">
13+
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows">
14+
<Version>0.10.6</Version>
15+
</PackageReference>
8216
</ItemGroup>
17+
8318
<ItemGroup>
84-
<ProjectReference Include="..\HdrHistogram\HdrHistogram.csproj">
85-
<Project>{655d9c4c-5bbd-4494-9828-ae427a1ddd01}</Project>
86-
<Name>HdrHistogram</Name>
87-
</ProjectReference>
19+
<ProjectReference Include="..\HdrHistogram\HdrHistogram.csproj" />
8820
</ItemGroup>
89-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
90-
<Import Project="..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets" Condition="Exists('..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" />
91-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
92-
<PropertyGroup>
93-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
94-
</PropertyGroup>
95-
<Error Condition="!Exists('..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets'))" />
96-
</Target>
97-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
98-
Other similar extension points exist, see Microsoft.Common.targets.
99-
<Target Name="BeforeBuild">
100-
</Target>
101-
<Target Name="AfterBuild">
102-
</Target>
103-
-->
21+
10422
</Project>

‎src/HdrHistogram.Benchmarking/Program.cs‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,30 @@
11
using BenchmarkDotNet.Running;
2+
using BenchmarkDotNet.Jobs;
3+
using BenchmarkDotNet.Diagnosers;
4+
using BenchmarkDotNet.Configs;
5+
using BenchmarkDotNet.Environments;
26

37
namespace HdrHistogram.Benchmarking
48
{
59
class Program
610
{
711
static void Main(string[] args)
812
{
13+
var manualConfig = ManualConfig.Create(DefaultConfig.Instance);
14+
manualConfig.Add(new MemoryDiagnoser());
15+
//manualConfig.Add(new BenchmarkDotNet.Diagnostics.Windows.InliningDiagnoser());
16+
//manualConfig.Add(HardwareCounter.BranchMispredictions, HardwareCounter.BranchInstructions);
17+
var config = manualConfig
18+
.With(Job.Clr.With(Jit.LegacyJit))
19+
.With(Job.Clr.With(Jit.RyuJit))
20+
.With(Job.Core.With(Jit.RyuJit));
21+
922
var switcher = new BenchmarkSwitcher(new[] {
1023
typeof(LeadingZeroCount.LeadingZeroCount64BitBenchmark),
1124
typeof(LeadingZeroCount.LeadingZeroCount32BitBenchmark),
1225
typeof(Recording.Recording32BitBenchmark),
1326
});
14-
switcher.Run(args);
27+
switcher.Run(args, config);
1528
}
1629
}
1730
}

‎src/HdrHistogram.Benchmarking/Properties/AssemblyInfo.cs‎

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

‎src/HdrHistogram.Benchmarking/Recording/Recording32BitBenchmark.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
namespace HdrHistogram.Benchmarking.Recording
55
{
6-
[Config(typeof(ExhuastiveJobWithMemoryDiagnosisConfig))]
76
public class Recording32BitBenchmark
87
{
98
private readonly long[] _testValues;

‎src/HdrHistogram.Benchmarking/WithMemoryDiagnosisConfig.cs‎

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

‎src/HdrHistogram.Benchmarking/packages.config‎

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

‎src/HdrHistogram.Examples/HdrHistogram.Examples.csproj‎

Lines changed: 6 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{E210C748-4792-4658-9345-CC073C29EC0B}</ProjectGuid>
94
<OutputType>Exe</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>HdrHistogram.Examples</RootNamespace>
12-
<AssemblyName>HdrHistogram.Examples</AssemblyName>
13-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>
15-
</TargetFrameworkProfile>
16-
<FileAlignment>512</FileAlignment>
5+
<TargetFramework>netcoreapp1.1</TargetFramework>
176
</PropertyGroup>
18-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
19-
<DebugSymbols>true</DebugSymbols>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<DebugType>full</DebugType>
23-
<PlatformTarget>AnyCPU</PlatformTarget>
24-
<ErrorReport>prompt</ErrorReport>
25-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
26-
<Prefer32Bit>false</Prefer32Bit>
27-
</PropertyGroup>
28-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<Optimize>true</Optimize>
32-
<DebugType>pdbonly</DebugType>
33-
<PlatformTarget>AnyCPU</PlatformTarget>
34-
<ErrorReport>prompt</ErrorReport>
35-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
36-
<Prefer32Bit>false</Prefer32Bit>
37-
</PropertyGroup>
38-
<ItemGroup>
39-
<Reference Include="System" />
40-
<Reference Include="System.Data" />
41-
<Reference Include="System.Xml" />
42-
</ItemGroup>
43-
<ItemGroup>
44-
<Compile Include="Program.cs" />
45-
<Compile Include="Properties\AssemblyInfo.cs" />
46-
<Compile Include="RecorderExample.cs" />
47-
<Compile Include="SimpleHistogramExample.cs" />
48-
<Compile Include="SocketTester.cs" />
49-
</ItemGroup>
50-
<ItemGroup>
51-
<None Include="app.config" />
52-
</ItemGroup>
7+
538
<ItemGroup>
54-
<ProjectReference Include="..\HdrHistogram\HdrHistogram.csproj">
55-
<Project>{655d9c4c-5bbd-4494-9828-ae427a1ddd01}</Project>
56-
<Name>HdrHistogram</Name>
57-
</ProjectReference>
9+
<ProjectReference Include="..\HdrHistogram\HdrHistogram.csproj" />
5810
</ItemGroup>
59-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
60-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
61-
Other similar extension points exist, see Microsoft.Common.targets.
62-
<Target Name="BeforeBuild">
63-
</Target>
64-
<Target Name="AfterBuild">
65-
</Target>
66-
-->
11+
6712
</Project>

0 commit comments

Comments
 (0)