From 10c1131bd82052f61ffa2a6979bb3978349f648c Mon Sep 17 00:00:00 2001 From: Antony Male Date: Tue, 22 Dec 2015 10:30:07 +0000 Subject: [PATCH 1/3] Oops, fix up Stylet.Start --- NuGet/start/content/net45/Bootstrapper.cs.pp | 1 + .../start/content/net45/Pages/ShellView.xaml.pp | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/NuGet/start/content/net45/Bootstrapper.cs.pp b/NuGet/start/content/net45/Bootstrapper.cs.pp index 341987f..4a9633b 100644 --- a/NuGet/start/content/net45/Bootstrapper.cs.pp +++ b/NuGet/start/content/net45/Bootstrapper.cs.pp @@ -1,4 +1,5 @@ using Stylet; +using StyletIoC; using $rootnamespace$.Pages; using System; using System.Collections.Generic; diff --git a/NuGet/start/content/net45/Pages/ShellView.xaml.pp b/NuGet/start/content/net45/Pages/ShellView.xaml.pp index 06af06a..61cb58f 100644 --- a/NuGet/start/content/net45/Pages/ShellView.xaml.pp +++ b/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"> - - + Width="350" Height="200"> + + Hello Stylet! - + + Now delete MainWindow.xaml. + + From 5a3c912e2ad7d7df549627ed242c9a192683be66 Mon Sep 17 00:00:00 2001 From: Antony Male Date: Tue, 22 Dec 2015 10:34:11 +0000 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 7357ea5..b534368 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,11 @@ Stylet Changelog ================ +v1.1.10 +------- + + - Fix `Stylet.Start` + v1.1.9 ------ From 3e4f4b1999237dcc9c68a6b4b65d9b76de8bee66 Mon Sep 17 00:00:00 2001 From: Antony Male Date: Tue, 22 Dec 2015 10:34:17 +0000 Subject: [PATCH 3/3] Bump version --- NuGet/Stylet.Start.nuspec | 4 ++-- NuGet/Stylet.nuspec | 2 +- Stylet/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet/Stylet.Start.nuspec b/NuGet/Stylet.Start.nuspec index 6f3e43b..4685848 100644 --- a/NuGet/Stylet.Start.nuspec +++ b/NuGet/Stylet.Start.nuspec @@ -2,7 +2,7 @@ Stylet.Start - 1.1.9 + 1.1.10 Stylet.Start Antony Male Antony Male @@ -16,7 +16,7 @@ - + diff --git a/NuGet/Stylet.nuspec b/NuGet/Stylet.nuspec index 6784e7f..d133a27 100644 --- a/NuGet/Stylet.nuspec +++ b/NuGet/Stylet.nuspec @@ -2,7 +2,7 @@ Stylet - 1.1.9 + 1.1.10 Stylet Antony Male Antony Male diff --git a/Stylet/Properties/AssemblyInfo.cs b/Stylet/Properties/AssemblyInfo.cs index 87cbffa..34eb2ba 100644 --- a/Stylet/Properties/AssemblyInfo.cs +++ b/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")]