[automated] Merge branch 'release/10.0.2xx' => 'release/10.0.3xx'

[github-actions]

I detected changes in the release/10.0.2xx branch which have not been merged yet to release/10.0.3xx. I'm a robot and am configured to help you automatically keep release/10.0.3xx up to date, so I've opened this PR.

This PR merges commits made on release/10.0.2xx by the following committers:

• marcpopMSFT
• MiYanni
• tmat
• baronfel
• github-actions[bot]
• DonnaChen888
• dotnet-maestro[bot]

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/10.0.2xx
git pull --ff-only
git checkout release/10.0.3xx
git pull --ff-only
git merge --no-ff release/10.0.2xx

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/sdk HEAD:merge/release/10.0.2xx-to-release/10.0.3xx

or if you are using SSH

git push git@github.com:dotnet/sdk HEAD:merge/release/10.0.2xx-to-release/10.0.3xx

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ 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.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/10.0.2xx-to-release/10.0.3xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/release/10.0.2xx-to-release/10.0.3xx origin/release/10.0.3xx
git pull https://github.com/dotnet/sdk merge/release/10.0.2xx-to-release/10.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/10.0.2xx-to-release/10.0.3xx

or if you are using SSH

git fetch
git checkout -b merge/release/10.0.2xx-to-release/10.0.3xx origin/release/10.0.3xx
git pull git@github.com:dotnet/sdk merge/release/10.0.2xx-to-release/10.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/10.0.2xx-to-release/10.0.3xx

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

[DonnaChen888]

@marcpopMSFT @MiYanni could you please help me to take a look at this issue?
src/RazorSdk/Tool/GenerateCommand.cs(301,24): error CS0246: (NETCORE_ENGINEERING_TELEMETRY=Build) The type or namespace name 'TagHelperCollection' could not be found (are you missing a using directive or an assembly reference?)

[jjonescz]

src/RazorSdk/Tool/GenerateCommand.cs(301,24): error CS0246: (NETCORE_ENGINEERING_TELEMETRY=Build) The type or namespace name 'TagHelperCollection' could not be found (are you missing a using directive or an assembly reference?)

@dotnet/razor-tooling

[davidwengier]

This is surprising. I can see in the commit list here the commits that move the Razor code to using TagHelperCollection, which is the newer type, but the build error implies that the Razor assemblies that contain that type aren't referenced. Bad merge conflict resolution perhaps?

[marcpopMSFT]

@ericstj You had fixed DisposableObjectInErrorCode_NotDisposed_BailOut_NoDiagnosticAsync before in 2xx but it's failing again in the flow. Did it get reverted in the merge or is the behavior different in 3xx? Is the dotnet/dotnet flow going to change the test again so we're in a weird chicken egg situation?

[marcpopMSFT]

Same question to @javiercn, you have fixes for the failing tests that were made in 6e1623a that are in this flow. I'm wondering if we need the dotnet/dotnet flow as well as this to get them all working.

[marcpopMSFT]

I went ahead and cherry-picked a bunch of the changes from this PR over into the dotnet/dotnet flow .

[ericstj]

@ericstj You had fixed DisposableObjectInErrorCode_NotDisposed_BailOut_NoDiagnosticAsync before in 2xx but it's failing again in the flow. Did it get reverted in the merge or is the behavior different in 3xx? Is the dotnet/dotnet flow going to change the test again so we're in a weird chicken egg situation?

My assumption was that roslyn improved its diagnostics here to better report invalid syntax against the correct line numbers. This test is just trying to make sure the analyzer doesn't crash, but the test framework it's using requires it to assert the exact expected diagnostics. I would expect the test needs an update wherever that roslyn fix is flowing. Is it possible that 3xx is missing a newer version of roslyn, or that the related roslyn change was reverted? @333fred

For reference the test fix was d4d6445, failure is here.

update: @marcpopMSFT I noticed this PR did not include any dependency updates, so that would make sense why these fixes for dependency flow (new compiler) wouldn't be working correctly here.

I went ahead and cherry-picked a bunch of the changes from this PR over into the dotnet/dotnet flow .

That makes sense. Alternatively you could allow the merge to include dependency updates.