mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove merge conflict

Browse source
This commit is contained in:
Jon Fortescue 2021-10-12 13:31:52 -07:00
parent c63a9f5490
commit 3957151342
1 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
.vsts-ci.yml
View file

@ -104,17 +104,10 @@ stages:
agentOs: Windows_NT agentOs: Windows_NT
pool: pool:
${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}:
<<<<<<< HEAD
name: NetCore1ESPool-Public name: NetCore1ESPool-Public
demands: ImageOverride -equals build.windows.10.amd64.vs2019.open demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal name: NetCore1ESPool-Internal
=======
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
>>>>>>> main
demands: ImageOverride -equals build.windows.10.amd64.vs2019 demands: ImageOverride -equals build.windows.10.amd64.vs2019
timeoutInMinutes: 180 timeoutInMinutes: 180
strategy: strategy:
@ -140,17 +133,10 @@ stages:
agentOs: Linux agentOs: Linux
pool: pool:
${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}:
<<<<<<< HEAD
name: NetCore1ESPool-Public name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal name: NetCore1ESPool-Internal
=======
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
>>>>>>> main
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
timeoutInMinutes: 180 timeoutInMinutes: 180
strategy: strategy:
@ -312,17 +298,10 @@ stages:
agentOs: Linux agentOs: Linux
pool: pool:
${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}:
<<<<<<< HEAD
name: NetCore1ESPool-Public name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal name: NetCore1ESPool-Internal
=======
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
>>>>>>> main
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
timeoutInMinutes: 180 timeoutInMinutes: 180
strategy: strategy: