Merge release/dev17.5 to release/dev17.6 #8360
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[Infra] Bring `release/dev17.5` branch up to date
Bring 17.5 branch up to date
Include Compiler features in Project Engine
Skip Diagnostic tests for now
Due to the way we decided to implement bind get,set,after, customers can run into situations where their components render many more times than expected, which results in confusion and performance degradation. This was due to the fact that we chose to rely on EventCallback to implement this feature and we did not realize there were some side effects associated with it. The APIs we are adding bypass the whole EventCallback infrastructure (simplifying the implementation too) and fix the issue. This change updates the compiler to rely on the new runtime APIs (cherry picked from commit 9ce52f1afbfb819fc8499a590385200b97b13f33) Co-authored-by: Javier Calvarro Nelson <[email protected]>
* Add a test * Visit assemblies in search for view components
dotnet-bot
added
area-infrastructure
auto-merge
|
⚠ This PR has merge conflicts. @davidwengier @Cosifne |
|
Hello @dotnet-bot! Because this pull request has the Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 12 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 (
|
ghost
merged commit 
|
Weird, I just found one of these PRs and resolved the conflicts too. Didn't realise it was the 3rd or 4th one! Hopefully it doesn't reappear again |
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatically generated pull request from release/dev17.5 into release/dev17.6.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all git checkout -t upstream/merges/release/dev17.5-to-release/dev17.6 git reset --hard upstream/release/dev17.6 git merge upstream/release/dev17.5 # Fix merge conflicts git commit git push upstream merges/release/dev17.5-to-release/dev17.6 --force