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-03-02 14:21:36 -08:00
parent 4a49d6dd75 f173f3f08f
commit 82013bd8b5
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.appveyor.yml
View File

@ -5,20 +5,19 @@ environment:
global:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: 1
ASPNETCORE_WSTEST_PATH: "$(APPVEYOR_BUILD_FOLDER)/vendor/virtualenv/Scripts/wstest.exe"
ASPNETCORE_WSTEST_PATH: $(APPVEYOR_BUILD_FOLDER)/vendor/virtualenv/Scripts/wstest.exe
cache:
- vendor\VCForPython27.msi
branches:
only:
- master
- /release\/.*/
- dev
- /^release\/.*$/
- /^(.*\/)?ci-.*$/
install:
- ps: .\build\setup-wstest.ps1
build_script:
- ps: .\run.ps1 default-build
clone_depth: 1
test: off
deploy: off
test: 'off'
deploy: 'off'
os: Visual Studio 2017

5
.travis.yml
View File

@ -6,7 +6,7 @@ env:
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
- AUTOBAHN_SUITES_LOG: 1
- ASPNETCORE_WSTEST_PATH: "$TRAVIS_BUILD_DIR/.virtualenv/bin/wstest"
- ASPNETCORE_WSTEST_PATH: $TRAVIS_BUILD_DIR/.virtualenv/bin/wstest
mono: none
python:
- pypy
@ -20,9 +20,8 @@ addons:
- libunwind8
branches:
only:
- master
- /release\/.*/
- dev
- /^release\/.*$/
- /^(.*\/)?ci-.*$/
install:
- ./build/setup-wstest.sh