Merge in 'release/2.1' changes

This commit is contained in:
dotnet-bot 2018-12-06 20:42:41 +00:00
commit d09ff4d30b
2 changed files with 39 additions and 10 deletions

View File

@ -1,18 +1,17 @@
trigger:
- master
- release/*
# Don't run CI for this config yet. We're not ready to move official builds on to Azure Pipelines
trigger: none
# Run PR validation on all branches
pr:
branches:
include:
- '*'
jobs:
- template: jobs/default-build.yml
parameters:
jobName: PR_FastCheck
jobDisplayName: Fast Check
agentOs: Windows
buildArgs: "/t:FastCheck"
- template: jobs/default-build.yml
parameters:
jobName: Windows_Build
jobDisplayName: "Build: Windows"
jobDisplayName: "Build and test: Windows"
agentOs: Windows
beforeBuild:
- powershell: "& ./src/IISIntegration/tools/UpdateIISExpressCertificate.ps1"

View File

@ -0,0 +1,30 @@
# This configuration is temporary while we work on getting all unit tests to pass on PR checks
# Don't run CI for this config
trigger: none
# Run PR validation on all branches
pr:
branches:
include:
- '*'
jobs:
- template: jobs/default-build.yml
parameters:
jobName: Windows_Build
jobDisplayName: "Build only : Windows"
agentOs: Windows
buildArgs: '/p:SkipTests=true'
- template: jobs/default-build.yml
parameters:
jobName: macOs_Build
jobDisplayName: "Build only : macOS"
agentOs: macOS
buildArgs: '/p:SkipTests=true'
- template: jobs/default-build.yml
parameters:
jobName: Linux_Build
jobDisplayName: "Build only : Linux"
agentOs: Linux
buildArgs: '/p:SkipTests=true'