[automated] Change default branch to master

This commit is contained in:
Nate McMaster (automated) 2018-07-02 12:40:27 -07:00
Родитель d9b34d1c36
Коммит 77ca2f95a2
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: A778D9601BD78810
7 изменённых файлов: 15 добавлений и 15 удалений

Просмотреть файл

@ -2,7 +2,7 @@ init:
- git config --global core.autocrlf true
branches:
only:
- dev
- master
- /^release\/.*$/
- /^(.*\/)?ci-.*$/
build_script:
@ -12,7 +12,7 @@ environment:
global:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: 1
ASPNETCORE_TEST_LOG_DIR: "$APPVEYOR_BUILD_FOLDER\\artifacts\\logs"
ASPNETCORE_TEST_LOG_DIR: $APPVEYOR_BUILD_FOLDER\artifacts\logs
test: 'off'
deploy: 'off'
os: Visual Studio 2017

Просмотреть файл

@ -5,7 +5,7 @@ env:
global:
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
- ASPNETCORE_TEST_LOG_DIR: "$APPVEYOR_BUILD_FOLDER\\artifacts\\logs"
- ASPNETCORE_TEST_LOG_DIR: $APPVEYOR_BUILD_FOLDER\artifacts\logs
mono: none
os:
- linux
@ -17,7 +17,7 @@ addons:
- libunwind8
branches:
only:
- dev
- master
- /^release\/.*$/
- /^(.*\/)?ci-.*$/
before_install:

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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"
}

Просмотреть файл

@ -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

2
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