Entity Framework Id Object Name Collision Problem - entity-framework-core

Question

So I'm running into an annoying problem with EF Core 6.0 where I am getting a naming conflict when mapping using strongly typed Value Objects as Id's.
So the following, using straight Guid's as Id's, works:
public class User {
public Guid Id { get; set; }
public List<UserRole> Roles { get; set; }
}
public class UserRole {
public Guid UserId { get; set; }
public Guid RoleId { get; set; }
}
internal sealed class UserEntityTypeConfiguration : IEntityTypeConfiguration<User> {
public void Configure(EntityTypeBuilder<User> builder) {
builder.ToTable("User", SchemaNames.Application);
builder.HasKey(p => p.Id).HasName("Id");
builder.HasMany(d => d.Roles);
}
}
internal sealed class UserRoleValueTypeConfiguration : IEntityTypeConfiguration<UserRole> {
public void Configure(EntityTypeBuilder<UserRole> builder) {
builder.ToTable("UserRoles", SchemaNames.Application);
builder.HasKey(userRole => new { userRole.UserId, userRole.RoleId });
builder.Property("UserId").HasColumnName("UserId");
builder.Property("RoleId").HasColumnName("RoleId");
}
}
User user = new User() { Id = Guid.NewGuid() };
user.Roles.Add(new UserRole() { UserId = user.Id.Value, RoleId = roleId });
context.Users.AddAsync(user);
However when trying to use strongly typed Id's and perform an Add:
public class UserId : TypedIdValue {
public UserId(Guid value) : base(value) { }
}
public class User {
public UserId Id { get; set; }
public List<UserRole> Roles { get; set; }
}
User user = new User() { Id = Guid.NewGuid() };
user.Roles.Add(new UserRole() { UserId = user.Id.Value, RoleId = roleId });
context.Users.AddAsync(user);
I get - SqlException: Invalid column name 'UserId1'.
I am using a custom ValueConverterSelector and ValueConverter registered with the DbContextOptionsBuilder to facilitate the strongly typed Id's.
Clearly it's tripping up over there being a UserId object for Id and UserId field in the UserRole object, but I'm at a loss as to how to resolve this issue.
Any help would be greatly appreciated.