diff options
| author | Stephen Halter <halter73@gmail.com> | 2022-09-02 03:31:05 +0300 |
|---|---|---|
| committer | Stephen Halter <halter73@gmail.com> | 2022-09-02 03:31:05 +0300 |
| commit | 3cdfafda025282a89c575ce4a32bd909425ec0af (patch) | |
| tree | 3e4e9e11ba1f69df015b5e81fc8c62598dcd05ef /.azure | |
| parent | 0349c22d749b3ba4cf61267a7ec5851e3de27e20 (diff) | |
| parent | 067c6c2903b446a327c628b1bc82a9260a47d746 (diff) | |
Merge branch 'release/7.0' into merge/release/7.0-to-main
# Conflicts:
# .azure/pipelines/jobs/default-build.yml
# src/Http/Http.Results/test/OkResultTests.cs
# src/Http/Http.Results/test/ValidationProblemResultTests.cs
Diffstat (limited to '.azure')
| -rw-r--r-- | .azure/pipelines/jobs/default-build.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index ecd95ec36c..50e067cb93 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -109,14 +109,14 @@ jobs: vmImage: ubuntu-18.04 ${{ if or(eq(parameters.useHostedUbuntu, false), and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if eq(parameters.agentOs, 'Windows') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Public + name: NetCore-Svc-Public demands: ImageOverride -equals 1es-windows-2022-open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal |