Update branding for 5.0.11 (#36236)

* Update branding for 5.0.11

* Update docker container to mcr

* Only install nginx if not already installed (#30253)

* ContinueOnError for nginx

* Resolve conflict

* Fix bad merge

* Update selenium version for E2E tests

* Try fixing test files

Co-authored-by: Brennan <[email protected]>
Co-authored-by: William Godbe <[email protected]>
Co-authored-by: Sébastien Ros <[email protected]>

Author: 4 people

.azure/pipelines/ci.yml

@@ -666,6 +666,7 @@ stages:
         beforeBuild:
         - bash: "./eng/scripts/install-nginx-mac.sh"
           displayName: Installing Nginx
+          continueOnError: true
         artifacts:
         - name: MacOS_Test_Logs
           path: artifacts/log/

eng/Versions.props

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Version settings">
     <AspNetCoreMajorVersion>5</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>10</AspNetCorePatchVersion>
-    <ValidateBaseline>true</ValidateBaseline>
+    <AspNetCorePatchVersion>11</AspNetCorePatchVersion>
+    <ValidateBaseline>false</ValidateBaseline>
     <!--
         When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
     -->
@@ -267,9 +267,9 @@
     <NewtonsoftJsonBsonPackageVersion>1.0.2</NewtonsoftJsonBsonPackageVersion>
     <NewtonsoftJsonPackageVersion>12.0.2</NewtonsoftJsonPackageVersion>
     <NSwagApiDescriptionClientPackageVersion>13.0.4</NSwagApiDescriptionClientPackageVersion>
-    <SeleniumSupportPackageVersion>4.0.0-beta1</SeleniumSupportPackageVersion>
-    <SeleniumWebDriverChromeDriverPackageVersion>91.0.4472.1900-beta</SeleniumWebDriverChromeDriverPackageVersion>
-    <SeleniumWebDriverPackageVersion>4.0.0-beta1</SeleniumWebDriverPackageVersion>
+    <SeleniumSupportPackageVersion>4.0.0-rc1</SeleniumSupportPackageVersion>
+    <SeleniumWebDriverChromeDriverPackageVersion>93.0.4577.1500</SeleniumWebDriverChromeDriverPackageVersion>
+    <SeleniumWebDriverPackageVersion>4.0.0-rc1</SeleniumWebDriverPackageVersion>
     <SerilogExtensionsLoggingPackageVersion>1.4.0</SerilogExtensionsLoggingPackageVersion>
     <SerilogSinksFilePackageVersion>4.0.0</SerilogSinksFilePackageVersion>
     <StackExchangeRedisPackageVersion>2.0.593</StackExchangeRedisPackageVersion>

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

eng/scripts/install-nginx-mac.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 
 brew update
-brew install openssl nginx
+brew list openssl || brew install openssl
+brew list nginx || brew install nginx

src/Components/benchmarkapps/Wasm.Performance/Driver/Selenium.cs

@@ -93,7 +93,7 @@ public static async Task<RemoteWebDriver> CreateBrowser(CancellationToken cancel
                     if (PoolForBrowserLogs)
                     {
                         // Run in background.
-                        var logs = new RemoteLogs(driver);
+                        var logs = driver.Manage().Logs;
                         _ = Task.Run(async () =>
                         {
                             while (!cancellationToken.IsCancellationRequested)

src/Components/test/E2ETest/package.json

@@ -13,7 +13,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "sauce-connect-launcher": "^1.3.1",
-    "selenium-standalone": "^6.17.0"
+    "selenium-standalone": "^6.24.0"
   },
   "devDependencies": {
     "@types/node": "^13.1.7",