From 0038fd654c91062ea5a00425580d963cbf8f9667 Mon Sep 17 00:00:00 2001 From: maopeixia Date: Thu, 7 May 2020 19:43:43 +0800 Subject: [PATCH] WinRT migration - C++/WinRT signature differences --- .../Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs | 2 +- mdoc/Test/en.expected-cppwinrt2/Mono.DocTest.Generic/IFoo`1.xml | 2 +- mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/IProcess.xml | 2 +- .../en.expected-cppwinrt2/Mono.DocTest/Widget+IMenuItem.xml | 2 +- .../CustomNamespace/CustomInterface.xml | 2 +- .../CustomNamespace/CustomInterface.xml | 2 +- .../CustomNamespace/CustomInterface.xml | 2 +- mdoc/Test/en.expected/Mono.DocTest.Generic/IFoo`1.xml | 2 +- mdoc/Test/en.expected/Mono.DocTest/IProcess.xml | 2 +- mdoc/Test/en.expected/Mono.DocTest/Widget+IMenuItem.xml | 2 +- mdoc/mdoc.Test/CppWinRtFormatterTests.cs | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs b/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs index 2d3ce7cb2..fc65ef4ef 100644 --- a/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs +++ b/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs @@ -119,7 +119,7 @@ protected override string GetTypeKind(TypeDefinition t) if (t.IsClass) return "class"; if (t.IsInterface) - return "__interface"; + return "struct"; throw new ArgumentException(t.FullName); } diff --git a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest.Generic/IFoo`1.xml b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest.Generic/IFoo`1.xml index c3ed871d7..a054fb271 100644 --- a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest.Generic/IFoo`1.xml +++ b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest.Generic/IFoo`1.xml @@ -1,7 +1,7 @@ - + DocTest 0.0.0.0 diff --git a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/IProcess.xml b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/IProcess.xml index 7a013c313..5d026eaab 100644 --- a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/IProcess.xml +++ b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/IProcess.xml @@ -1,7 +1,7 @@ - + DocTest 0.0.0.0 diff --git a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Widget+IMenuItem.xml b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Widget+IMenuItem.xml index 05fc2f78a..3980ca954 100644 --- a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Widget+IMenuItem.xml +++ b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/Widget+IMenuItem.xml @@ -1,7 +1,7 @@ - + DocTest 0.0.0.0 diff --git a/mdoc/Test/en.expected-eii-implementation-ecmadoc/CustomNamespace/CustomInterface.xml b/mdoc/Test/en.expected-eii-implementation-ecmadoc/CustomNamespace/CustomInterface.xml index f686568c5..8c96f79ab 100644 --- a/mdoc/Test/en.expected-eii-implementation-ecmadoc/CustomNamespace/CustomInterface.xml +++ b/mdoc/Test/en.expected-eii-implementation-ecmadoc/CustomNamespace/CustomInterface.xml @@ -5,7 +5,7 @@ - + DocTest-VB-Eii 0.0.65535.65535 diff --git a/mdoc/Test/en.expected-eii-implementation-slashdoc/CustomNamespace/CustomInterface.xml b/mdoc/Test/en.expected-eii-implementation-slashdoc/CustomNamespace/CustomInterface.xml index f686568c5..8c96f79ab 100644 --- a/mdoc/Test/en.expected-eii-implementation-slashdoc/CustomNamespace/CustomInterface.xml +++ b/mdoc/Test/en.expected-eii-implementation-slashdoc/CustomNamespace/CustomInterface.xml @@ -5,7 +5,7 @@ - + DocTest-VB-Eii 0.0.65535.65535 diff --git a/mdoc/Test/en.expected-eii-implementation/CustomNamespace/CustomInterface.xml b/mdoc/Test/en.expected-eii-implementation/CustomNamespace/CustomInterface.xml index f686568c5..8c96f79ab 100644 --- a/mdoc/Test/en.expected-eii-implementation/CustomNamespace/CustomInterface.xml +++ b/mdoc/Test/en.expected-eii-implementation/CustomNamespace/CustomInterface.xml @@ -5,7 +5,7 @@ - + DocTest-VB-Eii 0.0.65535.65535 diff --git a/mdoc/Test/en.expected/Mono.DocTest.Generic/IFoo`1.xml b/mdoc/Test/en.expected/Mono.DocTest.Generic/IFoo`1.xml index b8b2a0429..fec45e1cb 100644 --- a/mdoc/Test/en.expected/Mono.DocTest.Generic/IFoo`1.xml +++ b/mdoc/Test/en.expected/Mono.DocTest.Generic/IFoo`1.xml @@ -6,7 +6,7 @@ - + DocTest 0.0.0.0 diff --git a/mdoc/Test/en.expected/Mono.DocTest/IProcess.xml b/mdoc/Test/en.expected/Mono.DocTest/IProcess.xml index 0a6ba2e83..1020a01e3 100644 --- a/mdoc/Test/en.expected/Mono.DocTest/IProcess.xml +++ b/mdoc/Test/en.expected/Mono.DocTest/IProcess.xml @@ -6,7 +6,7 @@ - + DocTest 0.0.0.0 diff --git a/mdoc/Test/en.expected/Mono.DocTest/Widget+IMenuItem.xml b/mdoc/Test/en.expected/Mono.DocTest/Widget+IMenuItem.xml index 3c962597b..4aaa80268 100644 --- a/mdoc/Test/en.expected/Mono.DocTest/Widget+IMenuItem.xml +++ b/mdoc/Test/en.expected/Mono.DocTest/Widget+IMenuItem.xml @@ -6,7 +6,7 @@ - + DocTest 0.0.0.0 diff --git a/mdoc/mdoc.Test/CppWinRtFormatterTests.cs b/mdoc/mdoc.Test/CppWinRtFormatterTests.cs index 0a2b361d3..fec9dd23a 100644 --- a/mdoc/mdoc.Test/CppWinRtFormatterTests.cs +++ b/mdoc/mdoc.Test/CppWinRtFormatterTests.cs @@ -59,7 +59,7 @@ public void TypeSignature_Struct_Class4() public void TypeSignature_GenericInterface() { TestTypeSignature(typeof(IFoo<>), @"template -__interface IFoo"); +struct IFoo"); } [Test]