[automated] Change default branch to master

This commit is contained in:
Nate McMaster (automated) 2018-07-02 12:40:23 -07:00
parent 655457edd5
commit 7d8599ed5c
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
4 changed files with 16 additions and 16 deletions

View File

@ -1,20 +1,20 @@
init:
- git config --global core.autocrlf true
- git config --global core.autocrlf true
branches:
only:
- dev
- /^release\/.*$/
- /^(.*\/)?ci-.*$/
- master
- /^release\/.*$/
- /^(.*\/)?ci-.*$/
install:
- ps: .\tools\update_schema.ps1
- git submodule update --init --recursive
- ps: .\tools\update_schema.ps1
- git submodule update --init --recursive
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

View File

@ -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/master/tools/korebuild.schema.json",
"channel": "master",
"toolsets": {
"visualstudio": {
"required": ["Windows"],
@ -14,4 +14,4 @@
]
}
}
}
}

View File

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

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