Merge branch 'master' into dev

This commit is contained in:
bao-qian 2016-04-22 23:04:05 +01:00
commit fea237a3ea
2 changed files with 15 additions and 3 deletions

View File

@ -1,5 +1,6 @@
[![Build status](https://ci.appveyor.com/api/projects/status/bfktntbivg32e103)](https://ci.appveyor.com/project/qianlifeng/wox) [![Github All Releases](https://img.shields.io/github/downloads/Wox-launcher/Wox/total.svg)](https://github.com/Wox-launcher/Wox/releases)
[![Bountysource](https://www.bountysource.com/badge/team?team_id=39433&style=raised)](https://www.bountysource.com/teams/wox?utm_source=Wox&utm_medium=shield&utm_campaign=raised)
[![Gitter](https://badges.gitter.im/Wox-launcher/Wox.svg)](https://gitter.im/Wox-launcher/Wox?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
[![Build status](https://ci.appveyor.com/api/projects/status/bfktntbivg32e103)](https://ci.appveyor.com/project/happlebao/wox)
[![Github All Releases](https://img.shields.io/github/downloads/Wox-launcher/Wox/total.svg)](https://github.com/Wox-launcher/Wox/releases)
[![Issue Stats](http://issuestats.com/github/Wox-launcher/Wox/badge/pr)](http://issuestats.com/github/Wox-launcher/Wox)
=========

View File

@ -7,7 +7,7 @@ assembly_info:
file: AssemblyInfo.*
assembly_version: '{version}'
assembly_file_version: '{version}'
assembly_informational_version: '{version}-beta.2-$(APPVEYOR_REPO_COMMIT)'
assembly_informational_version: '{version}-$(APPVEYOR_REPO_COMMIT)'
before_build:
- ps: nuget restore
build:
@ -29,3 +29,14 @@ deploy:
artifact: nuget_package
on:
branch: api
- provider: GitHub
description: 'Prerelease from every stable master build'
auth_token:
# encriped using appveyor account -> encrypt data
secure: QWPF8at/Ber4dcTAtOVZd7kgbUii6GYrEFdJAKC6SaqmwMO9OAwkXccN2bqBAml9
artifact: /.*\.zip/
prerelease: true
on:
branch: master
# deploy on tag push only
appveyor_repo_tag: true