Merge pull request #495 from maopeixia/mpx-mdoc-1.0.1.6

[mdoc] AssemblyVersion missing in some instances

Author: joelmartinez

mdoc/Mono.Documentation/MDocUpdater.cs

@@ -1542,7 +1542,15 @@ public void DoUpdateType2 (string message, XmlDocument basefile, TypeDefinition
                         oldmember.SetAttribute ("MemberName", memberName);
                     }
 
-                    AddEiiNameAsAttribute(info.Member, oldmember, memberName);
+                    AddEiiNameAsAttribute(info.Member, oldmember, memberName);
+
+                    // Check valid Member AssemblyInfo and delete invalid
+                    if (typeEntry.Framework.IsFirstFrameworkForType(typeEntry))
+                    {
+                        var delList = DocUtils.RemoveInvalidAssemblyInfo(info.Node, no_assembly_versions, "Member");
+                        foreach (var delitem in delList)
+                            info.Node.RemoveChild(delitem);
+                    }
                 }
 
                 string sig = oldmember2 != null ? FormatterManager.MemberFormatters[1].GetDeclaration (oldmember2) : null;
@@ -2139,6 +2147,14 @@ public void UpdateType (XmlElement root, TypeDefinition type, FrameworkTypeEntry
             foreach (MemberFormatter f in FormatterManager.TypeFormatters)
             {
                 UpdateSignature(f, type, root, typeEntry);
+            }
+
+            // Check valid Type AssemblyInfo and delete invalid
+            if (typeEntry.Framework.IsFirstFrameworkForType(typeEntry))
+            {
+                var delList = DocUtils.RemoveInvalidAssemblyInfo(root, no_assembly_versions, "Type");
+                foreach (var delitem in delList)
+                    delitem.ParentNode.RemoveChild(delitem);
             }
 
             AddAssemblyNameToNode (root, type);

mdoc/Mono.Documentation/Updater/DocUtils.cs

@@ -868,5 +868,25 @@ public static List<GenericParameter> GetGenericParameters(TypeDefinition type)
             }
             return genericParameters;
         }
+
+        public static List<System.Xml.XmlNode> RemoveInvalidAssemblyInfo(XmlElement Nodeinfo, bool No_assembly_versions, String Type)
+        {
+            List<System.Xml.XmlNode> assemblyDelList = new List<System.Xml.XmlNode>();
+            if (No_assembly_versions)
+                return assemblyDelList;
+
+            var filter = Type == "Member" ? "AssemblyInfo" : $"/{Type}/AssemblyInfo";
+
+            var assemblyFromXml = Nodeinfo
+                                     .SelectNodes(filter)
+                                     .Cast<XmlElement>();
+
+            foreach (var item in assemblyFromXml)
+            {
+                if (item.GetElementsByTagName("AssemblyVersion").Count == 0)
+                    assemblyDelList.Add(item);
+            }
+            return assemblyDelList;
+        }
     }
 }

mdoc/mdoc.Test/MDocUpdaterTests.cs

@@ -76,5 +76,29 @@ public void InternalEIITest()
             Assert.AreEqual("System.String mdoc.Test2.InternalEIICalss::mdoc.Test.SampleClasses.InterfaceA.Getstring(System.Int32)", oldmember.FullName);
 
         }
+
+        [Test]
+        public void RemoveInvalidAssembliesInfo()
+        {
+            XmlDocument doc = new System.Xml.XmlDocument();
+            doc.LoadXml(XmlConsts.internalEllXml);
+
+            var type = GetType(typeof(mdoc.Test2.InternalEIICalss));
+            var docEnum = new DocumentationEnumerator();
+
+            var delList = DocUtils.RemoveInvalidAssemblyInfo(doc.DocumentElement, false, "Type");
+            Assert.IsTrue(delList.Count == 1);
+
+            foreach (DocsNodeInfo info in docEnum.GetDocumentationMembers(doc, type, FrameworkTypeEntry.Empty))
+            {
+                delList.AddRange(DocUtils.RemoveInvalidAssemblyInfo(info.Node, false, "Member"));
+            }
+
+            Assert.IsTrue(delList.Count == 2);
+
+            ///Note : (The following operation will not be carried out, just prompt)
+            //   foreach (var delitem in delList)
+            // delitem.ParentNode.RemoveChild(child);        
+        }
     }
 }

mdoc/mdoc.Test/XmlConsts.cs

@@ -312,6 +312,9 @@ class XmlConsts
     <AssemblyName>mdoc.Test</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <AssemblyInfo>
+     <AssemblyName>System.Object</AssemblyName>
+  </AssemblyInfo>
   <Base>
     <BaseTypeName>System.Object</BaseTypeName>
   </Base>
@@ -373,7 +376,7 @@ class XmlConsts
       <MemberSignature Language = ""F#"" Value=""abstract member mdoc.Test.SampleClasses.InterfaceA.Getstring : int -&gt; string&#xA;override this.mdoc.Test.SampleClasses.InterfaceA.Getstring : int -&gt; string"" Usage=""internalEIICalss.mdoc.Test.SampleClasses.InterfaceA.Getstring a"" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>0.0.0.0</AssemblyVersion>
+        <AssemblyName>System.Object</AssemblyName>
       </AssemblyInfo>
       <ReturnValue>
         <ReturnType>System.String</ReturnType>