Skip to content
代码片段 群组 项目
未验证 提交 d0bc5d8c 编辑于 作者: Doug Bunting's avatar Doug Bunting 提交者: GitHub
浏览文件

Move builds to MacOS 11 (#42791)

* Move builds to MacOS 11
- hosted macOS-10.15 environment is deprecated

* Use an installed XCode version
上级 e6f27b07
No related branches found
No related tags found
无相关合并请求
...@@ -106,7 +106,7 @@ jobs: ...@@ -106,7 +106,7 @@ jobs:
# See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md
pool: pool:
${{ if eq(parameters.agentOs, 'macOS') }}: ${{ if eq(parameters.agentOs, 'macOS') }}:
vmImage: macOS-10.15 vmImage: macOS-11
${{ if eq(parameters.agentOs, 'Linux') }}: ${{ if eq(parameters.agentOs, 'Linux') }}:
${{ if and(eq(parameters.useHostedUbuntu, true), or(ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}: ${{ if and(eq(parameters.useHostedUbuntu, true), or(ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
vmImage: ubuntu-18.04 vmImage: ubuntu-18.04
...@@ -160,8 +160,8 @@ jobs: ...@@ -160,8 +160,8 @@ jobs:
- script: df -h - script: df -h
displayName: Disk size displayName: Disk size
- ${{ if eq(parameters.agentOs, 'macOS') }}: - ${{ if eq(parameters.agentOs, 'macOS') }}:
- script: sudo xcode-select -s /Applications/Xcode_12.2.app/Contents/Developer - script: sudo xcode-select -s /Applications/Xcode_12.5.1.app/Contents/Developer
displayName: Use XCode 12.2 displayName: Use XCode 12.5.1
- checkout: self - checkout: self
clean: true clean: true
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}: - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册