Merge build configs

appveyor.yml

@@ -1,21 +1,4 @@
--
-  branches:
-    only:
-      - master
-      - /v.*/
-
-  version: 1.1.999.{build}
-
-  image: Visual Studio 2017
-
-  dotnet_csproj:
-    patch: true
-    file: '**\*.csproj'
-    version: '{version}'
-    package_version: '{version}'
-    assembly_version: '{version}'
-    file_version: '{version}'
-    informational_version: '{version}'
+# AppVeyor config for https://github.com/inflatablefriends/lastfm
 
 configuration: Release
 
@@ -31,6 +14,32 @@
 test_script:
   - ps: .\run-tests.ps1
 
+image: Visual Studio 2017
+
+dotnet_csproj:
+  patch: true
+  file: '**\*.csproj'
+  version: '{version}'
+  package_version: '{version}'
+  assembly_version: '{version}'
+  file_version: '{version}'
+  informational_version: '{version}'
+
+notifications:
+  - provider: Webhook # ping Gitter ticker 
+    url: https://webhooks.gitter.im/e/aa615fb57d382a430815
+
+#---------------------------------------------------------------
+
+for:
+  -
+    branches:
+      only:
+        - master
+        - /v.*/
+
+    version: 1.1.999.{build}
+    
     after_test:
       - ps: pushd .nuget
       - ps: .\pack.ps1 -versionSuffix prerelease
@@ -44,12 +53,6 @@
         name: IF.Lastfm.SQLite.dll
       - path: '\*-prerelease.nupkg'
 
-  notifications:
-    - provider: Webhook # ping Gitter ticker 
-      url: https://webhooks.gitter.im/e/aa615fb57d382a430815
-
-#---------------------------------------------------------------
-
   -
     branches:
       only:
@@ -58,31 +61,6 @@
     # don't forget to update this!
     version: 1.1.1.{build}
     
-  image: Visual Studio 2017
-
-  dotnet_csproj:
-    patch: true
-    file: '**\*.csproj'
-    version: '{version}'
-    package_version: '{version}'
-    assembly_version: '{version}'
-    file_version: '{version}'
-    informational_version: '{version}'
-
-  configuration: Release
-
-  install:
-    - appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe
-
-  before_build:
-    - ps: nuget restore IF.Lastfm.sln
-
-  build:
-    project: IF.Lastfm.sln
-
-  test_script:
-    - ps: .\run-tests.ps1
-
     after_test:
       - ps: pushd .nuget
       - ps: .\pack.ps1
@@ -101,7 +79,3 @@
       api_key:
         secure: b4Q8KLmOfeQHZNGbTf4OYud3pvi3aR4rKE35dcLHYBTBaQwc9QeoIkDoG13Jpbxs
       artifact: /.*\.nupkg/
-
-  notifications:
-    - provider: Webhook # ping Gitter ticker 
-      url: https://webhooks.gitter.im/e/aa615fb57d382a430815