Merge branch 'release/2.1' into dev

.appveyor.yml

@@ -1,24 +1,23 @@
 init:
-  - git config --global core.autocrlf true
+- git config --global core.autocrlf true
 environment:
   AUTOBAHN_SUITES_LOG: 1
   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
+- vendor\VCForPython27.msi
 branches:
   only:
-    - master
-    - /release\/.*/
-    - dev
-    - /^(.*\/)?ci-.*$/
+  - dev
+  - /^release\/.*$/
+  - /^(.*\/)?ci-.*$/
 install:
-  - ps: .\build\setup-wstest.ps1
+- ps: .\build\setup-wstest.ps1
 build_script:
-  - ps: .\run.ps1 default-build
+- ps: .\run.ps1 default-build
 clone_depth: 1
-test: off
-deploy: off
+test: 'off'
+deploy: 'off'
 os: Visual Studio 2017

.travis.yml

@@ -3,28 +3,27 @@ sudo: false
 dist: trusty
 env:
   global:
-    - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-    - DOTNET_CLI_TELEMETRY_OPTOUT: 1
-    - AUTOBAHN_SUITES_LOG: 1
-    - ASPNETCORE_WSTEST_PATH: "$TRAVIS_BUILD_DIR/.virtualenv/bin/wstest"
+  - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  - DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  - AUTOBAHN_SUITES_LOG: 1
+  - ASPNETCORE_WSTEST_PATH: $TRAVIS_BUILD_DIR/.virtualenv/bin/wstest
 mono: none
 python:
-  - pypy
+- pypy
 os:
-  - linux
-  - osx
+- linux
+- osx
 osx_image: xcode8.2
 addons:
   apt:
     packages:
-      - libunwind8
+    - libunwind8
 branches:
   only:
-    - master
-    - /release\/.*/
-    - dev
-    - /^(.*\/)?ci-.*$/
+  - dev
+  - /^release\/.*$/
+  - /^(.*\/)?ci-.*$/
 install:
-  - ./build/setup-wstest.sh
+- ./build/setup-wstest.sh
 script:
-  - ./build.sh
+- ./build.sh