From 7b9257ad188cf2063e1d8b9782f675f2770197cc Mon Sep 17 00:00:00 2001 From: TinaLiu <134926504+TinaLiu02@users.noreply.github.com> Date: Mon, 12 Jun 2023 10:36:07 +0800 Subject: [PATCH 1/3] 838410:[Dotnet] ignore include tag when importing comments from xml (#672) --- .gitignore | 1 + mdoc/Mono.Documentation/Updater/DocUtils.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5d55318be..155e7c4a9 100644 --- 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/Mono.Documentation/Updater/DocUtils.cs b/mdoc/Mono.Documentation/Updater/DocUtils.cs index 718303b05..baa8d6096 100644 --- 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; From dc1400174697d37f65ce2a386da6b628b65f9e45 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Fri, 23 Jun 2023 02:13:06 -0400 Subject: [PATCH 2/3] [mdoc] Set `RollForward` to `Major` (#671) Context: https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#rollforward Allows the `net6.0` version of mdoc to run against newer dotnet runtime versions, rather than requiring `net6.0` to be installed. Co-authored-by: Min Huang --- mdoc/mdoc.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/mdoc/mdoc.csproj b/mdoc/mdoc.csproj index 267427af0..0b2282370 100644 --- a/mdoc/mdoc.csproj +++ b/mdoc/mdoc.csproj @@ -7,6 +7,7 @@ false false false + Major From 3bd41b37f0540a8873076188449b7d762314efb3 Mon Sep 17 00:00:00 2001 From: Min Huang Date: Wed, 5 Jul 2023 14:49:07 +0800 Subject: [PATCH 3/3] Bump mdoc to 5.9.2.3 --- mdoc/Consts.cs | 2 +- mdoc/mdoc.nuspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mdoc/Consts.cs b/mdoc/Consts.cs index a4944edae..e022b0bfe 100644 --- 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/mdoc.nuspec b/mdoc/mdoc.nuspec index fc31407e9..947ffe973 100644 --- a/mdoc/mdoc.nuspec +++ b/mdoc/mdoc.nuspec @@ -2,7 +2,7 @@ mdoc - 5.9.2.2 + 5.9.2.3 mdoc Microsoft Microsoft