Fix invalid ComVisible attributes

dotnet · May 4, 2020 · 4d9d53d · 4d9d53d
1 parent d851dac
commit 4d9d53d
Show file tree

Hide file tree

Showing 40 changed files with 20 additions and 44 deletions.
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLDOMNode.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLDOMNode.cs
@@ -9,7 +9,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("3050f5da-98b5-11cf-bb82-00aa00bdce0b")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLDOMNode

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLDocument.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLDocument.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("626FC520-A41E-11cf-A731-00A0C9082637")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLDocument

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLDocument2.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLDocument2.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("332C4425-26CB-11D0-B483-00C04FD90119")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         internal interface IHTMLDocument2

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLDocument3.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLDocument3.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("3050F485-98B5-11CF-BB82-00AA00BDCE0B")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLDocument3

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLDocument4.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLDocument4.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("3050F69A-98B5-11CF-BB82-00AA00BDCE0B")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLDocument4

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLElement.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLElement.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("3050F1FF-98B5-11CF-BB82-00AA00BDCE0B")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLElement

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLElement2.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLElement2.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("3050f434-98b5-11cf-bb82-00aa00bdce0b")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLElement2

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLElement3.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLElement3.cs
@@ -9,7 +9,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("3050f673-98b5-11cf-bb82-00aa00bdce0b")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLElement3

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLElementCollection.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLElementCollection.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("3050F21F-98B5-11CF-BB82-00AA00BDCE0B")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLElementCollection

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLEventObj.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLEventObj.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("3050F32D-98B5-11CF-BB82-00AA00BDCE0B")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLEventObj

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLFramesCollection2.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLFramesCollection2.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("332C4426-26CB-11D0-B483-00C04FD90119")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLFramesCollection2

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLLocation.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLLocation.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("163BB1E0-6E00-11CF-837A-48DC04C10000")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLLocation

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLScreen.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLScreen.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("3050f35c-98b5-11cf-bb82-00aa00bdce0b")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLScreen

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLStyle.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLStyle.cs
@@ -9,7 +9,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("3050F25E-98B5-11CF-BB82-00AA00BDCE0B")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLStyle

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLWindow2.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLWindow2.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("332C4427-26CB-11D0-B483-00C04FD90119")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLWindow2

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLWindow3.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLWindow3.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("3050f4ae-98b5-11cf-bb82-00aa00bdce0b")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLWindow3

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLWindow4.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLWindow4.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("3050f6cf-98b5-11cf-bb82-00aa00bdce0b")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IHTMLWindow4

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IOmHistory.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IOmHistory.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("FECEAAA2-8405-11CF-8BA1-00AA00476DA6")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IOmHistory

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IOmNavigator.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IOmNavigator.cs
@@ -8,7 +8,7 @@ internal partial class Interop
 {
     internal partial class Mshtml
     {
-        [ComVisible(true)]
+        [ComImport]
         [Guid("FECEAAA5-8405-11CF-8BA1-00AA00476DA6")]
         [InterfaceType(ComInterfaceType.InterfaceIsDual)]
         public interface IOmNavigator

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ExpandCollapseState.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ExpandCollapseState.cs
@@ -9,8 +9,6 @@ internal static partial class Interop
 {
     internal static partial class UiaCore
     {
-        [ComVisible(true)]
-        [Guid("76d12d7e-b227-4417-9ce2-42642ffa896a")]
         public enum ExpandCollapseState
         {
             /// <summary>

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IAccessibleEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IAccessibleEx.cs
@@ -11,7 +11,6 @@ internal static partial class Interop
     internal static partial class UiaCore
     {
         [ComImport]
-        [ComVisible(true)]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         [Guid("F8B80ADA-2C44-48D0-89BE-5FF23C9CD875")]
         public unsafe interface IAccessibleEx

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IExpandCollapseProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IExpandCollapseProvider.cs
@@ -10,7 +10,6 @@ internal static partial class Interop
     internal static partial class UiaCore
     {
         [ComImport]
-        [ComVisible(true)]
         [Guid("d847d3a5-cab0-4a98-8c32-ecb45c59ad24")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface IExpandCollapseProvider

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IGridItemProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IGridItemProvider.cs
@@ -10,7 +10,6 @@ internal static partial class Interop
     internal static partial class UiaCore
     {
         [ComImport]
-        [ComVisible(true)]
         [Guid("d02541f1-fb81-4d64-ae32-f520f8a6dbd1")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface IGridItemProvider

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IGridProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IGridProvider.cs
@@ -10,7 +10,6 @@ internal static partial class Interop
     internal static partial class UiaCore
     {
         [ComImport]
-        [ComVisible(true)]
         [Guid("b17d6187-0907-464b-a168-0ef17a1572b1")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface IGridProvider

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IInvokeProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IInvokeProvider.cs
@@ -20,7 +20,6 @@ internal static partial class UiaCore
         ///  Menu items
         /// </summary>
         [ComImport]
-        [ComVisible(true)]
         [Guid("54fcb24b-e18e-47a2-b4d3-eccbe77599a2")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface IInvokeProvider

diff --git a/...System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ILegacyIAccessibleProvider.cs b/...System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ILegacyIAccessibleProvider.cs
@@ -13,7 +13,6 @@ internal static partial class UiaCore
         [ComImport]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         [Guid("E44C3566-915D-4070-99C6-047BFF5A08F5")]
-        [ComVisible(true)]
         public interface ILegacyIAccessibleProvider
         {
             void Select(int flagsSelect);

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRangeValueProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRangeValueProvider.cs
@@ -10,7 +10,6 @@ internal static partial class Interop
     internal static partial class UiaCore
     {
         [ComImport]
-        [ComVisible(true)]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         [Guid("36dc7aef-33e6-4691-afe1-2be7274b3d33")]
         public interface IRangeValueProvider

diff --git a/...ystem.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragment.cs b/...ystem.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragment.cs
@@ -19,7 +19,6 @@ internal static partial class UiaCore
         ///  interface, which is derived from this, and has some additional methods.
         /// </summary>
         [ComImport]
-        [ComVisible(true)]
         [Guid("f7063da8-8359-439c-9297-bbc5299a7d87")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface IRawElementProviderFragment : IRawElementProviderSimple

diff --git a/...m.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragmentRoot.cs b/...m.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragmentRoot.cs
@@ -15,7 +15,6 @@ internal static partial class UiaCore
         ///  interface.
         /// </summary>
         [ComImport]
-        [ComVisible(true)]
         [Guid("620ce2a5-ab8f-40a9-86cb-de3c75599b58")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface IRawElementProviderFragmentRoot : IRawElementProviderFragment

diff --git a/...m.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderHwndOverride.cs b/...m.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderHwndOverride.cs
@@ -13,7 +13,7 @@ internal static partial class UiaCore
         ///  Implemented by providers which want to provide information about or want to
         ///  reposition contained HWND-based elements.
         /// </summary>
-        [ComVisible(true)]
+        [ComImport]
         [Guid("1d5df27c-8947-4425-b8d9-79787bb460b8")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface IRawElementProviderHwndOverride : IRawElementProviderSimple

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderSimple.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderSimple.cs
@@ -10,7 +10,6 @@ internal static partial class Interop
     internal static partial class UiaCore
     {
         [ComImport]
-        [ComVisible(true)]
         [Guid("D6DD68D1-86FD-4332-8666-9ABEDEA2D24C")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface IRawElementProviderSimple

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IScrollItemProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IScrollItemProvider.cs
@@ -14,7 +14,6 @@ internal static partial class UiaCore
         ///  This allows them to be scrolled into view using known API's based on the control in question.
         /// </summary>
         [ComImport]
-        [ComVisible(true)]
         [Guid("2360c714-4bf1-4b26-ba65-9b21316127eb")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface IScrollItemProvider

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ISelectionItemProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ISelectionItemProvider.cs
@@ -16,7 +16,6 @@ internal static partial class UiaCore
         /// </summary>
         [ComImport]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-        [ComVisible(true)]
         [Guid("2acad808-b2d4-452d-a407-91ff1ad167b2")]
         public interface ISelectionItemProvider
         {

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ISelectionProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ISelectionProvider.cs
@@ -17,7 +17,6 @@ internal static partial class UiaCore
         ///  ISelectionProvider public interface instead.
         /// </remarks>
         [ComImport]
-        [ComVisible(true)]
         [Guid("fb8b03af-3bdf-48d4-bd36-1a65793be168")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface ISelectionProvider

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableItemProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableItemProvider.cs
@@ -10,7 +10,6 @@ internal static partial class Interop
     internal static partial class UiaCore
     {
         [ComImport]
-        [ComVisible(true)]
         [Guid("b9734fa6-771f-4d78-9c90-2517999349cd")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface ITableItemProvider

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableProvider.cs
@@ -10,7 +10,6 @@ internal static partial class Interop
     internal static partial class UiaCore
     {
         [ComImport]
-        [ComVisible(true)]
         [Guid("9c860395-97b3-490a-b52a-858cc22af166")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface ITableProvider

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IToggleProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IToggleProvider.cs
@@ -10,7 +10,6 @@ internal static partial class Interop
     internal static partial class UiaCore
     {
         [ComImport]
-        [ComVisible(true)]
         [Guid("56D00BD0-C4F4-433C-A836-1A52A57E0892")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface IToggleProvider

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IValueProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IValueProvider.cs
@@ -10,7 +10,6 @@ internal static partial class Interop
     internal static partial class UiaCore
     {
         [ComImport]
-        [ComVisible(true)]
         [Guid("c7935180-6fb3-4201-b174-7df73adbf64a")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface IValueProvider

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.NavigateDirection.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.NavigateDirection.cs
@@ -12,8 +12,6 @@ internal static partial class UiaCore
         /// <summary>
         ///  Directions for navigation the UIAutomation tree
         /// </summary>
-        [ComVisible(true)]
-        [Guid("670c3006-bf4c-428b-8534-e1848f645122")]
         public enum NavigateDirection
         {
             /// <summary>

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.StructureChangeType.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.StructureChangeType.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Runtime.InteropServices;
 
 internal static partial class Interop
 {
@@ -12,8 +11,6 @@ internal static partial class UiaCore
         /// <summary>
         ///  Logical structure change flags
         /// </summary>
-        [ComVisible(true)]
-        [Guid("e4cfef41-071d-472c-a65c-c14f59ea81eb")]
         public enum StructureChangeType
         {
             /// <summary>