From 3df0beaa23c213918cb506a8e81ee499ff7d2a0d Mon Sep 17 00:00:00 2001 From: Antony Male Date: Wed, 9 Sep 2015 12:48:21 +0100 Subject: [PATCH 1/2] Update changelog --- CHANGELOG.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ec12e5b..bd0ec50 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,13 @@ Stylet Changelog ================ +v1.1.7 +------ + + - Fix issue where OnInitialActivate may not be invoked if Screen was deactivated before being activated + - Action s:Action to be instantiated with zero parameters + - Make Stylet more modular by removing dependency on Application.Current from WindowManager, and View.ViewManager static property + v1.1.6 ------ From 4114e1cf9227125cad8bab48e03cbded170bb765 Mon Sep 17 00:00:00 2001 From: Antony Male Date: Wed, 9 Sep 2015 12:48:29 +0100 Subject: [PATCH 2/2] Bump version --- NuGet/Stylet.nuspec | 2 +- Stylet/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet/Stylet.nuspec b/NuGet/Stylet.nuspec index bc9261f..1604c18 100644 --- a/NuGet/Stylet.nuspec +++ b/NuGet/Stylet.nuspec @@ -2,7 +2,7 @@ Stylet - 1.1.6 + 1.1.7 Stylet Antony Male Antony Male diff --git a/Stylet/Properties/AssemblyInfo.cs b/Stylet/Properties/AssemblyInfo.cs index f632170..85e5787 100644 --- a/Stylet/Properties/AssemblyInfo.cs +++ b/Stylet/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ using System.Windows.Markup; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.6.0")] -[assembly: AssemblyFileVersion("1.1.6.0")] +[assembly: AssemblyVersion("1.1.7.0")] +[assembly: AssemblyFileVersion("1.1.7.0")]