Merge pull request #674 from mono/develop

bump Mdoc to 5.9.2.3
mono · Jul 6, 2023 · f813bcc · f813bcc
2 parents 9712c8d + 3bd41b3
commit f813bcc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,4 @@ Debug
 /mdoc/mdoc.Test/UwpTestWinRtComponentCpp/x64/Release
 /mdoc.Test.Cplusplus/x64/Release
 /x64/Release/UwpTestWinRtComponentCpp
+/mdoc/Properties/launchSettings.json
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.2";
+        public static string MonoVersion = "5.9.2.3";
         public const string DocId = "DocId";
         public const string CppCli = "C++ CLI";
         public const string CppCx = "C++ CX";

diff --git a/mdoc/Mono.Documentation/Updater/DocUtils.cs b/mdoc/Mono.Documentation/Updater/DocUtils.cs
@@ -323,7 +323,7 @@ public static bool ClearNodesIfNotDefault(XmlNode n, XmlNode incoming, int depth
                 {
                     if (nchild == null) continue;
 
-                    if (nchild is XmlComment || nchild is XmlText || nchild is XmlCDataSection)
+                    if (nchild is XmlComment || nchild is XmlText || nchild is XmlCDataSection || nchild.Name == "include")
                     {
                         nchild.ParentNode.RemoveChild(nchild);
                         removed = true;

diff --git a/mdoc/mdoc.csproj b/mdoc/mdoc.csproj
@@ -7,6 +7,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+    <RollForward>Major</RollForward>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net471' ">

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