Skip to content

[automated] Merge branch 'release/3.0-preview3' => 'master' #7918

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.

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

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/3.0-preview3 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/3.0-preview3 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/3.0-preview3
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/3.0-preview3

# 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/3.0-preview3-to-master
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/3.0-preview3-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/3.0-preview3-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/3.0-preview3-to-master master
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/3.0-preview3-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore merge/release/3.0-preview3-to-master
or if you are using SSH
git checkout -b merge/release/3.0-preview3-to-master master
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/3.0-preview3-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore merge/release/3.0-preview3-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.

@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/3.0-preview3 by the following committers:

* Make InputBase use EventCallback for ValueChanged

... so that the host component gets re-rendered automatically after each value change (like when binding to DOM elements).

* Improve E2E test code

... so that the host component gets re-rendered automatically after each value change (like when binding to DOM elements).
* Add Microsoft.AspNetCore.Components.Forms to default Components imports

* Add default validation CSS rules in Components/Blazor templates

* Add default validation CSS styles to Components testassets projects
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/3.0-preview3 by the following committers:

@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/3.0-preview3 by the following committers:

@dougbu
Copy link
Contributor

dougbu commented Feb 25, 2019

I've resolved the eng/ conflicts. Assigning to @Tratcher and @SteveSandersonMS to double-check what the bot's bringing into master from their changes.

@Tratcher
Copy link
Member

It's pulling my correct changes, but it needs ref assembly updates in master. I can re-gen them later tonight.

@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0-preview3, but I could not automatically push those to merge/release/3.0-preview3-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@Tratcher Tratcher merged commit 40b2a94 into dotnet:master Feb 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants