Merge branch 'release/1.0.5' into develop

This commit is contained in:
Antony Male 2015-01-14 12:25:06 +00:00
commit f7a7654984
3 changed files with 12 additions and 3 deletions

View File

@ -1,6 +1,15 @@
Stylet Changelog Stylet Changelog
================ ================
v1.0.5
------
- Code analysis improvements (StyleCop and ReSharper)
- Work around error when showing multiple dialogs after main window has been closed
- Actions unwrap TargetInvocationException, showing the user the actual exception and stack trace
- Accept any (reasonable) event signature for event Actions, not just RoutedEventHandler
- Bootstrapper disposes its container on exit
v1.0.4 v1.0.4
------ ------

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.0.4</version> <version>1.0.5</version>
<title>Stylet</title> <title>Stylet</title>
<authors>Antony Male</authors> <authors>Antony Male</authors>
<owners>Antony Male</owners> <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 // 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.0.4.0")] [assembly: AssemblyVersion("1.0.5.0")]
[assembly: AssemblyFileVersion("1.0.4.0")] [assembly: AssemblyFileVersion("1.0.5.0")]