Skip to content

Commit c43cf7a

Browse files
Update branding to 6.0.9 (#43057)
* Update branding to 6.0.9 * [release/6.0] Move builds to MacOS 11 - hosted macOS-10.15 environment is deprecated * Use an installed XCode version Co-authored-by: Doug Bunting <[email protected]>
1 parent ec68a6b commit c43cf7a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.azure/pipelines/jobs/default-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
# See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md
9595
pool:
9696
${{ if eq(parameters.agentOs, 'macOS') }}:
97-
vmImage: macOS-10.15
97+
vmImage: macOS-11
9898
${{ if eq(parameters.agentOs, 'Linux') }}:
9999
${{ if and(eq(parameters.useHostedUbuntu, true), or(ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
100100
vmImage: ubuntu-18.04
@@ -151,8 +151,8 @@ jobs:
151151
- script: df -h
152152
displayName: Disk size
153153
- ${{ if eq(parameters.agentOs, 'macOS') }}:
154-
- script: sudo xcode-select -s /Applications/Xcode_12.2.app/Contents/Developer
155-
displayName: Use XCode 12.2
154+
- script: sudo xcode-select -s /Applications/Xcode_12.5.1.app/Contents/Developer
155+
displayName: Use XCode 12.5.1
156156
- checkout: self
157157
clean: true
158158
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isTestingJob, true)) }}:

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<PropertyGroup Label="Version settings">
99
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
11-
<AspNetCorePatchVersion>8</AspNetCorePatchVersion>
12-
<ValidateBaseline>true</ValidateBaseline>
11+
<AspNetCorePatchVersion>9</AspNetCorePatchVersion>
12+
<ValidateBaseline>false</ValidateBaseline>
1313
<!--
1414
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1515
-->

0 commit comments

Comments
 (0)