From 631217586ec5f62234d0777ea6a2924ae22a5df4 Mon Sep 17 00:00:00 2001
From: Scott Williams <tocsoft@gmail.com>
Date: Sat, 19 Aug 2017 12:51:01 +0100
Subject: [PATCH] update build scripts to ensure tests only run once during CI

---
 appveyor.yml |  2 +-
 build.cmd    | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2e713e452b..5c548a71c8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,7 +18,7 @@ build_script:
 test_script:
 - tests\CodeCoverage\CodeCoverage.cmd
 
-after_build:
+after_test:
   - cmd: appveyor PushArtifact "artifacts\SixLabors.ImageSharp.%GitVersion_NuGetVersion%.nupkg"
   - cmd: appveyor PushArtifact "artifacts\SixLabors.ImageSharp.Drawing.%GitVersion_NuGetVersion%.nupkg"
 
diff --git a/build.cmd b/build.cmd
index 662be648a2..1ba1b3742e 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,5 +1,6 @@
 @echo Off
 
+SET versionCommand=
 if not "%GitVersion_NuGetVersion%" == "" (
     SET versionCommand=/p:packageversion=%GitVersion_NuGetVersion%
     @echo building with version set to '%GitVersion_NuGetVersion%'
@@ -7,16 +8,18 @@ if not "%GitVersion_NuGetVersion%" == "" (
 
 dotnet restore %versionCommand%
 
-
-ECHO Building nuget packages
+ECHO Building projects
 dotnet build -c Release %versionCommand%
+
 if not "%errorlevel%"=="0" goto failure
 
-if not %CI% == "True" (
+if not "%CI%" == "True"  (
+    ECHO NOT on CI server running tests
     dotnet test ./tests/ImageSharp.Tests/ImageSharp.Tests.csproj --no-build -c Release
-    if not "%errorlevel%"=="0" goto failure
 )
+if not "%errorlevel%"=="0" goto failure
 
+ECHO Packaging projects
 dotnet pack ./src/ImageSharp/ -c Release --output ../../artifacts --no-build  %versionCommand%
 if not "%errorlevel%"=="0" goto failure