Merge remote-tracking branch 'refs/remotes/origin/master' into feature/excludes

# Conflicts:
#	Source/Tests/packages.config

Author: ejsmith

Source/Tests/Exceptionless.Tests.csproj

@@ -40,6 +40,8 @@
   <ItemGroup>
     <Reference Include="BenchmarkDotNet, Version=0.9.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\BenchmarkDotNet.0.9.4\lib\net45\BenchmarkDotNet.dll</HintPath>
+    <Reference Include="BenchmarkDotNet, Version=0.9.5.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\BenchmarkDotNet.0.9.5\lib\net45\BenchmarkDotNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Exceptionless.RandomData, Version=1.0.22.0, Culture=neutral, processorArchitecture=MSIL">

Source/Tests/Plugins/DeduplicationBenchmarks.cs

@@ -6,7 +6,6 @@
 using Exceptionless.Plugins;
 using Exceptionless.Plugins.Default;
 using Exceptionless.Tests.Utility;
-using Xunit;
 
 namespace Exceptionless.Tests.Plugins {
     public class DeduplicationBenchmarks {

Source/Tests/Plugins/PluginTests.cs

@@ -628,17 +628,15 @@ private Exception GetException(string message = "Test") {
             }
         }
 
-        [Fact(Skip = "Skip until benchmark.net is updated with the runtime fixes (0.9.5")]
+        [Fact]
         public void RunBenchmark() {
             var summary = BenchmarkRunner.Run<DeduplicationBenchmarks>();
 
-            foreach (var benchmark in summary.Benchmarks) {
-                var report = summary.Reports[benchmark];
-
+            foreach (var report in summary.Reports) {
                 _writer.WriteLine(report.ToString());
 
                 var benchmarkMedianMilliseconds = report.ResultStatistics.Median / 1000000;
-                _writer.WriteLine(String.Format("{0} - {1:0.00}ms", benchmark.ShortInfo, benchmarkMedianMilliseconds));
+                _writer.WriteLine(String.Format("{0} - {1:0.00}ms", report.Benchmark.ShortInfo, benchmarkMedianMilliseconds));
             }
         }
 

Source/Tests/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BenchmarkDotNet" version="0.9.4" targetFramework="net452" />
+  <package id="BenchmarkDotNet" version="0.9.5" targetFramework="net452" />
   <package id="Exceptionless.RandomData" version="1.0.22.0" targetFramework="net452" />
   <package id="Foundatio" version="4.0.958" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />