Fix assemblyVersion not removed bug (#675)

huangmin-ms · TinaLiu02 · web-flow · commit 696e6e581c8b · 2023-10-24T13:29:06.000+08:00
* Fix assemblyVersion not removed bug

* update version to 5.9.2.4

---------

Co-authored-by: Tina Liu &lt;v-liutina@microsoft.com&gt;
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>

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ namespace Mono.Documentation`
`3`	`3`	`{`
`4`	`4`	`public static class Consts`
`5`	`5`	`{`
`6`		`- public static string MonoVersion = "5.9.2.3";`
	`6`	`+ public static string MonoVersion = "5.9.2.4";`
`7`	`7`	`public const string DocId = "DocId";`
`8`	`8`	`public const string CppCli = "C++ CLI";`
`9`	`9`	`public const string CppCx = "C++ CX";`
Original file line number	Diff line number	Diff line change
`@@ -2432,6 +2432,11 @@ private void UpdateMember (DocsNodeInfo info, FrameworkTypeEntry typeEntry, Dict`
`2432`	`2432`	`{`
`2433`	`2433`	`var node = AddAssemblyNameToNode (me, mi.Module, mi.DeclaringType.Resolve());`
`2434`	`2434`
	`2435`	`+ if (typeEntry.IsMemberOnFirstFramework(mi))`
	`2436`	`+ {`
	`2437`	`+ node.SelectNodes("AssemblyVersion").Cast<XmlNode>().ToList().ForEach(e => e.ParentNode.RemoveChild(e));`
	`2438`	`+ }`
	`2439`	`+`
`2435`	`2440`	`UpdateAssemblyVersionForAssemblyInfo (node, me, new[] { GetAssemblyVersion (mi.Module.Assembly) }, add: true);`
`2436`	`2441`	`}`
`2437`	`2442`	`}`