Merge branch 'release/1.1.10' into develop

* release/1.1.10:
  Bump version
  Update changelog
This commit is contained in:
Antony Male 2016-01-06 21:21:40 +00:00
commit c3d5cbcbe4
4 changed files with 10 additions and 5 deletions

View File

@ -1,6 +1,11 @@
Stylet Changelog
================
v1.1.10
-------
- Fix `Stylet.Start`
v1.1.9
------

View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>Stylet.Start</id>
<version>1.1.9</version>
<version>1.1.10</version>
<title>Stylet.Start</title>
<authors>Antony Male</authors>
<owners>Antony Male</owners>
@ -16,7 +16,7 @@
<dependencies>
<group>
<dependency id="Stylet" version="[1.1.9]"/>
<dependency id="Stylet" version="[1.1.10]"/>
</group>
</dependencies>
</metadata>

View File

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