From f173f3f08f45da0f353656cf0dc585fec65d5353 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 31 Jan 2018 15:01:14 -0800 Subject: [PATCH] Update dependencies.props to 2.1.0-preview-28193, build tools to 2.1.0-preview1-1010 [ci skip] Scripted changes: - updated travis and appveyor.yml files to only build dev, ci, and release branches - updated dependencies.props - updated korebuild-lock.txt - updated korebuild.json to release/2.1 channel --- .appveyor.yml | 15 +++++++-------- .travis.yml | 27 +++++++++++++-------------- build/dependencies.props | 30 +++++++++++++++--------------- korebuild-lock.txt | 4 ++-- korebuild.json | 4 ++-- 5 files changed, 39 insertions(+), 41 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 7ca6d1770f..212f42583e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,5 +1,5 @@ init: - - git config --global core.autocrlf true +- git config --global core.autocrlf true environment: AUTOBAHN_SUITES_LOG: 1 global: @@ -7,13 +7,12 @@ environment: DOTNET_CLI_TELEMETRY_OPTOUT: 1 branches: only: - - master - - /release\/.*/ - - dev - - /^(.*\/)?ci-.*$/ + - dev + - /^release\/.*$/ + - /^(.*\/)?ci-.*$/ 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 diff --git a/.travis.yml b/.travis.yml index 1a8a676d38..81bf8af485 100644 --- a/.travis.yml +++ b/.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 diff --git a/build/dependencies.props b/build/dependencies.props index 2de3e02327..c437c86eb8 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,21 +3,21 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.0-preview1-15679 - 2.1.0-preview1-28172 - 2.1.0-preview1-28172 - 2.1.0-preview1-28172 - 2.1.0-preview1-28172 - 2.1.0-preview1-28172 - 0.5.0-preview1-28172 - 2.1.0-preview1-28172 - 2.1.0-preview1-28172 - 2.1.0-preview1-28172 - 2.1.0-preview1-28172 - 2.1.0-preview1-28172 - 2.1.0-preview1-28172 - 2.1.0-preview1-28172 - 2.1.0-preview1-28172 + 2.1.0-preview1-1010 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 0.5.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 2.0.0 2.1.0-preview1-26122-01 15.3.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index a474bc0e35..851bfbf203 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview1-15679 -commithash:5347461137cb45a77ddcc0b55b2478092de43338 +version:2.1.0-preview1-1010 +commithash:75ca924dfbd673c38841025b04c4dcd93b84f56d diff --git a/korebuild.json b/korebuild.json index bd5d51a51b..678d8bb948 100644 --- a/korebuild.json +++ b/korebuild.json @@ -1,4 +1,4 @@ { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", - "channel": "dev" + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json", + "channel": "release/2.1" }