Skip to content

Update branding for 5.0.11 #36236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 9, 2021
Merged

Update branding for 5.0.11 #36236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
14b00d4
Update branding for 5.0.11
vseanreesermsft Sep 7, 2021
d4bebe9
Update docker container to mcr
BrennanConroy Aug 23, 2021
57cb96e
Only install nginx if not already installed (#30253)
wtgodbe Feb 17, 2021
5a6101c
ContinueOnError for nginx
wtgodbe Sep 8, 2021
9b829aa
Resolve conflict
sebastienros Sep 3, 2021
d87b7ed
Fix bad merge
wtgodbe Sep 8, 2021
d49816b
Update selenium version for E2E tests
sebastienros Sep 4, 2021
10c1395
Try fixing test files
wtgodbe Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .azure/pipelines/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
-->
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion eng/docker/bionic.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion eng/scripts/install-nginx-mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/Components/benchmarkapps/Wasm.Performance/Driver/Selenium.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Components/test/E2ETest/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading