diff options
| author | Joel Martinez <joelmartinez@gmail.com> | 2017-11-14 20:03:10 +0300 |
|---|---|---|
| committer | Joel Martinez <joelmartinez@gmail.com> | 2017-11-15 00:26:10 +0300 |
| commit | e5406258628d2ae1e2439166d1012b70e1c43040 (patch) | |
| tree | 6a85eb25c3283836dfd0659d9b4bcb1ba7eb6e3a /mdoc | |
| parent | 89bd7b4734aad55175a5492ed9d05ce74c53dc83 (diff) | |
mdoc: importer can now handle xml comments.mdoc-5.3.1
Bump to v5.3.1. Closes #159 and Closes #97.
Diffstat (limited to 'mdoc')
| -rw-r--r-- | mdoc/Consts.cs | 2 | ||||
| -rw-r--r-- | mdoc/Mono.Documentation/Updater/MsxdocDocumentationImporter.cs | 18 | ||||
| -rw-r--r-- | mdoc/mdoc.nuspec | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/mdoc/Consts.cs b/mdoc/Consts.cs index 251fd0d8..c83ca5db 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.3.0.0"; + public static string MonoVersion = "5.3.1.0"; public const string DocId = "DocId"; public const string VbNet = "VB.NET"; public const string DocIdLowCase = "docid"; diff --git a/mdoc/Mono.Documentation/Updater/MsxdocDocumentationImporter.cs b/mdoc/Mono.Documentation/Updater/MsxdocDocumentationImporter.cs index 73282c9a..ab94d07a 100644 --- a/mdoc/Mono.Documentation/Updater/MsxdocDocumentationImporter.cs +++ b/mdoc/Mono.Documentation/Updater/MsxdocDocumentationImporter.cs @@ -125,14 +125,18 @@ namespace Mono.Documentation.Updater } default: { - bool add = true; - if (child.NodeType == XmlNodeType.Element && - e.SelectNodes (child.Name).Cast<XmlElement> ().Any (n => n.OuterXml == child.OuterXml)) - add = false;
- if (add)
+ var targetNodes = e.ChildNodes.Cast<XmlNode> () + .Where (n => n.Name == child.Name) + .Select (n => new + { + Xml = n.OuterXml, + Overwrite = n.Attributes["overwrite"] + }); + string sourceXml = child.OuterXml; +
+ if (!targetNodes.Any (n => sourceXml.Equals (n.Xml) || n.Overwrite?.Value == "false"))
{ - if (child.NodeType == XmlNodeType.Text || e.SelectSingleNode(child.Name) == null) - MDocUpdater.CopyNode(child, e); + MDocUpdater.CopyNode(child, e); }
break; } diff --git a/mdoc/mdoc.nuspec b/mdoc/mdoc.nuspec index 9bdbe9b4..17598208 100644 --- a/mdoc/mdoc.nuspec +++ b/mdoc/mdoc.nuspec @@ -2,7 +2,7 @@ <package > <metadata> <id>mdoc</id> - <version>5.3.0.0</version> + <version>5.3.1.0</version> <title>mdoc</title> <authors>Joel Martinez</authors> <owners>Xamarin</owners> |