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

Merge branch 'release/2.1' into dev

This commit is contained in:
Nate McMaster 2018-02-09 10:05:29 -08:00
parent 3f03428b0c a64672d6e9
commit aee1afce91
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.appveyor.yml
View File

@ -3,7 +3,7 @@ init:
branches: branches:
only: only:
- dev - dev
- /^release\/.*/ - /^release\/.*$/
- /^(.*\/)?ci-.*$/ - /^(.*\/)?ci-.*$/
build_script: build_script:
- ps: .\run.ps1 default-build - ps: .\run.ps1 default-build
@ -12,6 +12,6 @@ environment:
global: global:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_CLI_TELEMETRY_OPTOUT: 1
test: off test: 'off'
deploy: off deploy: 'off'
os: Visual Studio 2017 os: Visual Studio 2017

6
.travis.yml
View File

@ -17,9 +17,11 @@ addons:
branches: branches:
only: only:
- dev - dev
- /^release\/.*/ - /^release\/.*$/
- /^(.*\/)?ci-.*$/ - /^(.*\/)?ci-.*$/
before_install: before_install:
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s
/usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib
/usr/local/lib/; fi
script: script:
- ./build.sh - ./build.sh

4
src/Directory.Build.targets
View File

@ -3,4 +3,8 @@
<Import Project="..\Directory.Build.targets" /> <Import Project="..\Directory.Build.targets" />
<Import Project="PackGlobalTool.targets" /> <Import Project="PackGlobalTool.targets" />
<Target Name="CleanPublishDir" AfterTargets="CoreClean">
<RemoveDir Directories="$(PublishDir)" />
</Target>
</Project> </Project>