Skip to content

Merge release/dev17.4 to main#63372

Merged
dotnet-bot merged 71 commits intomainfrom
merges/release/dev17.4-to-main
Aug 16, 2022
Merged

Merge release/dev17.4 to main#63372
dotnet-bot merged 71 commits intomainfrom
merges/release/dev17.4-to-main

Conversation

@dotnet-bot
Copy link
Copy Markdown
Collaborator

@dotnet-bot dotnet-bot commented Aug 13, 2022

This is an automatically generated pull request from release/dev17.4 into main.

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.4-to-main
git reset --hard upstream/main
git merge upstream/release/dev17.4
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.4-to-main --force

dotnet-bot and others added 30 commits July 26, 2022 18:44
@dotnet-bot
Merge pull request #62964 from dotnet/merges/main-to-main-vs-deps
5d4f120 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #62966 from dotnet/merges/main-to-main-vs-deps
d58c55a 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #62967 from dotnet/merges/main-to-main-vs-deps
5a681c1 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #62974 from dotnet/merges/main-to-main-vs-deps
a9e5a33 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #62981 from dotnet/merges/main-to-main-vs-deps
eaf60a7 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #62995 from dotnet/merges/main-to-main-vs-deps
06c4d76 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63002 from dotnet/merges/main-to-main-vs-deps
29cefc8 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63001 from dotnet/merges/release/dev17.4-vs-deps-…
67a394d 
…to-main-vs-deps

Merge release/dev17.4-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request #63004 from dotnet/merges/release/dev17.4-vs-deps-…
c07cc14 
…to-main-vs-deps

Merge release/dev17.4-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request #63007 from dotnet/merges/release/dev17.4-vs-deps-…
0910a2f 
…to-main-vs-deps

Merge release/dev17.4-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request #63012 from dotnet/merges/release/dev17.4-vs-deps-…
d35f53c 
…to-main-vs-deps

Merge release/dev17.4-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request #63020 from dotnet/merges/release/dev17.4-vs-deps-…
d6979ba 
…to-main-vs-deps

Merge release/dev17.4-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request #63021 from dotnet/merges/main-to-main-vs-deps
67a96b1 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63030 from dotnet/merges/main-to-main-vs-deps
44f60de 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63044 from dotnet/merges/release/dev17.4-vs-deps-…
2ae908f 
…to-main-vs-deps

Merge release/dev17.4-vs-deps to main-vs-deps
@JoeRobich
Merge branch 'main-vs-deps' into merges/main-to-main-vs-deps
546c22c
@dotnet-bot
Merge pull request #63045 from dotnet/merges/main-to-main-vs-deps
442d8f4 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63052 from dotnet/merges/release/dev17.4-vs-deps-…
eafc8c5 
…to-main-vs-deps

Merge release/dev17.4-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request #63049 from dotnet/merges/main-to-main-vs-deps
e2373f4 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63060 from dotnet/merges/main-to-main-vs-deps
11bd7de 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63069 from dotnet/merges/main-to-main-vs-deps
2520267 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63086 from dotnet/merges/main-to-main-vs-deps
3817ac9 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63105 from dotnet/merges/main-to-main-vs-deps
8452d2f 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63126 from dotnet/merges/main-to-main-vs-deps
042d870 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63127 from dotnet/merges/main-to-main-vs-deps
6df1687 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63128 from dotnet/merges/main-to-main-vs-deps
0d84162 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63136 from dotnet/merges/main-to-main-vs-deps
b6ff31a 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63143 from dotnet/merges/main-to-main-vs-deps
30cd533 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63154 from dotnet/merges/main-to-main-vs-deps
ba79feb 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63157 from dotnet/merges/release/dev17.4-vs-deps-…
3776d2c 
…to-main-vs-deps

Merge release/dev17.4-vs-deps to main-vs-deps
dotnet-bot and others added 10 commits August 10, 2022 21:13
@dotnet-bot
Merge pull request #63323 from dotnet/merges/main-to-main-vs-deps
065c90f 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63327 from dotnet/merges/main-to-main-vs-deps
bd11fae 
Merge main to main-vs-deps
@JoeRobich
Merge pull request #63300 from dibarbet/backport_skip
8f7e159 
Backport some integration test skips to 17.3
@dibarbet
Revert "Merge pull request #61568 from CyrusNajmabadi/localFuncindexing"
2fe5202 
This reverts commit b1fbb44, reversing
changes made to d79fe4e.
@dotnet-bot
Merge pull request #63346 from dotnet/merges/main-to-main-vs-deps
98c4f89 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request #63350 from dotnet/merges/main-to-main-vs-deps
1eb0f43 
Merge main to main-vs-deps
@JoeRobich
Merge pull request #63344 from dibarbet/revert_local_func_index
6ad672d 
Revert "Merge pull request #61568 from CyrusNajmabadi/localFuncindexing"
@333fred
Merge remote-tracking branch 'upstream/release/dev17.3' into merges/r…
38e0c67 
…elease/dev17.3-to-release/dev17.4

* upstream/release/dev17.3:
  Revert "Merge pull request #61568 from CyrusNajmabadi/localFuncindexing"
  Backport some integration test skips to 17.3
  Mark shipped APIs (#63244)
@JoeRobich
Merge remote-tracking branch 'origin/main' into merges/main-vs-deps-t…
98989aa 
…o-main
@JoeRobich
Merge pull request #63282 from dotnet/merges/release/dev17.3-to-relea…
d69f080 
…se/dev17.4

Merge release/dev17.3 to release/dev17.4
@dotnet-bot dotnet-bot requested review from a team as code owners August 13, 2022 00:02
@dotnet-bot dotnet-bot force-pushed the merges/release/dev17.4-to-main branch from 1d1e0cf to d69f080 Compare August 13, 2022 00:02
@dotnet-bot dotnet-bot added Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch. labels Aug 13, 2022
@dotnet-bot
Copy link
Copy Markdown
Collaborator Author

dotnet-bot commented Aug 13, 2022

⚠ This PR has merge conflicts. @dibarbet

@dotnet-bot dotnet-bot enabled auto-merge August 13, 2022 00:02
ghost
ghost approved these changes Aug 13, 2022
View reviewed changes
Copy link
Copy Markdown

@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-approval

@JoeRobich
Copy link
Copy Markdown
Member

JoeRobich commented Aug 13, 2022

@333fred Could you take a look at this merge conflict?

JoeRobich and others added 3 commits August 12, 2022 17:08
@JoeRobich
Merge pull request #63355 from dotnet/merges/main-vs-deps-to-main
625533f 
Merge main-vs-deps to main
@333fred
Merge remote-tracking branch 'upstream/release/dev17.4' into merges/r…
8d7675e 
…elease/dev17.4-to-main

* upstream/release/dev17.4:
  Revert "Merge pull request #61568 from CyrusNajmabadi/localFuncindexing"
  Backport some integration test skips to 17.3
  Mark shipped APIs (#63244)
@dibarbet
Fix merge
ac1eb9b
@dibarbet dibarbet mentioned this pull request Aug 15, 2022
Closed
@dotnet-bot dotnet-bot merged commit 83a95a9 into main Aug 16, 2022
@ghost ghost added this to the Next milestone Aug 16, 2022
@dibarbet dibarbet modified the milestones: Next, 17.4 P2 Sep 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
Reviewers whose approvals may not affect merge requirements

Assignees

@dibarbet dibarbet

Labels

Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@dotnet-bot @JoeRobich @dibarbet @genlu @tmat @333fred