From 8f593e69cdb846c87f97bd6b97e42244a8e5a13d Mon Sep 17 00:00:00 2001
From: Shay Rojansky <roji@roji.org>
Date: Thu, 18 Mar 2021 20:39:23 +0100
Subject: [PATCH] Obsolete MemberIdentity.IsNone()

---
 src/EFCore/Metadata/Internal/InternalForeignKeyBuilder.cs | 4 +---
 src/EFCore/Metadata/MemberIdentity.cs                     | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/EFCore/Metadata/Internal/InternalForeignKeyBuilder.cs b/src/EFCore/Metadata/Internal/InternalForeignKeyBuilder.cs
index 766a1c215c0..282e58bd6df 100644
--- a/src/EFCore/Metadata/Internal/InternalForeignKeyBuilder.cs
+++ b/src/EFCore/Metadata/Internal/InternalForeignKeyBuilder.cs
@@ -3309,9 +3309,7 @@ private InternalForeignKeyBuilder MergeFacetsFrom(Navigation newNavigation, Navi
 
                 if (configurationSource != ConfigurationSource.Explicit
                     && (shouldResetToPrincipal || shouldResetToDependent)
-                    && (navigationToPrincipal == null
-                        || navigationToPrincipal.Value.IsNone()
-                        || navigationToDependent?.IsNone() != false)
+                    && (navigationToPrincipal?.Name is null || navigationToDependent?.Name is null)
                     && candidateRelationship.Metadata.DependentToPrincipal != null
                     && candidateRelationship.Metadata.PrincipalToDependent != null
                     && ((!candidateRelationshipInverted
diff --git a/src/EFCore/Metadata/MemberIdentity.cs b/src/EFCore/Metadata/MemberIdentity.cs
index 73454c01459..23376c9b7c0 100644
--- a/src/EFCore/Metadata/MemberIdentity.cs
+++ b/src/EFCore/Metadata/MemberIdentity.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
 namespace Microsoft.EntityFrameworkCore.Metadata
@@ -46,6 +47,8 @@ private MemberIdentity(object? nameOrMember)
         ///     Checks if the identity is empty, as opposed to representing a member.
         /// </summary>
         /// <returns> <see langword="true" /> if the identity is empty; <see langword="false" /> otherwise. </returns>
+        [Obsolete("Compare Name to null")]
+        [MemberNotNullWhen(false, nameof(Name))]
         public bool IsNone()
             => _nameOrMember == null;