[release/6.0-preview6] Handle more cases with the new entry point pattern#33633

Pilchie merged 4 commits intorelease/6.0-preview6dotnet/aspnetcore:release/6.0-preview6from

backport/pr-33500-to-release/6.0-preview6dotnet/aspnetcore:backport/pr-33500-to-release/6.0-preview6Copy head branch name to clipboard