diff --git a/.appveyor.yml b/.appveyor.yml
index c171b4c7f4..0b53daa069 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,22 +1,19 @@
-init:
- - git config --global core.autocrlf true
+init:
+- git config --global core.autocrlf true
install:
- - ps: Install-Product node 8 x64
+- ps: Install-Product node 8 x64
branches:
only:
- - master
- - release
- - dev
- - /^rel\/.*/
- - /^release\/.*/
- - /^(.*\/)?ci-.*$/
+ - dev
+ - /^release\/.*$/
+ - /^(.*\/)?ci-.*$/
build_script:
- - ps: .\build.cmd
+- ps: .\build.cmd
clone_depth: 1
environment:
global:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: 1
-test: off
-deploy: off
+test: 'off'
+deploy: 'off'
os: Visual Studio 2017
diff --git a/.travis.yml b/.travis.yml
index fdb971f0ed..41d3fd2653 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,25 +3,27 @@ sudo: required
dist: trusty
env:
global:
- - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
- - DOTNET_CLI_TELEMETRY_OPTOUT: 1
- - TRAVIS_NODE_VERSION: 8.9.3
+ - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+ - DOTNET_CLI_TELEMETRY_OPTOUT: 1
+ - TRAVIS_NODE_VERSION: 8.9.3
addons:
apt:
packages:
- - libunwind8
+ - libunwind8
mono: none
os:
- - linux
- - osx
+- linux
+- osx
osx_image: xcode9.2
branches:
only:
- - dev
- - /^release\/.*$/
- - /^(.*\/)?ci-.*$/
+ - dev
+ - /^release\/.*$/
+ - /^(.*\/)?ci-.*$/
before_install:
- - nvm install $TRAVIS_NODE_VERSION
- - 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
+- nvm install $TRAVIS_NODE_VERSION
+- 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:
- - ./build.sh
\ No newline at end of file
+- ./build.sh
diff --git a/build/dependencies.props b/build/dependencies.props
index e7c8a05fc7..1a211c1adc 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -3,39 +3,39 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 2.1.0-preview1-15679
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
+ 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
+ 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.1.0-preview1-28193
+ 2.1.0-preview1-28193
+ 2.1.0-preview1-28193
+ 2.1.0-preview1-28193
15.3.409
15.3.409
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
+ 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
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
- 2.1.0-preview1-28163
+ 2.1.0-preview1-28193
+ 2.1.0-preview1-28193
+ 2.1.0-preview1-28193
0.19.0
3.7.0
16.16299.0
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 0518052b1b..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 19b76654e1..9260aaf1e6 100644
--- a/korebuild.json
+++ b/korebuild.json
@@ -1,6 +1,6 @@
{
- "$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",
"toolsets": {
"nodejs": {
"required": true,