diff options
| author | Min Huang <huangmin@microsoft.com> | 2022-08-15 04:56:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-15 04:56:34 +0300 |
| commit | 796b1e1de6749e04b0f43ff1e7cc2c34a880e37b (patch) | |
| tree | d190b8f3ec2cd0bea3874794d2c13cc17ae8c166 | |
| parent | 53df4b8a7cbc0935a02cd3c781fd84aab1b4ab26 (diff) | |
Fix 662735: Members with user edited docs will not be deleted (#647)
* Fix 662735: Members with user edited docs will not be deleted
* upgrade mdoc to 5.9.0
| -rw-r--r-- | mdoc/Consts.cs | 2 | ||||
| -rw-r--r-- | mdoc/Mono.Documentation/MDocUpdater.cs | 6 | ||||
| -rw-r--r-- | mdoc/mdoc.nuspec | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/mdoc/Consts.cs b/mdoc/Consts.cs index 7d64b319..64d86ab7 100644 --- a/mdoc/Consts.cs +++ b/mdoc/Consts.cs @@ -3,7 +3,7 @@ namespace Mono.Documentation { public static class Consts { - public static string MonoVersion = "5.8.9.2"; + public static string MonoVersion = "5.9.0"; public const string DocId = "DocId"; public const string CppCli = "C++ CLI"; public const string CppCx = "C++ CX"; 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); diff --git a/mdoc/mdoc.nuspec b/mdoc/mdoc.nuspec index 2885e518..41f7144f 100644 --- a/mdoc/mdoc.nuspec +++ b/mdoc/mdoc.nuspec @@ -2,7 +2,7 @@ <package > <metadata> <id>mdoc</id> - <version>5.8.9.2</version> + <version>5.9.0</version> <title>mdoc</title> <authors>Microsoft</authors> <owners>Microsoft</owners> |