From 6b7e31f9f3cfb8c00fdeaad13e899287dd3ec597 Mon Sep 17 00:00:00 2001
From: Lee Campbell <lee.ryan.campbell@gmail.com>
Date: Sat, 11 Feb 2017 11:19:16 +0800
Subject: [PATCH 1/2] @alhardy #17 HdrHistogram targeting .NET Standard, nunit
 and example project changed to .net core

---
 .gitignore                                    |   9 +-
 HdrHistogram.sln                              |  59 ++++
 HdrHistogram.snk                              | Bin 0 -> 596 bytes
 build.cmd                                     |   5 +
 build/HdrHistogram.nuspec                     |  19 -
 build/build.cmd                               |   5 -
 build/build.ps1                               | 325 ++++--------------
 build/psake.psd1                              |  31 ++
 build/psake.psm1                              | 284 +++++++++------
 global.json                                   |   6 +
 .../ExhuastiveJobWithMemoryDiagnosisConfig.cs |  29 +-
 .../HdrHistogram.Benchmarking.csproj          | 104 ------
 .../HdrHistogram.Benchmarking.xproj           |  19 +
 .../WithMemoryDiagnosisConfig.cs              |   2 +-
 src/HdrHistogram.Benchmarking/project.json    |  25 ++
 .../HdrHistogram.Examples.xproj               |  19 +
 .../SimpleHistogramExample.cs                 |   4 +-
 src/HdrHistogram.Examples/SocketTester.cs     |   2 +-
 src/HdrHistogram.Examples/project.json        |  33 ++
 .../HdrHistogram.UnitTests.csproj             | 143 --------
 src/HdrHistogram.UnitTests/app.config         |   3 -
 src/HdrHistogram.UnitTests/packages.config    |   4 -
 src/HdrHistogram.sln                          |  59 ----
 src/HdrHistogram/HdrHistogram.csproj          | 110 ------
 src/HdrHistogram/HdrHistogram.xproj           |  21 ++
 src/HdrHistogram/HistogramBase.cs             |   2 +-
 src/HdrHistogram/IRecorder.cs                 |   2 +-
 src/HdrHistogram/Recorder.cs                  |   2 +-
 src/HdrHistogram/Utilities/AtomicIntArray.cs  |   6 +-
 src/HdrHistogram/Utilities/AtomicLongArray.cs |   6 +-
 src/HdrHistogram/Utilities/Bitwise.cs         |  13 +-
 .../Utilities/WriterReaderPhaser.cs           |   6 +-
 src/HdrHistogram/project.json                 |  36 ++
 .../ConcurrentHistogramTestBase.cs            |   0
 .../HdrHistogram.UnitTests.xproj              |  22 ++
 .../HgrmPercentileDistrubutionOutputTests.cs  |   3 +-
 .../HdrHistogram.UnitTests/HistogramAssert.cs |   0
 .../HistogramEncodingTestBase.cs              |   0
 .../HistogramFactoryTests.cs                  |   0
 .../HistogramIterationValueComparer.cs        |   0
 .../HistogramTestBase.cs                      |   0
 .../IntConcurrentHistogramTests.cs            |   0
 .../IntHistogramEncodingTests.cs              |   0
 .../IntHistogramTests.cs                      |   0
 .../LongConcurrentHistogramTests.cs           |   0
 .../LongHistogramEncodingTests.cs             |   0
 .../LongHistogramTests.cs                     |   0
 .../HdrHistogram.UnitTests/MathEx.cs          |   0
 .../Persistence/HistogramLogExtensions.cs     |   0
 .../HistogramLogReaderWriterTestBase.cs       |   3 +-
 ...ConcurrentHistogramLogReaderWriterTests.cs |   0
 .../IntHistogramLogReaderWriterTests.cs       |   0
 ...ConcurrentHistogramLogReaderWriterTests.cs |   0
 .../LongHistogramLogReaderWriterTests.cs      |   0
 .../ShortHistogramLogReaderWriterTests.cs     |   0
 .../Persistence/TestCaseGenerator.cs          |   0
 .../Properties/AssemblyInfo.cs                |   0
 .../RecorderTestWithIntConcurrentHistogram.cs |   0
 .../Recording/RecorderTestWithIntHistogram.cs |   0
 ...RecorderTestWithLongConcurrentHistogram.cs |   0
 .../RecorderTestWithLongHistogram.cs          |   0
 .../RecorderTestWithShortHistogram.cs         |   0
 .../Recording/RecorderTestsBase.cs            |   0
 .../Resources/IsLastValueBug.hgrm             |   0
 ...icksPerHour_asMs_10percPerHalfDistance.csv |   0
 ...cksPerHour_asMs_10percPerHalfDistance.hgrm |   0
 ...icksPerHour_asMs_20percPerHalfDistance.csv |   0
 ...cksPerHour_asMs_20percPerHalfDistance.hgrm |   0
 ...TicksPerHour_asMs_5percPerHalfDistance.csv |   0
 ...icksPerHour_asMs_5percPerHalfDistance.hgrm |   0
 ...icksPerHour_asMs_10percPerHalfDistance.csv |   0
 ...cksPerHour_asMs_10percPerHalfDistance.hgrm |   0
 ...icksPerHour_asMs_20percPerHalfDistance.csv |   0
 ...cksPerHour_asMs_20percPerHalfDistance.hgrm |   0
 ...TicksPerHour_asMs_5percPerHalfDistance.csv |   0
 ...icksPerHour_asMs_5percPerHalfDistance.hgrm |   0
 ...icksPerHour_asMs_10percPerHalfDistance.csv |   0
 ...cksPerHour_asMs_10percPerHalfDistance.hgrm |   0
 ...icksPerHour_asMs_20percPerHalfDistance.csv |   0
 ...cksPerHour_asMs_20percPerHalfDistance.hgrm |   0
 ...TicksPerHour_asMs_5percPerHalfDistance.csv |   0
 ...icksPerHour_asMs_5percPerHalfDistance.hgrm |   0
 ...icksPerHour_asMs_10percPerHalfDistance.csv |   0
 ...cksPerHour_asMs_10percPerHalfDistance.hgrm |   0
 ...icksPerHour_asMs_20percPerHalfDistance.csv |   0
 ...cksPerHour_asMs_20percPerHalfDistance.hgrm |   0
 ...TicksPerHour_asMs_5percPerHalfDistance.csv |   0
 ...icksPerHour_asMs_5percPerHalfDistance.hgrm |   0
 ...icksPerHour_asMs_10percPerHalfDistance.csv |   0
 ...cksPerHour_asMs_10percPerHalfDistance.hgrm |   0
 ...icksPerHour_asMs_20percPerHalfDistance.csv |   0
 ...cksPerHour_asMs_20percPerHalfDistance.hgrm |   0
 ...TicksPerHour_asMs_5percPerHalfDistance.csv |   0
 ...icksPerHour_asMs_5percPerHalfDistance.hgrm |   0
 .../Resources/jHiccup-2.0.1.logV0.hlog        |   0
 .../Resources/jHiccup-2.0.6.logV1.hlog        |   0
 .../Resources/jHiccup-2.0.7S.logV2.hlog       |   0
 .../Resources/tagged-Log.logV2.hlog           |   0
 .../Resources/ycsb.logV1.hlog                 |   0
 .../ShortHistogramEncodingTests.cs            |   0
 .../ShortHistogramTests.cs                    |   0
 .../HdrHistogram.UnitTests/TimeStampTests.cs  |   0
 test/HdrHistogram.UnitTests/project.json      |  33 ++
 103 files changed, 609 insertions(+), 845 deletions(-)
 create mode 100644 HdrHistogram.sln
 create mode 100644 HdrHistogram.snk
 create mode 100644 build.cmd
 delete mode 100644 build/HdrHistogram.nuspec
 delete mode 100644 build/build.cmd
 create mode 100644 build/psake.psd1
 create mode 100644 global.json
 delete mode 100644 src/HdrHistogram.Benchmarking/HdrHistogram.Benchmarking.csproj
 create mode 100644 src/HdrHistogram.Benchmarking/HdrHistogram.Benchmarking.xproj
 create mode 100644 src/HdrHistogram.Benchmarking/project.json
 create mode 100644 src/HdrHistogram.Examples/HdrHistogram.Examples.xproj
 create mode 100644 src/HdrHistogram.Examples/project.json
 delete mode 100644 src/HdrHistogram.UnitTests/HdrHistogram.UnitTests.csproj
 delete mode 100644 src/HdrHistogram.UnitTests/app.config
 delete mode 100644 src/HdrHistogram.UnitTests/packages.config
 delete mode 100644 src/HdrHistogram.sln
 delete mode 100644 src/HdrHistogram/HdrHistogram.csproj
 create mode 100644 src/HdrHistogram/HdrHistogram.xproj
 create mode 100644 src/HdrHistogram/project.json
 rename {src => test}/HdrHistogram.UnitTests/ConcurrentHistogramTestBase.cs (100%)
 create mode 100644 test/HdrHistogram.UnitTests/HdrHistogram.UnitTests.xproj
 rename {src => test}/HdrHistogram.UnitTests/HgrmPercentileDistrubutionOutputTests.cs (98%)
 rename {src => test}/HdrHistogram.UnitTests/HistogramAssert.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/HistogramEncodingTestBase.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/HistogramFactoryTests.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/HistogramIterationValueComparer.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/HistogramTestBase.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/IntConcurrentHistogramTests.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/IntHistogramEncodingTests.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/IntHistogramTests.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/LongConcurrentHistogramTests.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/LongHistogramEncodingTests.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/LongHistogramTests.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/MathEx.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/Persistence/HistogramLogExtensions.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/Persistence/HistogramLogReaderWriterTestBase.cs (99%)
 rename {src => test}/HdrHistogram.UnitTests/Persistence/IntConcurrentHistogramLogReaderWriterTests.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/Persistence/IntHistogramLogReaderWriterTests.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/Persistence/LongConcurrentHistogramLogReaderWriterTests.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/Persistence/LongHistogramLogReaderWriterTests.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/Persistence/ShortHistogramLogReaderWriterTests.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/Persistence/TestCaseGenerator.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/Properties/AssemblyInfo.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/Recording/RecorderTestWithIntConcurrentHistogram.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/Recording/RecorderTestWithIntHistogram.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/Recording/RecorderTestWithLongConcurrentHistogram.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/Recording/RecorderTestWithLongHistogram.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/Recording/RecorderTestWithShortHistogram.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/Recording/RecorderTestsBase.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/IsLastValueBug.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_10percPerHalfDistance.csv (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_20percPerHalfDistance.csv (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_5percPerHalfDistance.csv (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_10percPerHalfDistance.csv (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_20percPerHalfDistance.csv (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_5percPerHalfDistance.csv (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_10percPerHalfDistance.csv (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_20percPerHalfDistance.csv (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_5percPerHalfDistance.csv (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_10percPerHalfDistance.csv (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_20percPerHalfDistance.csv (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_5percPerHalfDistance.csv (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_10percPerHalfDistance.csv (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_20percPerHalfDistance.csv (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_5percPerHalfDistance.csv (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/jHiccup-2.0.1.logV0.hlog (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/jHiccup-2.0.6.logV1.hlog (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/jHiccup-2.0.7S.logV2.hlog (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/tagged-Log.logV2.hlog (100%)
 rename {src => test}/HdrHistogram.UnitTests/Resources/ycsb.logV1.hlog (100%)
 rename {src => test}/HdrHistogram.UnitTests/ShortHistogramEncodingTests.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/ShortHistogramTests.cs (100%)
 rename {src => test}/HdrHistogram.UnitTests/TimeStampTests.cs (100%)
 create mode 100644 test/HdrHistogram.UnitTests/project.json

diff --git a/.gitignore b/.gitignore
index 25bb5f0..498e8da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,8 +91,7 @@ csx
 *.build.csdef
 
 # Others
-[Bb]in
-[Oo]bj
+.vs/
 sql
 TestResults
 [Tt]est[Rr]esult*
@@ -109,4 +108,10 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 
+#Tools and packages
+.nuget
+packages
+packages/*
+*.lock.json
+
 Thumbs.db
\ No newline at end of file
diff --git a/HdrHistogram.sln b/HdrHistogram.sln
new file mode 100644
index 0000000..226c474
--- /dev/null
+++ b/HdrHistogram.sln
@@ -0,0 +1,59 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F2800CBA-6CFC-45FE-AA8F-25E4FF912E41}"
+	ProjectSection(SolutionItems) = preProject
+		..\global.json = ..\global.json
+		..\LICENSE.txt = ..\LICENSE.txt
+		..\README.md = ..\README.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{48A302F0-0D3C-4616-B4D0-7B64CE75AB1D}"
+	ProjectSection(SolutionItems) = preProject
+		..\build.cmd = ..\build.cmd
+		..\scripts\default.ps1 = ..\scripts\default.ps1
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D3EBE9D9-B40D-4D2F-B76D-16A34FB09A94}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HdrHistogram", "src\HdrHistogram\HdrHistogram.xproj", "{DFBAE224-AF34-4D34-B788-8D9B61009A1F}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HdrHistogram.Examples", "src\HdrHistogram.Examples\HdrHistogram.Examples.xproj", "{8E9AF44F-38EC-43BA-B9F0-06D33E214AA5}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HdrHistogram.UnitTests", "test\HdrHistogram.UnitTests\HdrHistogram.UnitTests.xproj", "{2C6B7BF1-4EB2-4A46-A389-23EADFED543B}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HdrHistogram.Benchmarking", "src\HdrHistogram.Benchmarking\HdrHistogram.Benchmarking.xproj", "{B6820B91-7588-4F26-9551-853446A22CC5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DFBAE224-AF34-4D34-B788-8D9B61009A1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFBAE224-AF34-4D34-B788-8D9B61009A1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFBAE224-AF34-4D34-B788-8D9B61009A1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DFBAE224-AF34-4D34-B788-8D9B61009A1F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E9AF44F-38EC-43BA-B9F0-06D33E214AA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E9AF44F-38EC-43BA-B9F0-06D33E214AA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E9AF44F-38EC-43BA-B9F0-06D33E214AA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E9AF44F-38EC-43BA-B9F0-06D33E214AA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C6B7BF1-4EB2-4A46-A389-23EADFED543B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C6B7BF1-4EB2-4A46-A389-23EADFED543B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C6B7BF1-4EB2-4A46-A389-23EADFED543B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C6B7BF1-4EB2-4A46-A389-23EADFED543B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6820B91-7588-4F26-9551-853446A22CC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6820B91-7588-4F26-9551-853446A22CC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6820B91-7588-4F26-9551-853446A22CC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6820B91-7588-4F26-9551-853446A22CC5}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{2C6B7BF1-4EB2-4A46-A389-23EADFED543B} = {D3EBE9D9-B40D-4D2F-B76D-16A34FB09A94}
+		{B6820B91-7588-4F26-9551-853446A22CC5} = {D3EBE9D9-B40D-4D2F-B76D-16A34FB09A94}
+	EndGlobalSection
+EndGlobal
diff --git a/HdrHistogram.snk b/HdrHistogram.snk
new file mode 100644
index 0000000000000000000000000000000000000000..412e72d60648fe8ce2b9b6542e8224f9992048fb
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098AL}`?W6xZW(Nha&|D6~PfFbv;@WII<M
zln#g35)zdpwNQA51x%Ti*WaG$+hyO{6@{c4rnI~oj+9Mv>S%buy_pHbQ+R+EU-~AW
zp91al_Af$?>(|(2r3{d?-1nLdvvvS!za#k0j3B{0b1nQP-l9o{W$~!>K((YZ*#7NV
zc5i$W`gt!+bnVlbtH}PyN7UrNnDMHV*ADb`i%y4t`|osxAmG|td&6KK)p6E_edEhj
zC3R~Z7vE)*#O(3wiIP2Wi#fP1UnxjLfP-0oVZfaU6zpkveAKH}VT!koc<fww(Ej!z
zw`$xPjt!O=bJlxX*?NG1))*mVjo15GJ!RP8Jc~zFt%Fg>?V6n+1u~=yY@isi@;Js-
zTx(5tDffQV`ziebi(0-7vcOOOY_t4X6$pA0VGM65^vH(s12=T?%bx`%6!SGeu(j}_
zV8q#E%&k8_r)%EwKv0?<fZK(JyU5k<F6?XZIn$8qYe<v2FP_apjeFlx4hMbP^^h2B
zYqvGGJYocLLWaNCR^6tUdxw$84UgjWHiD<cr_QMS;MBSS(+Y+e-b?~q^UY$Ry#Jw4
zSa*$n7{c%oY~<~)Y%}fhCdyc9TGYN#cUxXA+>L_U(+|e0%U+<9kdF>i<Vq8#w|=Yb
z6qrGNH{*6xfO_GLwQMOvwJD1i6}^?RYws-Kh!H32?D3R~n{_lzplBg1NeLB-REjYN
iI&09UOW`xq>(?fqA9#>QbrwZ6fQHXpO*|UZ4;lzwzAC2x

literal 0
HcmV?d00001

diff --git a/build.cmd b/build.cmd
new file mode 100644
index 0000000..fa91d82
--- /dev/null
+++ b/build.cmd
@@ -0,0 +1,5 @@
+@echo off
+cd %~dp0
+
+:: Get Psake to Return Non-Zero Return Code on Build Failure (https://github.com/psake/psake/issues/58)
+@powershell -NoProfile -ExecutionPolicy unrestricted -command "&{ Import-Module .\build\psake.psm1;	Invoke-Psake .\build\build.ps1 -taskList Test,Package -properties @{'semver'='1.0.0-local'} ; exit !($psake.build_success) }"
\ No newline at end of file
diff --git a/build/HdrHistogram.nuspec b/build/HdrHistogram.nuspec
deleted file mode 100644
index 72df786..0000000
--- a/build/HdrHistogram.nuspec
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>HdrHistogram</id>
-    <version></version>
-    <title>HdrHistogram</title>
-    <description>HdrHistogram supports low latency recording and analyzing of sampled data value counts across a configurable integer value range with configurable value precision within the range.</description>
-    <authors>Gil Tene, Lee Campbell</authors>
-    <language>en-US</language>
-    <owners>Lee Campbell</owners>
-    <projectUrl>https://github.com/HdrHistogram/HdrHistogram.NET</projectUrl>
-    <licenseUrl>https://raw.githubusercontent.com/HdrHistogram/HdrHistogram.NET/master/LICENSE.txt</licenseUrl>
-    <iconUrl>http://hdrhistogram.github.io/HdrHistogram.NET/HdrHistogram-icon-64x64.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <releaseNotes>HdrHistogram for .NET. API is.NET idiomatic, available as nuget, with API documentationa and debug symbols.</releaseNotes>
-    <copyright>Copyright 2016</copyright>
-    <tags>HdrHistogram HdrHistogram.NET Histogram Instrumentation</tags>
-  </metadata>
-</package>
\ No newline at end of file
diff --git a/build/build.cmd b/build/build.cmd
deleted file mode 100644
index 2279825..0000000
--- a/build/build.cmd
+++ /dev/null
@@ -1,5 +0,0 @@
-cls
-powershell -Command "& { Start-Transcript %~dp0runbuild.txt; Import-Module %~dp0.\psake.psm1; Invoke-psake %~dp0.\build.ps1 %*; Stop-Transcript; exit !($psake.build_success); }"
-
-ECHO %ERRORLEVEL%
-EXIT /B %ERRORLEVEL%
\ No newline at end of file
diff --git a/build/build.ps1 b/build/build.ps1
index 7ce07c0..362a0bd 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -1,53 +1,38 @@
 # The bones of this build script taken from the James Newton-King's JSON.NET project (https://github.com/JamesNK/Newtonsoft.Json/blob/81103079e241fb055af2e81c51cdd56c52410fbf/Build/build.ps1)
-#  Requires PowerShell 5 (https://www.microsoft.com/en-us/download/details.aspx?id=50395)
+# They have then been heavily modified again based on Allan Hardy's (https://github.com/alhardy) work.
 #  Requires 
+#	dotnet cli tools
 #    either NuGet v3 or higher on the path -AND- local caches of the NuGet package dependencies
 #    -OR- a connection to the internet (to download NuGet and to restore packages)
 #
 #  To run, from a PowerShell console
-#    PS .\HdrHistogram.NET> Import-Module .\build\psake.psm
+#    PS .\HdrHistogram.NET> Import-Module .\build\psake.psm1
 #    PS .\HdrHistogram.NET> Invoke-psake %~dp0.\build.ps1
 #
 #  Modifications to the origin script taken from JSON.NET project are:
 #    -No dependency on 7Zip. So the binary is not checked into source control
 #    -NuGet is not in source control. We look for an installed version, else download it
-#    -Currently no support for dotNetCore so no dependency on KVM (which I think is deprecated now anyway, in favor of dotnet cli)
-#    -Only a semver* version property is set. Other Versions (assembly, file, NuGet) are inferred from this. *semver==Semantic Version see http://semver.org/
-#    -Requires PS version 5 to extract and compress archives.
 #    -Sandcastle documentation generation has been removed.
 properties { 
-  $semver = "1.0.0-beta"
-  $zipFileName = "HdrHistogram.NET$semver.zip"
-  $packageId = "HdrHistogram"
+  $semver = "1.0.0"
   $buildEnv = "local" #Or TeamCity, AppVeyor
-  $buildNuGet = $true
-  $treatWarningsAsErrors = $false
   $baseDir  = resolve-path ..
-  $buildDir = "$baseDir\Build"
-  $sourceDir = "$baseDir\Src"
-  $releaseDir = "$baseDir\Release"
+  $sourceDir = "$baseDir\src"
+  $testsDir = "$baseDir\test"
   $workingDir = "$baseDir\Working"
-  $workingSourceDir = "$workingDir\Src"
-  $signAssemblies = $true
-  $signKeyPath = "$buildDir\HdrHistogram.snk"
-  $builds = @(
-     @{Name = "HdrHistogram"; TestsName = "HdrHistogram.UnitTests"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants=""; FinalDir="Net45"; NuGetDir = "net45"; Framework="net-4.0"}
-  )
+  $workingSourceDir = "$workingDir\src"
+  $workingTestsDir = "$workingDir\test"
+  $packableProjectDirectories = @("$workingSourceDir\HdrHistogram")
+  $packageOutputDir = "$workingDir\Nuget"
+  $testOutputPath = "$workingDir\NunitTestResults.xml"
+  $localNugetPath = "$workingDir\nuget.exe"
+  $nugetDependecies = "$workingDir\packages"
+  $jsonlib= "$nugetDependecies\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll"
 }
 
-framework '4.6x86'
-
-task default -depends Test
-
-task VerifyDependencies {
-  if($PSVersionTable.PSVersion.Major -lt 5) {
-    #Compress-Archive and Expand-Archive are PS5 feature. Means we don't need a binary dependency on 7Zip or have to hand code .NET or Shell compression.
-    Write-Error "This build script requires PowerShell 5 or greater"
-  }
-}
+task default -depends Package
 
-# Ensure a clean working directory
-task Clean -depends VerifyDependencies {
+task Clean {
   Write-Host "Setting location to $baseDir"
   Set-Location $baseDir
   
@@ -59,143 +44,59 @@ task Clean -depends VerifyDependencies {
   
   Write-Host "Creating working directory $workingDir"
   New-Item -Path $workingDir -ItemType Directory
-  
-  GetNuget
 }
 
-# Build each solution, optionally signed
-task Build -depends Clean { 
+task CreateWorkingDir -depends Clean {
   Write-Host "Copying source to working source directory $workingSourceDir"
-  robocopy $sourceDir $workingSourceDir /MIR /NP /XD bin obj TestResults AppPackages $packageDirs .vs artifacts /XF *.suo *.user *.lock.json | Out-Default
-
-  Write-Host -ForegroundColor Green "Updating assembly version"
-  Write-Host
-  Update-AssemblyInfoFiles $workingSourceDir $semver
-  
-  foreach ($build in $builds) {
-    $name = $build.Name
-    if ($name -ne $null) {
-      Write-Host -ForegroundColor Green "Building " $name
-      Write-Host -ForegroundColor Green "Signed " $signAssemblies
-      Write-Host -ForegroundColor Green "Key " $signKeyPath
-
-      & $build.BuildFunction $build
-    }
-  }
-}
-
-# Optional build documentation, add files to final zip
-task Package -depends Build {
-  foreach ($build in $builds) {
-    $name = $build.TestsName
-    $finalDir = $build.FinalDir
-    
-    robocopy "$workingSourceDir\HdrHistogram\bin\Release\$finalDir" $workingDir\Package\Bin\$finalDir *.dll *.pdb *.xml /NFL /NDL /NJS /NC /NS /NP /XO /XF *.CodeAnalysisLog.xml | Out-Default
-  }
-  
-  if ($buildNuGet) {
-    New-Item -Path $workingDir\NuGet -ItemType Directory
-
-    $nuspecPath = "$workingDir\NuGet\HdrHistogram.nuspec"
-    Copy-Item -Path "$buildDir\HdrHistogram.nuspec" -Destination $nuspecPath -recurse
-
-    Write-Host "Updating nuspec file at $nuspecPath" -ForegroundColor Green
-    Write-Host
-
-    $xml = [xml](Get-Content $nuspecPath)
-    Edit-XmlNodes -doc $xml -xpath "//*[local-name() = 'id']" -value $packageId
-    Edit-XmlNodes -doc $xml -xpath "//*[local-name() = 'version']" -value $semver
-
-    Write-Host $xml.OuterXml
-
-    $xml.save($nuspecPath)
-    
-    Write-Host "Copying build artefacts to NuGet target structure" -ForegroundColor Green
-    foreach ($build in $builds) {
-      if ($build.NuGetDir) {
-        $name = $build.TestsName
-        $finalDir = $build.FinalDir
-        $frameworkDirs = $build.NuGetDir.Split(",")
-        
-        foreach ($frameworkDir in $frameworkDirs) {
-          $artefactSource = "$workingSourceDir\HdrHistogram\bin\Release\$finalDir"
-          $artefactTarget = "$workingDir\NuGet\lib\$frameworkDir"
-      
-          Write-Host "Copying build artefacts from '$artefactSource' to '$artefactTarget'" -ForegroundColor Green
-      
-          robocopy $artefactSource $artefactTarget *.dll *.pdb *.xml /NFL /NDL /NJS /NC /NS /NP /XO /XF *.CodeAnalysisLog.xml | Out-Default
-        }
-      }
-    }
+  robocopy $sourceDir $workingSourceDir /MIR /NP /XD /NJH /NJS /NFL /NDL bin obj TestResults AppPackages $packageDirs .vs artifacts /XF *.suo *.user *.lock.json | Out-Default
   
-    robocopy $workingSourceDir $workingDir\NuGet\src *.cs /S /NFL /NDL /NJS /NC /NS /NP /XD obj .vs artifacts | Out-Default
-
-    Write-Host "Building NuGet package with ID $packageId and version $semver from '$nuspecPath'" -ForegroundColor Green
-    Write-Host
-    Write-Host "Using NuGet from $nugetPath"
-
-    exec { .\working\nuget.exe pack $nuspecPath -Symbols } "Error packing $nuspecPath"
-    move -Path .\*.nupkg -Destination $workingDir\NuGet
-  }
+  Write-Host "Copying tests to working test directory $workingTestsDir"
+  robocopy $testsDir $workingTestsDir /MIR /NP /XD /NJH /NJS /NFL /NDL bin obj TestResults AppPackages $packageDirs .vs artifacts /XF *.suo *.user *.lock.json | Out-Default
   
-  Copy-Item -Path $baseDir\readme.md -Destination $workingDir\Package\
-  Copy-Item -Path $baseDir\license.txt -Destination $workingDir\Package\
-
-  robocopy $workingSourceDir $workingDir\Package\Source\Src /MIR /NFL /NDL /NJS /NC /NS /NP /XD bin obj TestResults AppPackages .vs artifacts /XF *.suo *.user *.lock.json | Out-Default
-  robocopy $buildDir $workingDir\Package\Source\Build /MIR /NFL /NDL /NJS /NC /NS /NP /XF runbuild.txt | Out-Default
+  Write-Host "Copying HdrHistogram.snk to working directory"
+  Copy-Item "$baseDir\HdrHistogram.snk" $workingDir
   
-  Compress-Archive -Path "$workingDir\Package\*" -DestinationPath "$workingDir\$zipFileName"
+  Write-Host "Copying global.json to working directory"
+  Copy-Item "$baseDir\global.json" $workingDir
 }
 
-# Unzip package to a location
-task Deploy -depends Package {
-  Expand-Archive -Path "$workingDir\$zipFileName" -DestinationPath "$workingDir\Deployed"
+task Patch -depends CreateWorkingDir { 
+  Get-Nuget
+  Get-JsonNet
+  Write-Host -ForegroundColor Green "Patching semantic version number --> $semver"
+  Write-Host
+  Patch-Versions $workingSourceDir $semver
 }
 
-# Run tests on deployed files
-task Test -depends Deploy {
-  foreach ($build in $builds) {
-    if ($build.TestsFunction -ne $null) {
-      & $build.TestsFunction $build
-    }
+task Build -depends Patch { 
+  $srcProjects = Get-ChildItem "$workingDir\src\**\project.json" | foreach { $_.FullName }
+  $testProjects= Get-ChildItem "$workingDir\test\**\project.json" | foreach { $_.FullName }
+  
+  Set-Location $workingDir
+  exec { dotnet restore }
+  Set-Location $baseDir
+  
+  $srcProjects + $testProjects | foreach {
+	exec { dotnet build "$_" --configuration Release }
   }
 }
 
-function MSBuildBuild ($build) {
-  $name = $build.Name
-  $finalDir = $build.FinalDir
-  
-  Write-Host
-  Write-Host "Restoring $workingSourceDir\$name.sln" -ForegroundColor Green
-  [Environment]::SetEnvironmentVariable("EnableNuGetPackageRestore", "true", "Process")
-  exec { .\working\nuget.exe restore "$workingSourceDir\$name.sln" `
-    -verbosity detailed `
-    -configfile $workingSourceDir\nuget.config `
-    | Out-Default 
-  } "Error restoring $name"
-
-  $constants = GetConstants $build.Constants $signAssemblies
+task Test -depends Build {
+	Get-ChildItem "$workingDir\test\**\" | 
+	foreach { $_.FullName }	| 
+	foreach {
+		Write-Output "Running tests for '$_'"
+		exec { dotnet test "$_" "-result:$testOutputPath" }
+	}
+}
 
-  Write-Host
-  Write-Host "Building $workingSourceDir\$name.sln" -ForegroundColor Green
-  exec { msbuild "/t:Clean;Rebuild" `
-    /p:Configuration=Release `
-    "/p:CopyNuGetImplementations=true" `
-    "/p:Platform=Any CPU" `
-    "/p:PlatformTarget=AnyCPU" `
-    /p:OutputPath=bin\Release\$finalDir\ `
-    /p:AssemblyOriginatorKeyFile=$signKeyPath `
-    "/p:SignAssembly=$signAssemblies" `
-    "/p:TreatWarningsAsErrors=$treatWarningsAsErrors" `
-    "/p:VisualStudioVersion=14.0" `
-    /p:DefineConstants=`"$constants`" `
-    "$workingSourceDir\$name.sln" `
-    | Out-Default 
-  } "Error building $name"
+task Package -depends Build {
+	$packableProjectDirectories | foreach {
+		exec { dotnet pack "$_" --configuration Release -o "$packageOutputDir" }
+	}
 }
 
-function GetNuget () {
-  $localNugetPath = "$workingDir\nuget.exe"
+function Get-Nuget () {
   #Check for existence of Nuget.exe on path, if not there, download and install from nuget.org
   $currentNuget = (Get-Command "nuget.exe" -ErrorAction SilentlyContinue)
   if (($currentNuget -eq $null) -Or ($currentNuget.Version.Major -lt 3)) { 
@@ -214,91 +115,28 @@ function GetNuget () {
   }
 }
 
-function NUnitTests ($build) {
-  $name = $build.TestsName
-  $finalDir = $build.FinalDir
-  $framework = $build.Framework
-
-  
-
-  if ($buildEnv -eq "AppVeyor") {
-    Write-Host "Skipping Explicit NUnit test as AppVeyor should discover them and run automatically"
-  }else{
-
-    exec { .\working\nuget.exe install NUnit.ConsoleRunner -version 3.2.0 -OutputDirectory $workingSourceDir\packages }
-  
-    Write-Host -ForegroundColor Green "Copying test assembly $name to deployed directory"
-    Write-Host
-    robocopy "$workingSourceDir\HdrHistogram.UnitTests\bin\Release\$finalDir" $workingDir\Deployed\Bin\$finalDir /MIR /NFL /NDL /NJS /NC /NS /NP /XO | Out-Default
-
-    Copy-Item -Path "$workingSourceDir\HdrHistogram.UnitTests\bin\Release\$finalDir\HdrHistogram.UnitTests.dll" -Destination $workingDir\Deployed\Bin\$finalDir\
-
-    Write-Host -ForegroundColor Green "Running NUnit tests '$name' for '$buildEnv' build platform"
-    Write-Host
-    $nUnitPath = "$workingSourceDir\packages\NUnit.ConsoleRunner.3.2.0\tools\nunit3-console.exe"  
-
-    $flag = ""
-    if ($buildEnv -eq "TeamCity") {
-      $flag = "--teamcity"
-    }
-
-    exec { .\working\src\packages\NUnit.ConsoleRunner.3.2.0\tools\nunit3-console.exe `
-      $workingDir\Deployed\Bin\$finalDir\HdrHistogram.UnitTests.dll `
-      --framework=$framework `
-      $flag `
-      | Out-Default 
-    } "Error running $name tests"
-  }
-}
-
-function GetConstants ($constants, $includeSigned) {
-  $signed = switch($includeSigned) { $true { ";SIGNED" } default { "" } }
-
-  return "CODE_ANALYSIS;TRACE;$constants$signed"
+function Get-JsonNet() {
+	& "$localNugetPath" install newtonsoft.json -Version 9.0.1 -ExcludeVersion -o $nugetDependecies
 }
 
-function Update-AssemblyInfoFiles ([string] $workingSourceDir, [string]$semver) {
-  $majorMinor = GetMajorMinor($semver)
-  $majorMinorPatch = GetMajorMinorPatch($semver)
-  $assemblyVersionNumber = "$majorMinor.0.0"
-  $fileVersionNumber = "$majorMinorPatch.0"
-  $assemblyVersionPattern = 'AssemblyVersion\("[0-9]+(\.([0-9]+|\*)){1,3}"\)'
-  $fileVersionPattern = 'AssemblyFileVersion\("[0-9]+(\.([0-9]+|\*)){1,3}"\)'
-  $assemblyVersion = 'AssemblyVersion("' + $assemblyVersionNumber + '")';
-  $fileVersion = 'AssemblyFileVersion("' + $fileVersionNumber + '")';
-    
-  Get-ChildItem -Path $workingSourceDir -r -filter AssemblyInfo.cs | ForEach-Object {
-    $filename = $_.Directory.ToString() + '\' + $_.Name
-    Write-Host $filename + ' -> ' + $fileVersionNumber
-    
-    (Get-Content $filename) | ForEach-Object {
-        % {$_ -replace $assemblyVersionPattern, $assemblyVersion } |
-        % {$_ -replace $fileVersionPattern, $fileVersion }
-    } | Set-Content $filename
-  }
-}
-
-function Edit-XmlNodes {
-  param (
-      [xml] $doc,
-      [string] $xpath = $(throw "xpath is a required parameter"),
-      [string] $value = $(throw "value is a required parameter")
-  )
-    
-  $nodes = $doc.SelectNodes($xpath)
-  $count = $nodes.Count
-
-  Write-Host "Found $count nodes with path '$xpath'"
-    
-  foreach ($node in $nodes) {
-    if ($node -ne $null) {
-      if ($node.NodeType -eq "Element") {
-          $node.InnerXml = $value
-      } else {
-          $node.Value = $value
-      }
-    }
-  }
+#HACK While we wait for `dotnet pack` to support setting the version, not just "bizzarely" the version-suffix. -LC
+# https://github.com/dotnet/cli/issues/5568
+function Patch-Versions ([string] $workingSourceDir, [string]$semver) {
+	[Reflection.Assembly]::LoadFile($jsonlib) | out-null
+	
+	$packableProjectDirectories | foreach {
+		Write-Host "Patching project.json"
+		
+		$json = (Get-Content "$_\project.json" | Out-String)
+		$config = [Newtonsoft.Json.Linq.JObject]::Parse($json)
+		$version = $config.Item("version").ToString()
+		$config.Item("version") = New-Object -TypeName Newtonsoft.Json.Linq.JValue -ArgumentList "$semver"
+
+		$config.ToString() | Out-File "$_\project.json"
+		
+		$after = (Get-Content "$_\project.json" | Out-String)
+		Write-Host $after
+	}
 }
 
 function Execute-Command ($command) {
@@ -319,21 +157,4 @@ function Execute-Command ($command) {
       $currentRetry = $currentRetry + 1
     }
   } while (!$success)
-}
-
-function GetMajorMinorPatch ([string] $semver) {
-  $semverPattern = '(?<major>[0-9]+)\.(?<minor>[0-9]+)\.(?<patch>[0-9]+)(-(?<label>.*))?'
-  $matches = [regex]::matches($semver, $semverPattern)
-  $major = $matches.captures.groups['major'].Value;
-  $minor = $matches.captures.groups['minor'].Value;
-  $patch = $matches.captures.groups['patch'].Value;
-  return "$major.$minor.$patch";
-}
-
-function GetMajorMinor ([string] $semver) {
-  $semverPattern = '(?<major>[0-9]+)\.(?<minor>[0-9]+)\.(?<patch>[0-9]+)(-(?<label>.*))?'
-  $matches = [regex]::matches($semver, $semverPattern)
-  $major = $matches.captures.groups['major'].Value;
-  $minor = $matches.captures.groups['minor'].Value;
-  return "$major.$minor";
 }
\ No newline at end of file
diff --git a/build/psake.psd1 b/build/psake.psd1
new file mode 100644
index 0000000..7e00532
--- /dev/null
+++ b/build/psake.psd1
@@ -0,0 +1,31 @@
+@{
+    ModuleToProcess   = 'psake.psm1'
+    ModuleVersion     = '4.6.0'
+    GUID              = 'cfb53216-072f-4a46-8975-ff7e6bda05a5'
+    Author            = 'James Kovacs'
+    Copyright         = 'Copyright (c) 2012-16 James Kovacs, Damian Hickey and Contributors'
+    PowerShellVersion = '2.0'
+    Description       = 'psake is a build automation tool written in PowerShell.'
+    FunctionsToExport = @('Invoke-psake',
+                          'Invoke-Task',
+                          'Get-PSakeScriptTasks', 
+                          'Task',
+                          'Properties',
+                          'Include',
+                          'FormatTaskName',
+                          'TaskSetup',
+                          'TaskTearDown',
+                          'Framework',
+                          'Assert',
+                          'Exec')
+    VariablesToExport = 'psake'
+
+    PrivateData = @{
+        PSData = @{
+            LicenseUri = 'https://github.com/psake/psake/blob/master/license.txt'
+            ProjectUri = 'https://github.com/psake/psake'
+            Tags     = @('Build', 'Task')
+            IconUri  = 'https://raw.githubusercontent.com/psake/graphics/master/jpg/psake-full-icon-teal-bg-256x256.jpg'
+        }
+    }
+}
diff --git a/build/psake.psm1 b/build/psake.psm1
index 74be70c..e5f8f3c 100644
--- a/build/psake.psm1
+++ b/build/psake.psm1
@@ -20,6 +20,15 @@
 
 #Requires -Version 2.0
 
+if ($PSVersionTable.PSVersion.Major -ge 3)
+{
+    $script:IgnoreError = 'Ignore'
+}
+else
+{
+    $script:IgnoreError = 'SilentlyContinue'
+}
+
 #-- Public Module Functions --#
 
 # .ExternalHelp  psake.psm1-help.xml
@@ -200,9 +209,7 @@ function Task
         [Parameter(Position=7,Mandatory=0)][string[]]$depends = @(),
         [Parameter(Position=8,Mandatory=0)][string[]]$requiredVariables = @(),
         [Parameter(Position=9,Mandatory=0)][string]$description = $null,
-        [Parameter(Position=10,Mandatory=0)][string]$alias = $null,
-        [Parameter(Position=11,Mandatory=0)][string]$maxRetries = 0,
-        [Parameter(Position=12,Mandatory=0)][string]$retryTriggerErrorPattern = $null
+        [Parameter(Position=10,Mandatory=0)][string]$alias = $null
     )
     if ($name -eq 'default') {
         Assert (!$action) ($msgs.error_default_task_cannot_have_action)
@@ -221,8 +228,6 @@ function Task
         Duration = [System.TimeSpan]::Zero
         RequiredVariables = $requiredVariables
         Alias = $alias
-        MaxRetries = $maxRetries
-        RetryTriggerErrorPattern = $retryTriggerErrorPattern
     }
 
     $taskKey = $name.ToLower()
@@ -299,6 +304,30 @@ function Framework {
     ConfigureBuildEnvironment
 }
 
+# .ExternalHelp  psake.psm1-help.xml
+function Get-PSakeScriptTasks {
+    [CmdletBinding()]
+    param(
+        [Parameter(Position = 0, Mandatory = 0)][string] $buildFile
+    )
+
+    if (!$buildFile) {
+        $buildFile = $psake.config_default.buildFileName
+    }
+
+    try
+    {
+        ExecuteInBuildFileScope $buildFile $MyInvocation.MyCommand.Module {
+            param($currentContext, $module)
+            return GetTasksFromContext $currentContext
+        }
+
+    } finally {
+
+        CleanupEnvironment
+    }
+}
+
 # .ExternalHelp  psake.psm1-help.xml
 function Invoke-psake {
     [CmdletBinding()]
@@ -311,11 +340,12 @@ function Invoke-psake {
         [Parameter(Position = 5, Mandatory = 0)][hashtable] $properties = @{},
         [Parameter(Position = 6, Mandatory = 0)][alias("init")][scriptblock] $initialization = {},
         [Parameter(Position = 7, Mandatory = 0)][switch] $nologo = $false,
-        [Parameter(Position = 8, Mandatory = 0)][switch] $detailedDocs = $false
+        [Parameter(Position = 8, Mandatory = 0)][switch] $detailedDocs = $false,
+        [Parameter(Position = 9, Mandatory = 0)][switch] $notr = $false # disable time report
     )
     try {
         if (-not $nologo) {
-            "psake version {0}`nCopyright (c) 2010-2015 James Kovacs, Damian Hickey & Contributors`n" -f $psake.version
+            "psake version {0}`nCopyright (c) 2010-2014 James Kovacs & Contributors`n" -f $psake.version
         }
 
         if (!$buildFile) {
@@ -328,98 +358,60 @@ function Invoke-psake {
             $buildFile = $psake.config_default.buildFileName
         }
 
-        # Execute the build file to set up the tasks and defaults
-        Assert (test-path $buildFile -pathType Leaf) ($msgs.error_build_file_not_found -f $buildFile)
-
-        $psake.build_script_file = get-item $buildFile
-        $psake.build_script_dir = $psake.build_script_file.DirectoryName
-        $psake.build_success = $false
-
-        $psake.context.push(@{
-            "taskSetupScriptBlock" = {};
-            "taskTearDownScriptBlock" = {};
-            "executedTasks" = new-object System.Collections.Stack;
-            "callStack" = new-object System.Collections.Stack;
-            "originalEnvPath" = $env:path;
-            "originalDirectory" = get-location;
-            "originalErrorActionPreference" = $global:ErrorActionPreference;
-            "tasks" = @{};
-            "aliases" = @{};
-            "properties" = @();
-            "includes" = new-object System.Collections.Queue;
-            "config" = CreateConfigurationForNewContext $buildFile $framework
-        })
-
-        LoadConfiguration $psake.build_script_dir
-
-        $stopwatch = [System.Diagnostics.Stopwatch]::StartNew()
+        ExecuteInBuildFileScope $buildFile $MyInvocation.MyCommand.Module {
+            param($currentContext, $module)            
 
-        set-location $psake.build_script_dir
-
-        LoadModules
-
-        $frameworkOldValue = $framework
-        . $psake.build_script_file.FullName
-
-        $currentContext = $psake.context.Peek()
-
-        if ($framework -ne $frameworkOldValue) {
-            writecoloredoutput $msgs.warning_deprecated_framework_variable -foregroundcolor Yellow
-            $currentContext.config.framework = $framework
-        }
-
-        ConfigureBuildEnvironment
-
-        while ($currentContext.includes.Count -gt 0) {
-            $includeFilename = $currentContext.includes.Dequeue()
-            . $includeFilename
-        }
-
-        if ($docs -or $detailedDocs) {
-            WriteDocumentation($detailedDocs)
-            CleanupEnvironment
-            return
-        }
-
-        foreach ($key in $parameters.keys) {
-            if (test-path "variable:\$key") {
-                set-item -path "variable:\$key" -value $parameters.$key -WhatIf:$false -Confirm:$false | out-null
-            } else {
-                new-item -path "variable:\$key" -value $parameters.$key -WhatIf:$false -Confirm:$false | out-null
+            $stopwatch = [System.Diagnostics.Stopwatch]::StartNew()
+            
+            if ($docs -or $detailedDocs) {
+                WriteDocumentation($detailedDocs)
+                return
             }
-        }
-
-        # The initial dot (.) indicates that variables initialized/modified in the propertyBlock are available in the parent scope.
-        foreach ($propertyBlock in $currentContext.properties) {
-            . $propertyBlock
-        }
-
-        foreach ($key in $properties.keys) {
-            if (test-path "variable:\$key") {
-                set-item -path "variable:\$key" -value $properties.$key -WhatIf:$false -Confirm:$false | out-null
+            
+            foreach ($key in $parameters.keys) {
+                if (test-path "variable:\$key") {
+                    set-item -path "variable:\$key" -value $parameters.$key -WhatIf:$false -Confirm:$false | out-null
+                } else {
+                    new-item -path "variable:\$key" -value $parameters.$key -WhatIf:$false -Confirm:$false | out-null
+                }
             }
-        }
-
-        # Simple dot sourcing will not work. We have to force the script block into our
-        # module's scope in order to initialize variables properly.
-        . $MyInvocation.MyCommand.Module $initialization
-
-        # Execute the list of tasks or the default task
-        if ($taskList) {
-            foreach ($task in $taskList) {
-                invoke-task $task
+            
+            # The initial dot (.) indicates that variables initialized/modified in the propertyBlock are available in the parent scope.
+            foreach ($propertyBlock in $currentContext.properties) {
+                . $propertyBlock
+            }
+            
+            foreach ($key in $properties.keys) {
+                if (test-path "variable:\$key") {
+                    set-item -path "variable:\$key" -value $properties.$key -WhatIf:$false -Confirm:$false | out-null
+                }
+            }
+            
+            # Simple dot sourcing will not work. We have to force the script block into our
+            # module's scope in order to initialize variables properly.
+            . $module $initialization
+            
+            # Execute the list of tasks or the default task
+            if ($taskList) {
+                foreach ($task in $taskList) {
+                    invoke-task $task
+                }
+            } elseif ($currentContext.tasks.default) {
+                invoke-task default
+            } else {
+                throw $msgs.error_no_default_task
+            }
+            
+            WriteColoredOutput ("`n" + $msgs.build_success + "`n") -foregroundcolor Green
+            
+            $stopwatch.Stop()
+            if (-not $notr) {
+                WriteTaskTimeSummary $stopwatch.Elapsed
             }
-        } elseif ($currentContext.tasks.default) {
-            invoke-task default
-        } else {
-            throw $msgs.error_no_default_task
         }
 
-        WriteColoredOutput ("`n" + $msgs.build_success + "`n") -foregroundcolor Green
-
-        WriteTaskTimeSummary $stopwatch.Elapsed
-
         $psake.build_success = $true
+
     } catch {
         $currentConfig = GetCurrentConfigurationOrDefault
         if ($currentConfig.verboseError) {
@@ -584,7 +576,7 @@ function ConfigureBuildEnvironment {
             $versions = @('v4.0.30319')
             $buildToolsVersions = @('14.0', '12.0')
         }
-        '4.6' {
+        {($_ -eq '4.6') -or ($_ -eq '4.6.1')} {
             $versions = @('v4.0.30319')
             $buildToolsVersions = @('14.0')
         }
@@ -654,6 +646,57 @@ function ConfigureBuildEnvironment {
     $global:ErrorActionPreference = "Stop"
 }
 
+function ExecuteInBuildFileScope {    
+    param([string]$buildFile, $module, [scriptblock]$sb)
+    
+    # Execute the build file to set up the tasks and defaults
+    Assert (test-path $buildFile -pathType Leaf) ($msgs.error_build_file_not_found -f $buildFile)
+
+    $psake.build_script_file = get-item $buildFile
+    $psake.build_script_dir = $psake.build_script_file.DirectoryName
+    $psake.build_success = $false
+
+    $psake.context.push(@{
+        "taskSetupScriptBlock" = {};
+        "taskTearDownScriptBlock" = {};
+        "executedTasks" = new-object System.Collections.Stack;
+        "callStack" = new-object System.Collections.Stack;
+        "originalEnvPath" = $env:path;
+        "originalDirectory" = get-location;
+        "originalErrorActionPreference" = $global:ErrorActionPreference;
+        "tasks" = @{};
+        "aliases" = @{};
+        "properties" = @();
+        "includes" = new-object System.Collections.Queue;
+        "config" = CreateConfigurationForNewContext $buildFile $framework
+    })
+
+    LoadConfiguration $psake.build_script_dir
+
+    set-location $psake.build_script_dir
+
+    LoadModules
+
+    $frameworkOldValue = $framework
+    . $psake.build_script_file.FullName
+
+    $currentContext = $psake.context.Peek()
+
+    if ($framework -ne $frameworkOldValue) {
+        writecoloredoutput $msgs.warning_deprecated_framework_variable -foregroundcolor Yellow
+        $currentContext.config.framework = $framework
+    }
+
+    ConfigureBuildEnvironment
+
+    while ($currentContext.includes.Count -gt 0) {
+        $includeFilename = $currentContext.includes.Dequeue()
+        . $includeFilename
+    }
+
+    & $sb $currentContext $module
+}
+
 function CleanupEnvironment {
     if ($psake.context.Count -gt 0) {
         $currentContext = $psake.context.Peek()
@@ -752,35 +795,47 @@ function ResolveError
     }
 }
 
-function WriteDocumentation($showDetailed) {
-    $currentContext = $psake.context.Peek()
-
-    if ($currentContext.tasks.default) {
-        $defaultTaskDependencies = $currentContext.tasks.default.DependsOn
-    } else {
-        $defaultTaskDependencies = @()
-    }
+function GetTasksFromContext($currentContext) {    
 
     $docs = $currentContext.tasks.Keys | foreach-object {
-        if ($_ -eq "default") {
-            return
-        }
 
         $task = $currentContext.tasks.$_
         new-object PSObject -property @{
             Name = $task.Name;
             Alias = $task.Alias;
             Description = $task.Description;
-            "Depends On" = $task.DependsOn -join ", "
-            Default = if ($defaultTaskDependencies -contains $task.Name) { $true }
+            DependsOn = $task.DependsOn;
         }
     }
-    if ($showDetailed) {
-        $docs | sort 'Name' | format-list -property Name,Alias,Description,"Depends On",Default
+
+    return $docs
+}
+
+function WriteDocumentation($showDetailed) {
+
+    $currentContext = $psake.context.Peek()
+
+    if ($currentContext.tasks.default) {
+        $defaultTaskDependencies = $currentContext.tasks.default.DependsOn
     } else {
-        $docs | sort 'Name' | format-table -autoSize -wrap -property Name,Alias,"Depends On",Default,Description
+        $defaultTaskDependencies = @()
     }
+    
+    $docs = GetTasksFromContext $currentContext | 
+                Where   {$_.Name -ne 'default'} | 
+                ForEach {
+                    $isDefault = $null
+                    if ($defaultTaskDependencies -contains $_.Name) { 
+                        $isDefault = $true 
+                    }
+                    return Add-Member -InputObject $_ 'Default' $isDefault -PassThru
+                }
 
+    if ($showDetailed) {
+        $docs | sort 'Name' | format-list -property Name,Alias,Description,@{Label="Depends On";Expression={$_.DependsOn -join ', '}},Default
+    } else {
+        $docs | sort 'Name' | format-table -autoSize -wrap -property Name,Alias,@{Label="Depends On";Expression={$_.DependsOn -join ', '}},Default,Description
+    }
 }
 
 function WriteTaskTimeSummary($invokePsakeDuration) {
@@ -840,10 +895,15 @@ convertfrom-stringdata @'
 '@
 }
 
-import-localizeddata -bindingvariable msgs -erroraction silentlycontinue
+Import-LocalizedData -BindingVariable msgs -FileName messages.psd1 -ErrorAction $script:IgnoreError
+
+$scriptDir = Split-Path $MyInvocation.MyCommand.Path
+$manifestPath = Join-Path $scriptDir psake.psd1
+$manifest = Test-ModuleManifest -Path $manifestPath -WarningAction SilentlyContinue
 
 $script:psake = @{}
-$psake.version = "4.4.2" # contains the current version of psake
+
+$psake.version = $manifest.Version.ToString()
 $psake.context = new-object system.collections.stack # holds onto the current state of all variables
 $psake.run_by_psake_build_tester = $false # indicates that build is being run by psake-BuildTester
 $psake.config_default = new-object psobject -property @{
@@ -862,4 +922,4 @@ $psake.build_script_dir = "" # contains a string with fully-qualified path to cu
 
 LoadConfiguration
 
-export-modulemember -function Invoke-psake, Invoke-Task, Task, Properties, Include, FormatTaskName, TaskSetup, TaskTearDown, Framework, Assert, Exec -variable psake
+export-modulemember -function Invoke-psake, Invoke-Task, Get-PSakeScriptTasks, Task, Properties, Include, FormatTaskName, TaskSetup, TaskTearDown, Framework, Assert, Exec -variable psake
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..0646968
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+  "projects": [ "src" ],
+  "sdk": {
+    "version": "1.0.0-preview2-1-003177"
+  }
+}
diff --git a/src/HdrHistogram.Benchmarking/ExhuastiveJobWithMemoryDiagnosisConfig.cs b/src/HdrHistogram.Benchmarking/ExhuastiveJobWithMemoryDiagnosisConfig.cs
index 5c883c7..ed43f4e 100644
--- a/src/HdrHistogram.Benchmarking/ExhuastiveJobWithMemoryDiagnosisConfig.cs
+++ b/src/HdrHistogram.Benchmarking/ExhuastiveJobWithMemoryDiagnosisConfig.cs
@@ -1,6 +1,6 @@
-using System.Linq;
 using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Diagnostics.Windows;
+using BenchmarkDotNet.Diagnosers;
+using BenchmarkDotNet.Environments;
 using BenchmarkDotNet.Jobs;
 
 namespace HdrHistogram.Benchmarking
@@ -11,23 +11,14 @@ public ExhuastiveJobWithMemoryDiagnosisConfig()
         {
             Add(new MemoryDiagnoser());
 
-            var crossProduct = from jitter in new[] {Jit.LegacyJit, Jit.RyuJit}
-                               from platform in new[] {/*Platform.AnyCpu,*/ Platform.X64, Platform.X86}
-                               //Lets not test old/unsupported frameworks.
-                               from framework in new[] { /*Framework.V40, Framework.V45, Framework.V451, Framework.V452, Framework.V46, Framework.V461,*/ Framework.V462 } 
-                               //from toolchain in new[] {Toolchain.}
-                               //Currently the project doesn't support Core or Mono
-                               from runtime in new[] {Runtime.Clr, /*Runtime.Core , Runtime.Mono*/}
-                               //where !(runtime == Runtime.Core && (jitter == Jit.LegacyJit || platform!=Platform.X64))
-                               select new Job()
-                               {
-                                   Jit = jitter,
-                                   Platform = platform,
-                                   Framework = framework,
-                                   Runtime = runtime
-                               };
-
-            Add(crossProduct.ToArray());
+            Add(
+                Job.Dry
+                .With(Platform.X64)
+                .With(Platform.X86)
+                .With(Jit.RyuJit)
+                .With(Jit.LegacyJit)
+                .With(Runtime.Clr)
+                .WithId("ExhuastiveJobWithMemoryDiagnosis"));
         }
     }
 }
\ No newline at end of file
diff --git a/src/HdrHistogram.Benchmarking/HdrHistogram.Benchmarking.csproj b/src/HdrHistogram.Benchmarking/HdrHistogram.Benchmarking.csproj
deleted file mode 100644
index 7d34e98..0000000
--- a/src/HdrHistogram.Benchmarking/HdrHistogram.Benchmarking.csproj
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{8AAE86BE-5ABC-4902-B48B-20DCDBB93C7B}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HdrHistogram.Benchmarking</RootNamespace>
-    <AssemblyName>HdrHistogram.Benchmarking</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="BenchmarkDotNet, Version=0.9.7.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
-      <HintPath>..\packages\BenchmarkDotNet.0.9.7-beta\lib\net40\BenchmarkDotNet.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="BenchmarkDotNet.Diagnostics.Windows, Version=0.9.6.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
-      <HintPath>..\packages\BenchmarkDotNet.Diagnostics.Windows.0.9.6\lib\net40\BenchmarkDotNet.Diagnostics.Windows.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Diagnostics.Tracing.TraceEvent, Version=1.0.41.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\lib\net40\Microsoft.Diagnostics.Tracing.TraceEvent.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\HdrHistogram\Utilities\Bitwise.cs">
-      <Link>LeadingZeroCount\Bitwise.cs</Link>
-    </Compile>
-    <Compile Include="ExhuastiveJobWithMemoryDiagnosisConfig.cs" />
-    <Compile Include="LeadingZeroCount\DeBruijn128Bits.cs" />
-    <Compile Include="LeadingZeroCount\DeBruijn64Bits.cs" />
-    <Compile Include="LeadingZeroCount\IfAndShift.cs" />
-    <Compile Include="LeadingZeroCount\LeadingZeroCount32BitBenchmark.cs" />
-    <Compile Include="LeadingZeroCount\LeadingZeroCount64BitBenchmark.cs" />
-    <Compile Include="LeadingZeroCount\LeadingZeroCountBenchmarkBase.cs" />
-    <Compile Include="LeadingZeroCount\Magic32Bit.cs" />
-    <Compile Include="LeadingZeroCount\MathLog.cs" />
-    <Compile Include="LeadingZeroCount\StringManipulation.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Recording\Recording32BitBenchmark.cs" />
-    <Compile Include="WithMemoryDiagnosisConfig.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\HdrHistogram\HdrHistogram.csproj">
-      <Project>{655d9c4c-5bbd-4494-9828-ae427a1ddd01}</Project>
-      <Name>HdrHistogram</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <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')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <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>
-    </PropertyGroup>
-    <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'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/HdrHistogram.Benchmarking/HdrHistogram.Benchmarking.xproj b/src/HdrHistogram.Benchmarking/HdrHistogram.Benchmarking.xproj
new file mode 100644
index 0000000..e539a8a
--- /dev/null
+++ b/src/HdrHistogram.Benchmarking/HdrHistogram.Benchmarking.xproj
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>b6820b91-7588-4f26-9551-853446a22cc5</ProjectGuid>
+    <RootNamespace>HdrHistogram.Benchmarking</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
\ No newline at end of file
diff --git a/src/HdrHistogram.Benchmarking/WithMemoryDiagnosisConfig.cs b/src/HdrHistogram.Benchmarking/WithMemoryDiagnosisConfig.cs
index 13918ca..1432b9c 100644
--- a/src/HdrHistogram.Benchmarking/WithMemoryDiagnosisConfig.cs
+++ b/src/HdrHistogram.Benchmarking/WithMemoryDiagnosisConfig.cs
@@ -1,5 +1,5 @@
 using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Diagnostics.Windows;
+using BenchmarkDotNet.Diagnosers;
 
 namespace HdrHistogram.Benchmarking
 {
diff --git a/src/HdrHistogram.Benchmarking/project.json b/src/HdrHistogram.Benchmarking/project.json
new file mode 100644
index 0000000..9bbdc9d
--- /dev/null
+++ b/src/HdrHistogram.Benchmarking/project.json
@@ -0,0 +1,25 @@
+{
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "debugType": "portable"
+  },
+  "frameworks": {
+   "net452": {
+    "dependencies": {
+      "BenchmarkDotNet.Diagnostics.Windows": "0.10.2",
+      "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.41"
+    }
+    }
+  },
+  "dependencies": {
+    "HdrHistogram": {
+      "target": "project"
+    }
+  },
+  "runtimes": {
+    "win7-x64": {},
+    "ubuntu.14.04-x64": {},
+    "win10-x64": {}
+  },
+  "version": "1.0.0-*"
+}
diff --git a/src/HdrHistogram.Examples/HdrHistogram.Examples.xproj b/src/HdrHistogram.Examples/HdrHistogram.Examples.xproj
new file mode 100644
index 0000000..8896ae3
--- /dev/null
+++ b/src/HdrHistogram.Examples/HdrHistogram.Examples.xproj
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>8e9af44f-38ec-43ba-b9f0-06d33e214aa5</ProjectGuid>
+    <RootNamespace>HdrHistogram.Examples</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
\ No newline at end of file
diff --git a/src/HdrHistogram.Examples/SimpleHistogramExample.cs b/src/HdrHistogram.Examples/SimpleHistogramExample.cs
index 6494e47..9250930 100644
--- a/src/HdrHistogram.Examples/SimpleHistogramExample.cs
+++ b/src/HdrHistogram.Examples/SimpleHistogramExample.cs
@@ -84,13 +84,13 @@ private static void CreateAndCloseDatagramSocket()
             }
             finally
             {
-                _socket.Close();
+                _socket.Dispose();
             }
         }
 
         private static AddressFamily GetAddressFamily(string url)
         {
-            var hostIpAddress = Dns.GetHostEntry(url).AddressList[0];
+            var hostIpAddress = Dns.GetHostEntryAsync(url).GetAwaiter().GetResult().AddressList[0];
             var hostIpEndPoint = new IPEndPoint(hostIpAddress, 80);
             return hostIpEndPoint.AddressFamily;
         }
diff --git a/src/HdrHistogram.Examples/SocketTester.cs b/src/HdrHistogram.Examples/SocketTester.cs
index 30e7340..b4cf843 100644
--- a/src/HdrHistogram.Examples/SocketTester.cs
+++ b/src/HdrHistogram.Examples/SocketTester.cs
@@ -31,7 +31,7 @@ public void CreateAndCloseDatagramSocket()
 
         private static AddressFamily GetAddressFamily(string url)
         {
-            var hostIpAddress = Dns.GetHostEntry(url).AddressList[0];
+            var hostIpAddress = Dns.GetHostEntryAsync(url).GetAwaiter().GetResult().AddressList[0];
             var hostIpEndPoint = new IPEndPoint(hostIpAddress, 80);
             return hostIpEndPoint.AddressFamily;
         }
diff --git a/src/HdrHistogram.Examples/project.json b/src/HdrHistogram.Examples/project.json
new file mode 100644
index 0000000..123edff
--- /dev/null
+++ b/src/HdrHistogram.Examples/project.json
@@ -0,0 +1,33 @@
+{
+  "buildOptions": {
+    "emitEntryPoint": true,
+    "debugType": "portable"
+  },
+  "frameworks": {
+    "netcoreapp1.1": {
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.1.0"
+        },
+        "NETStandard.Library": "1.6.1",
+        "System.Net.NameResolution": "4.3.0"
+      },
+      "imports": [
+        "dnxcore50"
+      ]
+    },
+    "net452": {}
+  },
+  "dependencies": {
+    "HdrHistogram": {
+      "target": "project"
+    } 
+  },
+  "runtimes": {
+    "win7-x64": {},
+    "ubuntu.14.04-x64": {},
+    "win10-x64": {}
+  },
+  "version": "1.0.0-*"
+}
diff --git a/src/HdrHistogram.UnitTests/HdrHistogram.UnitTests.csproj b/src/HdrHistogram.UnitTests/HdrHistogram.UnitTests.csproj
deleted file mode 100644
index 4fcbcce..0000000
--- a/src/HdrHistogram.UnitTests/HdrHistogram.UnitTests.csproj
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2D189069-FE39-42AE-8169-71ABC4D5A87B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HdrHistogram.UnitTests</RootNamespace>
-    <AssemblyName>HdrHistogram.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>
-    </StartupObject>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ConcurrentHistogramTestBase.cs" />
-    <Compile Include="HistogramEncodingTestBase.cs" />
-    <Compile Include="HistogramFactoryTests.cs" />
-    <Compile Include="IntConcurrentHistogramTests.cs" />
-    <Compile Include="IntHistogramEncodingTests.cs" />
-    <Compile Include="LongConcurrentHistogramTests.cs" />
-    <Compile Include="HistogramAssert.cs" />
-    <Compile Include="LongHistogramEncodingTests.cs" />
-    <Compile Include="HistogramIterationValueComparer.cs" />
-    <Compile Include="Persistence\LongConcurrentHistogramLogReaderWriterTests.cs" />
-    <Compile Include="Persistence\HistogramLogExtensions.cs" />
-    <Compile Include="Persistence\HistogramLogReaderWriterTestBase.cs" />
-    <Compile Include="Persistence\IntConcurrentHistogramLogReaderWriterTests.cs" />
-    <Compile Include="Persistence\IntHistogramLogReaderWriterTests.cs" />
-    <Compile Include="HistogramTestBase.cs" />
-    <Compile Include="IntHistogramTests.cs" />
-    <Compile Include="LongHistogramTests.cs" />
-    <Compile Include="HgrmPercentileDistrubutionOutputTests.cs" />
-    <Compile Include="MathEx.cs" />
-    <Compile Include="Persistence\LongHistogramLogReaderWriterTests.cs" />
-    <Compile Include="Persistence\ShortHistogramLogReaderWriterTests.cs" />
-    <Compile Include="Persistence\TestCaseGenerator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Recording\RecorderTestsBase.cs" />
-    <Compile Include="Recording\RecorderTestWithIntConcurrentHistogram.cs" />
-    <Compile Include="Recording\RecorderTestWithIntHistogram.cs" />
-    <Compile Include="Recording\RecorderTestWithLongConcurrentHistogram.cs" />
-    <Compile Include="Recording\RecorderTestWithLongHistogram.cs" />
-    <Compile Include="Recording\RecorderTestWithShortHistogram.cs" />
-    <Compile Include="ShortHistogramEncodingTests.cs" />
-    <Compile Include="ShortHistogramTests.cs" />
-    <Compile Include="TimeStampTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_1sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_1sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_1sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_2sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_2sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_2sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_3sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_3sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_3sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_4sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_4sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_4sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_5sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_5sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_5sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_1sf_TicksPerHour_asMs_10percPerHalfDistance.csv" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_1sf_TicksPerHour_asMs_20percPerHalfDistance.csv" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_1sf_TicksPerHour_asMs_5percPerHalfDistance.csv" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_2sf_TicksPerHour_asMs_10percPerHalfDistance.csv" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_2sf_TicksPerHour_asMs_20percPerHalfDistance.csv" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_2sf_TicksPerHour_asMs_5percPerHalfDistance.csv" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_3sf_TicksPerHour_asMs_10percPerHalfDistance.csv" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_3sf_TicksPerHour_asMs_20percPerHalfDistance.csv" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_3sf_TicksPerHour_asMs_5percPerHalfDistance.csv" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_4sf_TicksPerHour_asMs_10percPerHalfDistance.csv" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_4sf_TicksPerHour_asMs_20percPerHalfDistance.csv" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_4sf_TicksPerHour_asMs_5percPerHalfDistance.csv" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_5sf_TicksPerHour_asMs_10percPerHalfDistance.csv" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_5sf_TicksPerHour_asMs_20percPerHalfDistance.csv" />
-    <EmbeddedResource Include="Resources\Sample_10kBy1k_5sf_TicksPerHour_asMs_5percPerHalfDistance.csv" />
-    <EmbeddedResource Include="Resources\jHiccup-2.0.1.logV0.hlog" />
-    <EmbeddedResource Include="Resources\jHiccup-2.0.6.logV1.hlog" />
-    <EmbeddedResource Include="Resources\jHiccup-2.0.7S.logV2.hlog" />
-    <EmbeddedResource Include="Resources\ycsb.logV1.hlog" />
-    <EmbeddedResource Include="Resources\tagged-Log.logV2.hlog" />
-    <EmbeddedResource Include="Resources\IsLastValueBug.hgrm" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\HdrHistogram\HdrHistogram.csproj">
-      <Project>{655d9c4c-5bbd-4494-9828-ae427a1ddd01}</Project>
-      <Name>HdrHistogram</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/HdrHistogram.UnitTests/app.config b/src/HdrHistogram.UnitTests/app.config
deleted file mode 100644
index de82893..0000000
--- a/src/HdrHistogram.UnitTests/app.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
diff --git a/src/HdrHistogram.UnitTests/packages.config b/src/HdrHistogram.UnitTests/packages.config
deleted file mode 100644
index af7105c..0000000
--- a/src/HdrHistogram.UnitTests/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="3.2.0" targetFramework="net452" />
-</packages>
\ No newline at end of file
diff --git a/src/HdrHistogram.sln b/src/HdrHistogram.sln
deleted file mode 100644
index 3b61d3e..0000000
--- a/src/HdrHistogram.sln
+++ /dev/null
@@ -1,59 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HdrHistogram", "HdrHistogram\HdrHistogram.csproj", "{655D9C4C-5BBD-4494-9828-AE427A1DDD01}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F2800CBA-6CFC-45FE-AA8F-25E4FF912E41}"
-	ProjectSection(SolutionItems) = preProject
-		..\LICENSE.txt = ..\LICENSE.txt
-		..\README.md = ..\README.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{48A302F0-0D3C-4616-B4D0-7B64CE75AB1D}"
-	ProjectSection(SolutionItems) = preProject
-		..\build\build.cmd = ..\build\build.cmd
-		..\build\build.ps1 = ..\build\build.ps1
-		..\build\HdrHistogram.nuspec = ..\build\HdrHistogram.nuspec
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HdrHistogram.UnitTests", "HdrHistogram.UnitTests\HdrHistogram.UnitTests.csproj", "{2D189069-FE39-42AE-8169-71ABC4D5A87B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D3EBE9D9-B40D-4D2F-B76D-16A34FB09A94}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HdrHistogram.Examples", "HdrHistogram.Examples\HdrHistogram.Examples.csproj", "{E210C748-4792-4658-9345-CC073C29EC0B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HdrHistogram.Benchmarking", "HdrHistogram.Benchmarking\HdrHistogram.Benchmarking.csproj", "{8AAE86BE-5ABC-4902-B48B-20DCDBB93C7B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{655D9C4C-5BBD-4494-9828-AE427A1DDD01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{655D9C4C-5BBD-4494-9828-AE427A1DDD01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{655D9C4C-5BBD-4494-9828-AE427A1DDD01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{655D9C4C-5BBD-4494-9828-AE427A1DDD01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D189069-FE39-42AE-8169-71ABC4D5A87B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D189069-FE39-42AE-8169-71ABC4D5A87B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D189069-FE39-42AE-8169-71ABC4D5A87B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D189069-FE39-42AE-8169-71ABC4D5A87B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E210C748-4792-4658-9345-CC073C29EC0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E210C748-4792-4658-9345-CC073C29EC0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E210C748-4792-4658-9345-CC073C29EC0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E210C748-4792-4658-9345-CC073C29EC0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8AAE86BE-5ABC-4902-B48B-20DCDBB93C7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8AAE86BE-5ABC-4902-B48B-20DCDBB93C7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8AAE86BE-5ABC-4902-B48B-20DCDBB93C7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8AAE86BE-5ABC-4902-B48B-20DCDBB93C7B}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{2D189069-FE39-42AE-8169-71ABC4D5A87B} = {D3EBE9D9-B40D-4D2F-B76D-16A34FB09A94}
-		{8AAE86BE-5ABC-4902-B48B-20DCDBB93C7B} = {D3EBE9D9-B40D-4D2F-B76D-16A34FB09A94}
-	EndGlobalSection
-EndGlobal
diff --git a/src/HdrHistogram/HdrHistogram.csproj b/src/HdrHistogram/HdrHistogram.csproj
deleted file mode 100644
index d224fc4..0000000
--- a/src/HdrHistogram/HdrHistogram.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{655D9C4C-5BBD-4494-9828-AE427A1DDD01}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HdrHistogram</RootNamespace>
-    <AssemblyName>HdrHistogram</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\Net45\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\Net45\</OutputPath>
-    <IntermediateOutputPath>obj\Release\Net45\</IntermediateOutputPath>
-    <DefineConstants>
-    </DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <DocumentationFile>bin\Release\Net45\HdrHistogram.XML</DocumentationFile>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Histogram.cs" />
-    <Compile Include="HistogramFactoryDelegate.cs" />
-    <Compile Include="IntConcurrentHistogram.cs" />
-    <Compile Include="LongConcurrentHistogram.cs" />
-    <Compile Include="HistogramEncoding.cs" />
-    <Compile Include="Encoding\HistogramEncoderV2.cs" />
-    <Compile Include="Encoding\IEncoder.cs" />
-    <Compile Include="Encoding\IHeader.cs" />
-    <Compile Include="Encoding\IRecordedData.cs" />
-    <Compile Include="Encoding\RecordedData.cs" />
-    <Compile Include="Encoding\V0Header.cs" />
-    <Compile Include="Encoding\V1Header.cs" />
-    <Compile Include="HistogramBase.cs" />
-    <Compile Include="HistogramExtensions.cs" />
-    <Compile Include="HistogramLogReader.cs" />
-    <Compile Include="HistogramLogWriter.cs" />
-    <Compile Include="IHistogramLogV1Reader.cs" />
-    <Compile Include="IntHistogram.cs" />
-    <Compile Include="IRecorder.cs" />
-    <Compile Include="Iteration\AbstractHistogramEnumerator.cs" />
-    <Compile Include="Iteration\AllValueEnumerable.cs" />
-    <Compile Include="Iteration\AllValuesEnumerator.cs" />
-    <Compile Include="Iteration\HistogramIterationValue.cs" />
-    <Compile Include="Iteration\PercentileEnumerable.cs" />
-    <Compile Include="Iteration\PercentileEnumerator.cs" />
-    <Compile Include="Iteration\RecordedValuesEnumerable.cs" />
-    <Compile Include="Iteration\RecordedValuesEnumerator.cs" />
-    <Compile Include="OutputScalingFactor.cs" />
-    <Compile Include="Output\CsvOutputFormatter.cs" />
-    <Compile Include="Output\HgrmOutputFormatter.cs" />
-    <Compile Include="Output\IOutputFormatter.cs" />
-    <Compile Include="Persistence\CountsDecoder.cs" />
-    <Compile Include="Persistence\ICountsDecoder.cs" />
-    <Compile Include="Persistence\IntCountsDecoder.cs" />
-    <Compile Include="Persistence\LongCountsDecoder.cs" />
-    <Compile Include="Persistence\ShortCountsDecoder.cs" />
-    <Compile Include="Persistence\SimpleCountsDecoder.cs" />
-    <Compile Include="Persistence\V2MaxWordSizeCountsDecoder.cs" />
-    <Compile Include="Properties\AssemblyInfo.g.cs" />
-    <Compile Include="Recorder.cs" />
-    <Compile Include="ShortHistogram.cs" />
-    <Compile Include="TimeStamp.cs" />
-    <Compile Include="Utilities\ArrayExtensions.cs" />
-    <Compile Include="Utilities\AtomicIntArray.cs" />
-    <Compile Include="Utilities\AtomicLongArray.cs" />
-    <Compile Include="Utilities\Bitwise.cs" />
-    <Compile Include="LongHistogram.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utilities\ByteBuffer.cs" />
-    <Compile Include="Utilities\ByteBufferExtensions.cs" />
-    <Compile Include="Utilities\TypeHelper.cs" />
-    <Compile Include="Utilities\UnixTimeExtensions.cs" />
-    <Compile Include="Utilities\WriterReaderPhaser.cs" />
-    <Compile Include="ZigZagEncoding.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/HdrHistogram/HdrHistogram.xproj b/src/HdrHistogram/HdrHistogram.xproj
new file mode 100644
index 0000000..8a20ca8
--- /dev/null
+++ b/src/HdrHistogram/HdrHistogram.xproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>dfbae224-af34-4d34-b788-8d9b61009a1f</ProjectGuid>
+    <RootNamespace>HdrHistogram</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
diff --git a/src/HdrHistogram/HistogramBase.cs b/src/HdrHistogram/HistogramBase.cs
index 3ac9331..e3128ed 100644
--- a/src/HdrHistogram/HistogramBase.cs
+++ b/src/HdrHistogram/HistogramBase.cs
@@ -253,7 +253,7 @@ public void RecordValueWithCount(long value, long count)
         /// To compensate for the loss of sampled values when a recorded value is larger than the expected interval between value samples, 
         /// Histogram will auto-generate an additional series of decreasingly-smaller (down to the expectedIntervalBetweenValueSamples) value records.
         /// <para>
-        /// Note: This is a at-recording correction method, as opposed to the post-recording correction method provided by <see cref="CopyCorrectedForCoordinatedOmission"/>.
+        /// Note: This is a at-recording correction method, as opposed to the post-recording correction method provided by currently unimplemented <c>CopyCorrectedForCoordinatedOmission</c> method.
         /// The two methods are mutually exclusive, and only one of the two should be be used on a given data set to correct for the same coordinated omission issue.
         /// </para>
         /// See notes in the description of the Histogram calls for an illustration of why this corrective behavior is important.
diff --git a/src/HdrHistogram/IRecorder.cs b/src/HdrHistogram/IRecorder.cs
index a1199db..0692028 100644
--- a/src/HdrHistogram/IRecorder.cs
+++ b/src/HdrHistogram/IRecorder.cs
@@ -30,7 +30,7 @@ public interface IRecorder
         /// To compensate for the loss of sampled values when a recorded value is larger than the expected interval between value samples, 
         /// Histogram will auto-generate an additional series of decreasingly-smaller (down to the expectedIntervalBetweenValueSamples) value records.
         /// <para>
-        /// Note: This is a at-recording correction method, as opposed to the post-recording correction method provided by <see cref="CopyCorrectedForCoordinatedOmission"/>.
+        /// Note: This is a at-recording correction method, as opposed to the post-recording correction method provided by currently unimplemented <c>CopyCorrectedForCoordinatedOmission</c> method.
         /// The two methods are mutually exclusive, and only one of the two should be be used on a given data set to correct for the same coordinated omission issue.
         /// </para>
         /// See notes in the description of the Histogram calls for an illustration of why this corrective behavior is important.
diff --git a/src/HdrHistogram/Recorder.cs b/src/HdrHistogram/Recorder.cs
index 14ce366..97d84fd 100644
--- a/src/HdrHistogram/Recorder.cs
+++ b/src/HdrHistogram/Recorder.cs
@@ -106,7 +106,7 @@ public void RecordValueWithCount(long value, long count)
         /// To compensate for the loss of sampled values when a recorded value is larger than the expected interval between value samples, 
         /// Histogram will auto-generate an additional series of decreasingly-smaller (down to the expectedIntervalBetweenValueSamples) value records.
         /// <para>
-        /// Note: This is a at-recording correction method, as opposed to the post-recording correction method provided by <see cref="CopyCorrectedForCoordinatedOmission"/>.
+        /// Note: This is a at-recording correction method, as opposed to the post-recording correction method provided by currently unimplemented <c>CopyCorrectedForCoordinatedOmission</c> method.
         /// The two methods are mutually exclusive, and only one of the two should be be used on a given data set to correct for the same coordinated omission issue.
         /// </para>
         /// See notes in the description of the Histogram calls for an illustration of why this corrective behavior is important.
diff --git a/src/HdrHistogram/Utilities/AtomicIntArray.cs b/src/HdrHistogram/Utilities/AtomicIntArray.cs
index 64f133c..ddf56ef 100644
--- a/src/HdrHistogram/Utilities/AtomicIntArray.cs
+++ b/src/HdrHistogram/Utilities/AtomicIntArray.cs
@@ -64,7 +64,11 @@ private void LazySet(int index, int value)
 
             _counts[index] = value;
             // Is this right, is that all we need??? We definitely don't want an Interlocked here, that's too much!!
-            Thread.MemoryBarrier();
+            #if NET425
+				Thread.MemoryBarrier();
+			else
+				Interlocked.MemoryBarrier 
+			#endif
 
             //Volatile.Read (only emits half-fence (acquire fence) as opposed to Thread.VolatileRead which emits a full-fence
 
diff --git a/src/HdrHistogram/Utilities/AtomicLongArray.cs b/src/HdrHistogram/Utilities/AtomicLongArray.cs
index 60dc092..8900128 100644
--- a/src/HdrHistogram/Utilities/AtomicLongArray.cs
+++ b/src/HdrHistogram/Utilities/AtomicLongArray.cs
@@ -73,7 +73,11 @@ private void LazySet(int index, long value)
 
             _counts[index] = value;
             // Is this right, is that all we need??? We definitely don't want an Interlocked here, that's too much!!
-            Thread.MemoryBarrier();
+            #if NET425
+				Thread.MemoryBarrier();
+			else
+				Interlocked.MemoryBarrier 
+			#endif
 
             //Volatile.Read (only emits half-fence (acquire fence) as opposed to Thread.VolatileRead which emits a full-fence
 
diff --git a/src/HdrHistogram/Utilities/Bitwise.cs b/src/HdrHistogram/Utilities/Bitwise.cs
index d81569c..c7486ad 100644
--- a/src/HdrHistogram/Utilities/Bitwise.cs
+++ b/src/HdrHistogram/Utilities/Bitwise.cs
@@ -8,6 +8,7 @@
 
 using System;
 
+
 namespace HdrHistogram.Utilities
 {
     //Code has been tested and taken from :
@@ -17,7 +18,11 @@ namespace HdrHistogram.Utilities
     //http://graphics.stanford.edu/~seander/bithacks.html#IntegerLogObvious
     //
     //Ideally newer versions of .NET will expose the CPU instructions to do this  Intel SSE 'lzcnt' (Leading Zero Count), or give access to the BitScanReverse VC++ functions (https://msdn.microsoft.com/en-us/library/fbxyd7zd.aspx)
-    internal static class Bitwise
+
+    /// <summary>
+    /// Exposes optimised methods to get Leading Zero Count.
+    /// </summary>
+    public static class Bitwise
     {
         private static readonly int[] Lookup;
 
@@ -29,6 +34,12 @@ static Bitwise()
                 Lookup[i] = (int)(Math.Log(i) / Math.Log(2));
             }
         }
+
+        /// <summary>
+        /// Returns the Leading Zero Count (lzc) of the <paramref name="value"/> for its binary representation.
+        /// </summary>
+        /// <param name="value">The value to find the number of leading zeros</param>
+        /// <returns>The number of leading zeros.</returns>
         public static int NumberOfLeadingZeros(long value)
         {
             //Optimisation for 32 bit values. So values under 00:16:41.0 when measuring with Stopwatch.GetTimestamp()*, we will hit a fast path.
diff --git a/src/HdrHistogram/Utilities/WriterReaderPhaser.cs b/src/HdrHistogram/Utilities/WriterReaderPhaser.cs
index 938c8c1..03d4da4 100644
--- a/src/HdrHistogram/Utilities/WriterReaderPhaser.cs
+++ b/src/HdrHistogram/Utilities/WriterReaderPhaser.cs
@@ -181,7 +181,11 @@ public void FlipPhase(TimeSpan yieldPeriod)
                 {
                     if (yieldPeriod == TimeSpan.Zero)
                     {
-                        Thread.Yield();
+                        #if NET425
+							Thread.Yield();
+						else
+							Task.Yield().GetAwaiter().GetResult();
+						#endif
                     }
                     else
                     {
diff --git a/src/HdrHistogram/project.json b/src/HdrHistogram/project.json
new file mode 100644
index 0000000..9aa6d81
--- /dev/null
+++ b/src/HdrHistogram/project.json
@@ -0,0 +1,36 @@
+{
+  "authors": [ "Gil Tene", "Lee Campbell" ],  
+  "dependencies": {
+    "NETStandard.Library": "1.6.1"
+  },
+  "buildOptions": {
+    "keyFile": "../../HdrHistogram.snk",
+    "xmlDoc":  true 
+  },
+  "description": "HdrHistogram supports low latency recording and analyzing of sampled data value counts across a configurable integer value range with configurable value precision within the range.",
+  "frameworks": {
+    "netstandard1.6": {
+      "dependencies": {
+        "System.Net.Primitives": "4.3.0",
+        "System.Threading.Thread": "4.3.0"
+      },
+      "imports": [
+        "dotnet5.6",
+        "portable-net45+win8"
+      ]
+    },
+    "net452": {}
+  },
+  "language": "en-US",
+  "packOptions": {    
+    "owners": [ "Lee Campbell" ],
+    "requireLicenseAcceptance": false,
+    "releaseNotes": "HdrHistogram targeted at .NET Standard and .NET 4.6.1",
+    "tags": [ "HdrHistogram", "HdrHistogram.NET", "Histogram", "Instrumentation" ],
+    "projectUrl": "https://github.com/HdrHistogram/HdrHistogram.NET",
+    "licenseUrl": "https://raw.githubusercontent.com/HdrHistogram/HdrHistogram.NET/master/LICENSE.txt",
+    "iconUrl": "http://hdrhistogram.github.io/HdrHistogram.NET/HdrHistogram-icon-64x64.png"
+  },
+  "title": "HdrHistogram",
+  "version": "2.0.0-*"
+}
diff --git a/src/HdrHistogram.UnitTests/ConcurrentHistogramTestBase.cs b/test/HdrHistogram.UnitTests/ConcurrentHistogramTestBase.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/ConcurrentHistogramTestBase.cs
rename to test/HdrHistogram.UnitTests/ConcurrentHistogramTestBase.cs
diff --git a/test/HdrHistogram.UnitTests/HdrHistogram.UnitTests.xproj b/test/HdrHistogram.UnitTests/HdrHistogram.UnitTests.xproj
new file mode 100644
index 0000000..0d646d3
--- /dev/null
+++ b/test/HdrHistogram.UnitTests/HdrHistogram.UnitTests.xproj
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>2c6b7bf1-4eb2-4a46-a389-23eadfed543b</ProjectGuid>
+    <RootNamespace>HdrHistogram.UnitTests</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
\ No newline at end of file
diff --git a/src/HdrHistogram.UnitTests/HgrmPercentileDistrubutionOutputTests.cs b/test/HdrHistogram.UnitTests/HgrmPercentileDistrubutionOutputTests.cs
similarity index 98%
rename from src/HdrHistogram.UnitTests/HgrmPercentileDistrubutionOutputTests.cs
rename to test/HdrHistogram.UnitTests/HgrmPercentileDistrubutionOutputTests.cs
index 96f249f..741e1c1 100644
--- a/src/HdrHistogram.UnitTests/HgrmPercentileDistrubutionOutputTests.cs
+++ b/test/HdrHistogram.UnitTests/HgrmPercentileDistrubutionOutputTests.cs
@@ -1,5 +1,6 @@
 using System.Globalization;
 using System.IO;
+using System.Reflection;
 using NUnit.Framework;
 
 namespace HdrHistogram.UnitTests
@@ -82,7 +83,7 @@ public void OnlySingleValueFlaggedAsLastValue()
         private Stream GetEmbeddedFileStream(string filename)
         {
             var fileName = string.Format(CultureInfo.InvariantCulture, "HdrHistogram.UnitTests.Resources.{0}", filename);
-            return GetType()
+            return GetType().GetTypeInfo()
                 .Assembly
                 .GetManifestResourceStream(fileName);
         }
diff --git a/src/HdrHistogram.UnitTests/HistogramAssert.cs b/test/HdrHistogram.UnitTests/HistogramAssert.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/HistogramAssert.cs
rename to test/HdrHistogram.UnitTests/HistogramAssert.cs
diff --git a/src/HdrHistogram.UnitTests/HistogramEncodingTestBase.cs b/test/HdrHistogram.UnitTests/HistogramEncodingTestBase.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/HistogramEncodingTestBase.cs
rename to test/HdrHistogram.UnitTests/HistogramEncodingTestBase.cs
diff --git a/src/HdrHistogram.UnitTests/HistogramFactoryTests.cs b/test/HdrHistogram.UnitTests/HistogramFactoryTests.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/HistogramFactoryTests.cs
rename to test/HdrHistogram.UnitTests/HistogramFactoryTests.cs
diff --git a/src/HdrHistogram.UnitTests/HistogramIterationValueComparer.cs b/test/HdrHistogram.UnitTests/HistogramIterationValueComparer.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/HistogramIterationValueComparer.cs
rename to test/HdrHistogram.UnitTests/HistogramIterationValueComparer.cs
diff --git a/src/HdrHistogram.UnitTests/HistogramTestBase.cs b/test/HdrHistogram.UnitTests/HistogramTestBase.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/HistogramTestBase.cs
rename to test/HdrHistogram.UnitTests/HistogramTestBase.cs
diff --git a/src/HdrHistogram.UnitTests/IntConcurrentHistogramTests.cs b/test/HdrHistogram.UnitTests/IntConcurrentHistogramTests.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/IntConcurrentHistogramTests.cs
rename to test/HdrHistogram.UnitTests/IntConcurrentHistogramTests.cs
diff --git a/src/HdrHistogram.UnitTests/IntHistogramEncodingTests.cs b/test/HdrHistogram.UnitTests/IntHistogramEncodingTests.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/IntHistogramEncodingTests.cs
rename to test/HdrHistogram.UnitTests/IntHistogramEncodingTests.cs
diff --git a/src/HdrHistogram.UnitTests/IntHistogramTests.cs b/test/HdrHistogram.UnitTests/IntHistogramTests.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/IntHistogramTests.cs
rename to test/HdrHistogram.UnitTests/IntHistogramTests.cs
diff --git a/src/HdrHistogram.UnitTests/LongConcurrentHistogramTests.cs b/test/HdrHistogram.UnitTests/LongConcurrentHistogramTests.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/LongConcurrentHistogramTests.cs
rename to test/HdrHistogram.UnitTests/LongConcurrentHistogramTests.cs
diff --git a/src/HdrHistogram.UnitTests/LongHistogramEncodingTests.cs b/test/HdrHistogram.UnitTests/LongHistogramEncodingTests.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/LongHistogramEncodingTests.cs
rename to test/HdrHistogram.UnitTests/LongHistogramEncodingTests.cs
diff --git a/src/HdrHistogram.UnitTests/LongHistogramTests.cs b/test/HdrHistogram.UnitTests/LongHistogramTests.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/LongHistogramTests.cs
rename to test/HdrHistogram.UnitTests/LongHistogramTests.cs
diff --git a/src/HdrHistogram.UnitTests/MathEx.cs b/test/HdrHistogram.UnitTests/MathEx.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/MathEx.cs
rename to test/HdrHistogram.UnitTests/MathEx.cs
diff --git a/src/HdrHistogram.UnitTests/Persistence/HistogramLogExtensions.cs b/test/HdrHistogram.UnitTests/Persistence/HistogramLogExtensions.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/Persistence/HistogramLogExtensions.cs
rename to test/HdrHistogram.UnitTests/Persistence/HistogramLogExtensions.cs
diff --git a/src/HdrHistogram.UnitTests/Persistence/HistogramLogReaderWriterTestBase.cs b/test/HdrHistogram.UnitTests/Persistence/HistogramLogReaderWriterTestBase.cs
similarity index 99%
rename from src/HdrHistogram.UnitTests/Persistence/HistogramLogReaderWriterTestBase.cs
rename to test/HdrHistogram.UnitTests/Persistence/HistogramLogReaderWriterTestBase.cs
index 0f19723..9036304 100644
--- a/src/HdrHistogram.UnitTests/Persistence/HistogramLogReaderWriterTestBase.cs
+++ b/test/HdrHistogram.UnitTests/Persistence/HistogramLogReaderWriterTestBase.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using HdrHistogram.Utilities;
 using NUnit.Framework;
 
@@ -282,7 +283,7 @@ private HistogramBase CreatePopulatedHistogram(long highestTrackableValue, int s
         private Stream GetEmbeddedFileStream(string filename)
         {
             var fileName = string.Format(CultureInfo.InvariantCulture, "HdrHistogram.UnitTests.Resources.{0}", filename);
-            return GetType()
+            return GetType().GetTypeInfo()
                 .Assembly
                 .GetManifestResourceStream(fileName);
         }
diff --git a/src/HdrHistogram.UnitTests/Persistence/IntConcurrentHistogramLogReaderWriterTests.cs b/test/HdrHistogram.UnitTests/Persistence/IntConcurrentHistogramLogReaderWriterTests.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/Persistence/IntConcurrentHistogramLogReaderWriterTests.cs
rename to test/HdrHistogram.UnitTests/Persistence/IntConcurrentHistogramLogReaderWriterTests.cs
diff --git a/src/HdrHistogram.UnitTests/Persistence/IntHistogramLogReaderWriterTests.cs b/test/HdrHistogram.UnitTests/Persistence/IntHistogramLogReaderWriterTests.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/Persistence/IntHistogramLogReaderWriterTests.cs
rename to test/HdrHistogram.UnitTests/Persistence/IntHistogramLogReaderWriterTests.cs
diff --git a/src/HdrHistogram.UnitTests/Persistence/LongConcurrentHistogramLogReaderWriterTests.cs b/test/HdrHistogram.UnitTests/Persistence/LongConcurrentHistogramLogReaderWriterTests.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/Persistence/LongConcurrentHistogramLogReaderWriterTests.cs
rename to test/HdrHistogram.UnitTests/Persistence/LongConcurrentHistogramLogReaderWriterTests.cs
diff --git a/src/HdrHistogram.UnitTests/Persistence/LongHistogramLogReaderWriterTests.cs b/test/HdrHistogram.UnitTests/Persistence/LongHistogramLogReaderWriterTests.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/Persistence/LongHistogramLogReaderWriterTests.cs
rename to test/HdrHistogram.UnitTests/Persistence/LongHistogramLogReaderWriterTests.cs
diff --git a/src/HdrHistogram.UnitTests/Persistence/ShortHistogramLogReaderWriterTests.cs b/test/HdrHistogram.UnitTests/Persistence/ShortHistogramLogReaderWriterTests.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/Persistence/ShortHistogramLogReaderWriterTests.cs
rename to test/HdrHistogram.UnitTests/Persistence/ShortHistogramLogReaderWriterTests.cs
diff --git a/src/HdrHistogram.UnitTests/Persistence/TestCaseGenerator.cs b/test/HdrHistogram.UnitTests/Persistence/TestCaseGenerator.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/Persistence/TestCaseGenerator.cs
rename to test/HdrHistogram.UnitTests/Persistence/TestCaseGenerator.cs
diff --git a/src/HdrHistogram.UnitTests/Properties/AssemblyInfo.cs b/test/HdrHistogram.UnitTests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/Properties/AssemblyInfo.cs
rename to test/HdrHistogram.UnitTests/Properties/AssemblyInfo.cs
diff --git a/src/HdrHistogram.UnitTests/Recording/RecorderTestWithIntConcurrentHistogram.cs b/test/HdrHistogram.UnitTests/Recording/RecorderTestWithIntConcurrentHistogram.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/Recording/RecorderTestWithIntConcurrentHistogram.cs
rename to test/HdrHistogram.UnitTests/Recording/RecorderTestWithIntConcurrentHistogram.cs
diff --git a/src/HdrHistogram.UnitTests/Recording/RecorderTestWithIntHistogram.cs b/test/HdrHistogram.UnitTests/Recording/RecorderTestWithIntHistogram.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/Recording/RecorderTestWithIntHistogram.cs
rename to test/HdrHistogram.UnitTests/Recording/RecorderTestWithIntHistogram.cs
diff --git a/src/HdrHistogram.UnitTests/Recording/RecorderTestWithLongConcurrentHistogram.cs b/test/HdrHistogram.UnitTests/Recording/RecorderTestWithLongConcurrentHistogram.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/Recording/RecorderTestWithLongConcurrentHistogram.cs
rename to test/HdrHistogram.UnitTests/Recording/RecorderTestWithLongConcurrentHistogram.cs
diff --git a/src/HdrHistogram.UnitTests/Recording/RecorderTestWithLongHistogram.cs b/test/HdrHistogram.UnitTests/Recording/RecorderTestWithLongHistogram.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/Recording/RecorderTestWithLongHistogram.cs
rename to test/HdrHistogram.UnitTests/Recording/RecorderTestWithLongHistogram.cs
diff --git a/src/HdrHistogram.UnitTests/Recording/RecorderTestWithShortHistogram.cs b/test/HdrHistogram.UnitTests/Recording/RecorderTestWithShortHistogram.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/Recording/RecorderTestWithShortHistogram.cs
rename to test/HdrHistogram.UnitTests/Recording/RecorderTestWithShortHistogram.cs
diff --git a/src/HdrHistogram.UnitTests/Recording/RecorderTestsBase.cs b/test/HdrHistogram.UnitTests/Recording/RecorderTestsBase.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/Recording/RecorderTestsBase.cs
rename to test/HdrHistogram.UnitTests/Recording/RecorderTestsBase.cs
diff --git a/src/HdrHistogram.UnitTests/Resources/IsLastValueBug.hgrm b/test/HdrHistogram.UnitTests/Resources/IsLastValueBug.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/IsLastValueBug.hgrm
rename to test/HdrHistogram.UnitTests/Resources/IsLastValueBug.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_10percPerHalfDistance.csv b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_10percPerHalfDistance.csv
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_10percPerHalfDistance.csv
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_10percPerHalfDistance.csv
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_20percPerHalfDistance.csv b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_20percPerHalfDistance.csv
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_20percPerHalfDistance.csv
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_20percPerHalfDistance.csv
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_5percPerHalfDistance.csv b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_5percPerHalfDistance.csv
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_5percPerHalfDistance.csv
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_5percPerHalfDistance.csv
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_1sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_10percPerHalfDistance.csv b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_10percPerHalfDistance.csv
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_10percPerHalfDistance.csv
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_10percPerHalfDistance.csv
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_20percPerHalfDistance.csv b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_20percPerHalfDistance.csv
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_20percPerHalfDistance.csv
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_20percPerHalfDistance.csv
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_5percPerHalfDistance.csv b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_5percPerHalfDistance.csv
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_5percPerHalfDistance.csv
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_5percPerHalfDistance.csv
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_2sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_10percPerHalfDistance.csv b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_10percPerHalfDistance.csv
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_10percPerHalfDistance.csv
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_10percPerHalfDistance.csv
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_20percPerHalfDistance.csv b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_20percPerHalfDistance.csv
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_20percPerHalfDistance.csv
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_20percPerHalfDistance.csv
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_5percPerHalfDistance.csv b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_5percPerHalfDistance.csv
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_5percPerHalfDistance.csv
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_5percPerHalfDistance.csv
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_3sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_10percPerHalfDistance.csv b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_10percPerHalfDistance.csv
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_10percPerHalfDistance.csv
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_10percPerHalfDistance.csv
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_20percPerHalfDistance.csv b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_20percPerHalfDistance.csv
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_20percPerHalfDistance.csv
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_20percPerHalfDistance.csv
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_5percPerHalfDistance.csv b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_5percPerHalfDistance.csv
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_5percPerHalfDistance.csv
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_5percPerHalfDistance.csv
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_4sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_10percPerHalfDistance.csv b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_10percPerHalfDistance.csv
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_10percPerHalfDistance.csv
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_10percPerHalfDistance.csv
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_10percPerHalfDistance.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_20percPerHalfDistance.csv b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_20percPerHalfDistance.csv
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_20percPerHalfDistance.csv
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_20percPerHalfDistance.csv
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_20percPerHalfDistance.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_5percPerHalfDistance.csv b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_5percPerHalfDistance.csv
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_5percPerHalfDistance.csv
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_5percPerHalfDistance.csv
diff --git a/src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm b/test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm
rename to test/HdrHistogram.UnitTests/Resources/Sample_10kBy1k_5sf_TicksPerHour_asMs_5percPerHalfDistance.hgrm
diff --git a/src/HdrHistogram.UnitTests/Resources/jHiccup-2.0.1.logV0.hlog b/test/HdrHistogram.UnitTests/Resources/jHiccup-2.0.1.logV0.hlog
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/jHiccup-2.0.1.logV0.hlog
rename to test/HdrHistogram.UnitTests/Resources/jHiccup-2.0.1.logV0.hlog
diff --git a/src/HdrHistogram.UnitTests/Resources/jHiccup-2.0.6.logV1.hlog b/test/HdrHistogram.UnitTests/Resources/jHiccup-2.0.6.logV1.hlog
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/jHiccup-2.0.6.logV1.hlog
rename to test/HdrHistogram.UnitTests/Resources/jHiccup-2.0.6.logV1.hlog
diff --git a/src/HdrHistogram.UnitTests/Resources/jHiccup-2.0.7S.logV2.hlog b/test/HdrHistogram.UnitTests/Resources/jHiccup-2.0.7S.logV2.hlog
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/jHiccup-2.0.7S.logV2.hlog
rename to test/HdrHistogram.UnitTests/Resources/jHiccup-2.0.7S.logV2.hlog
diff --git a/src/HdrHistogram.UnitTests/Resources/tagged-Log.logV2.hlog b/test/HdrHistogram.UnitTests/Resources/tagged-Log.logV2.hlog
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/tagged-Log.logV2.hlog
rename to test/HdrHistogram.UnitTests/Resources/tagged-Log.logV2.hlog
diff --git a/src/HdrHistogram.UnitTests/Resources/ycsb.logV1.hlog b/test/HdrHistogram.UnitTests/Resources/ycsb.logV1.hlog
similarity index 100%
rename from src/HdrHistogram.UnitTests/Resources/ycsb.logV1.hlog
rename to test/HdrHistogram.UnitTests/Resources/ycsb.logV1.hlog
diff --git a/src/HdrHistogram.UnitTests/ShortHistogramEncodingTests.cs b/test/HdrHistogram.UnitTests/ShortHistogramEncodingTests.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/ShortHistogramEncodingTests.cs
rename to test/HdrHistogram.UnitTests/ShortHistogramEncodingTests.cs
diff --git a/src/HdrHistogram.UnitTests/ShortHistogramTests.cs b/test/HdrHistogram.UnitTests/ShortHistogramTests.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/ShortHistogramTests.cs
rename to test/HdrHistogram.UnitTests/ShortHistogramTests.cs
diff --git a/src/HdrHistogram.UnitTests/TimeStampTests.cs b/test/HdrHistogram.UnitTests/TimeStampTests.cs
similarity index 100%
rename from src/HdrHistogram.UnitTests/TimeStampTests.cs
rename to test/HdrHistogram.UnitTests/TimeStampTests.cs
diff --git a/test/HdrHistogram.UnitTests/project.json b/test/HdrHistogram.UnitTests/project.json
new file mode 100644
index 0000000..573e6f6
--- /dev/null
+++ b/test/HdrHistogram.UnitTests/project.json
@@ -0,0 +1,33 @@
+{
+  "version": "1.0.0-*",
+  "testRunner": "nunit",
+  "runtimes": {
+    "win7-x64": {},
+    "ubuntu.14.04-x64": {},
+    "win10-x64": {}
+  },
+
+  "buildOptions": {
+    "debugType": "portable",
+    "embed": {
+      "include": ["Resources/*.csv", "Resources/*.hgrm", "Resources/*.hlog"]
+    }
+  },
+
+  "dependencies": {
+    "dotnet-test-nunit": "3.4.0-beta-3",
+    "HdrHistogram": {
+      "target": "project"      
+    },
+    "nunit": "3.5.0"
+  },
+
+  "frameworks": {
+    "netcoreapp1.0": {
+      "imports": [
+        "dotnet5.6",
+        "portable-net45+win8"
+      ]
+    }
+  }
+}

From 7c1e0a95e654adc5831dd0648e59f55944ef776b Mon Sep 17 00:00:00 2001
From: Lee Campbell <lee.ryan.campbell@gmail.com>
Date: Sat, 11 Feb 2017 13:26:02 +0800
Subject: [PATCH 2/2] Adding AppVeyor build file. Allows builds to vary by
 branch if required

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 90197aa..d4c13af 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -35,7 +35,7 @@ build_script:
 
     $uploadPath = "https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)"
 
-    $testResults = (Resolve-Path .\TestResult.xml)
+    $testResults = (Resolve-Path .\Working\NunitTestResults.xml)
 
     Write-Host "Sending $testResults to $uploadPath"