AMT-Cheif
/
Stylet
mirror of https://github.com/AMT-Cheif/Stylet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.1.7' into develop

This commit is contained in:
Antony Male 2015-09-09 12:48:49 +01:00
parent 44cff93967 4114e1cf92
commit 7f14d29696
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.txt
View File

@ -1,6 +1,13 @@
Stylet Changelog 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 v1.1.6
------ ------

2
NuGet/Stylet.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata> <metadata>
<id>Stylet</id> <id>Stylet</id>
<version>1.1.6</version> <version>1.1.7</version>
<title>Stylet</title> <title>Stylet</title>
<authors>Antony Male</authors> <authors>Antony Male</authors>
<owners>Antony Male</owners> <owners>Antony Male</owners>

4
Stylet/Properties/AssemblyInfo.cs
View File

@ -35,5 +35,5 @@ using System.Windows.Markup;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.6.0")] [assembly: AssemblyVersion("1.1.7.0")]
[assembly: AssemblyFileVersion("1.1.6.0")] [assembly: AssemblyFileVersion("1.1.7.0")]