huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into feature/msbuild

This commit is contained in:
Nate McMaster 2016-12-15 09:35:06 -08:00
parent d55948cae3 c8b37f47d0
commit a4b7bbab45
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -19,6 +19,7 @@ mono:
os: os:
- linux - linux
- osx - osx
osx_image: xcode7.3
branches: branches:
only: only:
- master - master

2
build.sh
View File

@ -38,7 +38,7 @@ if test ! -d $buildFolder; then
chmod +x $buildFile chmod +x $buildFile
# Cleanup # Cleanup
if test ! -d $tempFolder; then if test -d $tempFolder; then
rm -rf $tempFolder rm -rf $tempFolder
fi fi
fi fi