Updates to support MahApps 2.0 (#1861)

Author: Keboo

MahMaterialDragablzMashUp/Mah.xaml

@@ -41,7 +41,7 @@
                     </smtx:XamlDisplay>
                     <smtx:XamlDisplay Key="AccentSquareButton_1" HorizontalAlignment="Left">
                         <Button Width="100" Margin="0 8 0 0" Content="Nice" HorizontalAlignment="Left"
-                            Style="{StaticResource MahApps.Styles.Button.AccentedSquare}" />
+                                Style="{StaticResource MahApps.Styles.Button.Square.Accent}" />
                     </smtx:XamlDisplay>
                 </StackPanel>
             </TabItem>

MaterialDesignThemes.MahApps.nuspec

@@ -23,7 +23,7 @@
       <group targetFramework="netcoreapp3.1">
         <dependency id="MaterialDesignColors" version="[1.2.1, 2.0)" />
         <dependency id="MaterialDesignThemes" version="[3.0.0, 4.0)" />
-        <dependency id="MahApps.Metro" version="[2.0.0-alpha0748, 3.0)" />
+        <dependency id="MahApps.Metro" version="[2.0.0, 3.0)" />
       </group>
     </dependencies>
   </metadata>

MaterialDesignThemes.MahApps/Themes/MaterialDesignTheme.MahApps.RangeSlider.xaml

@@ -15,7 +15,7 @@
     </Style>
 
     <Style x:Key="MaterialDesign.RangeSlider.HorizontalMiddleThumb"
-           BasedOn="{StaticResource MahApps.Styles.MetroThumb.RangeSlider.HorizontalMiddleThumb}"
+           BasedOn="{StaticResource MahApps.Styles.MetroThumb.RangeSlider.Horizontal.Middle}"
            TargetType="{x:Type controls:MetroThumb}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />

paket-files/paket.restore.cached

@@ -1,4 +1,4 @@
 {
-  "packagesDownloadedHash": "B37C5E56DA79890D1BF77D83B0007CB549D83507FE901C9E21AED64E511015F0",
-  "projectsRestoredHash": "B37C5E56DA79890D1BF77D83B0007CB549D83507FE901C9E21AED64E511015F0"
+  "packagesDownloadedHash": "17DAD83C90AD78A5AE6330761F0FD37C0EF7F4A69DD75BCD88E835BBC427D110",
+  "projectsRestoredHash": "17DAD83C90AD78A5AE6330761F0FD37C0EF7F4A69DD75BCD88E835BBC427D110"
 }

paket.dependencies

@@ -1,7 +1,7 @@
 source https://nuget.org/api/v2
 framework: net45, net452, net472, netcoreapp3.1
 
-nuget MahApps.Metro ~> 2.0.0-alpha0821
+nuget MahApps.Metro ~> 2.0.0
 nuget Dragablz ~> 0.0.3
 nuget NuGet.CommandLine
 nuget Shouldly ~> 3.0

paket.lock

@@ -2,12 +2,12 @@ RESTRICTION: || (== net45) (== net452) (== net472) (== netcoreapp3.1)
 NUGET
   remote: https://www.nuget.org/api/v2
     AvalonEdit (6.0.1)
-    ControlzEx (4.3.0-alpha0107) - restriction: || (&& (== net45) (>= net452)) (&& (== net45) (>= netcoreapp3.0)) (== net452) (== net472) (== netcoreapp3.1)
+    ControlzEx (4.3) - restriction: || (&& (== net45) (>= net452)) (&& (== net45) (>= netcoreapp3.0)) (== net452) (== net472) (== netcoreapp3.1)
       Microsoft.Xaml.Behaviors.Wpf (>= 1.1.19)
-      System.Text.Json (>= 4.7.1) - restriction: || (&& (== net45) (>= netcoreapp3.0)) (&& (== net452) (>= netcoreapp3.0)) (&& (== net472) (>= netcoreapp3.0)) (== netcoreapp3.1)
+      System.Text.Json (>= 4.7.2) - restriction: || (&& (== net45) (>= netcoreapp3.0)) (&& (== net452) (>= netcoreapp3.0)) (&& (== net472) (>= netcoreapp3.0)) (== netcoreapp3.1)
     Dragablz (0.0.3.203)
-    MahApps.Metro (2.0.0-alpha0821)
-      ControlzEx (>= 4.3.0-alpha0107) - restriction: || (&& (== net45) (>= net452)) (&& (== net45) (>= netcoreapp3.0)) (== net452) (== net472) (== netcoreapp3.1)
+    MahApps.Metro (2.0)
+      ControlzEx (>= 4.3) - restriction: || (&& (== net45) (>= net452)) (&& (== net45) (>= netcoreapp3.0)) (== net452) (== net472) (== netcoreapp3.1)
     Microsoft.CodeCoverage (16.6.1) - restriction: || (&& (== net45) (>= netcoreapp1.0)) (&& (== net45) (>= netcoreapp2.1)) (&& (== net452) (>= netcoreapp1.0)) (&& (== net452) (>= netcoreapp2.1)) (&& (== net472) (>= netcoreapp1.0)) (&& (== net472) (>= netcoreapp2.1)) (== netcoreapp3.1)
     Microsoft.CSharp (4.6)
     Microsoft.NET.Test.Sdk (16.6.1) - restriction: || (&& (== net45) (>= netcoreapp1.0)) (&& (== net452) (>= netcoreapp1.0)) (&& (== net472) (>= netcoreapp1.0)) (== netcoreapp3.1)
@@ -26,7 +26,7 @@ NUGET
       System.Runtime.InteropServices.RuntimeInformation (>= 4.3) - restriction: || (== net45) (== net452) (&& (== net472) (< net45) (< netstandard1.2)) (&& (== net472) (< net45) (< netstandard1.5)) (&& (== net472) (< net45) (< netstandard1.6)) (&& (== net472) (< net45) (< netstandard2.0)) (&& (== net472) (< netstandard1.0)) (&& (== net472) (< netstandard1.3)) (&& (== net472) (< netstandard1.4)) (&& (== net472) (< netstandard1.5) (>= uap10.0)) (&& (== netcoreapp3.1) (< netstandard1.0)) (&& (== netcoreapp3.1) (< netstandard1.2)) (&& (== netcoreapp3.1) (< netstandard1.3)) (&& (== netcoreapp3.1) (< netstandard1.4)) (&& (== netcoreapp3.1) (< netstandard1.5)) (&& (== netcoreapp3.1) (< netstandard1.6)) (&& (== netcoreapp3.1) (< netstandard2.0))
     Newtonsoft.Json (12.0.3) - restriction: || (&& (== net45) (>= netcoreapp2.1)) (&& (== net452) (>= netcoreapp2.1)) (&& (== net472) (>= netcoreapp2.1)) (== netcoreapp3.1)
     NuGet.CommandLine (5.5.1)
-    NuGet.Frameworks (5.5.1) - restriction: || (&& (== net45) (>= netcoreapp2.1)) (&& (== net452) (>= netcoreapp2.1)) (&& (== net472) (>= netcoreapp2.1)) (== netcoreapp3.1)
+    NuGet.Frameworks (5.6) - restriction: || (&& (== net45) (>= netcoreapp2.1)) (&& (== net452) (>= netcoreapp2.1)) (&& (== net472) (>= netcoreapp2.1)) (== netcoreapp3.1)
     runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - restriction: || (&& (== net452) (< net45) (>= netstandard1.6)) (&& (== net472) (< net45)) (== netcoreapp3.1)
     runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - restriction: || (&& (== net452) (< net45) (>= netstandard1.6)) (&& (== net472) (< net45)) (== netcoreapp3.1)
     runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - restriction: || (&& (== net452) (< net45) (>= netstandard1.6)) (&& (== net472) (< net45)) (== netcoreapp3.1)