chore: update to latest MahApps alpha version

punker76 · Apr 17, 2024 · 99af337 · 99af337
1 parent dca1810
commit 99af337
Show file tree

Hide file tree

Showing 18 changed files with 1,324 additions and 46 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,11 +2,11 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <!-- Project properties -->
     <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp3.1;net5.0-windows</TargetFrameworks>
+        <TargetFrameworks>net8.0-windows;net6.0-windows;net462</TargetFrameworks>
         <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
         <GenerateDocumentationFile>false</GenerateDocumentationFile>
-        <LangVersion>9.0</LangVersion>
+        <LangVersion>10.0</LangVersion>
         <DebugSymbols>true</DebugSymbols>
         <DebugType>full</DebugType>
         <UseWPF>true</UseWPF>
@@ -20,8 +20,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <None Remove="**\*.png;**\*.jpg;**\*.ico;**\*.ttf" />
-        <Resource Include="**\*.png;**\*.jpg;**\*.ico;**\*.ttf" />
+        <None Remove="**\*.bmp;**\*.cur;**\*.gif;**\*.ico;**\*.jpg;**\*.png;**\*.ttf"/>
+        <Resource Include="**\*.bmp;**\*.cur;**\*.gif;**\*.ico;**\*.jpg;**\*.png;**\*.ttf" Exclude="**\bin\**\*.*;**\obj\**\*.*"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageVersion Include="JetBrains.Annotations" Version="2021.2.0" PrivateAssets="All" IncludeAssets="build;compile" />
-    <PackageVersion Include="WpfAnalyzers" Version="3.5.4">
+    <PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="All" IncludeAssets="build;compile" />
+    <PackageVersion Include="WpfAnalyzers" Version="4.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageVersion>
 
-    <PackageVersion Include="MahApps.Metro" Version="2.4.7" />
-    <PackageVersion Include="ControlzEx" Version="4.4.0" />
-    <PackageVersion Include="MahApps.Metro.IconPacks" Version="4.10.0" />
-    <PackageVersion Include="MahApps.Metro.IconPacks.BoxIcons" Version="4.10.0" />
-    <PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.10.0" />
-    <PackageVersion Include="MahApps.Metro.IconPacks.Material" Version="4.10.0" />
-    <PackageVersion Include="MahApps.Metro.IconPacks.Modern" Version="4.10.0" />
-    <PackageVersion Include="Extended.Wpf.Toolkit" Version="4.1.0" />
+    <PackageVersion Include="MahApps.Metro" Version="3.0.0-alpha0492" />
+    <PackageVersion Include="ControlzEx" Version="7.0.0-alpha0021" />
+    <PackageVersion Include="MahApps.Metro.IconPacks" Version="4.11.0" />
+    <PackageVersion Include="MahApps.Metro.IconPacks.BoxIcons" Version="4.11.0" />
+    <PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />
+    <PackageVersion Include="MahApps.Metro.IconPacks.Material" Version="4.11.0" />
+    <PackageVersion Include="MahApps.Metro.IconPacks.Modern" Version="4.11.0" />
+    <PackageVersion Include="Extended.Wpf.Toolkit" Version="4.6.0" />
   </ItemGroup>
 </Project>
diff --git a/ListViewSwitchItemsPanel/ListViewSample_ffi3tk3x_wpftmp.csproj b/ListViewSwitchItemsPanel/ListViewSample_ffi3tk3x_wpftmp.csproj
diff --git a/MahAppsMetroDataGridSample/MainWindow.xaml b/MahAppsMetroDataGridSample/MainWindow.xaml
@@ -8,7 +8,7 @@
                  Title="MahApps.Metro DataGrid Sample"
                  Width="670"
                  Height="350"
-                 GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
+                 GlowColor="{DynamicResource MahApps.Colors.Accent}"
                  mc:Ignorable="d">
 
     <mah:MetroWindow.Resources>

diff --git a/MahAppsMetroFullScreen/MainWindow.xaml b/MahAppsMetroFullScreen/MainWindow.xaml
@@ -6,11 +6,8 @@
                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                       Title="MainWindow"
                       BorderThickness="1"
-                      GlowBrush="{DynamicResource MahApps.Brushes.AccentBase}"
+                      GlowColor="{DynamicResource MahApps.Colors.AccentBase}"
                       WindowStartupLocation="CenterScreen"
-                      WindowState="Maximized"
-                      UseNoneWindowStyle="True"
-                      IgnoreTaskbarOnMaximize="True"
                       Width="525"
                       Height="350"
                       mc:Ignorable="d">

diff --git a/MahAppsMetroFullScreen/MainWindow.xaml.cs b/MahAppsMetroFullScreen/MainWindow.xaml.cs
@@ -11,20 +11,24 @@ public partial class MainWindow : MetroWindow
         public MainWindow()
         {
             InitializeComponent();
+            this.Loaded += MainWindow_Loaded;
+        }
+
+        private void MainWindow_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.SetCurrentValue(WindowStateProperty, WindowState.Maximized);
+            this.SetCurrentValue(IgnoreTaskbarOnMaximizeProperty, true);
         }
 
         private void FullClick(object sender, RoutedEventArgs e)
         {
             this.SetCurrentValue(WindowStateProperty, WindowState.Maximized);
-            this.SetCurrentValue(UseNoneWindowStyleProperty, true);
             this.SetCurrentValue(IgnoreTaskbarOnMaximizeProperty, true);
         }
 
         private void NormalClick(object sender, RoutedEventArgs e)
         {
             this.SetCurrentValue(WindowStateProperty, WindowState.Normal);
-            this.SetCurrentValue(UseNoneWindowStyleProperty, false);
-            this.SetCurrentValue(ShowTitleBarProperty, true); // <-- this must be set to true
             this.SetCurrentValue(IgnoreTaskbarOnMaximizeProperty, false);
         }
     }

diff --git a/MahAppsMetroHamburgerMenuNavigation/MainWindow.xaml b/MahAppsMetroHamburgerMenuNavigation/MainWindow.xaml
@@ -9,7 +9,7 @@
                       Title="MainWindow"
                       Width="600"
                       Height="450"
-                      GlowBrush="{DynamicResource MahApps.Brushes.AccentBase}"
+                      GlowColor="{DynamicResource MahApps.Colors.AccentBase}"
                       WindowStartupLocation="CenterScreen"
                       WindowTransitionsEnabled="False"
                       mc:Ignorable="d">