Use final to replace sealed in C++/WinRt class type signature (#519)

v-zazhou · web-flow · commit 55530451cea3 · 2020-11-05T15:06:51.000-05:00
https://dev.azure.com/ceapex/Engineering/_workitems/edit/285648
diff --git a/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs b/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs
@@ -206,7 +206,7 @@ protected override string GetTypeDeclaration(TypeDefinition type)
             if (type.IsAbstract && !type.IsInterface)
                 buf.Append(" abstract");
             if (type.IsSealed && !DocUtils.IsDelegate(type) && !type.IsValueType)
-                buf.Append(" sealed");
+                buf.Append(" final");
 
             CppWinRtFullMemberFormatter full = new CppWinRtFullMemberFormatter(this.TypeMap);
 
diff --git a/mdoc/Test/ClassEnumeratorECMA.xml b/mdoc/Test/ClassEnumeratorECMA.xml
@@ -13,7 +13,7 @@
          <TypeSignature Language="JavaScript" Value="function ClassEnumerator()" Usage="var classEnumerator = new ClassEnumerator();" />
          <TypeSignature Language="C++ CLI" Value="public ref class ClassEnumerator sealed : CustomNamespace::CustomInterface" />
          <TypeSignature Language="C++ CX" Value="public ref class ClassEnumerator sealed : CustomNamespace::CustomInterface" />
-         <TypeSignature Language="C++ WINRT" Value="class ClassEnumerator sealed : CustomNamespace::CustomInterface" />
+         <TypeSignature Language="C++ WINRT" Value="class ClassEnumerator final : CustomNamespace::CustomInterface" />
          <AssemblyInfo>
             <AssemblyName>DocTest-VB-Eii</AssemblyName>
             <AssemblyVersion>0.0.65535.65535</AssemblyVersion>
diff --git a/mdoc/Test/en.expected-attached-entities/AttachedEventsAndProperties/AttachedPropertyExample.xml b/mdoc/Test/en.expected-attached-entities/AttachedEventsAndProperties/AttachedPropertyExample.xml
@@ -6,7 +6,7 @@
   <TypeSignature Language="F#" Value="type AttachedPropertyExample = class" />
   <TypeSignature Language="C++ CLI" Value="public ref class AttachedPropertyExample abstract sealed" />
   <TypeSignature Language="C++ CX" Value="public ref class AttachedPropertyExample abstract sealed" />
-  <TypeSignature Language="C++ WINRT" Value="class AttachedPropertyExample abstract sealed" />
+  <TypeSignature Language="C++ WINRT" Value="class AttachedPropertyExample abstract final" />
   <AssemblyInfo>
     <AssemblyName>AttachedEventsAndProperties</AssemblyName>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
diff --git a/mdoc/Test/en.expected-cppwinrt/MyFramework.MyNamespace/MyClassExtensions.xml b/mdoc/Test/en.expected-cppwinrt/MyFramework.MyNamespace/MyClassExtensions.xml
@@ -1,7 +1,7 @@
 <Type Name="MyClassExtensions" FullName="MyFramework.MyNamespace.MyClassExtensions">
   <TypeSignature Language="C#" Value="public static class MyClassExtensions" />
   <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit MyClassExtensions extends System.Object" />
-  <TypeSignature Language="C++ WINRT" Value="class MyClassExtensions abstract sealed" />
+  <TypeSignature Language="C++ WINRT" Value="class MyClassExtensions abstract final" />
   <AssemblyInfo>
     <AssemblyName>DocTest-DropNS-classic</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest.Generic/Extensions.xml b/mdoc/Test/en.expected-cppwinrt2/Mono.DocTest.Generic/Extensions.xml
@@ -1,7 +1,7 @@
 <Type Name="Extensions" FullName="Mono.DocTest.Generic.Extensions">
   <TypeSignature Language="C#" Value="public static class Extensions" />
   <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit Extensions extends System.Object" />
-  <TypeSignature Language="C++ WINRT" Value="class Extensions abstract sealed" />
+  <TypeSignature Language="C++ WINRT" Value="class Extensions abstract final" />
   <AssemblyInfo>
     <AssemblyName>DocTest</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/mdoc/Test/en.expected-eii-implementation-ecmadoc/CustomNamespace/ClassEnumerator.xml b/mdoc/Test/en.expected-eii-implementation-ecmadoc/CustomNamespace/ClassEnumerator.xml
@@ -6,7 +6,7 @@
   <TypeSignature Language="JavaScript" Value="function ClassEnumerator()" Usage="var classEnumerator = new ClassEnumerator();" />
   <TypeSignature Language="C++ CLI" Value="public ref class ClassEnumerator sealed : CustomNamespace::CustomInterface" />
   <TypeSignature Language="C++ CX" Value="public ref class ClassEnumerator sealed : CustomNamespace::CustomInterface" />
-  <TypeSignature Language="C++ WINRT" Value="class ClassEnumerator sealed : CustomNamespace::CustomInterface" />
+  <TypeSignature Language="C++ WINRT" Value="class ClassEnumerator final : CustomNamespace::CustomInterface" />
   <AssemblyInfo>
     <AssemblyName>DocTest-VB-Eii</AssemblyName>
     <AssemblyVersion>0.0.65535.65535</AssemblyVersion>
diff --git a/mdoc/Test/en.expected-eii-implementation-slashdoc/CustomNamespace/ClassEnumerator.xml b/mdoc/Test/en.expected-eii-implementation-slashdoc/CustomNamespace/ClassEnumerator.xml
@@ -6,7 +6,7 @@
   <TypeSignature Language="JavaScript" Value="function ClassEnumerator()" Usage="var classEnumerator = new ClassEnumerator();" />
   <TypeSignature Language="C++ CLI" Value="public ref class ClassEnumerator sealed : CustomNamespace::CustomInterface" />
   <TypeSignature Language="C++ CX" Value="public ref class ClassEnumerator sealed : CustomNamespace::CustomInterface" />
-  <TypeSignature Language="C++ WINRT" Value="class ClassEnumerator sealed : CustomNamespace::CustomInterface" />
+  <TypeSignature Language="C++ WINRT" Value="class ClassEnumerator final : CustomNamespace::CustomInterface" />
   <AssemblyInfo>
     <AssemblyName>DocTest-VB-Eii</AssemblyName>
     <AssemblyVersion>0.0.65535.65535</AssemblyVersion>
diff --git a/mdoc/Test/en.expected-eii-implementation/CustomNamespace/ClassEnumerator.xml b/mdoc/Test/en.expected-eii-implementation/CustomNamespace/ClassEnumerator.xml
@@ -6,7 +6,7 @@
   <TypeSignature Language="JavaScript" Value="function ClassEnumerator()" Usage="var classEnumerator = new ClassEnumerator();" />
   <TypeSignature Language="C++ CLI" Value="public ref class ClassEnumerator sealed : CustomNamespace::CustomInterface" />
   <TypeSignature Language="C++ CX" Value="public ref class ClassEnumerator sealed : CustomNamespace::CustomInterface" />
-  <TypeSignature Language="C++ WINRT" Value="class ClassEnumerator sealed : CustomNamespace::CustomInterface" />
+  <TypeSignature Language="C++ WINRT" Value="class ClassEnumerator final : CustomNamespace::CustomInterface" />
   <AssemblyInfo>
     <AssemblyName>DocTest-VB-Eii</AssemblyName>
     <AssemblyVersion>0.0.65535.65535</AssemblyVersion>
diff --git a/mdoc/Test/en.expected/Mono.DocTest.Generic/Extensions.xml b/mdoc/Test/en.expected/Mono.DocTest.Generic/Extensions.xml
@@ -6,7 +6,7 @@
   <TypeSignature Language="F#" Value="type Extensions = class" />
   <TypeSignature Language="C++ CLI" Value="public ref class Extensions abstract sealed" />
   <TypeSignature Language="C++ CX" Value="public ref class Extensions abstract sealed" />
-  <TypeSignature Language="C++ WINRT" Value="class Extensions abstract sealed" />
+  <TypeSignature Language="C++ WINRT" Value="class Extensions abstract final" />
   <AssemblyInfo>
     <AssemblyName>DocTest</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/mdoc/Test/ex.expected-cppwinrtuwp/Namespace2/Class3.xml b/mdoc/Test/ex.expected-cppwinrtuwp/Namespace2/Class3.xml
@@ -1,7 +1,7 @@
 <Type Name="Class3" FullName="Namespace2.Class3">
   <TypeSignature Language="C#" Value="public sealed class Class3 : Windows.UI.Xaml.Application" />
   <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed Class3 extends Windows.UI.Xaml.Application" />
-  <TypeSignature Language="C++ WINRT" Value="class Class3 sealed : winrt::Windows::UI::Xaml::Application" />
+  <TypeSignature Language="C++ WINRT" Value="class Class3 final : winrt::Windows::UI::Xaml::Application" />
   <AssemblyInfo>
     <AssemblyName>UwpTestWinRtComponentCpp</AssemblyName>
     <AssemblyVersion>255.255.255.255</AssemblyVersion>
diff --git a/mdoc/Test/ex.expected-cppwinrtuwp/Namespace222/App.xml b/mdoc/Test/ex.expected-cppwinrtuwp/Namespace222/App.xml
@@ -1,7 +1,7 @@
 <Type Name="App" FullName="Namespace222.App">
   <TypeSignature Language="C#" Value="public sealed class App : Windows.ApplicationModel.Core.IFrameworkView" />
   <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed App extends System.Object implements class Windows.ApplicationModel.Core.IFrameworkView" />
-  <TypeSignature Language="C++ WINRT" Value="class App sealed : winrt::Windows::ApplicationModel::Core::IFrameworkView" />
+  <TypeSignature Language="C++ WINRT" Value="class App final : winrt::Windows::ApplicationModel::Core::IFrameworkView" />
   <AssemblyInfo>
     <AssemblyName>UwpTestWinRtComponentCpp</AssemblyName>
     <AssemblyVersion>255.255.255.255</AssemblyVersion>
diff --git a/mdoc/Test/ex.expected-cppwinrtuwp/UwpTestWinRtComponentCpp/Class1.xml b/mdoc/Test/ex.expected-cppwinrtuwp/UwpTestWinRtComponentCpp/Class1.xml
@@ -1,7 +1,7 @@
 <Type Name="Class1" FullName="UwpTestWinRtComponentCpp.Class1">
   <TypeSignature Language="C#" Value="public sealed class Class1" />
   <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed Class1 extends System.Object" />
-  <TypeSignature Language="C++ WINRT" Value="class Class1 sealed" />
+  <TypeSignature Language="C++ WINRT" Value="class Class1 final" />
   <AssemblyInfo>
     <AssemblyName>UwpTestWinRtComponentCpp</AssemblyName>
     <AssemblyVersion>255.255.255.255</AssemblyVersion>
diff --git a/mdoc/mdoc.Test/CppWinRtFormatterTests.cs b/mdoc/mdoc.Test/CppWinRtFormatterTests.cs
@@ -36,7 +36,7 @@ public void TypeSignature_enum()
         public void TypeSignature_publicSealedClass_Class1()
         {
             TestTypeSignature(_cppCxTestLibName, "UwpTestWinRtComponentCpp.Class1",
-                "class Class1 sealed");
+                "class Class1 final");
         }
 
         [Test]
