Merge 7c1e0a9 into 3e7ad9d

Author: LeeCampbell

.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

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

HdrHistogram.snk

@@ -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"
 

appveyor.yml

@@ -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) }"