Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/api-doc-tools.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMin Huang <huangmin@microsoft.com>2022-08-10 14:21:21 +0300
committerMin Huang <huangmin@microsoft.com>2022-08-10 14:21:21 +0300
commit28898a221d6fbd2b825da5bdc44657bd7a75edcf (patch)
tree4352bd05f79db4ff961d8b8b39e64ea2234af634
parent53df4b8a7cbc0935a02cd3c781fd84aab1b4ab26 (diff)
Fix 662735: Members with user edited docs will not be deletedmdoc-5.9.0
-rw-r--r--mdoc/Mono.Documentation/MDocUpdater.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/mdoc/Mono.Documentation/MDocUpdater.cs b/mdoc/Mono.Documentation/MDocUpdater.cs
index 269e36ea..e98b068b 100644
--- a/mdoc/Mono.Documentation/MDocUpdater.cs
+++ b/mdoc/Mono.Documentation/MDocUpdater.cs
@@ -1550,7 +1550,7 @@ namespace Mono.Documentation
bool isprivateeii = !IsMemberNotPrivateEII(oldmember2);
if (oldmember2 == null || isprivateeii)
{
- if (!string.IsNullOrWhiteSpace (FrameworksPath) && !isprivateeii) // only do this check if fx mode AND it's not a private EII. If it's a private EII, we just want to delete it
+ if (!string.IsNullOrWhiteSpace (FrameworksPath)) // only do this check if fx mode
{
// verify that this member wasn't seen in another framework and is indeed valid
var sigFromXml = oldmember
@@ -1939,11 +1939,9 @@ namespace Mono.Documentation
signature);
// Identify all of the different states that could affect our decision to delete the member
- bool duplicated = reason.Contains("Duplicate Member");
bool shouldPreserve = !string.IsNullOrWhiteSpace (PreserveTag);
bool hasContent = MemberDocsHaveUserContent (member);
- //When the member is NOT PRESERVED, the member has NO CONTENT or is DUPLICATED, then it should be deleted
- bool shouldDelete = !shouldPreserve && (delete && (!hasContent || duplicated));
+ bool shouldDelete = !shouldPreserve && (delete || !hasContent);
bool unifiedRun = HasDroppedNamespace (type);