Merge in 'release/3.1' changes

Author: dotnet-bot

.azure/pipelines/ci.yml

@@ -626,7 +626,7 @@ stages:
     parameters:
       condition: ne(variables['SkipTests'], 'true')
       jobName: MacOS_Test
-      jobDisplayName: "Test: macOS 10.15"
+      jobDisplayName: "Test: macOS"
       agentOs: macOS
       isTestingJob: true
       buildArgs: --all --test "/p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs)

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

@@ -89,7 +89,7 @@ jobs:
     # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md
     pool:
       ${{ if eq(parameters.agentOs, 'macOS') }}:
-        vmImage: macOS-10.15
+        vmImage: macOS-11
       ${{ if eq(parameters.agentOs, 'Linux') }}:
         vmImage: ubuntu-18.04
       ${{ if eq(parameters.agentOs, 'Windows') }}:

eng/Versions.props

@@ -8,9 +8,9 @@
   <PropertyGroup Label="Version settings">
     <AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>28</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>29</AspNetCorePatchVersion>
     <!-- This property should be 'false' between branding & code-merging, 'true' the rest of the time -->
-    <ValidateBaseline>true</ValidateBaseline>
+    <ValidateBaseline>false</ValidateBaseline>
     <PreReleasePreviewNumber>0</PreReleasePreviewNumber>
     <ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
     <ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>