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
This commit is contained in:
Родитель
53df4b8a7c
Коммит
796b1e1de6
|
@ -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";
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
Загрузка…
Ссылка в новой задаче