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.

* Template changes

* Template changes + scope computation update

* Template updates

* tmp

* Fix style path

* Webassembly template changes

* Update tests

* Undo blazor.server.js changes

* WebAssembly cleanups

* Undo unwanted change

* Undo another unwanted change

* Fix server-side login combinator

* update tests, switch from app to div id=app
@dotnet-maestro-bot dotnet-maestro-bot requested a review from a team as a code owner July 28, 2020 22:33
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Jul 28, 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-mvc Includes: MVC, Actions and Controllers, Localization, CORS, most templates labels Jul 28, 2020
@ghost
Copy link

ghost commented Jul 28, 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.

* update arcade version

* update version details file as well
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

@ghost ghost removed the auto-merge label Jul 29, 2020
* Update blazor and components web templates

* Update Identity.Web version to 0.2.1-preview
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

@wtgodbe
Copy link
Member

wtgodbe commented Jul 29, 2020

@JunTaoLuo could you resolve the project template conflicts?

@JunTaoLuo
Copy link
Contributor

I'll take a look.

@JunTaoLuo
Copy link
Contributor

Actually the conflict comes from @javiercn 's change. I'll let him resolve the conflicts given that it conflicts with cee763b in the css files.

@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

@captainsafia
Copy link
Member

@JunTaoLuo Synced with @javiercn and went ahead and resolved the merge conflicts here so we can merge it before more commits come in. Take it away build!

@captainsafia captainsafia merged commit e0ef3d2 into dotnet:master Jul 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework area-mvc Includes: MVC, Actions and Controllers, Localization, CORS, most templates Type: Merge Forward ⏩

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants