From e139669ba8c3c181ad33fda8605d13443f64f652 Mon Sep 17 00:00:00 2001 From: RanhaoXu Date: Tue, 13 Apr 2021 17:45:47 +0800 Subject: [PATCH 1/9] Added type forwarding check --- mdoc/Mono.Documentation/MDocUpdater.cs | 2 +- mdoc/Mono.Documentation/Updater/Frameworks/AssemblySet.cs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mdoc/Mono.Documentation/MDocUpdater.cs b/mdoc/Mono.Documentation/MDocUpdater.cs index 8d7463e06..08e456fbb 100644 --- a/mdoc/Mono.Documentation/MDocUpdater.cs +++ b/mdoc/Mono.Documentation/MDocUpdater.cs @@ -3873,7 +3873,7 @@ public static void MakeAttributes( public void MakeParameters (XmlElement root, MemberReference member, IList parameters, FrameworkTypeEntry typeEntry, ref bool fxAlternateTriggered, bool shouldDuplicateWithNew = false) { - if (typeEntry.TimesProcessed > 1) + if (typeEntry.TimesProcessed > 1 && this.assemblies.Where(a => a.Name == typeEntry.Framework.Name && a.IsTypeForwardingTo(typeEntry)).Any()) return; XmlElement e = WriteElement (root, "Parameters"); diff --git a/mdoc/Mono.Documentation/Updater/Frameworks/AssemblySet.cs b/mdoc/Mono.Documentation/Updater/Frameworks/AssemblySet.cs index ce46d4884..533f221c8 100644 --- a/mdoc/Mono.Documentation/Updater/Frameworks/AssemblySet.cs +++ b/mdoc/Mono.Documentation/Updater/Frameworks/AssemblySet.cs @@ -228,5 +228,10 @@ IEnumerable LoadAllAssemblies () else return new HashSet(); } + + public bool IsTypeForwardingTo(FrameworkTypeEntry typeEntry) + { + return forwardedTypesTo.ContainsKey(typeEntry.Name); + } } } From c9c7d3f9659cde2836f2c7f543579d09ec4c1939 Mon Sep 17 00:00:00 2001 From: RanhaoXu Date: Tue, 13 Apr 2021 17:49:47 +0800 Subject: [PATCH 2/9] Update MDocUpdater.cs --- mdoc/Mono.Documentation/MDocUpdater.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mdoc/Mono.Documentation/MDocUpdater.cs b/mdoc/Mono.Documentation/MDocUpdater.cs index 08e456fbb..ac8fe0ab5 100644 --- a/mdoc/Mono.Documentation/MDocUpdater.cs +++ b/mdoc/Mono.Documentation/MDocUpdater.cs @@ -3873,7 +3873,7 @@ public static void MakeAttributes( public void MakeParameters (XmlElement root, MemberReference member, IList parameters, FrameworkTypeEntry typeEntry, ref bool fxAlternateTriggered, bool shouldDuplicateWithNew = false) { - if (typeEntry.TimesProcessed > 1 && this.assemblies.Where(a => a.Name == typeEntry.Framework.Name && a.IsTypeForwardingTo(typeEntry)).Any()) + if (typeEntry.TimesProcessed > 1 && this.assemblies.Any(a => a.Name == typeEntry.Framework.Name && a.IsTypeForwardingTo(typeEntry))) return; XmlElement e = WriteElement (root, "Parameters"); From a960c000715a171128fb0869059696cd9898eee1 Mon Sep 17 00:00:00 2001 From: RanhaoXu Date: Thu, 15 Apr 2021 14:01:26 +0800 Subject: [PATCH 3/9] Update MDocUpdater.cs --- mdoc/Mono.Documentation/MDocUpdater.cs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/mdoc/Mono.Documentation/MDocUpdater.cs b/mdoc/Mono.Documentation/MDocUpdater.cs index ac8fe0ab5..ac3e52503 100644 --- a/mdoc/Mono.Documentation/MDocUpdater.cs +++ b/mdoc/Mono.Documentation/MDocUpdater.cs @@ -3871,9 +3871,22 @@ public static void MakeAttributes( NormalizeWhitespace(e); } + private bool ProcessedMoreThanOnce(FrameworkTypeEntry typeEntry) + { + if (typeEntry.TimesProcessed <= 1) + { + return false; + } + else + { + var assemblies = this.assemblies.Where(a => a.Name == typeEntry.Framework.Name).ToList(); + return assemblies.Any(a => a.IsTypeForwardingTo(typeEntry)); + } + } + public void MakeParameters (XmlElement root, MemberReference member, IList parameters, FrameworkTypeEntry typeEntry, ref bool fxAlternateTriggered, bool shouldDuplicateWithNew = false) { - if (typeEntry.TimesProcessed > 1 && this.assemblies.Any(a => a.Name == typeEntry.Framework.Name && a.IsTypeForwardingTo(typeEntry))) + if (ProcessedMoreThanOnce(typeEntry)) return; XmlElement e = WriteElement (root, "Parameters"); From 1ede395f81aa0cf2dd68fb502b7949105a09562d Mon Sep 17 00:00:00 2001 From: RanhaoXu Date: Thu, 22 Apr 2021 15:41:11 +0800 Subject: [PATCH 4/9] Added test for type forwarding --- mdoc/Makefile | 9 ++++++++- mdoc/Test/DocTest-typeForwards.cs | 9 +++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/mdoc/Makefile b/mdoc/Makefile index 69403d6a6..a706f4fcb 100644 --- a/mdoc/Makefile +++ b/mdoc/Makefile @@ -157,6 +157,11 @@ Test/DocTest-typeForwards-Third.dll: $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:$@ Test/DocTest-typeForwards.cs /define:FIRST $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:Test/DocTest-typeForwards-Third-First.dll /reference:$@ Test/DocTest-typeForwards.cs /define:THIRD +.PHONY: Test/DocTest-typeForwards-Fourth.dll +Test/DocTest-typeForwards-Fourth.dll: + rm -f $@ + $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:$@ Test/DocTest-typeForwards.cs /define:FOURTH + # build test dll to test forwardings nested type Test/DocTest-nestedType-typeForwards-First.dll: rm -f $@ @@ -200,7 +205,7 @@ Test/FrameworkTestData-fx-inheritance: Test/DocTest-framework-inheritance-one.dl $(MONO) $(PROGRAM) fx-bootstrap Test/FrameworkTestData-fx-inheritance .PHONY: check-monodocer-typeForwards -check-monodocer-typeForwards : Test/DocTest-typeForwards-First.dll Test/DocTest-typeForwards-Second.dll Test/DocTest-typeForwards-Third.dll +check-monodocer-typeForwards : Test/DocTest-typeForwards-First.dll Test/DocTest-typeForwards-Second.dll Test/DocTest-typeForwards-Third.dll Test/DocTest-typeForwards-Fourth.dll -rm -Rf Test/en.actual # set up the fx test data @@ -213,6 +218,7 @@ check-monodocer-typeForwards : Test/DocTest-typeForwards-First.dll Test/DocTest- mkdir Test/FrameworkTestData-fx-typeForwards/One mkdir Test/FrameworkTestData-fx-typeForwards/Two mkdir Test/FrameworkTestData-fx-typeForwards/Three + mkdir Test/FrameworkTestData-fx-typeForwards/Four mkdir Test/FrameworkTestData-fx-typeForwards/dependencies mkdir Test/FrameworkTestData-fx-typeForwards/dependencies/One mkdir Test/FrameworkTestData-fx-typeForwards/dependencies/Two @@ -228,6 +234,7 @@ check-monodocer-typeForwards : Test/DocTest-typeForwards-First.dll Test/DocTest- cp Test/DocTest-typeForwards-Third-First.dll Test/FrameworkTestData-fx-typeForwards/Three cp Test/DocTest-typeForwards-Second.dll Test/FrameworkTestData-fx-typeForwards/dependencies/Three cp Test/DocTest-typeForwards-Third.dll Test/FrameworkTestData-fx-typeForwards/dependencies/Three + cp Test/DocTest-typeForwards-Fourth.dll Test/FrameworkTestData-fx-typeForwards/Four $(MONO) $(PROGRAM) fx-bootstrap Test/FrameworkTestData-fx-typeForwards # now run mdoc update diff --git a/mdoc/Test/DocTest-typeForwards.cs b/mdoc/Test/DocTest-typeForwards.cs index 8ad718c6d..1499856af 100644 --- a/mdoc/Test/DocTest-typeForwards.cs +++ b/mdoc/Test/DocTest-typeForwards.cs @@ -5,8 +5,13 @@ namespace TheNamespace { - #if FIRST + #if FIRST || FOURTH public class TheClass - {} + { + #if FOURTH + public TheClass(string arg) + {} + #endif + } #endif } \ No newline at end of file From 5bf7f89cdd06612c9797e2ecca3381eff85fedf5 Mon Sep 17 00:00:00 2001 From: RanhaoXu Date: Thu, 22 Apr 2021 15:42:38 +0800 Subject: [PATCH 5/9] Updated en.expected.typeForwards --- .../TheNamespace/TheClass.xml | 37 ++++++++++++++++++- mdoc/Test/en.expected.typeForwards/index.xml | 10 +++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/mdoc/Test/en.expected.typeForwards/TheNamespace/TheClass.xml b/mdoc/Test/en.expected.typeForwards/TheNamespace/TheClass.xml index 7fe2fd95a..3137df808 100644 --- a/mdoc/Test/en.expected.typeForwards/TheNamespace/TheClass.xml +++ b/mdoc/Test/en.expected.typeForwards/TheNamespace/TheClass.xml @@ -2,7 +2,7 @@ - DocTest-typeForwards-First + DocTest-typeForwards-Fourth 0.0.0.0 @@ -19,8 +19,12 @@ DocTest-typeForwards-Third-First + + DocTest-typeForwards-First + 0.0.0.0 + - + @@ -60,5 +64,34 @@ To be added. + + + + Constructor + + DocTest-typeForwards-Fourth + 0.0.0.0 + + + DocTest-typeForwards-Second + + + DocTest-typeForwards-Second-First + + + DocTest-typeForwards-Third + + + DocTest-typeForwards-Third-First + + + + + + To be added. + To be added. + To be added. + + diff --git a/mdoc/Test/en.expected.typeForwards/index.xml b/mdoc/Test/en.expected.typeForwards/index.xml index 0ecf35336..95b10e7c6 100644 --- a/mdoc/Test/en.expected.typeForwards/index.xml +++ b/mdoc/Test/en.expected.typeForwards/index.xml @@ -1,5 +1,15 @@ + + + + System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints) + + + System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true) + + + From a54e279cb04ca0420d87784e683a0fd857f0d05e Mon Sep 17 00:00:00 2001 From: RanhaoXu Date: Thu, 22 Apr 2021 16:02:39 +0800 Subject: [PATCH 6/9] Create Four.xml --- .../en.expected.typeForwards/FrameworksIndex/Four.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 mdoc/Test/en.expected.typeForwards/FrameworksIndex/Four.xml diff --git a/mdoc/Test/en.expected.typeForwards/FrameworksIndex/Four.xml b/mdoc/Test/en.expected.typeForwards/FrameworksIndex/Four.xml new file mode 100644 index 000000000..34116f85e --- /dev/null +++ b/mdoc/Test/en.expected.typeForwards/FrameworksIndex/Four.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file From b77a04a43b3545a4ec5961a1fbdbc6f912f9909c Mon Sep 17 00:00:00 2001 From: RanhaoXu Date: Mon, 26 Apr 2021 16:24:21 +0800 Subject: [PATCH 7/9] Added different TypeDefinitions integration test --- mdoc/Makefile | 32 +++++++++--- mdoc/Test/DocTest-differentTypeDefinitions.cs | 14 +++++ mdoc/Test/DocTest-typeForwards.cs | 9 +--- mdoc/Test/en.actual/FrameworksIndex/One.xml | 12 +++++ mdoc/Test/en.actual/FrameworksIndex/Three.xml | 12 +++++ mdoc/Test/en.actual/FrameworksIndex/Two.xml | 12 +++++ .../FrameworksIndex/One.xml} | 6 ++- .../TheNamespace/TheClass.xml | 52 +++++++++++++++++++ .../index.xml | 32 ++++++++++++ .../ns-TheNamespace.xml | 6 +++ .../TheNamespace/TheClass.xml | 37 +------------ mdoc/Test/en.expected.typeForwards/index.xml | 10 ---- 12 files changed, 172 insertions(+), 62 deletions(-) create mode 100644 mdoc/Test/DocTest-differentTypeDefinitions.cs create mode 100644 mdoc/Test/en.actual/FrameworksIndex/One.xml create mode 100644 mdoc/Test/en.actual/FrameworksIndex/Three.xml create mode 100644 mdoc/Test/en.actual/FrameworksIndex/Two.xml rename mdoc/Test/{en.expected.typeForwards/FrameworksIndex/Four.xml => en.expected.differentTypeDefinitions/FrameworksIndex/One.xml} (52%) create mode 100644 mdoc/Test/en.expected.differentTypeDefinitions/TheNamespace/TheClass.xml create mode 100644 mdoc/Test/en.expected.differentTypeDefinitions/index.xml create mode 100644 mdoc/Test/en.expected.differentTypeDefinitions/ns-TheNamespace.xml diff --git a/mdoc/Makefile b/mdoc/Makefile index a706f4fcb..3966cb34e 100644 --- a/mdoc/Makefile +++ b/mdoc/Makefile @@ -139,6 +139,14 @@ Test/DocTest-enumerations.dll: Test/DocTest-embedded-type.dll: $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:$@ Test/DocTest-embedded-type.cs +Test/DocTest-differentTypeDefinitions-First.dll: + rm -f $@ + $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:$@ Test/DocTest-differentTypeDefinitions.cs /define:FIRST + +Test/DocTest-differentTypeDefinitions-Second.dll: + rm -f $@ + $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:$@ Test/DocTest-differentTypeDefinitions.cs /define:SECOND + Test/DocTest-typeForwards-First.dll: rm -f $@ $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:$@ Test/DocTest-typeForwards.cs /define:FIRST @@ -157,11 +165,6 @@ Test/DocTest-typeForwards-Third.dll: $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:$@ Test/DocTest-typeForwards.cs /define:FIRST $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:Test/DocTest-typeForwards-Third-First.dll /reference:$@ Test/DocTest-typeForwards.cs /define:THIRD -.PHONY: Test/DocTest-typeForwards-Fourth.dll -Test/DocTest-typeForwards-Fourth.dll: - rm -f $@ - $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:$@ Test/DocTest-typeForwards.cs /define:FOURTH - # build test dll to test forwardings nested type Test/DocTest-nestedType-typeForwards-First.dll: rm -f $@ @@ -204,8 +207,22 @@ Test/FrameworkTestData-fx-inheritance: Test/DocTest-framework-inheritance-one.dl cp Test/DocTest-framework-inheritance-three.dll Test/FrameworkTestData-fx-inheritance/Three/ $(MONO) $(PROGRAM) fx-bootstrap Test/FrameworkTestData-fx-inheritance +.PHONY: check-monodocer-differentTypeDefinitions +check-monodocer-differentTypeDefinitions : Test/DocTest-differentTypeDefinitions-First.dll Test/DocTest-differentTypeDefinitions-Second.dll + -rm -Rf Test/en.actual + + -rm -Rf Test/FrameworkTestData-fx-differentTypeDefinitions + mkdir Test/FrameworkTestData-fx-differentTypeDefinitions + mkdir Test/FrameworkTestData-fx-differentTypeDefinitions/One + cp Test/DocTest-differentTypeDefinitions-First.dll Test/FrameworkTestData-fx-differentTypeDefinitions/One + cp Test/DocTest-differentTypeDefinitions-Second.dll Test/FrameworkTestData-fx-differentTypeDefinitions/One + $(MONO) $(PROGRAM) fx-bootstrap Test/FrameworkTestData-fx-differentTypeDefinitions + + $(MONO) $(PROGRAM) update -o Test/en.actual -frameworks Test/FrameworkTestData-fx-differentTypeDefinitions + $(DIFF) Test/en.expected.differentTypeDefinitions Test/en.actual + .PHONY: check-monodocer-typeForwards -check-monodocer-typeForwards : Test/DocTest-typeForwards-First.dll Test/DocTest-typeForwards-Second.dll Test/DocTest-typeForwards-Third.dll Test/DocTest-typeForwards-Fourth.dll +check-monodocer-typeForwards : Test/DocTest-typeForwards-First.dll Test/DocTest-typeForwards-Second.dll Test/DocTest-typeForwards-Third.dll -rm -Rf Test/en.actual # set up the fx test data @@ -218,7 +235,6 @@ check-monodocer-typeForwards : Test/DocTest-typeForwards-First.dll Test/DocTest- mkdir Test/FrameworkTestData-fx-typeForwards/One mkdir Test/FrameworkTestData-fx-typeForwards/Two mkdir Test/FrameworkTestData-fx-typeForwards/Three - mkdir Test/FrameworkTestData-fx-typeForwards/Four mkdir Test/FrameworkTestData-fx-typeForwards/dependencies mkdir Test/FrameworkTestData-fx-typeForwards/dependencies/One mkdir Test/FrameworkTestData-fx-typeForwards/dependencies/Two @@ -234,7 +250,6 @@ check-monodocer-typeForwards : Test/DocTest-typeForwards-First.dll Test/DocTest- cp Test/DocTest-typeForwards-Third-First.dll Test/FrameworkTestData-fx-typeForwards/Three cp Test/DocTest-typeForwards-Second.dll Test/FrameworkTestData-fx-typeForwards/dependencies/Three cp Test/DocTest-typeForwards-Third.dll Test/FrameworkTestData-fx-typeForwards/dependencies/Three - cp Test/DocTest-typeForwards-Fourth.dll Test/FrameworkTestData-fx-typeForwards/Four $(MONO) $(PROGRAM) fx-bootstrap Test/FrameworkTestData-fx-typeForwards # now run mdoc update @@ -842,6 +857,7 @@ run-test-local: check-doc-tools run-test-update : check-doc-tools-update check-doc-tools: \ + check-monodocer-differentTypeDefinitions \ check-monodocer-typeForwards \ check-monodocer-nestedType-typeForwards \ check-monodocer-Eii-importslashdoc \ diff --git a/mdoc/Test/DocTest-differentTypeDefinitions.cs b/mdoc/Test/DocTest-differentTypeDefinitions.cs new file mode 100644 index 000000000..c3c181816 --- /dev/null +++ b/mdoc/Test/DocTest-differentTypeDefinitions.cs @@ -0,0 +1,14 @@ +namespace TheNamespace +{ + public class TheClass + { + #if FIRST + public TheClass(int arg) + {} + #endif + #if SECOND + public TheClass(string arg) + {} + #endif + } +} \ No newline at end of file diff --git a/mdoc/Test/DocTest-typeForwards.cs b/mdoc/Test/DocTest-typeForwards.cs index 1499856af..8ad718c6d 100644 --- a/mdoc/Test/DocTest-typeForwards.cs +++ b/mdoc/Test/DocTest-typeForwards.cs @@ -5,13 +5,8 @@ namespace TheNamespace { - #if FIRST || FOURTH + #if FIRST public class TheClass - { - #if FOURTH - public TheClass(string arg) - {} - #endif - } + {} #endif } \ No newline at end of file diff --git a/mdoc/Test/en.actual/FrameworksIndex/One.xml b/mdoc/Test/en.actual/FrameworksIndex/One.xml new file mode 100644 index 000000000..2897e3123 --- /dev/null +++ b/mdoc/Test/en.actual/FrameworksIndex/One.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/mdoc/Test/en.actual/FrameworksIndex/Three.xml b/mdoc/Test/en.actual/FrameworksIndex/Three.xml new file mode 100644 index 000000000..2fe83e82a --- /dev/null +++ b/mdoc/Test/en.actual/FrameworksIndex/Three.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/mdoc/Test/en.actual/FrameworksIndex/Two.xml b/mdoc/Test/en.actual/FrameworksIndex/Two.xml new file mode 100644 index 000000000..aebb22233 --- /dev/null +++ b/mdoc/Test/en.actual/FrameworksIndex/Two.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/mdoc/Test/en.expected.typeForwards/FrameworksIndex/Four.xml b/mdoc/Test/en.expected.differentTypeDefinitions/FrameworksIndex/One.xml similarity index 52% rename from mdoc/Test/en.expected.typeForwards/FrameworksIndex/Four.xml rename to mdoc/Test/en.expected.differentTypeDefinitions/FrameworksIndex/One.xml index 34116f85e..cf5c13f9b 100644 --- a/mdoc/Test/en.expected.typeForwards/FrameworksIndex/Four.xml +++ b/mdoc/Test/en.expected.differentTypeDefinitions/FrameworksIndex/One.xml @@ -1,10 +1,12 @@  - + - + + + diff --git a/mdoc/Test/en.expected.differentTypeDefinitions/TheNamespace/TheClass.xml b/mdoc/Test/en.expected.differentTypeDefinitions/TheNamespace/TheClass.xml new file mode 100644 index 000000000..8575b2c21 --- /dev/null +++ b/mdoc/Test/en.expected.differentTypeDefinitions/TheNamespace/TheClass.xml @@ -0,0 +1,52 @@ + + + + + DocTest-differentTypeDefinitions-First + 0.0.0.0 + + + DocTest-differentTypeDefinitions-Second + 0.0.0.0 + + + System.Object + + + + To be added. + To be added. + + + + + + Constructor + + DocTest-differentTypeDefinitions-Second + 0.0.0.0 + + + To be added. + To be added. + + + + + + Constructor + + DocTest-differentTypeDefinitions-First + 0.0.0.0 + + + + + + To be added. + To be added. + To be added. + + + + diff --git a/mdoc/Test/en.expected.differentTypeDefinitions/index.xml b/mdoc/Test/en.expected.differentTypeDefinitions/index.xml new file mode 100644 index 000000000..fffae27ab --- /dev/null +++ b/mdoc/Test/en.expected.differentTypeDefinitions/index.xml @@ -0,0 +1,32 @@ + + + + + + System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints) + + + System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true) + + + + + + + System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints) + + + System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true) + + + + + To be added. + To be added. + + + + + + Untitled + diff --git a/mdoc/Test/en.expected.differentTypeDefinitions/ns-TheNamespace.xml b/mdoc/Test/en.expected.differentTypeDefinitions/ns-TheNamespace.xml new file mode 100644 index 000000000..757c55bd0 --- /dev/null +++ b/mdoc/Test/en.expected.differentTypeDefinitions/ns-TheNamespace.xml @@ -0,0 +1,6 @@ + + + To be added. + To be added. + + diff --git a/mdoc/Test/en.expected.typeForwards/TheNamespace/TheClass.xml b/mdoc/Test/en.expected.typeForwards/TheNamespace/TheClass.xml index 3137df808..7fe2fd95a 100644 --- a/mdoc/Test/en.expected.typeForwards/TheNamespace/TheClass.xml +++ b/mdoc/Test/en.expected.typeForwards/TheNamespace/TheClass.xml @@ -2,7 +2,7 @@ - DocTest-typeForwards-Fourth + DocTest-typeForwards-First 0.0.0.0 @@ -19,12 +19,8 @@ DocTest-typeForwards-Third-First - - DocTest-typeForwards-First - 0.0.0.0 - - + @@ -64,34 +60,5 @@ To be added. - - - - Constructor - - DocTest-typeForwards-Fourth - 0.0.0.0 - - - DocTest-typeForwards-Second - - - DocTest-typeForwards-Second-First - - - DocTest-typeForwards-Third - - - DocTest-typeForwards-Third-First - - - - - - To be added. - To be added. - To be added. - - diff --git a/mdoc/Test/en.expected.typeForwards/index.xml b/mdoc/Test/en.expected.typeForwards/index.xml index 95b10e7c6..0ecf35336 100644 --- a/mdoc/Test/en.expected.typeForwards/index.xml +++ b/mdoc/Test/en.expected.typeForwards/index.xml @@ -1,15 +1,5 @@ - - - - System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints) - - - System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true) - - - From c8e721565a716c4f617b7b0d76b870ce1fe57f9b Mon Sep 17 00:00:00 2001 From: RanhaoXu Date: Mon, 26 Apr 2021 16:26:23 +0800 Subject: [PATCH 8/9] Delete extra actual xml --- mdoc/Test/en.actual/FrameworksIndex/One.xml | 12 ------------ mdoc/Test/en.actual/FrameworksIndex/Three.xml | 12 ------------ mdoc/Test/en.actual/FrameworksIndex/Two.xml | 12 ------------ 3 files changed, 36 deletions(-) delete mode 100644 mdoc/Test/en.actual/FrameworksIndex/One.xml delete mode 100644 mdoc/Test/en.actual/FrameworksIndex/Three.xml delete mode 100644 mdoc/Test/en.actual/FrameworksIndex/Two.xml diff --git a/mdoc/Test/en.actual/FrameworksIndex/One.xml b/mdoc/Test/en.actual/FrameworksIndex/One.xml deleted file mode 100644 index 2897e3123..000000000 --- a/mdoc/Test/en.actual/FrameworksIndex/One.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/mdoc/Test/en.actual/FrameworksIndex/Three.xml b/mdoc/Test/en.actual/FrameworksIndex/Three.xml deleted file mode 100644 index 2fe83e82a..000000000 --- a/mdoc/Test/en.actual/FrameworksIndex/Three.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/mdoc/Test/en.actual/FrameworksIndex/Two.xml b/mdoc/Test/en.actual/FrameworksIndex/Two.xml deleted file mode 100644 index aebb22233..000000000 --- a/mdoc/Test/en.actual/FrameworksIndex/Two.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file From ea4b331fe0d5caaf6825f76f09738906d30506bf Mon Sep 17 00:00:00 2001 From: RanhaoXu Date: Mon, 26 Apr 2021 16:37:12 +0800 Subject: [PATCH 9/9] Update TheClass.xml --- .../TheNamespace/TheClass.xml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/mdoc/Test/en.expected.differentTypeDefinitions/TheNamespace/TheClass.xml b/mdoc/Test/en.expected.differentTypeDefinitions/TheNamespace/TheClass.xml index 8575b2c21..6351228d3 100644 --- a/mdoc/Test/en.expected.differentTypeDefinitions/TheNamespace/TheClass.xml +++ b/mdoc/Test/en.expected.differentTypeDefinitions/TheNamespace/TheClass.xml @@ -19,28 +19,32 @@ - - + + Constructor - DocTest-differentTypeDefinitions-Second + DocTest-differentTypeDefinitions-First 0.0.0.0 + + + + To be added. To be added. To be added. - - + + Constructor - DocTest-differentTypeDefinitions-First + DocTest-differentTypeDefinitions-Second 0.0.0.0 - + To be added.