Merge pull request #3204 from MahApps/develop

Merging changes for v1.6.1

Author: punker76

GitVersion.yml

@@ -5,13 +5,13 @@ branches:
   master:
     mode: ContinuousDeployment
     tag: rc
-    increment: Minor
+    increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
   develop:
     mode: ContinuousDeployment
     tag: alpha
-    increment: Minor
+    increment: Patch
     prevent-increment-of-merged-branch-version: false
     track-merge-target: true
   pull-request:

readme.md

@@ -29,10 +29,10 @@
   <a href="https://ci.appveyor.com/project/punker76/mahapps-metro/branch/master">
     <img alt="masterstatus" src="https://img.shields.io/appveyor/ci/punker76/mahapps-metro/master.svg?style=flat-square&&label=master">
   </a>
-  <a href="https://ci.appveyor.com/project/punker76/mahapps-metro/branch/dev">
-    <img alt="devstatus" src="https://img.shields.io/appveyor/ci/punker76/mahapps-metro/develop.svg?style=flat-square&&label=dev">
+  <a href="https://ci.appveyor.com/project/punker76/mahapps-metro/branch/develop">
+    <img alt="devstatus" src="https://img.shields.io/appveyor/ci/punker76/mahapps-metro/develop.svg?style=flat-square&&label=develop">
   </a>
-  <a href="https://ci.appveyor.com/project/punker76/mahapps-metro/branch/dev">
+  <a href="https://ci.appveyor.com/project/punker76/mahapps-metro/branch/develop">
     <img alt="devtests" src="https://img.shields.io/appveyor/tests/punker76/mahapps-metro/develop.svg?style=flat-square">
   </a>
   <br />

src/.paket/Paket.Restore.targets

@@ -53,10 +53,10 @@
     </PropertyGroup>
 
     <!-- If shasum and awk exist get the hashes -->
-    <Exec Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
+    <Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
         <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
     </Exec>
-    <Exec Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
+    <Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
         <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
     </Exec>
 

src/.paket/paket-sha256.txt

@@ -0,0 +1 @@
+8996429163A399AA2F2E675D29F668E72597EB836187FE404A29936793ACC6D2 paket.exe

src/.paket/paket.bootstrapper.exe

@@ -136,7 +136,7 @@ Task("CreateRelease")
 
     GitReleaseManagerCreate(username, token, "MahApps", "MahApps.Metro", new GitReleaseManagerCreateSettings {
         Milestone         = gitVersion.MajorMinorPatch,
-        Name              = "MahApps.Metro " + gitVersion.MajorMinorPatch,
+        Name              = gitVersion.MajorMinorPatch,
         Prerelease        = false,
         TargetCommitish   = "master",
         WorkingDirectory  = "../"

src/.paket/paket.exe

@@ -12,13 +12,13 @@ nuget NHotkey 1.2.1
 nuget NHotkey.Wpf 1.2.1
 nuget xunit ~> 1.9
 nuget xunit.extensions ~> 1.9
-nuget ControlzEx ~> 3.0
+nuget ControlzEx < 4.0
 
 group cake
 	source https://nuget.org/api/v2
 	framework: net45
 
-	nuget Cake
+	nuget Cake < 0.26
 	nuget Cake.Figlet
 	nuget Cake.Paket
 	nuget Cake.Paket.Module

src/build.cake

@@ -10,7 +10,7 @@ NUGET
     Fody (2.4.1)
     gitlink (3.1)
     JetBrains.Annotations (11.1)
-    MahApps.Metro.IconPacks (2.0)
+    MahApps.Metro.IconPacks (2.1)
     NHotkey (1.2.1)
     NHotkey.Wpf (1.2.1)
       NHotkey (>= 1.2.1)
@@ -27,7 +27,7 @@ NUGET
     Cake.Figlet (1.0)
     Cake.Paket (2.0)
     Cake.Paket.Module (2.0)
-    gitreleasemanager (0.6)
+    gitreleasemanager (0.7)
     GitVersion.CommandLine (4.0.0-beta0012)
     xunit.runner.console (2.3.1)
 
@@ -48,5 +48,5 @@ NUGET
   remote: https://www.nuget.org/api/v2
     ExposedObject (1.3)
     MaterialDesignColors (1.1.3)
-    MaterialDesignThemes (2.3.2-ci1036)
+    MaterialDesignThemes (2.4.0.1044)
       MaterialDesignColors (>= 1.1.2)

src/paket.dependencies

@@ -14,7 +14,7 @@ description
 summary
   The goal of MahApps.Metro is to allow devs to quickly and easily cobble together a "Metro" or "Modern UI" for their WPF4+ apps, with minimal effort.
 dependencies
-  ControlzEx > 3.0.2 < 4.0
+  ControlzEx >= LOCKEDVERSION < 4.0
 include-pdbs true
 files
   bin/MahApps.Metro/ReleaseNET40/MahApps.Metro.* ==> lib/net40/