From 8b68a4cd99e52ba3e39f0f58aea9bbac337d829a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20K=C3=A4s?= <tobias.kaes@gmail.com>
Date: Tue, 15 Oct 2019 20:13:13 +0200
Subject: [PATCH] Cleanup COM interfaces in jump list code - fix PreserveSig
 attributes (#9899)

---
 .../WindowsTaskbarJumpList/ComInterfaces.cs          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/ComInterfaces.cs b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/ComInterfaces.cs
index 1cf2749928..a62e51c29f 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/ComInterfaces.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/ComInterfaces.cs
@@ -106,7 +106,7 @@ namespace Microsoft.PowerShell
             /// </summary>
             /// <param name="propertyCount"></param>
             /// <returns></returns>
-            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            [PreserveSig]
             HResult GetCount([Out] out uint propertyCount);
 
             /// <summary>
@@ -115,7 +115,7 @@ namespace Microsoft.PowerShell
             /// <param name="propertyIndex"></param>
             /// <param name="key"></param>
             /// <returns></returns>
-            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            [PreserveSig]
             HResult GetAt([In] uint propertyIndex, out PropertyKey key);
 
             /// <summary>
@@ -124,7 +124,7 @@ namespace Microsoft.PowerShell
             /// <param name="key"></param>
             /// <param name="pv"></param>
             /// <returns></returns>
-            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            [PreserveSig]
             HResult GetValue([In] ref PropertyKey key, [Out] PropVariant pv);
 
             /// <summary>
@@ -133,7 +133,7 @@ namespace Microsoft.PowerShell
             /// <param name="key"></param>
             /// <param name="pv"></param>
             /// <returns></returns>
-            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime), PreserveSig]
+            [PreserveSig]
             HResult SetValue([In] ref PropertyKey key, [In] PropVariant pv);
 
             /// <summary>
@@ -141,7 +141,6 @@ namespace Microsoft.PowerShell
             /// </summary>
             /// <returns></returns>
             [PreserveSig]
-            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
             HResult Commit();
         }
 
@@ -199,9 +198,8 @@ namespace Microsoft.PowerShell
         internal interface IObjectCollection
         {
             // IObjectArray
-            [PreserveSig]
             void GetCount(out uint cObjects);
-            [PreserveSig]
+
             void GetAt(
                 uint iIndex,
                 ref Guid riid,