Skip to content

Commit

Permalink
Bumped version to v1.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
dchaib committed Oct 14, 2013
1 parent b554962 commit 4bb8576
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
3 changes: 3 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#1.2.2
Updated ReactiveUI to v5.2.0 (v4.6.5 for Silverlight 5)

#1.2.1
Updated to Caliburn.Micro 1.5.2 and ReactiveUI 4.6.4

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ The idea is to be able to easily use Caliburn.Micro's conventions and screen ma

## What is in it?

The project contains the default screens and conductors provided by Caliburn.Micro that have been rewritten to inherit from `ReactiveObject`. The name of these classes matches their Caliburn.Micro counterpart, prefixed with Reactive.
The project contains the default screens and conductors provided by Caliburn.Micro that have been rewritten to inherit from `ReactiveObject`. The name of these classes matches their Caliburn.Micro counterpart, prefixed with Reactive.

## 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, WinRT and Silverlight 5.
It supports the latest versions of Caliburn.Micro (starting with v1.4) and ReactiveUI (starting with v4.3.0), for .Net 4.5, WinRT and Silverlight 5.

## Where can it be found?

Expand Down
4 changes: 2 additions & 2 deletions src/Caliburn.Micro.ReactiveUI/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.1.0")]
[assembly: AssemblyFileVersion("1.2.1.0")]
[assembly: AssemblyVersion("1.2.2.0")]
[assembly: AssemblyFileVersion("1.2.2.0")]
4 changes: 2 additions & 2 deletions src/Caliburn.Micro.ReactiveUI_SL/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.1")]
[assembly: AssemblyFileVersion("1.2.1")]
[assembly: AssemblyVersion("1.2.2")]
[assembly: AssemblyFileVersion("1.2.2")]
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.1.0")]
[assembly: AssemblyFileVersion("1.2.1.0")]
[assembly: AssemblyVersion("1.2.2")]
[assembly: AssemblyFileVersion("1.2.2")]

0 comments on commit 4bb8576

Please sign in to comment.