Merge branch 'release/2.2'

This commit is contained in:
Nate McMaster 2018-07-30 17:16:32 -07:00
commit e4ac66cb13
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
3 changed files with 17 additions and 40 deletions

View File

@ -1,21 +0,0 @@
init:
- git config --global core.autocrlf true
branches:
only:
- master
- /^release\/.*/
- /^(.*\/)?ci-.*$/
install:
- git submodule update --init --recursive
skip_commits:
message: /.*\[auto-updated:.*/
build_script:
- ps: .\run.ps1 default-build /t:CheckUniverse
clone_depth: 1
environment:
global:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: 1
test: off
deploy: off
os: Visual Studio 2017

View File

@ -1,19 +0,0 @@
language: csharp
sudo: false
dist: trusty
env:
global:
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
mono: none
addons:
apt:
packages:
- libunwind8
branches:
only:
- master
- /^release\/.*/
- /^(.*\/)?ci-.*$/
script:
- ./build.sh -t:CheckUniverse

View File

@ -0,0 +1,17 @@
trigger:
- master
- release/*
# See https://github.com/aspnet/BuildTools
resources:
repositories:
- repository: buildtools
type: github
endpoint: DotNet-Bot GitHub Connection
name: aspnet/BuildTools
ref: refs/heads/master
phases:
- template: .vsts-pipelines/templates/project-ci.yml@buildtools
parameters:
buildArgs: "/t:CheckUniverse"