From 33ae3ec1b98f2c221932e643fe411f88b31a817f Mon Sep 17 00:00:00 2001
From: Adam Chester <adamchester@gmail.com>
Date: Sun, 5 Mar 2017 11:29:15 +1000
Subject: [PATCH] Perf tests: BDN 0.10.3 + netcoreapp1.1

---
 Build.ps1                                        | 16 ++++++++--------
 build.sh                                         |  8 ++++----
 .../Serilog.PerformanceTests.csproj              |  8 +++++---
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Build.ps1 b/Build.ps1
index 27729c8e1..648b06823 100644
--- a/Build.ps1
+++ b/Build.ps1
@@ -30,24 +30,24 @@ foreach ($src in ls src/*) {
     Pop-Location
 }
 
-foreach ($test in ls test/*.PerformanceTests) {
+foreach ($test in ls test/*.Tests) {
     Push-Location $test
 
-	echo "build: Building performance test project in $test"
+	echo "build: Testing project in $test"
 
-    & dotnet build -c Release
-    if($LASTEXITCODE -ne 0) { exit 2 }
+    & dotnet test -c Release
+    if($LASTEXITCODE -ne 0) { exit 3 }
 
     Pop-Location
 }
 
-foreach ($test in ls test/*.Tests) {
+foreach ($test in ls test/*.PerformanceTests) {
     Push-Location $test
 
-	echo "build: Testing project in $test"
+	echo "build: Building performance test project in $test"
 
-    & dotnet test -c Release
-    if($LASTEXITCODE -ne 0) { exit 3 }
+    & dotnet build -c Release
+    if($LASTEXITCODE -ne 0) { exit 2 }
 
     Pop-Location
 }
diff --git a/build.sh b/build.sh
index 829d1d287..f75d3c686 100755
--- a/build.sh
+++ b/build.sh
@@ -13,10 +13,10 @@ for path in src/**/*.csproj; do
     dotnet build -f netstandard1.3 -c Release ${path}
 done
 
-for path in test/Serilog.Tests/*.csproj; do
+for path in test/*.Tests/*.csproj; do
     dotnet test -f netcoreapp1.0  -c Release ${path}
 done
 
-# for path in test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj; do
-#     dotnet test -f netcoreapp1.0 -c Release ${path}
-# done
+for path in test/*.PerformanceTests/*.PerformanceTests.csproj; do
+    dotnet test -f netcoreapp1.1 -c Release ${path}
+done
diff --git a/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj b/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj
index 4aff922fa..9b54fe0d9 100644
--- a/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj
+++ b/test/Serilog.PerformanceTests/Serilog.PerformanceTests.csproj
@@ -1,13 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
     <AssemblyName>Serilog.PerformanceTests</AssemblyName>
     <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>Serilog.PerformanceTests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
+      $(PackageTargetFallback);dnxcore50;portable-net45+win8
+    </PackageTargetFallback>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Serilog\Serilog.csproj" />
@@ -16,7 +18,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
     <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.9.9" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.10.3" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
   </ItemGroup>