Skip to content

[automated] Merge branch 'release/2.2' => 'master' #9986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 5, 2019
Merged

[automated] Merge branch 'release/2.2' => 'master' #9986

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e96a53f
Support internal pull requests (#9578)
dougbu Apr 20, 2019
2e94885
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2
dougbu Apr 20, 2019
8db56e5
Merge branch 'release/2.1' => 'release/2.2' (#9590)
dougbu Apr 22, 2019
6a6a119
Switch to non `-Int` pools and clear NuGet caches
dougbu May 5, 2019
8cb331f
Merge branch 'release/2.1' into release/2.2
dougbu May 5, 2019
f226864
Merge branch 'release/2.1' => 'release/2.2' (#9980)
dougbu May 5, 2019
ed886c4
Merge branch 'release/2.2' -> 'master'
dougbu May 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .azure/pipelines/jobs/default-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ jobs:
name: ${{ parameters.poolName }}
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Int-Pool
name: NetCorePublic-Pool
${{ if ne(parameters.isTestingJob, true) }}:
# Visual Studio Build Tools
queue: BuildPool.Windows.10.Amd64.VS2019.BT.Open
${{ if eq(parameters.isTestingJob, true) }}:
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
queue: BuildPool.Windows.10.Amd64.VS2019.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCoreInternal-Int-Pool
name: NetCoreInternal-Pool
${{ if ne(parameters.isTestingJob, true) }}:
# Visual Studio Build Tools
queue: BuildPool.Windows.10.Amd64.VS2019.BT
Expand Down Expand Up @@ -138,6 +138,13 @@ jobs:
displayName: Install Node 10.x
inputs:
versionSpec: 10.x
- ${{ if eq(parameters.agentOs, 'Windows') }}:
- task: NuGetCommand@2
displayName: 'Clear NuGet caches'
condition: succeeded()
inputs:
command: custom
arguments: 'locals all -clear'
- ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
- powershell: |
./eng/scripts/InstallJdk.ps1 '11.0.1'
Expand Down