Merge branch 'release/2.2'

This commit is contained in:
Nate McMaster 2018-07-26 17:12:42 -07:00
commit 42f8f3eab4
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 46 additions and 0 deletions

View File

@ -0,0 +1,13 @@
trigger:
- master
- release/*
resources:
repositories:
- repository: buildtools
type: git
name: aspnet-BuildTools
ref: refs/heads/master
phases:
- template: .vsts-pipelines/templates/project-ci.yml@buildtools

View File

@ -0,0 +1,33 @@
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
# Workaround https://dotnet.visualstudio.com/internal/_workitems/edit/28.
# When this is fixed, we can simplify the build to just this
#
# phases:
# - template: .vsts-pipelines/templates/project-ci.yml@buildtools
#
phases:
- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
parameters:
agentOs: macOS
- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
parameters:
agentOs: Windows
- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
parameters:
agentOs: Linux
# Workaround https://dotnet.visualstudio.com/internal/_workitems/edit/28
# VSTS hangs indefinitely when running Razor tests.
buildArgs: "-p:SkipTests=true"