| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136 |
- commit c4904acddadfc69a6da83e17ce771333de02dcab
- Author: Nate McMaster <[email protected]>
- Date: Wed Jan 31 15:01:11 2018 -0800
- 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
- diff --git a/.appveyor.yml b/.appveyor.yml
- index 46038786c91..4eea96ab69c 100644
- --- a/.appveyor.yml
- +++ b/.appveyor.yml
- @@ -1,18 +1,17 @@
- init:
- - - git config --global core.autocrlf true
- +- git config --global core.autocrlf true
- branches:
- only:
- - - master
- - - release
- - - dev
- - - /^(.*\/)?ci-.*$/
- + - dev
- + - /^release\/.*$/
- + - /^(.*\/)?ci-.*$/
- build_script:
- - - ps: .\run.ps1 default-build
- +- ps: .\run.ps1 default-build
- 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 b10be142157..64bdbb4441c 100644
- --- a/.travis.yml
- +++ b/.travis.yml
- @@ -3,24 +3,25 @@ sudo: false
- dist: trusty
- env:
- global:
- - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
- - - DOTNET_CLI_TELEMETRY_OPTOUT: 1
- + - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
- + - DOTNET_CLI_TELEMETRY_OPTOUT: 1
- mono: none
- os:
- - - linux
- - - osx
- +- linux
- +- osx
- osx_image: xcode8.2
- addons:
- apt:
- packages:
- - - libunwind8
- + - libunwind8
- branches:
- only:
- - - master
- - - release
- - - dev
- - - /^(.*\/)?ci-.*$/
- + - dev
- + - /^release\/.*$/
- + - /^(.*\/)?ci-.*$/
- 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:
- - - ./build.sh
- +- ./build.sh
- diff --git a/build/dependencies.props b/build/dependencies.props
- index ae4dea95b88..14677c6e2e0 100644
- --- a/build/dependencies.props
- +++ b/build/dependencies.props
- @@ -3,18 +3,18 @@
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
- <PropertyGroup Label="Package Versions">
- - <InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-15679</InternalAspNetCoreSdkPackageVersion>
- - <MicrosoftAspNetCoreAuthenticationCorePackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
- - <MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreHostingPackageVersion>
- - <MicrosoftAspNetCoreTestingPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreTestingPackageVersion>
- - <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsLoggingConsolePackageVersion>
- + <InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-1010</InternalAspNetCoreSdkPackageVersion>
- + <MicrosoftAspNetCoreAuthenticationCorePackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
- + <MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreHostingPackageVersion>
- + <MicrosoftAspNetCoreTestingPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreTestingPackageVersion>
- + <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsLoggingConsolePackageVersion>
- <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
- - <MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-26115-03</MicrosoftNETCoreApp21PackageVersion>
- - <MicrosoftNetHttpHeadersPackageVersion>2.1.0-preview1-28153</MicrosoftNetHttpHeadersPackageVersion>
- + <MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-26122-01</MicrosoftNETCoreApp21PackageVersion>
- + <MicrosoftNetHttpHeadersPackageVersion>2.1.0-preview1-28193</MicrosoftNetHttpHeadersPackageVersion>
- <MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
- - <MicrosoftWin32RegistryPackageVersion>4.5.0-preview1-26112-01</MicrosoftWin32RegistryPackageVersion>
- - <SystemNetHttpWinHttpHandlerPackageVersion>4.5.0-preview1-26112-01</SystemNetHttpWinHttpHandlerPackageVersion>
- - <SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview1-26112-01</SystemSecurityPrincipalWindowsPackageVersion>
- + <MicrosoftWin32RegistryPackageVersion>4.5.0-preview1-26119-06</MicrosoftWin32RegistryPackageVersion>
- + <SystemNetHttpWinHttpHandlerPackageVersion>4.5.0-preview1-26119-06</SystemNetHttpWinHttpHandlerPackageVersion>
- + <SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview1-26119-06</SystemSecurityPrincipalWindowsPackageVersion>
- <XunitPackageVersion>2.3.1</XunitPackageVersion>
- <XunitRunnerVisualStudioPackageVersion>2.3.1</XunitRunnerVisualStudioPackageVersion>
- </PropertyGroup>
- diff --git a/korebuild-lock.txt b/korebuild-lock.txt
- index a474bc0e356..851bfbf2034 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 bd5d51a51b0..678d8bb9483 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"
- }
|