From ff4ab341c3218a890916acb826957ac335127c4b Mon Sep 17 00:00:00 2001 From: Joel Martinez Date: Wed, 16 Dec 2015 11:34:05 -0500 Subject: [PATCH] [mdoc] Extension method crash fix, removes -multiassembly The tests added during the initial development of the -multiassembly argument failed to test the presence of extension methods; the result was a crash that occurred when there were extension methods present in multiple assemblies. This patch addresses the issue by putting a guard clause around the code that adds the extension method to the index. Tests have been modified accordingly to verify this bug and include extension methods Additionally, the -multiassembly parameter was removed entirely. This behavior is now triggered by the presence of -apistyle, which is where support for "multiple assemblies" was meant to work anyways. To review, this is to support cross-platform development, where you have multiple -- *different* -- assemblies for each platform. These assemblies will share a certain cross-section of APIs that will be *exactly* the same in each assembly (as opposed to multiple versions of literally the same assembly). As a result, every member will now contain an individual `AssemblyInfo` tag that also contains the name of the assembly. --- mcs/tools/mdoc/Makefile | 12 ++-- .../mdoc/Mono.Documentation/monodocer.cs | 29 +++++---- mcs/tools/mdoc/Test/DocTest-DropNS-classic.cs | 3 + mcs/tools/mdoc/Test/DocTest-DropNS-unified.cs | 3 + .../MyFramework.MyNamespace/MyClass.xml | 8 +++ .../MyClassExtensions.xml | 47 ++++++++++++++ .../en.expected-dropns-classic-v1/index.xml | 34 ++++++++++ .../MyFramework.MyNamespace/MyClass.xml | 8 +++ .../MyClassExtensions.xml | 47 ++++++++++++++ .../MyOtherClass.xml | 15 +++-- .../index.xml | 34 ++++++++++ .../MyFramework.MyNamespace/MyClass.xml | 18 ++++++ .../MyClassExtensions.xml | 47 ++++++++++++++ .../TypeOnlyInClassic.xml | 5 +- .../WillDelete.xml.remove | 6 ++ .../Test/en.expected-dropns-delete/index.xml | 34 ++++++++++ .../MyFramework.MyNamespace/MyClass.xml | 16 ++--- .../MyClassExtensions.xml | 63 +++++++++++++++++++ .../index.xml | 24 +++++++ .../MyClassExtensions.xml | 63 +++++++++++++++++++ .../Test/en.expected-dropns-multi/index.xml | 24 +++++++ 21 files changed, 507 insertions(+), 33 deletions(-) create mode 100644 mcs/tools/mdoc/Test/en.expected-dropns-classic-v1/MyFramework.MyNamespace/MyClassExtensions.xml create mode 100644 mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/MyFramework.MyNamespace/MyClassExtensions.xml create mode 100644 mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/MyClassExtensions.xml create mode 100644 mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/MyFramework.MyNamespace/MyClassExtensions.xml create mode 100644 mcs/tools/mdoc/Test/en.expected-dropns-multi/MyFramework.MyNamespace/MyClassExtensions.xml diff --git a/mcs/tools/mdoc/Makefile b/mcs/tools/mdoc/Makefile index 77dcbc676d8b..047cab5ecff0 100644 --- a/mcs/tools/mdoc/Makefile +++ b/mcs/tools/mdoc/Makefile @@ -186,12 +186,12 @@ check-monodocer-dropns-multi: $(PROGRAM) $(MAKE) Test/DocTest-DropNS-unified-multitest.dll # mdoc update for both classic and unified - $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-CLASSIC) --api-style=classic -multiassembly - $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-UNIFIED) --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework --dropns Test/DocTest-DropNS-unified-multitest.dll=MyFramework -multiassembly + $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-CLASSIC) --api-style=classic + $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-UNIFIED) --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework --dropns Test/DocTest-DropNS-unified-multitest.dll=MyFramework # now run it again to verify idempotency - $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-CLASSIC) --api-style=classic -multiassembly - $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-UNIFIED) --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework --dropns Test/DocTest-DropNS-unified-multitest.dll=MyFramework -multiassembly + $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-CLASSIC) --api-style=classic + $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-UNIFIED) --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework --dropns Test/DocTest-DropNS-unified-multitest.dll=MyFramework diff --exclude=.svn -rup Test/en.expected-dropns-multi Test/en.actual @@ -208,8 +208,8 @@ check-monodocer-dropns-multi-withexisting: $(PROGRAM) $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual Test/DocTest-DropNS-unified.dll --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework # mdoc update for both classic and unified - $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-CLASSIC) --api-style=classic -multiassembly - $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-UNIFIED) --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework --dropns Test/DocTest-DropNS-unified-multitest.dll=MyFramework -multiassembly + $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-CLASSIC) --api-style=classic + $(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-UNIFIED) --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework --dropns Test/DocTest-DropNS-unified-multitest.dll=MyFramework diff --exclude=.svn -rup Test/en.expected-dropns-multi-withexisting Test/en.actual diff --git a/mcs/tools/mdoc/Mono.Documentation/monodocer.cs b/mcs/tools/mdoc/Mono.Documentation/monodocer.cs index a8f1ccc50290..dc94c3a50b82 100644 --- a/mcs/tools/mdoc/Mono.Documentation/monodocer.cs +++ b/mcs/tools/mdoc/Mono.Documentation/monodocer.cs @@ -135,7 +135,7 @@ class MDocUpdater : MDocCommand string apistyle = string.Empty; bool isClassicRun; - bool multiassembly; + bool delete; bool show_exceptions; bool no_assembly_versions, ignore_missing_types; @@ -194,7 +194,14 @@ public static bool HasDroppedAnyNamespace () { return !string.IsNullOrWhiteSpace (droppedNamespace); } - + + /// Logic flag to signify that we should list assemblies at the method level, since there are multiple + /// assemblies for a given type/method. + public bool IsMultiAssembly { + get { + return apistyle == "classic" || apistyle == "unified"; + } + } static List droppedAssemblies = new List(); @@ -281,12 +288,9 @@ public override void Run (IEnumerable args) { "preserve", "Do not delete members that don't exist in the assembly, but rather mark them as preserved.", v => PreserveTag = "true" }, - { "multiassembly", - "Allow types to be in multiple assemblies.", - v => multiassembly = true }, { "api-style=", "Denotes the apistyle. Currently, only `classic` and `unified` are supported. `classic` set of assemblies should be run first, immediately followed by 'unified' assemblies with the `dropns` parameter.", - v => apistyle = v.ToLowerInvariant ()}, + v => { apistyle = v.ToLowerInvariant (); }}, }; var assemblies = Parse (p, args, "update", "[OPTIONS]+ ASSEMBLIES", @@ -787,7 +791,7 @@ public static string GetTypeFileName (string typename) private void AddIndexAssembly (AssemblyDefinition assembly, XmlElement parent) { XmlElement index_assembly = null; - if (multiassembly) + if (IsMultiAssembly) index_assembly = (XmlElement)parent.SelectSingleNode ("Assembly[@Name='"+ assembly.Name.Name +"']"); if (index_assembly == null) @@ -867,7 +871,7 @@ private void DoUpdateAssemblies (string source, string dest) XmlElement index_types = WriteElement(index.DocumentElement, "Types"); XmlElement index_assemblies = WriteElement(index.DocumentElement, "Assemblies"); - if (!multiassembly) + if (!IsMultiAssembly) index_assemblies.RemoveAll (); @@ -1765,7 +1769,7 @@ private void UpdateMember (DocsNodeInfo info) WriteElementText(me, "MemberType", GetMemberType(mi)); if (!no_assembly_versions) { - if (!multiassembly) + if (!IsMultiAssembly) UpdateAssemblyVersions (me, mi, true); else { var node = AddAssemblyNameToNode (me, mi.Module); @@ -2013,7 +2017,10 @@ private void UpdateExtensionMethods (XmlElement e, DocsNodeInfo info) member.AppendChild (link); AddTargets (em, info); - extensionMethods.Add (em); + var sig = em.SelectSingleNode ("Member/MemberSignature[@Language='C#']/@Value"); + if (!IsMultiAssembly || (IsMultiAssembly && sig != null && !extensionMethods.Any (ex => ex.SelectSingleNode ("Member/MemberSignature[@Language='C#']/@Value").Value == sig.Value))) { + extensionMethods.Add (em); + } } private static void RemoveExcept (XmlNode node, string[] except) @@ -2404,7 +2411,7 @@ private static string GetAssemblyVersion (AssemblyDefinition assembly) private bool UpdateAssemblyVersions(XmlElement root, AssemblyDefinition assembly, string[] assemblyVersions, bool add) { - if (multiassembly) + if (IsMultiAssembly) return false; XmlElement av = (XmlElement) root.SelectSingleNode ("AssemblyVersions"); diff --git a/mcs/tools/mdoc/Test/DocTest-DropNS-classic.cs b/mcs/tools/mdoc/Test/DocTest-DropNS-classic.cs index 303c58e8882b..b9cbce549bf5 100644 --- a/mcs/tools/mdoc/Test/DocTest-DropNS-classic.cs +++ b/mcs/tools/mdoc/Test/DocTest-DropNS-classic.cs @@ -21,6 +21,9 @@ public float Hello(int value) { public string WillDeleteInV2Classic {get;set;} #endif } + public static class MyClassExtensions { + public static bool AnExtension (this MyClass value) { return false; } + } #if DELETETEST public class TypeOnlyInClassic {} diff --git a/mcs/tools/mdoc/Test/DocTest-DropNS-unified.cs b/mcs/tools/mdoc/Test/DocTest-DropNS-unified.cs index b4fcc9ea01b8..a11dcb9c2c87 100644 --- a/mcs/tools/mdoc/Test/DocTest-DropNS-unified.cs +++ b/mcs/tools/mdoc/Test/DocTest-DropNS-unified.cs @@ -22,6 +22,9 @@ public float Hello(int value) { #endif } + public static class MyClassExtensions { + public static bool AnExtension (this MyClass value) { return false; } + } #if DELETETEST public struct nint { diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-classic-v1/MyFramework.MyNamespace/MyClass.xml b/mcs/tools/mdoc/Test/en.expected-dropns-classic-v1/MyFramework.MyNamespace/MyClass.xml index 77388be8815e..317b6a618484 100644 --- a/mcs/tools/mdoc/Test/en.expected-dropns-classic-v1/MyFramework.MyNamespace/MyClass.xml +++ b/mcs/tools/mdoc/Test/en.expected-dropns-classic-v1/MyFramework.MyNamespace/MyClass.xml @@ -23,9 +23,11 @@ Constructor + DocTest-DropNS-classic 0.0.0.0 + DocTest-DropNS-unified 0.0.0.0 @@ -39,9 +41,11 @@ Method + DocTest-DropNS-classic 0.0.0.0 + DocTest-DropNS-unified 0.0.0.0 @@ -62,9 +66,11 @@ Property + DocTest-DropNS-classic 0.0.0.0 + DocTest-DropNS-unified 0.0.0.0 @@ -81,6 +87,7 @@ Property + DocTest-DropNS-classic 0.0.0.0 @@ -97,6 +104,7 @@ Property + DocTest-DropNS-unified 0.0.0.0 diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-classic-v1/MyFramework.MyNamespace/MyClassExtensions.xml b/mcs/tools/mdoc/Test/en.expected-dropns-classic-v1/MyFramework.MyNamespace/MyClassExtensions.xml new file mode 100644 index 000000000000..a11fafef697e --- /dev/null +++ b/mcs/tools/mdoc/Test/en.expected-dropns-classic-v1/MyFramework.MyNamespace/MyClassExtensions.xml @@ -0,0 +1,47 @@ + + + + + DocTest-DropNS-classic + 0.0.0.0 + + + DocTest-DropNS-unified + 0.0.0.0 + + + System.Object + + + + To be added. + To be added. + + + + + + Method + + DocTest-DropNS-classic + 0.0.0.0 + + + DocTest-DropNS-unified + 0.0.0.0 + + + System.Boolean + + + + + + To be added. + To be added. + To be added. + To be added. + + + + diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-classic-v1/index.xml b/mcs/tools/mdoc/Test/en.expected-dropns-classic-v1/index.xml index edacc723f54a..330a3895e2d6 100644 --- a/mcs/tools/mdoc/Test/en.expected-dropns-classic-v1/index.xml +++ b/mcs/tools/mdoc/Test/en.expected-dropns-classic-v1/index.xml @@ -1,5 +1,15 @@ + + + + System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints) + + + System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true) + + + @@ -16,7 +26,31 @@ + Codestin Search App + + + + + + + + + ExtensionMethod + + System.Boolean + + + + + + To be added. + To be added. + + + + + diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/MyFramework.MyNamespace/MyClass.xml b/mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/MyFramework.MyNamespace/MyClass.xml index 77388be8815e..317b6a618484 100644 --- a/mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/MyFramework.MyNamespace/MyClass.xml +++ b/mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/MyFramework.MyNamespace/MyClass.xml @@ -23,9 +23,11 @@ Constructor + DocTest-DropNS-classic 0.0.0.0 + DocTest-DropNS-unified 0.0.0.0 @@ -39,9 +41,11 @@ Method + DocTest-DropNS-classic 0.0.0.0 + DocTest-DropNS-unified 0.0.0.0 @@ -62,9 +66,11 @@ Property + DocTest-DropNS-classic 0.0.0.0 + DocTest-DropNS-unified 0.0.0.0 @@ -81,6 +87,7 @@ Property + DocTest-DropNS-classic 0.0.0.0 @@ -97,6 +104,7 @@ Property + DocTest-DropNS-unified 0.0.0.0 diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/MyFramework.MyNamespace/MyClassExtensions.xml b/mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/MyFramework.MyNamespace/MyClassExtensions.xml new file mode 100644 index 000000000000..a11fafef697e --- /dev/null +++ b/mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/MyFramework.MyNamespace/MyClassExtensions.xml @@ -0,0 +1,47 @@ + + + + + DocTest-DropNS-classic + 0.0.0.0 + + + DocTest-DropNS-unified + 0.0.0.0 + + + System.Object + + + + To be added. + To be added. + + + + + + Method + + DocTest-DropNS-classic + 0.0.0.0 + + + DocTest-DropNS-unified + 0.0.0.0 + + + System.Boolean + + + + + + To be added. + To be added. + To be added. + To be added. + + + + diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/MyFramework.MyOtherNamespace/MyOtherClass.xml b/mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/MyFramework.MyOtherNamespace/MyOtherClass.xml index a920ce2f499b..0e02038a020f 100644 --- a/mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/MyFramework.MyOtherNamespace/MyOtherClass.xml +++ b/mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/MyFramework.MyOtherNamespace/MyOtherClass.xml @@ -14,11 +14,12 @@ To be added. - + Constructor - + + DocTest-DropNS-classic-secondary 0.0.0.0 @@ -27,11 +28,12 @@ To be added. - + Method - + + DocTest-DropNS-classic-secondary 0.0.0.0 @@ -47,11 +49,12 @@ To be added. - + Property - + + DocTest-DropNS-classic-secondary 0.0.0.0 diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/index.xml b/mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/index.xml index d0fb593627f3..3620aa8d0aa6 100644 --- a/mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/index.xml +++ b/mcs/tools/mdoc/Test/en.expected-dropns-classic-withsecondary/index.xml @@ -1,5 +1,15 @@ + + + + System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints) + + + System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true) + + + @@ -26,10 +36,34 @@ + Codestin Search App + + + + + + + + + ExtensionMethod + + System.Boolean + + + + + + To be added. + To be added. + + + + + diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/MyClass.xml b/mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/MyClass.xml index 1ff3447bab2c..13e6364a07b3 100644 --- a/mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/MyClass.xml +++ b/mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/MyClass.xml @@ -23,9 +23,11 @@ Constructor + DocTest-DropNS-classic-deletetest 0.0.0.0 + DocTest-DropNS-unified-deletetest 0.0.0.0 @@ -39,9 +41,11 @@ Property + DocTest-DropNS-classic-deletetest 0.0.0.0 + DocTest-DropNS-unified-deletetest 0.0.0.0 @@ -58,6 +62,7 @@ Property + DocTest-DropNS-classic-deletetest 0.0.0.0 @@ -74,6 +79,7 @@ Property + DocTest-DropNS-unified-deletetest 0.0.0.0 @@ -90,9 +96,11 @@ Method + DocTest-DropNS-classic-deletetest 0.0.0.0 + DocTest-DropNS-unified-deletetest 0.0.0.0 @@ -113,9 +121,11 @@ Property + DocTest-DropNS-classic-deletetest 0.0.0.0 + DocTest-DropNS-unified-deletetest 0.0.0.0 @@ -132,6 +142,7 @@ Property + DocTest-DropNS-classic-deletetest 0.0.0.0 @@ -150,9 +161,11 @@ Property + DocTest-DropNS-classic-deletetest 0.0.0.0 + DocTest-DropNS-unified-deletetest 0.0.0.0 @@ -170,6 +183,7 @@ Property + DocTest-DropNS-unified-deletetest 0.0.0.0 @@ -186,9 +200,11 @@ Property + DocTest-DropNS-classic-deletetest 0.0.0.0 + DocTest-DropNS-unified-deletetest 0.0.0.0 @@ -205,6 +221,7 @@ Property + DocTest-DropNS-classic-deletetest 0.0.0.0 @@ -221,6 +238,7 @@ Property + DocTest-DropNS-unified-deletetest 0.0.0.0 diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/MyClassExtensions.xml b/mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/MyClassExtensions.xml new file mode 100644 index 000000000000..3edb15b4cb4b --- /dev/null +++ b/mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/MyClassExtensions.xml @@ -0,0 +1,47 @@ + + + + + DocTest-DropNS-classic-deletetest + 0.0.0.0 + + + DocTest-DropNS-unified-deletetest + 0.0.0.0 + + + System.Object + + + + To be added. + To be added. + + + + + + Method + + DocTest-DropNS-classic-deletetest + 0.0.0.0 + + + DocTest-DropNS-unified-deletetest + 0.0.0.0 + + + System.Boolean + + + + + + To be added. + To be added. + To be added. + To be added. + + + + diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/TypeOnlyInClassic.xml b/mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/TypeOnlyInClassic.xml index 7e6adf24eb3c..442a2d7c543c 100644 --- a/mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/TypeOnlyInClassic.xml +++ b/mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/TypeOnlyInClassic.xml @@ -14,11 +14,12 @@ To be added. - + Constructor - + + DocTest-DropNS-classic-deletetest 0.0.0.0 diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/WillDelete.xml.remove b/mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/WillDelete.xml.remove index ac5394fb6d1a..07c03dcff769 100644 --- a/mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/WillDelete.xml.remove +++ b/mcs/tools/mdoc/Test/en.expected-dropns-delete/MyFramework.MyNamespace/WillDelete.xml.remove @@ -1,6 +1,10 @@ + + DocTest-DropNS-unified-deletetest + 0.0.0.0 + System.Object @@ -15,6 +19,7 @@ Constructor + DocTest-DropNS-unified-deletetest 0.0.0.0 @@ -28,6 +33,7 @@ Property + DocTest-DropNS-unified-deletetest 0.0.0.0 diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-delete/index.xml b/mcs/tools/mdoc/Test/en.expected-dropns-delete/index.xml index 0988450d779f..02836fe97138 100644 --- a/mcs/tools/mdoc/Test/en.expected-dropns-delete/index.xml +++ b/mcs/tools/mdoc/Test/en.expected-dropns-delete/index.xml @@ -1,5 +1,15 @@ + + + + System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints) + + + System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true) + + + @@ -16,8 +26,32 @@ + Codestin Search App + + + + + + + + + ExtensionMethod + + System.Boolean + + + + + + To be added. + To be added. + + + + + diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/MyFramework.MyNamespace/MyClass.xml b/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/MyFramework.MyNamespace/MyClass.xml index e73f7d55ff31..a88b428a94eb 100644 --- a/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/MyFramework.MyNamespace/MyClass.xml +++ b/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/MyFramework.MyNamespace/MyClass.xml @@ -31,12 +31,12 @@ Constructor - 0.0.0.0 DocTest-DropNS-classic + 0.0.0.0 - 0.0.0.0 DocTest-DropNS-unified + 0.0.0.0 DocTest-DropNS-classic-multitest @@ -57,12 +57,12 @@ Method - 0.0.0.0 DocTest-DropNS-classic + 0.0.0.0 - 0.0.0.0 DocTest-DropNS-unified + 0.0.0.0 DocTest-DropNS-classic-multitest @@ -90,12 +90,12 @@ Property - 0.0.0.0 DocTest-DropNS-classic + 0.0.0.0 - 0.0.0.0 DocTest-DropNS-unified + 0.0.0.0 DocTest-DropNS-classic-multitest @@ -119,8 +119,8 @@ Property - 0.0.0.0 DocTest-DropNS-classic + 0.0.0.0 DocTest-DropNS-classic-multitest @@ -140,8 +140,8 @@ Property - 0.0.0.0 DocTest-DropNS-unified + 0.0.0.0 DocTest-DropNS-unified-multitest diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/MyFramework.MyNamespace/MyClassExtensions.xml b/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/MyFramework.MyNamespace/MyClassExtensions.xml new file mode 100644 index 000000000000..7a504e29c71e --- /dev/null +++ b/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/MyFramework.MyNamespace/MyClassExtensions.xml @@ -0,0 +1,63 @@ + + + + + DocTest-DropNS-classic + 0.0.0.0 + + + DocTest-DropNS-unified + 0.0.0.0 + + + DocTest-DropNS-classic-multitest + 0.0.0.0 + + + DocTest-DropNS-unified-multitest + 0.0.0.0 + + + System.Object + + + + To be added. + To be added. + + + + + + Method + + DocTest-DropNS-classic + 0.0.0.0 + + + DocTest-DropNS-unified + 0.0.0.0 + + + DocTest-DropNS-classic-multitest + 0.0.0.0 + + + DocTest-DropNS-unified-multitest + 0.0.0.0 + + + System.Boolean + + + + + + To be added. + To be added. + To be added. + To be added. + + + + diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/index.xml b/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/index.xml index 6b5124ac28c2..734bd3da1a49 100644 --- a/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/index.xml +++ b/mcs/tools/mdoc/Test/en.expected-dropns-multi-withexisting/index.xml @@ -46,8 +46,32 @@ + Codestin Search App + + + + + + + + + ExtensionMethod + + System.Boolean + + + + + + To be added. + To be added. + + + + + diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-multi/MyFramework.MyNamespace/MyClassExtensions.xml b/mcs/tools/mdoc/Test/en.expected-dropns-multi/MyFramework.MyNamespace/MyClassExtensions.xml new file mode 100644 index 000000000000..c3e0ca736fc6 --- /dev/null +++ b/mcs/tools/mdoc/Test/en.expected-dropns-multi/MyFramework.MyNamespace/MyClassExtensions.xml @@ -0,0 +1,63 @@ + + + + + DocTest-DropNS-classic + 0.0.0.0 + + + DocTest-DropNS-classic-multitest + 0.0.0.0 + + + DocTest-DropNS-unified + 0.0.0.0 + + + DocTest-DropNS-unified-multitest + 0.0.0.0 + + + System.Object + + + + To be added. + To be added. + + + + + + Method + + DocTest-DropNS-classic + 0.0.0.0 + + + DocTest-DropNS-classic-multitest + 0.0.0.0 + + + DocTest-DropNS-unified + 0.0.0.0 + + + DocTest-DropNS-unified-multitest + 0.0.0.0 + + + System.Boolean + + + + + + To be added. + To be added. + To be added. + To be added. + + + + diff --git a/mcs/tools/mdoc/Test/en.expected-dropns-multi/index.xml b/mcs/tools/mdoc/Test/en.expected-dropns-multi/index.xml index 3baf401ce5b0..b8345d02166f 100644 --- a/mcs/tools/mdoc/Test/en.expected-dropns-multi/index.xml +++ b/mcs/tools/mdoc/Test/en.expected-dropns-multi/index.xml @@ -46,8 +46,32 @@ + Codestin Search App + + + + + + + + + ExtensionMethod + + System.Boolean + + + + + + To be added. + To be added. + + + + +