Merge pull request #4353 from batzen/dependencyUpdate

Updating some dependencies

Author: punker76

src/Directory.Build.Props

@@ -22,8 +22,8 @@
 
     <!-- Add the references for all projects and targets -->
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
-        <PackageReference Include="WpfAnalyzers" Version="4.0.1">
+        <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
+        <PackageReference Include="WpfAnalyzers" Version="4.1.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>

src/MahApps.Metro/Controls/CustomValidationPopup.cs

@@ -451,17 +451,17 @@ private unsafe void SetTopmostState(bool isTop)
             var height = rect.GetHeight();
             if (isTop)
             {
-                PInvoke.SetWindowPos(handle, PInvoke.HWND_TOPMOST, left, top, width, height, SWP_TOPMOST);
+                PInvoke.SetWindowPos(handle, HWND.HWND_TOPMOST, left, top, width, height, SWP_TOPMOST);
             }
             else
             {
                 // Z-Order would only get refreshed/reflected if clicking the
                 // the titlebar (as opposed to other parts of the external
                 // window) unless I first set the popup to HWND_BOTTOM
                 // then HWND_TOP before HWND_NOTOPMOST
-                PInvoke.SetWindowPos(handle, PInvoke.HWND_BOTTOM, left, top, width, height, SWP_TOPMOST);
-                PInvoke.SetWindowPos(handle, PInvoke.HWND_TOP, left, top, width, height, SWP_TOPMOST);
-                PInvoke.SetWindowPos(handle, PInvoke.HWND_NOTOPMOST, left, top, width, height, SWP_TOPMOST);
+                PInvoke.SetWindowPos(handle, HWND.HWND_BOTTOM, left, top, width, height, SWP_TOPMOST);
+                PInvoke.SetWindowPos(handle, HWND.HWND_TOP, left, top, width, height, SWP_TOPMOST);
+                PInvoke.SetWindowPos(handle, HWND.HWND_NOTOPMOST, left, top, width, height, SWP_TOPMOST);
             }
 
             this.appliedTopMost = isTop;

src/MahApps.Metro/Controls/WindowSettings.cs

@@ -24,8 +24,8 @@ internal WINDOWPLACEMENT ToWINDOWPLACEMENT()
                    {
                         length = (uint)Marshal.SizeOf<WINDOWPLACEMENT>(),
                         showCmd = (SHOW_WINDOW_CMD)this.showCmd,
-                        ptMinPosition = new POINT { x = (int)this.minPosition.X, y = (int)this.minPosition.Y },
-                        ptMaxPosition = new POINT { x = (int)this.maxPosition.X, y = (int)this.maxPosition.Y },
+                        ptMinPosition = new System.Drawing.Point { X = (int)this.minPosition.X, Y = (int)this.minPosition.Y },
+                        ptMaxPosition = new System.Drawing.Point { X = (int)this.maxPosition.X, Y = (int)this.maxPosition.Y },
                         rcNormalPosition = new RECT { left = (int)this.normalPosition.X, top = (int)this.normalPosition.Y, right = (int)this.normalPosition.Right, bottom = (int)this.normalPosition.Bottom }
                    };
         }
@@ -35,8 +35,8 @@ internal static WindowPlacementSetting FromWINDOWPLACEMENT(WINDOWPLACEMENT windo
             return new WindowPlacementSetting
                     {
                         showCmd = (uint)windowplacement.showCmd,
-                        minPosition = new Point(windowplacement.ptMinPosition.x, windowplacement.ptMinPosition.y),
-                        maxPosition = new Point(windowplacement.ptMaxPosition.x, windowplacement.ptMaxPosition.y),
+                        minPosition = new Point(windowplacement.ptMinPosition.X, windowplacement.ptMinPosition.Y),
+                        maxPosition = new Point(windowplacement.ptMaxPosition.X, windowplacement.ptMaxPosition.Y),
                         normalPosition = new Rect(windowplacement.rcNormalPosition.left, windowplacement.rcNormalPosition.top, windowplacement.rcNormalPosition.GetWidth(), windowplacement.rcNormalPosition.GetHeight()),
                     };
         }

src/MahApps.Metro/MahApps.Metro.csproj

@@ -25,13 +25,13 @@
     <ItemGroup>
         <PackageReference Include="ControlzEx" version="6.0.0-alpha0241" />
 
-        <PackageReference Include="XAMLTools.MSBuild" Version="1.0.0-alpha0100" PrivateAssets="all" IncludeAssets="build" />
+        <PackageReference Include="XAMLTools.MSBuild" Version="1.0.0-alpha0135" PrivateAssets="all" IncludeAssets="build" />
 
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.1.635-beta">
+        <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.2.63-beta">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>

src/MahApps.Metro/NativeMethods.txt

@@ -13,10 +13,7 @@ SendMessage
 SetWindowPlacement
 SetWindowPos
 
-HWND_BOTTOM
-HWND_TOP
-HWND_NOTOPMOST
-HWND_TOPMOST
+HWND_*
 
 WM_HOTKEY
 WM_NCLBUTTONDOWN