Merge pull request #676 from mono/develop

Fix assemblyVersion not removed bug (#675)
mono · Oct 24, 2023 · 01efe58 · 01efe58
2 parents f813bcc + 696e6e5
commit 01efe58
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/mdoc/Consts.cs b/mdoc/Consts.cs
@@ -3,7 +3,7 @@ namespace Mono.Documentation
 {
     public static class Consts
     {
-        public static string MonoVersion = "5.9.2.3";
+        public static string MonoVersion = "5.9.2.4";
         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
@@ -2432,6 +2432,11 @@ private void UpdateMember (DocsNodeInfo info, FrameworkTypeEntry typeEntry, Dict
                 {
                     var node = AddAssemblyNameToNode (me, mi.Module, mi.DeclaringType.Resolve());
 
+                    if (typeEntry.IsMemberOnFirstFramework(mi))
+                    {
+                        node.SelectNodes("AssemblyVersion").Cast<XmlNode>().ToList().ForEach(e => e.ParentNode.RemoveChild(e));
+                    }
+
                     UpdateAssemblyVersionForAssemblyInfo (node, me, new[] { GetAssemblyVersion (mi.Module.Assembly) }, add: true);
                 }
             }

diff --git a/mdoc/mdoc.nuspec b/mdoc/mdoc.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>mdoc</id>
-    <version>5.9.2.3</version>
+    <version>5.9.2.4</version>
     <title>mdoc</title>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>