dotnet-ef scaffolding issue starting .NET 6

[freshe]

Starting .NET 6 (dotnet-ef 6.0.0) I can no longer reverse engineer our company database.
Seems to be because of ambiguity of foreign key column names. No problem in dotnet-ef 5.x.

The property or navigation 'Groups' cannot be added to the entity type 'SomeTable (Dictionary<string, object>)' because a property or navigation with the same name already exists on entity type 'SomeTable (Dictionary<string, object>)'.

Reproduced it with a small test database.

dotnet ef dbcontext scaffold "Server=localhost;Database=EfTest;User Id=sa;Password=password" Microsoft.EntityFrameworkCore.SqlServer --context DbContext --output-dir "Data"

--

CREATE DATABASE EfTest
GO

USE EfTest
GO

CREATE TABLE GroupTable1
(
	GroupId INT NOT NULL,
	Name NVARCHAR(100) NOT NULL

	PRIMARY KEY (GroupId)
)

CREATE TABLE GroupTable2
(
	GroupId INT NOT NULL,
	Name NVARCHAR(100) NOT NULL

	PRIMARY KEY (GroupId)
)

CREATE TABLE SomeTable
(
	SomeId INT NOT NULL,
	Name NVARCHAR(100) NOT NULL,

	PRIMARY KEY (SomeId)
)

CREATE TABLE SomeJoinTable1
(
	SomeId INT NOT NULL,
	GroupId INT NOT NULL,

	PRIMARY KEY (SomeId, GroupId),
	FOREIGN KEY (SomeId) REFERENCES SomeTable (SomeId),
	FOREIGN KEY (GroupId) REFERENCES GroupTable1 (GroupId)
)

CREATE TABLE SomeJoinTable2
(
	SomeId INT NOT NULL,
	GroupId INT NOT NULL,

	PRIMARY KEY (SomeId, GroupId),
	FOREIGN KEY (SomeId) REFERENCES SomeTable (SomeId),
	FOREIGN KEY (GroupId) REFERENCES GroupTable2 (GroupId)
)

[smitpatel]

Duplicate of #26496