Merge release/dev17.7 to main

[dotnet-bot]

This is an automatically generated pull request from release/dev17.7 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:

• https://github.com/dotnet/razor/find/release/dev17.7
• https://github.com/dotnet/razor/find/main

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

[dotnet-bot]

⚠ This PR has merge conflicts. @davidwengier @allisonchou

[ghost]

Hello @dotnet-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 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 (@msftbot) and give me an instruction to get started! Learn more here.

[davidwengier]

SourceGenerators test failures?

[Cosifne]

@davidwengier and @333fred
This is needed to be resolved before we can snap 17.7 p2 (otherwise there will be a conflict when merging main back to release/dev17.7) Could compiler folks take a look tomorrow?

[davidwengier]

I'll run the tests locally now, and if its just baseline generation, I can do that and merge this before you wake up tomorrow, otherwise will leave it for a compiler folk.

[davidwengier]

I think I'm going to have to leave this to you @333fred as I don't know what is the expected behaviour for 17.7. Looks like if I merge in your Update baseline. commit then a couple of the failing tests pass, but you have already merged it in, followed by a merge that must revert it in some way. It's not clear to me if the merge was incorrect, or if that commit was intended to be reverted.