From 51de349c5c413e3aa1949833b4c9ba0cf331f19c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damien=20Cha=EF=BF=BDb?= Date: Sun, 24 Feb 2013 14:21:59 +0100 Subject: [PATCH] Bumped version to 1.2.0, updated .gitignore to ignore nupkg files, updated README.md --- .gitignore | 2 ++ README.md | 2 +- nuget/package/Caliburn.Micro.ReactiveUI.nuspec | 2 +- src/Caliburn.Micro.ReactiveUI/Properties/AssemblyInfo.cs | 4 ++-- src/Caliburn.Micro.ReactiveUI_SL/Properties/AssemblyInfo.cs | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c20e766..31be775 100644 --- a/.gitignore +++ b/.gitignore @@ -168,3 +168,5 @@ pip-log.txt # Mac crap .DS_Store + +*.nupkg diff --git a/README.md b/README.md index 084ed87..53659c9 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The project contains the default screens and conductors provided by Caliburn.Mic ## What does it support? -For now, this only supports the latest versions of Caliburn.Micro (1.4) and ReactiveUI (4.3.0), for .Net 4.5. +For now, this only supports the latest versions of Caliburn.Micro (1.4) and ReactiveUI (4.3.0), for .Net 4.5, WinRT and Silverlight 5. ## Where can it be found? diff --git a/nuget/package/Caliburn.Micro.ReactiveUI.nuspec b/nuget/package/Caliburn.Micro.ReactiveUI.nuspec index 623b009..a908c84 100644 --- a/nuget/package/Caliburn.Micro.ReactiveUI.nuspec +++ b/nuget/package/Caliburn.Micro.ReactiveUI.nuspec @@ -2,7 +2,7 @@ Caliburn.Micro.ReactiveUI - 1.2 + 1.2.0 Caliburn.Micro.ReactiveUI Damien Chaib Damien Chaib diff --git a/src/Caliburn.Micro.ReactiveUI/Properties/AssemblyInfo.cs b/src/Caliburn.Micro.ReactiveUI/Properties/AssemblyInfo.cs index ce1352d..52c5702 100644 --- a/src/Caliburn.Micro.ReactiveUI/Properties/AssemblyInfo.cs +++ b/src/Caliburn.Micro.ReactiveUI/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 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.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.2.0.0")] +[assembly: AssemblyFileVersion("1.2.0.0")] diff --git a/src/Caliburn.Micro.ReactiveUI_SL/Properties/AssemblyInfo.cs b/src/Caliburn.Micro.ReactiveUI_SL/Properties/AssemblyInfo.cs index bc840e2..f7630c6 100644 --- a/src/Caliburn.Micro.ReactiveUI_SL/Properties/AssemblyInfo.cs +++ b/src/Caliburn.Micro.ReactiveUI_SL/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.2.0")] +[assembly: AssemblyFileVersion("1.2.0")]