Closed dotnet-maestro-bot closed 6 years ago
This pull request has been updated.
This PR merges commits made on release/2.2 by the following committers:
This pull request has been updated.
This PR merges commits made on release/2.2 by the following committers:
@javiercn we need this merged because the new UIFramework enum was referenced in aspnet/Templating, which has merged forward into master. Without this class existing in Identity multiple templating tests which attempt to validate Identity scenarios will fail.
I went ahead and this the merge manually
I detected changes in the release/2.2 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/2.2 by the following committers:
Instructions for merging
This PR will not be auto-merged. When pull request checks pass, please complete this PR by creating a merge commit, not a squash or rebase commit.
You can also do this on command line:
Instructions for resolving conflicts
:warning: 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.
Maintainers of this repo have permission to the branch 'merge/release/2.2-to-master' on https://github.com/dotnet-maestro-bot/Identity. You can push changes to this branch to resolve conflicts or other issues in this pull request. The bot will attempt to update this branch as more changes are discovered on release/2.2.
Please 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.