From ee20543a538a5663f20ce2a0b540b1c9da847b47 Mon Sep 17 00:00:00 2001
From: Sean Reeser <v-seanreeser@microsoft.com>
Date: Tue, 7 Sep 2021 09:48:51 -0700
Subject: [PATCH 1/4] Update branding for 3.1.20

---
 eng/Versions.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 16d9f0509ea6..af18dd7cc141 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,9 +8,9 @@
   <PropertyGroup Label="Version settings">
     <AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>19</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>20</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>

From 4cb3eef097a6786514703ee8fafc6d46672d49e3 Mon Sep 17 00:00:00 2001
From: Brennan <brecon@microsoft.com>
Date: Mon, 23 Aug 2021 14:43:16 -0700
Subject: [PATCH 2/4] Update docker container to mcr

---
 eng/docker/bionic.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/docker/bionic.Dockerfile b/eng/docker/bionic.Dockerfile
index 9fe672137af3..d1b063345c43 100644
--- a/eng/docker/bionic.Dockerfile
+++ b/eng/docker/bionic.Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.1-runtime-deps-bionic
+FROM mcr.microsoft.com/dotnet/runtime-deps:2.1-bionic
 
 ARG USER
 ARG USER_ID

From e913ba900c7c3c2317540fcf52eaca3a2f947c66 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Mon, 23 Aug 2021 16:38:21 -0700
Subject: [PATCH 3/4] Need mrc Alpine image too

---
 eng/docker/alpine.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/docker/alpine.Dockerfile b/eng/docker/alpine.Dockerfile
index bc1547d1df85..8a32cf738cac 100644
--- a/eng/docker/alpine.Dockerfile
+++ b/eng/docker/alpine.Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.1.0-preview1-runtime-deps-alpine
+FROM mcr.microsoft.com/dotnet/runtime-deps:2.1-alpine
 ARG USER
 ARG USER_ID
 ARG GROUP_ID

From 1f866ed2153863cf6fab4b33880277fc4c79838e Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Wed, 8 Sep 2021 09:59:02 -0700
Subject: [PATCH 4/4] ContinueOnError when installing nginx

---
 .azure/pipelines/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 693e0f5417e3..92755a3f5c5f 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -633,6 +633,7 @@ stages:
       beforeBuild:
       - bash: "./eng/scripts/install-nginx-mac.sh"
         displayName: Installing Nginx
+        continueOnError: true
       afterBuild:
       - bash: ./build.sh --ci --pack --no-build --no-restore --no-build-deps "/bl:artifacts/log/packages.pack.binlog"
         displayName: Pack Packages (for Template tests)