AMT-Cheif
/
Stylet
mirror of https://github.com/AMT-Cheif/Stylet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.1.10'

This commit is contained in:
Antony Male 2015-12-22 10:34:24 +00:00
parent 067ab99255 3e4f4b1999
commit 1d927bbb1d
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.txt
View File

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

4
NuGet/Stylet.Start.nuspec
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.Start</id> <id>Stylet.Start</id>
<version>1.1.9</version> <version>1.1.10</version>
<title>Stylet.Start</title> <title>Stylet.Start</title>
<authors>Antony Male</authors> <authors>Antony Male</authors>
<owners>Antony Male</owners> <owners>Antony Male</owners>
@ -16,7 +16,7 @@
<dependencies> <dependencies>
<group> <group>
<dependency id="Stylet" version="[1.1.9]"/> <dependency id="Stylet" version="[1.1.10]"/>
</group> </group>
</dependencies> </dependencies>
</metadata> </metadata>

2
NuGet/Stylet.nuspec
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.1.9</version> <version>1.1.10</version>
<title>Stylet</title> <title>Stylet</title>
<authors>Antony Male</authors> <authors>Antony Male</authors>
<owners>Antony Male</owners> <owners>Antony Male</owners>

1
NuGet/start/content/net45/Bootstrapper.cs.pp
View File

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

16
NuGet/start/content/net45/Pages/ShellView.xaml.pp
View File

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

4
Stylet/Properties/AssemblyInfo.cs
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.1.9.0")] [assembly: AssemblyVersion("1.1.10.0")]
[assembly: AssemblyFileVersion("1.1.9.0")] [assembly: AssemblyFileVersion("1.1.10.0")]