| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136 |
- commit f35c814fc76b544b984a7520d79771c5c03a1b27
- 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 10c59a68332..0d49a01d7f8 100755
- --- a/.appveyor.yml
- +++ b/.appveyor.yml
- @@ -1,21 +1,19 @@
- init:
- - - git config --global core.autocrlf true
- +- git config --global core.autocrlf true
- install:
- - - ps: Install-Product node 6.9.2 x64
- +- ps: Install-Product node 6.9.2 x64
- branches:
- only:
- - - master
- - - release
- - - dev
- - - /^(.*\/)?ci-.*$/
- - - /^rel\/.*/
- + - 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 33cfe66b9a9..7a388983f55 100755
- --- a/.travis.yml
- +++ b/.travis.yml
- @@ -12,8 +12,13 @@ addons:
- - zlib1g
- mono: none
- os:
- - - linux
- - - osx
- +- linux
- +- osx
- osx_image: xcode7.1
- script:
- - - ./build.sh
- +- ./build.sh
- +branches:
- + only:
- + - dev
- + - /^release\/.*$/
- + - /^(.*\/)?ci-.*$/
- diff --git a/build/dependencies.props b/build/dependencies.props
- index a889aab2c41..08bab6cef85 100644
- --- a/build/dependencies.props
- +++ b/build/dependencies.props
- @@ -3,25 +3,25 @@
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
- <PropertyGroup Label="Package Versions">
- - <InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-15679</InternalAspNetCoreSdkPackageVersion>
- - <MicrosoftAspNetCoreDiagnosticsPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreDiagnosticsPackageVersion>
- - <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
- - <MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreHostingPackageVersion>
- - <MicrosoftAspNetCoreMvcPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreMvcPackageVersion>
- - <MicrosoftAspNetCoreMvcTagHelpersPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreMvcTagHelpersPackageVersion>
- - <MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>
- - <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
- - <MicrosoftAspNetCoreServerKestrelPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreServerKestrelPackageVersion>
- - <MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreStaticFilesPackageVersion>
- - <MicrosoftAspNetCoreWebSocketsPackageVersion>2.1.0-preview1-28153</MicrosoftAspNetCoreWebSocketsPackageVersion>
- - <MicrosoftExtensionsDependencyInjectionPackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsDependencyInjectionPackageVersion>
- - <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
- - <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsLoggingConsolePackageVersion>
- - <MicrosoftExtensionsLoggingDebugPackageVersion>2.1.0-preview1-28153</MicrosoftExtensionsLoggingDebugPackageVersion>
- + <InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-1010</InternalAspNetCoreSdkPackageVersion>
- + <MicrosoftAspNetCoreDiagnosticsPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreDiagnosticsPackageVersion>
- + <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
- + <MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreHostingPackageVersion>
- + <MicrosoftAspNetCoreMvcPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreMvcPackageVersion>
- + <MicrosoftAspNetCoreMvcTagHelpersPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreMvcTagHelpersPackageVersion>
- + <MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>
- + <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
- + <MicrosoftAspNetCoreServerKestrelPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreServerKestrelPackageVersion>
- + <MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreStaticFilesPackageVersion>
- + <MicrosoftAspNetCoreWebSocketsPackageVersion>2.1.0-preview1-28193</MicrosoftAspNetCoreWebSocketsPackageVersion>
- + <MicrosoftExtensionsDependencyInjectionPackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsDependencyInjectionPackageVersion>
- + <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
- + <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsLoggingConsolePackageVersion>
- + <MicrosoftExtensionsLoggingDebugPackageVersion>2.1.0-preview1-28193</MicrosoftExtensionsLoggingDebugPackageVersion>
- <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
- - <MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-26115-03</MicrosoftNETCoreApp21PackageVersion>
- + <MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-26122-01</MicrosoftNETCoreApp21PackageVersion>
- <NewtonsoftJsonPackageVersion>10.0.1</NewtonsoftJsonPackageVersion>
- - <SystemThreadingTasksDataflowPackageVersion>4.9.0-preview1-26112-01</SystemThreadingTasksDataflowPackageVersion>
- + <SystemThreadingTasksDataflowPackageVersion>4.9.0-preview1-26119-06</SystemThreadingTasksDataflowPackageVersion>
- </PropertyGroup>
- <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
- </Project>
- 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 147edd8750f..8f2792737fa 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,
|