Merge pull request #36235 from vseanreesermsft/branding-3.1.20-2021-09-07-0948

Update branding for 3.1.20

Author: wtgodbe

.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)

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>

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

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