Merge remote-tracking branch 'origin/master' into develop

Author: joelmartinez

CODE-OF-CONDUCT.md

@@ -0,0 +1,6 @@
+# Code of Conduct
+
+This project has adopted the code of conduct defined by the Contributor Covenant
+to clarify expected behavior in our community.
+
+For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

mdoc/Consts.cs

@@ -3,7 +3,7 @@ namespace Mono.Documentation
 {
 	public static class Consts
 	{
-		public static string MonoVersion = "5.7.5.3";
+		public static string MonoVersion = "5.7.5.4";
 		public const string DocId = "DocId";
 		public const string CppCli = "C++ CLI";
 	    public const string CppCx = "C++ CX";

mdoc/Mono.Documentation/MDocUpdater.cs

@@ -437,7 +437,17 @@ public override void Run (IEnumerable<string> args)
                 ));
                 this.assemblies.AddRange (sets);
                 assemblyPaths.AddRange (sets.SelectMany (s => s.AssemblyPaths));
-                Console.WriteLine($"Frameworks Configuration contains {assemblyPaths.Count} assemblies");
+                Console.WriteLine($"Frameworks Configuration contains {assemblyPaths.Count} assemblies");
+
+
+                if (!DisableSearchDirectoryRecurse)
+                {
+                    // unless it's been explicitly disabled, let's
+                    // add all of the subdirectories to the resolver
+                    // search paths.
+                    foreach (var assemblySet in this.assemblies)
+                        assemblySet.RecurseSearchDirectories();
+                }
 
                 // Create a cache of all frameworks, so we can look up 
                 // members that may exist only other frameworks before deleting them
@@ -457,7 +467,7 @@ public override void Run (IEnumerable<string> args)
                                 foreach (var type in assembly.GetTypes())
                                 {
                                     var t = a.ProcessType(type, assembly);
-                                    foreach (var member in type.GetMembers().Where(i => !DocUtils.IsIgnored(i)))
+                                    foreach (var member in type.GetMembers().Where(i => !DocUtils.IsIgnored(i) && IsMemberNotPrivateEII(i)))
                                         t.ProcessMember(member);
                                 }
                             }
@@ -481,14 +491,6 @@ public override void Run (IEnumerable<string> args)
             if (assemblyPaths.Count == 0)
                 Error ("No assemblies specified.");
 
-            if (!DisableSearchDirectoryRecurse)
-            {
-                // unless it's been explicitly disabled, let's
-                // add all of the subdirectories to the resolver
-                // search paths.
-                foreach (var assemblySet in this.assemblies)
-                    assemblySet.RecurseSearchDirectories ();
-            }
 
             // validation for the api-style parameter
             if (apistyle == "classic")
@@ -1947,7 +1949,8 @@ public static bool IsMemberNotPrivateEII(MemberReference m)
                 if (methdef.Overrides.Count == 1 && !methdef.IsPublic && !(methdef.IsFamily && methdef.IsVirtual && !methdef.DeclaringType.IsSealed))
                 {
                     DocUtils.GetInfoForExplicitlyImplementedMethod(methdef, out iface, out imethod);
-                    if (!DocUtils.IsPublic(iface.Resolve())) return false;
+                    if (!DocUtils.IsPublic(iface.Resolve())) 
+                        return false;
                 }
             }
 

mdoc/mdoc.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>mdoc</id>
-    <version>5.7.5.3</version>
+    <version>5.7.5.4</version>
     <title>mdoc</title>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>