Improve handling of AppVeyor build

Author: robmen

appveyor.cmd

@@ -1,61 +1,36 @@
-- # Development branches build.
-  version: 0.0.0.{branch}-{build}
-  configuration: Debug
-
-  environment:
-    DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-    NUGET_XMLDOC_MODE: skip
-
-  init:
-    - git config --global core.autocrlf true
-
-  build_script:
-    - appveyor.cmd
-
-  skip_tags: true
-
-
-- # Master build and deploy.
-  branches:
-    only:
-      - master
-
-  version: 0.0.0.{build}
-  configuration: Release
-
-  environment:
-    DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-    NUGET_XMLDOC_MODE: skip
-    GITHUB_ACCESS_TOKEN:
-      secure: BuuXJ8z8dMoeeMPy4l7QbbNPFn1/CW9PRGZxMhH3IAFdtTftFKZHA7eqpBqiE2T3
-
-  init:
-    - git config --global core.autocrlf true
-
-  build_script:
-    - appveyor.cmd
-
-  artifacts:
-    - path: build\deploy\
-      name: deploy-artifacts
-
-  deploy:
-    - provider: WebDeploy
-      server: https://wixtoolset-staging.scm.azurewebsites.net:443/msdeploy.axd?site=wixtoolset-staging
-      website: wixtoolset__staging
-      username: $wixtoolset__staging
-      password:
-        secure: rSNrD+nlS813sckRsk5os/7NiYbvGl9faU3n1KjeCWr8iiO2lHTZTDj/NH9h3zfbagqXPAcu/f5hVjZuBqc95g==
-      remove_files: true
-      app_offline: true
-      artifact: deploy-artifacts
-
-  on_success:
-    - git config --global credential.helper store
-    - ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:GITHUB_ACCESS_TOKEN):[email protected]`n"
-    - git config --global user.email "[email protected]"
-    - git config --global user.name "WiX-BoT"
-    - git tag -a v%GitBuildVersion% -m "Build v%GitBuildVersion%"
-    - git push --tags origin HEAD:master
-
-  skip_tags: true
+version: 0.0.0.{build}
+configuration: Release
+
+environment:
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  NUGET_XMLDOC_MODE: skip
+  GITHUB_ACCESS_TOKEN:
+    secure: BuuXJ8z8dMoeeMPy4l7QbbNPFn1/CW9PRGZxMhH3IAFdtTftFKZHA7eqpBqiE2T3
+
+init:
+  - git config --global core.autocrlf true
+  - git config --global user.email "[email protected]"
+  - git config --global user.name "WiX-BoT"
+
+build_script:
+  - tools\appveyor_bld.cmd build\deploy
+
+artifacts:
+  - path: build\deploy
+    name: deploy-artifacts
+
+deploy:
+  - provider: WebDeploy
+    server: https://wixtoolset-staging.scm.azurewebsites.net:443/msdeploy.axd?site=wixtoolset-staging
+    website: wixtoolset__staging
+    username: $wixtoolset__staging
+    password:
+      secure: rSNrD+nlS813sckRsk5os/7NiYbvGl9faU3n1KjeCWr8iiO2lHTZTDj/NH9h3zfbagqXPAcu/f5hVjZuBqc95g==
+    remove_files: true
+    app_offline: true
+    artifact: deploy-artifacts
+
+on_success:
+  - ps: tools\appveyor_tag.ps1 -GithubAccessToken $env:GITHUB_ACCESS_TOKEN -Version $env:GitBuildVersion
+
+skip_tags: true

appveyor.yml

@@ -0,0 +1,16 @@
+@setlocal
+
+@set _P=%~dp0..\
+@set _RELATIVE_OUTPUT_FOLDER=%1
+
+@if "%CONFIGURATION%"=="" set CONFIGURATION=Release
+@if "%_RELATIVE_OUTPUT_FOLDER%"=="" set _RELATIVE_OUTPUT_FOLDER=build\deploy
+
+@pushd %_P%
+
+dotnet restore Web.sln
+
+dotnet publish .\src\Web\Web.csproj --configuration %CONFIGURATION% --output %CD%\%_RELATIVE_OUTPUT_FOLDER%
+
+@popd
+@endlocal

tools/appveyor_bld.cmd

@@ -0,0 +1,19 @@
+param (
+  [Parameter(Mandatory=$True)]
+  [string] $GithubAccessToken,
+
+  [Parameter(Mandatory=$True)]
+  [string] $Version
+)
+
+# Only tag builds on the master branch and not pull requests.
+if (($env:APPVEYOR_REPO_BRANCH -ne "master") -or (Test-Path env:\APPVEYOR_PULL_REQUEST_NUMBER))
+{
+    return
+}
+
+git config --global credential.helper store
+Add-Content "$env:USERPROFILE\.git-credentials" "https://$($GithubAccessToken):[email protected]`n"
+
+git tag -a v$Version -m "Build v$Version"
+git push --quiet --tags origin HEAD:master