From 922ebc1bf3ecaf092775e0ebd214a980cdaa8f49 Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Fri, 10 Dec 2010 09:03:14 +0100 Subject: [PATCH 1/2] Display property getters before setters. --- mcs/tools/mdoc/Mono.Documentation/monodocer.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mcs/tools/mdoc/Mono.Documentation/monodocer.cs b/mcs/tools/mdoc/Mono.Documentation/monodocer.cs index 35dae5a55d97..6b46e4cc190c 100644 --- a/mcs/tools/mdoc/Mono.Documentation/monodocer.cs +++ b/mcs/tools/mdoc/Mono.Documentation/monodocer.cs @@ -4532,16 +4532,16 @@ protected override string GetPropertyDeclaration (PropertyDefinition property) } buf.Append (" {"); - if (set_visible != null) { - if (set_visible != visibility) - buf.Append (' ').Append (set_visible); - buf.Append (" set;"); - } if (get_visible != null) { if (get_visible != visibility) buf.Append (' ').Append (get_visible); buf.Append (" get;"); } + if (set_visible != null) { + if (set_visible != visibility) + buf.Append (' ').Append (set_visible); + buf.Append (" set;"); + } buf.Append (" }"); return buf [0] != ' ' ? buf.ToString () : buf.ToString (1, buf.Length-1); From ee5c15db2a8255155cc64bc9792a2f0273325716 Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Fri, 10 Dec 2010 15:56:51 +0100 Subject: [PATCH 2/2] Ignore ContractInvariantMethodAttribute in doc generation. --- mcs/tools/mdoc/Mono.Documentation/monodocer.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mcs/tools/mdoc/Mono.Documentation/monodocer.cs b/mcs/tools/mdoc/Mono.Documentation/monodocer.cs index 6b46e4cc190c..74489aac47b7 100644 --- a/mcs/tools/mdoc/Mono.Documentation/monodocer.cs +++ b/mcs/tools/mdoc/Mono.Documentation/monodocer.cs @@ -1893,6 +1893,8 @@ private static bool UpdateAssemblyVersions(XmlElement root, string[] assemblyVer "System.Runtime.CompilerServices.ExtensionAttribute", // Used to differentiate 'object' from C#4 'dynamic' "System.Runtime.CompilerServices.DynamicAttribute", + // Used in code contracts' object invariants (should not be accessed directly) + "System.Diagnostics.Contracts.ContractInvariantMethodAttribute", }; private void MakeAttributes (XmlElement root, IEnumerable attributes)