Automation: main-next integrate

[msfluid-bot]

main-next integrate PR

The aim of this pull request is to sync main and next branch. This branch has MERGE CONFLICTS with next due to this commit. If this PR is assigned to you, you need to do the following:

1. Acknowledge the pull request by adding a comment -- "Actively working on it".
2. Merge main-next-9991f92 into the target branch, next. The direction of the merge matters! You need to checkout next and merge main-next-9991f92 into it, then fast-forward main-next-9991f92 to the merge commit. To do that use the following git commands:

• git fetch --all -- this ensures your remote refs are updated
• git remote -v -- displays the list of remote repositories associated with your Git repository along with their corresponding URLs. You have to choose the remote associated with the microsoft/FluidFramework repository. Change the remote name in these example commands if yours is not upstream.
• git checkout -b next-merge-head upstream/next -- make a temporary branch at next.
• git merge upstream/main-next-9991f92 -- merge next into main-next-9991f92

3. Resolve any merge conflicts between the branches, then commit all the changes using the following commands:

• git add . -- stage all the local changes
• git commit -m "Automation: main-next integrate" -- commit the merge

4. Fast-forward the main-next-9991f92 branch to the merge commit and push to the remote.

• git checkout main-next-9991f92 -- check out the mergeBranch locally
• git merge next-merge-head --ff-only -- fast-forward to the merge commit
• git push upstream -- and push it to upstream (your upstream remote name may be different)

5. Address any CI failures. If you need to make additional changes to the PR, always amend the commit using the following git commands:

• git commit --amend -m "Automation: main-next integrate"
• git push --force-with-lease

[tylerbutler]

I think my merge resolutions are correct. Let's see what CI says.