Merge pull request #497 from maopeixia/mpx-mdoc-1.0.1.7

joelmartinez · web-flow · commit 5721d52f5ffa · 2020-06-10T10:43:18.000-04:00
WinRT migration - C++/WinRT signature differences https://ceapex.visualstudio.com/Engineering/_workitems/edit/196895
diff --git a/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs b/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs
@@ -118,7 +118,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
@@ -1,7 +1,7 @@
 <Type Name="IFoo&lt;T&gt;" FullName="Mono.DocTest.Generic.IFoo&lt;T&gt;">
   <TypeSignature Language="C#" Value="public interface IFoo&lt;T&gt;" />
   <TypeSignature Language="ILAsm" Value=".class public interface auto ansi abstract IFoo`1&lt;T&gt;" />
-  <TypeSignature Language="C++ WINRT" Value="template &lt;typename T&gt;&#xA;__interface IFoo" />
+  <TypeSignature Language="C++ WINRT" Value="template &lt;typename T&gt;&#xA;struct IFoo" />
   <AssemblyInfo>
     <AssemblyName>DocTest</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/IProcess.xml b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest/IProcess.xml
@@ -1,7 +1,7 @@
 <Type Name="IProcess" FullName="Mono.DocTest.IProcess">
   <TypeSignature Language="C#" Value="public interface IProcess" />
   <TypeSignature Language="ILAsm" Value=".class public interface auto ansi abstract IProcess" />
-  <TypeSignature Language="C++ WINRT" Value="__interface IProcess" />
+  <TypeSignature Language="C++ WINRT" Value="struct IProcess" />
   <AssemblyInfo>
     <AssemblyName>DocTest</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git 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 @@
 <Type Name="Widget+IMenuItem" FullName="Mono.DocTest.Widget+IMenuItem">
   <TypeSignature Language="C#" Value="public interface Widget.IMenuItem" />
   <TypeSignature Language="ILAsm" Value=".class nested public interface auto ansi abstract Widget/IMenuItem" />
-  <TypeSignature Language="C++ WINRT" Value="__interface Widget::IMenuItem" />
+  <TypeSignature Language="C++ WINRT" Value="struct Widget::IMenuItem" />
   <AssemblyInfo>
     <AssemblyName>DocTest</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git 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 @@
   <TypeSignature Language="F#" Value="type CustomInterface = interface" />
   <TypeSignature Language="C++ CLI" Value="public interface class CustomInterface" />
   <TypeSignature Language="C++ CX" Value="public interface class CustomInterface" />
-  <TypeSignature Language="C++ WINRT" Value="__interface CustomInterface" />
+  <TypeSignature Language="C++ WINRT" Value="struct CustomInterface" />
   <AssemblyInfo>
     <AssemblyName>DocTest-VB-Eii</AssemblyName>
     <AssemblyVersion>0.0.65535.65535</AssemblyVersion>
diff --git 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 @@
   <TypeSignature Language="F#" Value="type CustomInterface = interface" />
   <TypeSignature Language="C++ CLI" Value="public interface class CustomInterface" />
   <TypeSignature Language="C++ CX" Value="public interface class CustomInterface" />
-  <TypeSignature Language="C++ WINRT" Value="__interface CustomInterface" />
+  <TypeSignature Language="C++ WINRT" Value="struct CustomInterface" />
   <AssemblyInfo>
     <AssemblyName>DocTest-VB-Eii</AssemblyName>
     <AssemblyVersion>0.0.65535.65535</AssemblyVersion>
diff --git a/mdoc/Test/en.expected-eii-implementation/CustomNamespace/CustomInterface.xml b/mdoc/Test/en.expected-eii-implementation/CustomNamespace/CustomInterface.xml
@@ -5,7 +5,7 @@
   <TypeSignature Language="F#" Value="type CustomInterface = interface" />
   <TypeSignature Language="C++ CLI" Value="public interface class CustomInterface" />
   <TypeSignature Language="C++ CX" Value="public interface class CustomInterface" />
-  <TypeSignature Language="C++ WINRT" Value="__interface CustomInterface" />
+  <TypeSignature Language="C++ WINRT" Value="struct CustomInterface" />
   <AssemblyInfo>
     <AssemblyName>DocTest-VB-Eii</AssemblyName>
     <AssemblyVersion>0.0.65535.65535</AssemblyVersion>
diff --git 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 @@
   <TypeSignature Language="F#" Value="type IFoo&lt;'T&gt; = interface" />
   <TypeSignature Language="C++ CLI" Value="generic &lt;typename T&gt;&#xA;public interface class IFoo" />
   <TypeSignature Language="C++ CX" Value="public interface class IFoo" />
-  <TypeSignature Language="C++ WINRT" Value="template &lt;typename T&gt;&#xA;__interface IFoo" />
+  <TypeSignature Language="C++ WINRT" Value="template &lt;typename T&gt;&#xA;struct IFoo" />
   <AssemblyInfo>
     <AssemblyName>DocTest</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/mdoc/Test/en.expected/Mono.DocTest/IProcess.xml b/mdoc/Test/en.expected/Mono.DocTest/IProcess.xml
@@ -6,7 +6,7 @@
   <TypeSignature Language="F#" Value="type IProcess = interface" />
   <TypeSignature Language="C++ CLI" Value="public interface class IProcess" />
   <TypeSignature Language="C++ CX" Value="public interface class IProcess" />
-  <TypeSignature Language="C++ WINRT" Value="__interface IProcess" />
+  <TypeSignature Language="C++ WINRT" Value="struct IProcess" />
   <AssemblyInfo>
     <AssemblyName>DocTest</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/mdoc/Test/en.expected/Mono.DocTest/Widget+IMenuItem.xml b/mdoc/Test/en.expected/Mono.DocTest/Widget+IMenuItem.xml
@@ -6,7 +6,7 @@
   <TypeSignature Language="F#" Value="type Widget.IMenuItem = interface" />
   <TypeSignature Language="C++ CLI" Value="public: interface class Widget::IMenuItem" />
   <TypeSignature Language="C++ CX" Value="public: interface class Widget::IMenuItem" />
-  <TypeSignature Language="C++ WINRT" Value="__interface Widget::IMenuItem" />
+  <TypeSignature Language="C++ WINRT" Value="struct Widget::IMenuItem" />
   <AssemblyInfo>
     <AssemblyName>DocTest</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/mdoc/mdoc.Test/CppWinRtFormatterTests.cs b/mdoc/mdoc.Test/CppWinRtFormatterTests.cs
@@ -58,7 +58,7 @@ public void TypeSignature_Struct_Class4()
         public void TypeSignature_GenericInterface()
         {
             TestTypeSignature(typeof(IFoo<>), @"template <typename T>
-__interface IFoo");
+struct IFoo");
         }
 
         [Test]

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ protected override string GetTypeKind(TypeDefinition t)`
`118`	`118`	`if (t.IsClass)`
`119`	`119`	`return "class";`
`120`	`120`	`if (t.IsInterface)`
`121`		`- return "__interface";`
	`121`	`+ return "struct";`
`122`	`122`	`throw new ArgumentException(t.FullName);`
`123`	`123`	`}`
`124`	`124`