Use LibraryImport in some Interop User32

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "7.0.100-preview.3.22154.3",
+    "dotnet": "7.0.100-preview.5.22228.6",
     "runtimes": {
       "dotnet/x64": [
         "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
@@ -11,7 +11,7 @@
     }
   },
   "sdk": {
-    "version": "7.0.100-preview.3.22154.3"
+    "version": "7.0.100-preview.5.22228.6"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22301.2",

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ActivateKeyboardLayout.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern IntPtr ActivateKeyboardLayout(IntPtr hkl, uint Flags);
+        [LibraryImport(Libraries.User32)]
+        public static partial IntPtr ActivateKeyboardLayout(IntPtr hkl, uint Flags);
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.AreDpiAwarenessContextsEqual.cs

@@ -9,8 +9,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true, EntryPoint = "AreDpiAwarenessContextsEqual", SetLastError = true)]
-        private static extern BOOL AreDpiAwarenessContextsEqualInternal(IntPtr dpiContextA, IntPtr dpiContextB);
+        [LibraryImport(Libraries.User32, EntryPoint = "AreDpiAwarenessContextsEqual", SetLastError = true)]
+        private static partial BOOL AreDpiAwarenessContextsEqualInternal(IntPtr dpiContextA, IntPtr dpiContextB);
 
         /// <summary>
         ///  Tries to compare two DPIawareness context values. Return true if they were equal.

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BlockInput.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern BOOL BlockInput(BOOL fBlockIt);
+        [LibraryImport(Libraries.User32)]
+        public static partial BOOL BlockInput(BOOL fBlockIt);
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CallNextHookEx.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern nint CallNextHookEx(IntPtr hhook, User32.HC nCode, nint wparam, nint lparam);
+        [LibraryImport(Libraries.User32)]
+        public static partial nint CallNextHookEx(IntPtr hhook, User32.HC nCode, nint wparam, nint lparam);
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CallWindowProcW.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern IntPtr CallWindowProcW(
+        [LibraryImport(Libraries.User32)]
+        public static partial IntPtr CallWindowProcW(
             IntPtr wndProc,
             IntPtr hWnd,
             WM msg,

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ClipCursor.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static unsafe extern BOOL ClipCursor(RECT* rcClip);
+        [LibraryImport(Libraries.User32)]
+        public static unsafe partial BOOL ClipCursor(RECT* rcClip);
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CloseDesktop.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true, SetLastError = true)]
-        public static extern BOOL CloseDesktop(IntPtr hDesktop);
+        [LibraryImport(Libraries.User32, SetLastError = true)]
+        public static partial BOOL CloseDesktop(IntPtr hDesktop);
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CopyImage.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern IntPtr CopyImage(IntPtr hImage, IMAGE type, int cx, int cy, LR flags);
+        [LibraryImport(Libraries.User32)]
+        public static partial IntPtr CopyImage(IntPtr hImage, IMAGE type, int cx, int cy, LR flags);
 
         public static IntPtr CopyImage(IHandle hImage, IMAGE type, int cx, int cy, LR flags)
         {

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreateAcceleratorTableW.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public unsafe static extern IntPtr CreateAcceleratorTableW(ACCEL* paccel, int cAccel);
+        [LibraryImport(Libraries.User32)]
+        public unsafe static partial IntPtr CreateAcceleratorTableW(ACCEL* paccel, int cAccel);
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreateMenu.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern IntPtr CreateMenu();
+        [LibraryImport(Libraries.User32)]
+        public static partial IntPtr CreateMenu();
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreatePopupMenu.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern IntPtr CreatePopupMenu();
+        [LibraryImport(Libraries.User32)]
+        public static partial IntPtr CreatePopupMenu();
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DefFrameProcW.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern IntPtr DefFrameProcW(IntPtr hWnd, IntPtr hWndClient, WM msg, IntPtr wParam, IntPtr lParam);
+        [LibraryImport(Libraries.User32)]
+        public static partial IntPtr DefFrameProcW(IntPtr hWnd, IntPtr hWndClient, WM msg, IntPtr wParam, IntPtr lParam);
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DefMDIChildProcW.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern IntPtr DefMDIChildProcW(IntPtr hWnd, WM msg, IntPtr wParam, IntPtr lParam);
+        [LibraryImport(Libraries.User32)]
+        public static partial IntPtr DefMDIChildProcW(IntPtr hWnd, WM msg, IntPtr wParam, IntPtr lParam);
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DefWindowProcW.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern IntPtr DefWindowProcW(
+        [LibraryImport(Libraries.User32)]
+        public static partial IntPtr DefWindowProcW(
             IntPtr hWnd,
             WM msg,
             IntPtr wParam,

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyAcceleratorTable.cs.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern BOOL DestroyAcceleratorTable(IntPtr hAccel);
+        [LibraryImport(Libraries.User32)]
+        public static partial BOOL DestroyAcceleratorTable(IntPtr hAccel);
 
         public static BOOL DestroyAcceleratorTable(HandleRef hAccel)
         {

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyCursor.cs

@@ -8,8 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-
-        public static extern BOOL DestroyCursor(IntPtr hCurs);
+        [LibraryImport(Libraries.User32)]
+        public static partial BOOL DestroyCursor(IntPtr hCurs);
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyIcon.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true, SetLastError = true)]
-        public extern static BOOL DestroyIcon(IntPtr handle);
+        [LibraryImport(Libraries.User32, SetLastError = true)]
+        public static partial BOOL DestroyIcon(IntPtr handle);
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyMenu.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern BOOL DestroyMenu(IntPtr hMenu);
+        [LibraryImport(Libraries.User32)]
+        public static partial BOOL DestroyMenu(IntPtr hMenu);
 
         public static BOOL DestroyMenu(HandleRef hMenu)
         {

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyWindow.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern BOOL DestroyWindow(IntPtr hWnd);
+        [LibraryImport(Libraries.User32)]
+        public static partial BOOL DestroyWindow(IntPtr hWnd);
 
         public static BOOL DestroyWindow(IHandle hWnd)
         {

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawIcon.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern BOOL DrawIcon(IntPtr hDC, int x, int y, IntPtr hIcon);
+        [LibraryImport(Libraries.User32)]
+        public static partial BOOL DrawIcon(IntPtr hDC, int x, int y, IntPtr hIcon);
 
         public static BOOL DrawIcon(IntPtr hDC, int x, int y, IHandle hIcon)
         {

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawIconEx.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern BOOL DrawIconEx(
+        [LibraryImport(Libraries.User32)]
+        public static partial BOOL DrawIconEx(
             Gdi32.HDC hDC,
             int xLeft,
             int yTop,

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawMenuBar.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        private static extern BOOL DrawMenuBar(IntPtr hWnd);
+        [LibraryImport(Libraries.User32)]
+        private static partial BOOL DrawMenuBar(IntPtr hWnd);
 
         public static BOOL DrawMenuBar(IHandle hWnd)
         {

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnableMenuItem.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern BOOL EnableMenuItem(IntPtr hMenu, SC uIDEnableItem, MF uEnable);
+        [LibraryImport(Libraries.User32)]
+        public static partial BOOL EnableMenuItem(IntPtr hMenu, SC uIDEnableItem, MF uEnable);
 
         public static BOOL EnableMenuItem(HandleRef hMenu, SC uIDEnableItem, MF uEnable)
         {

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnableScrollBar.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true, SetLastError = true)]
-        public static extern BOOL EnableScrollBar(IntPtr hWnd, SB wSBflags, ESB wArrows);
+        [LibraryImport(Libraries.User32, SetLastError = true)]
+        public static partial BOOL EnableScrollBar(IntPtr hWnd, SB wSBflags, ESB wArrows);
 
         public static BOOL EnableScrollBar(IHandle hWnd, SB wSBflags, ESB wArrows)
         {

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnableWindow.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern BOOL EnableWindow(IntPtr hWnd, BOOL bEnable);
+        [LibraryImport(Libraries.User32)]
+        public static partial BOOL EnableWindow(IntPtr hWnd, BOOL bEnable);
 
         public static BOOL EnableWindow(HandleRef hWnd, BOOL bEnable)
         {

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EndDialog.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern BOOL EndDialog(IntPtr hDlg, IntPtr nResult);
+        [LibraryImport(Libraries.User32)]
+        public static partial BOOL EndDialog(IntPtr hDlg, IntPtr nResult);
 
         public static BOOL EndDialog(HandleRef hDlg, IntPtr nResult)
         {

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EndPaint.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public unsafe static extern BOOL EndPaint(IntPtr hWnd, PAINTSTRUCT* lpPaint);
+        [LibraryImport(Libraries.User32)]
+        public unsafe static partial BOOL EndPaint(IntPtr hWnd, PAINTSTRUCT* lpPaint);
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetActiveWindow.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern IntPtr GetActiveWindow();
+        [LibraryImport(Libraries.User32)]
+        public static partial IntPtr GetActiveWindow();
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetAncestor.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern IntPtr GetAncestor(IntPtr hwnd, GA flags);
+        [LibraryImport(Libraries.User32)]
+        public static partial IntPtr GetAncestor(IntPtr hwnd, GA flags);
 
         public static IntPtr GetAncestor(IHandle hwnd, GA flags)
         {

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetAsyncKeyState.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern short GetAsyncKeyState(int vkey);
+        [LibraryImport(Libraries.User32)]
+        public static partial short GetAsyncKeyState(int vkey);
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetCapture.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern IntPtr GetCapture();
+        [LibraryImport(Libraries.User32)]
+        public static partial IntPtr GetCapture();
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetCaretBlinkTime.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern uint GetCaretBlinkTime();
+        [LibraryImport(Libraries.User32)]
+        public static partial uint GetCaretBlinkTime();
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetClipboardFormatNameW.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        private static unsafe extern int GetClipboardFormatNameW(uint format, char* lpszFormatName, int cchMaxCount);
+        [LibraryImport(Libraries.User32)]
+        private static unsafe partial int GetClipboardFormatNameW(uint format, char* lpszFormatName, int cchMaxCount);
 
         public static unsafe string? GetClipboardFormatNameW(uint format)
         {

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetCursor.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern IntPtr GetCursor();
+        [LibraryImport(Libraries.User32)]
+        public static partial IntPtr GetCursor();
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDesktopWindow.cs

@@ -8,7 +8,7 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern IntPtr GetDesktopWindow();
+        [LibraryImport(Libraries.User32)]
+        public static partial IntPtr GetDesktopWindow();
     }
 }

src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDlgItem.cs

@@ -8,8 +8,8 @@ internal static partial class Interop
 {
     internal static partial class User32
     {
-        [DllImport(Libraries.User32, ExactSpelling = true)]
-        public static extern IntPtr GetDlgItem(IntPtr hWnd, DialogItemID nIDDlgItem);
+        [LibraryImport(Libraries.User32)]
+        public static partial IntPtr GetDlgItem(IntPtr hWnd, DialogItemID nIDDlgItem);
 
         public static IntPtr GetDlgItem(IHandle hWnd, DialogItemID nIDDlgItem)
         {