[automated] Merge branch 'release/3.0' => 'master'

[dotnet-maestro-bot]

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

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

• @pranavkm
• @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/3.0
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/3.0

# 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-maestro-bot/Common HEAD:merge/release/3.0-to-master

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/Common HEAD:merge/release/3.0-to-master

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/3.0-to-master'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/3.0-to-master master
git pull https://github.com/dotnet-maestro-bot/Common merge/release/3.0-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/Common merge/release/3.0-to-master

or if you are using SSH

git checkout -b merge/release/3.0-to-master master
git pull [email protected]:dotnet-maestro-bot/Common merge/release/3.0-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/Common merge/release/3.0-to-master

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

[dotnet-maestro-bot]

This pull request has been updated.

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

• @JunTaoLuo
• @pranavkm
• @dotnet-maestro[bot]

[dotnet-maestro-bot]

This pull request has been updated.

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

• @JunTaoLuo
• @pranavkm
• @dotnet-maestro[bot]

[dotnet-maestro-bot]

This pull request has been updated.

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

• @dotnet-maestro[bot]
• @JunTaoLuo
• @pranavkm

[dotnet-maestro-bot]

This pull request has been updated.

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

• @wtgodbe
• @dotnet-maestro[bot]
• @JunTaoLuo
• @pranavkm

[wtgodbe]

DotNetObjectRefJsonConverterFactory.cs(17,39): error CS0115: 'DotNetObjectReferenceJsonConverterFactory.CreateConverter(Type, JsonSerializerOptions)': no suitable method found to override

@pranavkm I think related to your change? CC @JunTaoLuo

[JunTaoLuo]

This is a case of the missing API that I was referring to yesterday. I thought it was due to roll forward but looks like we need the same fix as in EntityFrameworkCore.

[JunTaoLuo]

Hmm that wasn't it. @pranavkm 's change should have worked since it was reacting to new APIs. The fact it worked in release/3.0 and not in master led me to believe we are not getting the latest bits. We need to take a closer look.

[dougbu]

@JunTaoLuo are we now waiting for new bits from core-setup with a fix for the bug we were talking about yesterday? Or, is an existing dependency PR that's blocking progress here?

[dougbu]

@anurse were your concerns met? And, does @Tratcher need to double-check anything before we get this in?

[JunTaoLuo]

So it looks like this might get a little hairier than I originally thought. The problem is as follows:

1. I'm multi-targeting projects to target netcoreapp3.0
2. The logic to override the ref pack versions is set to follow DefaultNetCoreTargetFramework which in master is netcoreapp5.0

I've updated the tfm in the projects to netcoreapp5.0 but I don't know if that's the correct approach. The apps targeting netcoreapp3.0 will now fall back to netstandard2.0 implementations for example.

If we want to multi-target for netcoreapp3.0 and netcoreapp5.0 simultaneously, we'll need to have dependency flow update both the 3.0 and 5.0 ref pack versions.

[JunTaoLuo]

Hmm Microsoft.Extensions.Hosting.Tests is hanging.

[dougbu]

If we want to multi-target for netcoreapp3.0 and netcoreapp5.0 simultaneously

No. Of the netcoreapp TFMs, target only netcoreapp5.0 and do the needful (perhaps as @wtgodbe is doing in dotnet/aspnetcore#12977 if not everything is done here). If that needs to be part of a dependency update, get the latest in before fixing up this PR.

[dotnet-maestro-bot]

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

[dotnet-maestro-bot]

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

[dotnet-maestro-bot]

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

[dotnet-maestro-bot]

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

[dotnet-maestro-bot]

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

[dotnet-maestro-bot]

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.