vcaraulean · SkyKnight · Aug 13, 2014
diff --git a/Silverlight/Caliburn.Micro.Telerik/Caliburn.Micro.Telerik.csproj b/Silverlight/Caliburn.Micro.Telerik/Caliburn.Micro.Telerik.csproj
@@ -47,9 +47,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Caliburn.Micro, Version=1.5.2.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
+    <Reference Include="Caliburn.Micro, Version=2.0.0.6, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Caliburn.Micro.1.5.2\lib\sl5\Caliburn.Micro.dll</HintPath>
+      <HintPath>..\..\packages\Caliburn.Micro.Core.2.0.0\lib\sl5\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="Caliburn.Micro.Platform">
+      <HintPath>..\..\packages\Caliburn.Micro.2.0.0\lib\sl5\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -69,7 +72,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Windows.Controls, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Windows.Interactivity, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Caliburn.Micro.1.5.2\lib\sl5\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\..\packages\Caliburn.Micro.2.0.0\lib\sl5\System.Windows.Interactivity.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Net" />

diff --git a/Silverlight/Caliburn.Micro.Telerik/TelerikConventions.cs b/Silverlight/Caliburn.Micro.Telerik/TelerikConventions.cs
@@ -46,7 +46,7 @@ public static void Install()
 
 			ConventionManager.AddElementConvention<RadMenuItem>(RadMenuItem.ItemsSourceProperty, "DataContext", "Click");
 			ConventionManager.AddElementConvention<RadBusyIndicator>(RadBusyIndicator.IsBusyProperty, "IsBusy", "Loaded");
-			ConventionManager.AddElementConvention<RadMaskedTextBox>(RadMaskedTextBox.MaskedTextProperty, "MaskedText",
+            ConventionManager.AddElementConvention<RadMaskedTextInput>(RadMaskedTextInput.ValueProperty, "Value",
 			                                                         "ValueChanged");
 			ConventionManager.AddElementConvention<RadMaskedTextInput>(RadMaskedTextInput.ValueProperty, "Value", "ValueChanged");
 			ConventionManager.AddElementConvention<RadMaskedCurrencyInput>(RadMaskedCurrencyInput.ValueProperty, "Value", "ValueChanged");

diff --git a/Silverlight/Caliburn.Micro.Telerik/packages.config b/Silverlight/Caliburn.Micro.Telerik/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Caliburn.Micro" version="1.5.2" targetFramework="sl50" />
+  <package id="Caliburn.Micro" version="2.0.0" targetFramework="sl50" />
+  <package id="Caliburn.Micro.Core" version="2.0.0" targetFramework="sl50" />
 </packages>
diff --git a/packages/Caliburn.Micro.2.0.0/Caliburn.Micro.2.0.0.nupkg b/packages/Caliburn.Micro.2.0.0/Caliburn.Micro.2.0.0.nupkg
diff --git a/packages/Caliburn.Micro.2.0.0/lib/net40/Caliburn.Micro.Platform.dll b/packages/Caliburn.Micro.2.0.0/lib/net40/Caliburn.Micro.Platform.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/net40/Caliburn.Micro.Platform.xml b/packages/Caliburn.Micro.2.0.0/lib/net40/Caliburn.Micro.Platform.xml
diff --git a/packages/Caliburn.Micro.2.0.0/lib/net40/System.Windows.Interactivity.dll b/packages/Caliburn.Micro.2.0.0/lib/net40/System.Windows.Interactivity.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/net40/System.Windows.Interactivity.xml b/packages/Caliburn.Micro.2.0.0/lib/net40/System.Windows.Interactivity.xml
diff --git a/packages/Caliburn.Micro.2.0.0/lib/net45/Caliburn.Micro.Platform.dll b/packages/Caliburn.Micro.2.0.0/lib/net45/Caliburn.Micro.Platform.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/net45/Caliburn.Micro.Platform.xml b/packages/Caliburn.Micro.2.0.0/lib/net45/Caliburn.Micro.Platform.xml
diff --git a/packages/Caliburn.Micro.2.0.0/lib/net45/System.Windows.Interactivity.dll b/packages/Caliburn.Micro.2.0.0/lib/net45/System.Windows.Interactivity.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/net45/System.Windows.Interactivity.xml b/packages/Caliburn.Micro.2.0.0/lib/net45/System.Windows.Interactivity.xml
diff --git a/packages/Caliburn.Micro.2.0.0/lib/sl5/Caliburn.Micro.Platform.dll b/packages/Caliburn.Micro.2.0.0/lib/sl5/Caliburn.Micro.Platform.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/sl5/Caliburn.Micro.Platform.xml b/packages/Caliburn.Micro.2.0.0/lib/sl5/Caliburn.Micro.Platform.xml
diff --git a/packages/Caliburn.Micro.2.0.0/lib/sl5/System.Windows.Interactivity.dll b/packages/Caliburn.Micro.2.0.0/lib/sl5/System.Windows.Interactivity.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/sl5/System.Windows.Interactivity.xml b/packages/Caliburn.Micro.2.0.0/lib/sl5/System.Windows.Interactivity.xml
diff --git a/packages/Caliburn.Micro.2.0.0/lib/win8/Caliburn.Micro.Extensions.dll b/packages/Caliburn.Micro.2.0.0/lib/win8/Caliburn.Micro.Extensions.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/win8/Caliburn.Micro.Extensions.pri b/packages/Caliburn.Micro.2.0.0/lib/win8/Caliburn.Micro.Extensions.pri
diff --git a/packages/Caliburn.Micro.2.0.0/lib/win8/Caliburn.Micro.Extensions.xml b/packages/Caliburn.Micro.2.0.0/lib/win8/Caliburn.Micro.Extensions.xml
diff --git a/packages/Caliburn.Micro.2.0.0/lib/win8/Caliburn.Micro.Platform.dll b/packages/Caliburn.Micro.2.0.0/lib/win8/Caliburn.Micro.Platform.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/win8/Caliburn.Micro.Platform.pri b/packages/Caliburn.Micro.2.0.0/lib/win8/Caliburn.Micro.Platform.pri
diff --git a/packages/Caliburn.Micro.2.0.0/lib/win8/Caliburn.Micro.Platform.xml b/packages/Caliburn.Micro.2.0.0/lib/win8/Caliburn.Micro.Platform.xml
diff --git a/packages/Caliburn.Micro.2.0.0/lib/win81/Caliburn.Micro.Extensions.XML b/packages/Caliburn.Micro.2.0.0/lib/win81/Caliburn.Micro.Extensions.XML
diff --git a/packages/Caliburn.Micro.2.0.0/lib/win81/Caliburn.Micro.Extensions.dll b/packages/Caliburn.Micro.2.0.0/lib/win81/Caliburn.Micro.Extensions.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/win81/Caliburn.Micro.Extensions.pri b/packages/Caliburn.Micro.2.0.0/lib/win81/Caliburn.Micro.Extensions.pri
diff --git a/packages/Caliburn.Micro.2.0.0/lib/win81/Caliburn.Micro.Platform.XML b/packages/Caliburn.Micro.2.0.0/lib/win81/Caliburn.Micro.Platform.XML
diff --git a/packages/Caliburn.Micro.2.0.0/lib/win81/Caliburn.Micro.Platform.dll b/packages/Caliburn.Micro.2.0.0/lib/win81/Caliburn.Micro.Platform.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/win81/Caliburn.Micro.Platform.pri b/packages/Caliburn.Micro.2.0.0/lib/win81/Caliburn.Micro.Platform.pri
diff --git a/packages/Caliburn.Micro.2.0.0/lib/win81/Microsoft.Xaml.Interactions.dll b/packages/Caliburn.Micro.2.0.0/lib/win81/Microsoft.Xaml.Interactions.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/win81/Microsoft.Xaml.Interactivity.dll b/packages/Caliburn.Micro.2.0.0/lib/win81/Microsoft.Xaml.Interactivity.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/wp8/Caliburn.Micro.Extensions.dll b/packages/Caliburn.Micro.2.0.0/lib/wp8/Caliburn.Micro.Extensions.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/wp8/Caliburn.Micro.Extensions.xml b/packages/Caliburn.Micro.2.0.0/lib/wp8/Caliburn.Micro.Extensions.xml
diff --git a/packages/Caliburn.Micro.2.0.0/lib/wp8/Caliburn.Micro.Platform.dll b/packages/Caliburn.Micro.2.0.0/lib/wp8/Caliburn.Micro.Platform.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/wp8/Caliburn.Micro.Platform.xml b/packages/Caliburn.Micro.2.0.0/lib/wp8/Caliburn.Micro.Platform.xml
diff --git a/packages/Caliburn.Micro.2.0.0/lib/wp8/System.Windows.Interactivity.dll b/packages/Caliburn.Micro.2.0.0/lib/wp8/System.Windows.Interactivity.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/wp8/System.Windows.Interactivity.xml b/packages/Caliburn.Micro.2.0.0/lib/wp8/System.Windows.Interactivity.xml
diff --git a/packages/Caliburn.Micro.2.0.0/lib/wpa81/Caliburn.Micro.Extensions.dll b/packages/Caliburn.Micro.2.0.0/lib/wpa81/Caliburn.Micro.Extensions.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/wpa81/Caliburn.Micro.Extensions.pri b/packages/Caliburn.Micro.2.0.0/lib/wpa81/Caliburn.Micro.Extensions.pri
diff --git a/packages/Caliburn.Micro.2.0.0/lib/wpa81/Caliburn.Micro.Platform.dll b/packages/Caliburn.Micro.2.0.0/lib/wpa81/Caliburn.Micro.Platform.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/wpa81/Caliburn.Micro.Platform.pri b/packages/Caliburn.Micro.2.0.0/lib/wpa81/Caliburn.Micro.Platform.pri
diff --git a/packages/Caliburn.Micro.2.0.0/lib/wpa81/Caliburn.Micro.Platform.xml b/packages/Caliburn.Micro.2.0.0/lib/wpa81/Caliburn.Micro.Platform.xml
diff --git a/packages/Caliburn.Micro.2.0.0/lib/wpa81/Microsoft.Xaml.Interactions.dll b/packages/Caliburn.Micro.2.0.0/lib/wpa81/Microsoft.Xaml.Interactions.dll
diff --git a/packages/Caliburn.Micro.2.0.0/lib/wpa81/Microsoft.Xaml.Interactivity.dll b/packages/Caliburn.Micro.2.0.0/lib/wpa81/Microsoft.Xaml.Interactivity.dll
diff --git a/packages/Caliburn.Micro.Core.2.0.0/Caliburn.Micro.Core.2.0.0.nupkg b/packages/Caliburn.Micro.Core.2.0.0/Caliburn.Micro.Core.2.0.0.nupkg