Skip to content
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

Merge release/dev17.0-vs-deps to release/dev17.2 #63738

Merged
merged 7 commits into from
Sep 1, 2022
Merged

Merge release/dev17.0-vs-deps to release/dev17.2 #63738

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e53fb86
Update public pool names
MattGal Sep 1, 2022
aa25402
Update public pool names
MattGal Sep 1, 2022
a6af0d4
Merge pull request #63726 from dotnet/release/dev16.11-vs-deps-public…
JoeRobich Sep 1, 2022
f48119b
Merge pull request #63727 from dotnet/release/dev17.0-vs-deps-publicP…
JoeRobich Sep 1, 2022
3f632f6
Merge branch 'release/dev17.0-vs-deps' into merges/release/dev16.11-v…
JoeRobich Sep 1, 2022
a8ceae6
Merge pull request #63736 from dotnet/merges/release/dev16.11-vs-deps…
JoeRobich Sep 1, 2022
6142f83
Merge branch 'release/dev17.2' into merges/release/dev17.0-vs-deps-to…
JoeRobich Sep 1, 2022
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
Next Next commit
Update public pool names
  • Loading branch information
@MattGal
MattGal committed Sep 1, 2022
commit e53fb8634b13caa6821ca2e20f6a686ab3838efc
2 changes: 1 addition & 1 deletion azure-pipelines-integration-lsp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pr:
jobs:
- job: VS_Integration_LSP
pool:
name: NetCore1ESPool-Svc-Public
name: NetCore-Svc-Public
demands: ImageOverride -equals windows.vs2019.amd64.open
timeoutInMinutes: 135

Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pr:
jobs:
- job: VS_Integration
pool:
name: NetCore1ESPool-Svc-Public
name: NetCore-Svc-Public
demands: ImageOverride -equals windows.vs2019.amd64.open
strategy:
maxParallel: 4
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines-richnav.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pr: none
jobs:
- job: RichCodeNav_Indexing
pool:
name: NetCore1ESPool-Svc-Public
name: NetCore-Svc-Public
demands: ImageOverride -equals windows.vs2019.amd64.open
variables:
EnableRichCodeNavigation: true
Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ jobs:

- job: Correctness_Determinism
pool:
name: NetCore1ESPool-Svc-Public
name: NetCore-Svc-Public
demands: ImageOverride -equals windows.vs2019.amd64.open
timeoutInMinutes: 90
steps:
Expand All @@ -159,7 +159,7 @@ jobs:

- job: Correctness_Build
pool:
name: NetCore1ESPool-Svc-Public
name: NetCore-Svc-Public
demands: ImageOverride -equals windows.vs2019.amd64.open
timeoutInMinutes: 90
steps:
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:

- job: Correctness_SourceBuild
pool:
name: NetCore1ESPool-Svc-Public
name: NetCore-Svc-Public
demands: ImageOverride -equals Build.Ubuntu.1804.amd64.Open
timeoutInMinutes: 90
steps:
Expand All @@ -215,7 +215,7 @@ jobs:

- job: Correctness_Rebuild
pool:
name: NetCore1ESPool-Svc-Public
name: NetCore-Svc-Public
demands: ImageOverride -equals windows.vs2019.amd64.open
timeoutInMinutes: 90
steps:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
# source-build builds run in Docker, including the default managed platform.
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Public
name: NetCore-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/build-unix-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- job: ${{ parameters.jobName }}
pool:
${{ if ne(parameters.queueName, '') }}:
name: NetCore1ESPool-Svc-Public
name: NetCore-Svc-Public
demands: ImageOverride -equals ${{ parameters.queueName }}

${{ if ne(parameters.vmImageName, '') }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/build-windows-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- job: ${{ parameters.jobName }}
pool:
${{ if ne(parameters.queueName, '') }}:
name: NetCore1ESPool-Svc-Public
name: NetCore-Svc-Public
demands: ImageOverride -equals ${{ parameters.queueName }}

${{ if ne(parameters.vmImageName, '') }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/test-unix-job-single-machine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
dependsOn: ${{ parameters.buildJobName }}
pool:
${{ if ne(parameters.queueName, '') }}:
name: NetCore1ESPool-Svc-Public
name: NetCore-Svc-Public
demands: ImageOverride -equals ${{ parameters.queueName }}

${{ if ne(parameters.vmImageName, '') }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/test-windows-job-single-machine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- job: ${{ parameters.jobName }}
dependsOn: ${{ parameters.buildJobName }}
pool:
name: NetCore1ESPool-Svc-Public
name: NetCore-Svc-Public
demands: ImageOverride -equals ${{ parameters.queueName }}
timeoutInMinutes: 120
variables:
Expand Down