From dbfdae5de7e48b378b08c607ecdcb3d4ec7fee14 Mon Sep 17 00:00:00 2001
From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Date: Tue, 2 Aug 2022 18:19:30 -0700
Subject: [PATCH] Update branding to 3.1.29 (#43050)
* Update branding to 3.1.29
* [release/3.1] Move builds to MacOS 11
- hosted macOS-10.15 environment is deprecated
Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
---
.azure/pipelines/ci.yml | 2 +-
.azure/pipelines/jobs/default-build.yml | 2 +-
eng/Versions.props | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 3ce63da0317..2d1f210823c 100644
--- a/.azure/pipelines/ci.yml
+++ b/.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)
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index 7e7429da1a1..aeb4c72c966 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.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') }}:
diff --git a/eng/Versions.props b/eng/Versions.props
index d9054c7e2a0..1413bc1b529 100644
--- a/eng/Versions.props
+++ b/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>
--
GitLab