Skip to content

Conversation

@dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/5.0-preview8 branch which have not been merged yet to master. I'm a robot and am configured to help you automatically keep master up to date, so I've opened this PR.

This PR merges commits made on release/5.0-preview8 by the following committers:

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/5.0-preview8
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/5.0-preview8

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-preview8-to-master
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-preview8-to-master

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/5.0-preview8-to-master'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/5.0-preview8-to-master master
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/5.0-preview8-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-preview8-to-master
or if you are using SSH
git checkout -b merge/release/5.0-preview8-to-master master
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/5.0-preview8-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-preview8-to-master

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

Using the full gc sometimes leads to an infinite recursion resulting
in a browser freeze. This was noted as part of running Blazor's benchmarks.
This is being addressed in rc1, in the meanwhile this reverts the behavior to 3.2 defaults.

Browser freezes when using a Blazor WASM application.

Yes. Full GC on is new to WASM on .NET Core

Low. Off by default is the behavior we had in 3.2.
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Aug 3, 2020
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approving branch merge.

@ghost ghost added auto-merge area-blazor Includes: Blazor, Razor Components labels Aug 3, 2020
@ghost
Copy link

ghost commented Aug 3, 2020

Hello @msftbot[bot]!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 60 minutes. No worries though, I will be back when the time is right! 😉

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@dougbu
Copy link
Contributor

dougbu commented Aug 4, 2020

@SteveSandersonMS and @pranavkm, it looks like 6f7a3df in master conflicts with fcabe6f in release/5.0-preview8. Could one of you please resolve the conflicts❔

@dougbu
Copy link
Contributor

dougbu commented Aug 4, 2020

/ping @SteveSandersonMS and @pranavkm to resolve conflicts

@ghost ghost merged commit e2d2aaa into dotnet:master Aug 5, 2020
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-blazor Includes: Blazor, Razor Components area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants