Merge branch 'release/1.1.10'

CHANGELOG.txt

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

NuGet/Stylet.Start.nuspec

@@ -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>

NuGet/Stylet.nuspec

@@ -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>

NuGet/start/content/net45/Bootstrapper.cs.pp

@@ -1,4 +1,5 @@
 using Stylet;
+using StyletIoC;
 using $rootnamespace$.Pages;
 using System;
 using System.Collections.Generic;

NuGet/start/content/net45/Pages/ShellView.xaml.pp

@@ -8,12 +8,16 @@
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance local:ShellView}"
         Title="Stylet Start Project"
-        Width="200" Height="200">
-    <Grid>
-        <TextBlock FontSize="20"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Center">
+        Width="350" Height="200">
+    <StackPanel VerticalAlignment="Center">
+        <TextBlock FontSize="30"
+                   HorizontalAlignment="Center">
             Hello Stylet!
         </TextBlock>
-    </Grid>
+        <TextBlock Margin="0,20,0,0"
+                   FontSize="20"
+                   HorizontalAlignment="Center">
+            Now delete MainWindow.xaml.
+        </TextBlock>
+    </StackPanel>
 </Window>

Stylet/Properties/AssemblyInfo.cs

@@ -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")]