Merge branch 'release/1.1.8' into develop

This commit is contained in:
Antony Male 2015-10-16 12:12:12 +01:00
commit a398cee39f
3 changed files with 12 additions and 3 deletions

View File

@ -1,6 +1,15 @@
Stylet Changelog
================
v1.1.8
------
- Fix bug where Actions could complain that no suitable method was found, when using `s:View.ActionTarget`
- Remove the Initial screen state. Screens are started on Deactivated
- Allow the ViewManager to be configured, including supporting Views and ViewModels in different namespaces and customizing the 'View' and 'ViewModel' suffixes
- Actions try harder to find a suitable ViewModel, in the case of things like KeyBindings and ContextMenus
- StyletIoC: Allow multiple services to be bound to the same registration (useful for having a single singleton instance used for two interfaces, for example)
v1.1.7
------

View File

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

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
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.7.0")]
[assembly: AssemblyFileVersion("1.1.7.0")]
[assembly: AssemblyVersion("1.1.8.0")]
[assembly: AssemblyFileVersion("1.1.8.0")]