Merge branch 'release/0.9.11' into develop

* release/0.9.11:
  Bump version
  Update changelog
This commit is contained in:
Antony Male 2014-07-26 18:21:58 +01:00
commit 92002326b1
3 changed files with 9 additions and 3 deletions

View File

@ -1,6 +1,12 @@
Stylet Changelog
================
v0.9.11
-------
- Add Execute.PostToUIThreadAsync
- Rename ILogger and LogManager to not conflict in projects also using NLog
v0.9.10
-------

View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>Stylet</id>
<version>0.9.10</version>
<version>0.9.11</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("0.9.10.0")]
[assembly: AssemblyFileVersion("0.9.10.0")]
[assembly: AssemblyVersion("0.9.11.0")]
[assembly: AssemblyFileVersion("0.9.11.0")]