| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166 |
- commit 03b42ccbe83eedaa0a98913aef66785a266480d0
- Author: Nate McMaster (automated) <[email protected]>
- Date: Mon Jul 2 12:40:11 2018 -0700
- [automated] Change default branch to master
- diff --git a/.appveyor.yml b/.appveyor.yml
- index 46038786c91..d45bd5a1f80 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-.*$/
- + - master
- + - /^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..ab3980055c0 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-.*$/
- + - master
- + - /^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/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml
- index d7ceb763786..c2c5336fd0f 100644
- --- a/.vsts-pipelines/builds/ci-internal.yml
- +++ b/.vsts-pipelines/builds/ci-internal.yml
- @@ -1,5 +1,5 @@
- trigger:
- -- dev
- +- master
- - release/*
-
- resources:
- @@ -7,7 +7,7 @@ resources:
- - repository: buildtools
- type: git
- name: aspnet-BuildTools
- - ref: refs/heads/dev
- + ref: refs/heads/master
-
- phases:
- - template: .vsts-pipelines/templates/project-ci.yml@buildtools
- diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml
- index b7f25723f8b..507c89b0250 100644
- --- a/.vsts-pipelines/builds/ci-public.yml
- +++ b/.vsts-pipelines/builds/ci-public.yml
- @@ -1,5 +1,5 @@
- trigger:
- -- dev
- +- master
- - release/*
-
- # See https://github.com/aspnet/BuildTools
- @@ -9,7 +9,7 @@ resources:
- type: github
- endpoint: DotNet-Bot GitHub Connection
- name: aspnet/BuildTools
- - ref: refs/heads/dev
- -
- + ref: refs/heads/master
- +
- phases:
- - template: .vsts-pipelines/templates/project-ci.yml@buildtools
- diff --git a/korebuild.json b/korebuild.json
- index bd5d51a51b0..8a276a7f35d 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/master/tools/korebuild.schema.json",
- + "channel": "master"
- }
- diff --git a/run.ps1 b/run.ps1
- index 3b273824681..34604c71758 100644
- --- a/run.ps1
- +++ b/run.ps1
- @@ -52,8 +52,8 @@ in the file are overridden by command line parameters.
- Example config file:
- ```json
- {
- - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
- - "channel": "dev",
- + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
- + "channel": "master",
- "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
- }
- ```
- @@ -192,7 +192,7 @@ if (!$DotNetHome) {
- else { Join-Path $PSScriptRoot '.dotnet'}
- }
-
- -if (!$Channel) { $Channel = 'dev' }
- +if (!$Channel) { $Channel = 'master' }
- if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
-
- # Execute
- diff --git a/run.sh b/run.sh
- index 02aac158742..61f7a533855 100755
- --- a/run.sh
- +++ b/run.sh
- @@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then
- [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
- fi
-
- -[ -z "$channel" ] && channel='dev'
- +[ -z "$channel" ] && channel='master'
- [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
-
- get_korebuild
|