From 394bf47b2154918bc71c7639964ffb9d682a5b15 Mon Sep 17 00:00:00 2001
From: Nigel Sampson <nigel.sampson@compiledexperience.com>
Date: Tue, 21 Apr 2015 10:46:27 +1200
Subject: [PATCH] Rename Platform.Mobile to Platform.Core

---
 .../CM.HelloUniversal.Windows.csproj          |   3 +++
 .../CM.HelloUniversal.WindowsPhone.csproj     |   3 +++
 ...aliburn.Micro.HelloPortable.Windows.csproj |   4 +++
 ...rn.Micro.HelloPortable.WindowsPhone.csproj |   4 +++
 .../Caliburn.Micro.HelloWP71.csproj           |   3 +++
 .../Caliburn.Micro.HelloWinRT.csproj          |   3 +++
 .../Caliburn.Micro.HelloWinRT81.csproj        |   3 +++
 .../Caliburn.Micro.HelloWindowManager.csproj  |   3 +++
 .../AppBootstrapper.cs                        |   5 +++-
 ...liburn.Micro.HelloWindowManagerWP71.csproj |   4 +++
 .../MainPageViewModel.cs                      |   2 +-
 .../Caliburn.Micro.KeyBinding.csproj          |   3 +++
 .../Caliburn.Micro.SimpleMDI.csproj           |   4 +++
 .../Caliburn.Micro.WinFormsInterop.csproj     |   3 +++
 .../Hello.Forms.Droid.csproj                  |   7 +++---
 .../Hello.Forms.WinPhone.csproj               |   4 +--
 .../Hello.Forms.iOS/Hello.Forms.iOS.csproj    |   4 +--
 .../Hello.Forms/Hello.Forms.csproj            |   4 +--
 .../Hello.Xamarin.Android.csproj              |   7 +++---
 .../Hello.Xamarin.Windows.csproj              |   3 +++
 .../Hello.Xamarin.iOS.csproj                  |   4 +--
 .../Caliburn.Micro.Extensions.WP8.csproj      |   4 +--
 src/Caliburn.Micro.Platform/AssemblySource.cs |   2 +-
 src/Caliburn.Micro.Platform/Bootstrapper.cs   |   2 +-
 .../Caliburn.Micro.Platform.Android.csproj    |   4 +--
 ...oj => Caliburn.Micro.Platform.Core.csproj} |  23 ++++++++++++------
 .../Caliburn.Micro.Platform.NET45.csproj      |  10 +++-----
 .../Caliburn.Micro.Platform.WIN8.csproj       |  10 +++-----
 .../Caliburn.Micro.Platform.WIN81.csproj      |  10 +++-----
 .../Caliburn.Micro.Platform.WP8.csproj        |   4 +--
 .../Caliburn.Micro.Platform.WPA81.csproj      |  10 +++-----
 ...liburn.Micro.Platform.Xamarin.Forms.csproj |   4 +--
 .../Caliburn.Micro.Platform.iOS.csproj        |   4 +--
 src/Caliburn.Micro.Platform/Caliburn.snk      | Bin 0 -> 596 bytes
 .../ExtensionMethods.cs                       |   4 +--
 .../win8/CaliburnApplication.cs               |  16 ++++++++++++
 .../Caliburn.Micro.Tests.NET45.csproj         |   4 +++
 src/Caliburn.Micro.sln                        |   2 +-
 38 files changed, 131 insertions(+), 62 deletions(-)
 rename src/Caliburn.Micro.Platform/{Caliburn.Micro.Platform.Mobile.csproj => Caliburn.Micro.Platform.Core.csproj} (81%)
 create mode 100644 src/Caliburn.Micro.Platform/Caliburn.snk

diff --git a/samples/CM.HelloUniversal/CM.HelloUniversal/CM.HelloUniversal.Windows/CM.HelloUniversal.Windows.csproj b/samples/CM.HelloUniversal/CM.HelloUniversal/CM.HelloUniversal.Windows/CM.HelloUniversal.Windows.csproj
index 094759bb..10345a4f 100644
--- a/samples/CM.HelloUniversal/CM.HelloUniversal/CM.HelloUniversal.Windows/CM.HelloUniversal.Windows.csproj
+++ b/samples/CM.HelloUniversal/CM.HelloUniversal/CM.HelloUniversal.Windows/CM.HelloUniversal.Windows.csproj
@@ -130,6 +130,9 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\..\bin\win81\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
+    <Reference Include="Caliburn.Micro.Platform.Core">
+      <HintPath>..\..\..\..\bin\win81\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Xaml.Interactions">
       <HintPath>..\..\..\..\bin\win81\Debug\Microsoft.Xaml.Interactions.dll</HintPath>
     </Reference>
diff --git a/samples/CM.HelloUniversal/CM.HelloUniversal/CM.HelloUniversal.WindowsPhone/CM.HelloUniversal.WindowsPhone.csproj b/samples/CM.HelloUniversal/CM.HelloUniversal/CM.HelloUniversal.WindowsPhone/CM.HelloUniversal.WindowsPhone.csproj
index 2ad619a1..32461970 100644
--- a/samples/CM.HelloUniversal/CM.HelloUniversal/CM.HelloUniversal.WindowsPhone/CM.HelloUniversal.WindowsPhone.csproj
+++ b/samples/CM.HelloUniversal/CM.HelloUniversal/CM.HelloUniversal.WindowsPhone/CM.HelloUniversal.WindowsPhone.csproj
@@ -108,6 +108,9 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\..\bin\wpa81\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
+    <Reference Include="Caliburn.Micro.Platform.Core">
+      <HintPath>..\..\..\..\bin\wpa81\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Xaml.Interactions">
       <HintPath>..\..\..\..\bin\wpa81\Debug\Microsoft.Xaml.Interactions.dll</HintPath>
     </Reference>
diff --git a/samples/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable.Windows/Caliburn.Micro.HelloPortable.Windows.csproj b/samples/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable.Windows/Caliburn.Micro.HelloPortable.Windows.csproj
index acc24e7b..2b0ab545 100644
--- a/samples/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable.Windows/Caliburn.Micro.HelloPortable.Windows.csproj
+++ b/samples/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable.Windows/Caliburn.Micro.HelloPortable.Windows.csproj
@@ -134,6 +134,10 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\..\bin\win81\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
+    <Reference Include="Caliburn.Micro.Platform.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\bin\win81\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Xaml.Interactions">
       <HintPath>..\..\..\..\bin\win81\Debug\Microsoft.Xaml.Interactions.dll</HintPath>
     </Reference>
diff --git a/samples/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable.WindowsPhone/Caliburn.Micro.HelloPortable.WindowsPhone.csproj b/samples/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable.WindowsPhone/Caliburn.Micro.HelloPortable.WindowsPhone.csproj
index b72dcdeb..7114c129 100644
--- a/samples/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable.WindowsPhone/Caliburn.Micro.HelloPortable.WindowsPhone.csproj
+++ b/samples/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable/Caliburn.Micro.HelloPortable.WindowsPhone/Caliburn.Micro.HelloPortable.WindowsPhone.csproj
@@ -96,6 +96,10 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\..\bin\wpa81\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
+    <Reference Include="Caliburn.Micro.Platform.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\bin\wpa81\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Xaml.Interactions">
       <HintPath>..\..\..\..\bin\wpa81\Debug\Microsoft.Xaml.Interactions.dll</HintPath>
     </Reference>
diff --git a/samples/Caliburn.Micro.HelloWP71/Caliburn.Micro.HelloWP71/Caliburn.Micro.HelloWP71.csproj b/samples/Caliburn.Micro.HelloWP71/Caliburn.Micro.HelloWP71/Caliburn.Micro.HelloWP71.csproj
index 55713a8d..108ae9e8 100644
--- a/samples/Caliburn.Micro.HelloWP71/Caliburn.Micro.HelloWP71/Caliburn.Micro.HelloWP71.csproj
+++ b/samples/Caliburn.Micro.HelloWP71/Caliburn.Micro.HelloWP71/Caliburn.Micro.HelloWP71.csproj
@@ -110,6 +110,9 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\bin\wp8\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
+    <Reference Include="Caliburn.Micro.Platform.Core">
+      <HintPath>..\..\..\bin\wp8\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Caliburn.Micro.Platform.Mobile">
       <HintPath>..\..\..\bin\wp8\Debug\Caliburn.Micro.Platform.Mobile.dll</HintPath>
     </Reference>
diff --git a/samples/Caliburn.Micro.HelloWinRT/Caliburn.Micro.HelloWinRT/Caliburn.Micro.HelloWinRT.csproj b/samples/Caliburn.Micro.HelloWinRT/Caliburn.Micro.HelloWinRT/Caliburn.Micro.HelloWinRT.csproj
index e4f769fd..88dfea7b 100644
--- a/samples/Caliburn.Micro.HelloWinRT/Caliburn.Micro.HelloWinRT/Caliburn.Micro.HelloWinRT.csproj
+++ b/samples/Caliburn.Micro.HelloWinRT/Caliburn.Micro.HelloWinRT/Caliburn.Micro.HelloWinRT.csproj
@@ -270,6 +270,9 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\bin\win8\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
+    <Reference Include="Caliburn.Micro.Platform.Core">
+      <HintPath>..\..\..\bin\win8\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Callisto, Version=1.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Callisto.1.3.1\lib\winrt45\Callisto.dll</HintPath>
diff --git a/samples/Caliburn.Micro.HelloWinRT81/Caliburn.Micro.HelloWinRT81/Caliburn.Micro.HelloWinRT81.csproj b/samples/Caliburn.Micro.HelloWinRT81/Caliburn.Micro.HelloWinRT81/Caliburn.Micro.HelloWinRT81.csproj
index ee27973c..2f7f10cc 100644
--- a/samples/Caliburn.Micro.HelloWinRT81/Caliburn.Micro.HelloWinRT81/Caliburn.Micro.HelloWinRT81.csproj
+++ b/samples/Caliburn.Micro.HelloWinRT81/Caliburn.Micro.HelloWinRT81/Caliburn.Micro.HelloWinRT81.csproj
@@ -199,6 +199,9 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\bin\win81\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
+    <Reference Include="Caliburn.Micro.Platform.Core">
+      <HintPath>..\..\..\bin\win81\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Xaml.Interactions">
       <HintPath>..\..\..\bin\win81\Debug\Microsoft.Xaml.Interactions.dll</HintPath>
     </Reference>
diff --git a/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager.csproj b/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager.csproj
index ef399620..85307e34 100644
--- a/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager.csproj
+++ b/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager.csproj
@@ -46,6 +46,9 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\bin\net45\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
+    <Reference Include="Caliburn.Micro.Platform.Core">
+      <HintPath>..\..\..\bin\net45\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data" />
diff --git a/samples/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71/AppBootstrapper.cs b/samples/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71/AppBootstrapper.cs
index b5e77fdf..165a19ff 100644
--- a/samples/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71/AppBootstrapper.cs
+++ b/samples/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71/AppBootstrapper.cs
@@ -1,4 +1,6 @@
-namespace Caliburn.Micro.HelloWindowManagerWP71 {
+using System.Linq;
+
+namespace Caliburn.Micro.HelloWindowManagerWP71 {
     using System;
     using System.Collections.Generic;
     using System.Windows.Controls;
@@ -18,6 +20,7 @@ protected override void Configure() {
             if (!Execute.InDesignMode)
                 container.RegisterPhoneServices(RootFrame);
 
+            container.Instance<Func<MessageViewModel>>(() => new MessageViewModel());
             container.PerRequest<MainPageViewModel>();
             container.PerRequest<MessageViewModel, MessageViewModel>();
             container.PerRequest<DialogViewModel, DialogViewModel>();
diff --git a/samples/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71.csproj b/samples/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71.csproj
index dbfeaf2a..060a0ec4 100644
--- a/samples/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71.csproj
+++ b/samples/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71.csproj
@@ -110,6 +110,10 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\bin\wp8\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
+    <Reference Include="Caliburn.Micro.Platform.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\bin\wp8\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Phone.Controls, Version=8.0.0.0, Culture=neutral, PublicKeyToken=24eec0d8c86cda1e, processorArchitecture=MSIL" />
     <Reference Include="System.Windows.Interactivity, Version=3.9.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
   </ItemGroup>
diff --git a/samples/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71/MainPageViewModel.cs b/samples/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71/MainPageViewModel.cs
index e5ae2371..4b4f4696 100644
--- a/samples/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71/MainPageViewModel.cs
+++ b/samples/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71/MainPageViewModel.cs
@@ -3,7 +3,7 @@
     using System.Collections.Generic;
     using System.Windows;
 
-    public class MainPageViewModel {
+    public class MainPageViewModel : Screen {
         readonly IWindowManager windowManager;
         readonly Func<MessageViewModel> messageViewModelFactory;
 
diff --git a/samples/Caliburn.Micro.KeyBinding/Caliburn.Micro.KeyBinding/Caliburn.Micro.KeyBinding.csproj b/samples/Caliburn.Micro.KeyBinding/Caliburn.Micro.KeyBinding/Caliburn.Micro.KeyBinding.csproj
index 354612ec..1ad9e033 100644
--- a/samples/Caliburn.Micro.KeyBinding/Caliburn.Micro.KeyBinding/Caliburn.Micro.KeyBinding.csproj
+++ b/samples/Caliburn.Micro.KeyBinding/Caliburn.Micro.KeyBinding/Caliburn.Micro.KeyBinding.csproj
@@ -46,6 +46,9 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\bin\net45\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
+    <Reference Include="Caliburn.Micro.Platform.Core">
+      <HintPath>..\..\..\bin\net45\Release\Caliburn.Micro.Platform.Core.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data" />
diff --git a/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI.csproj b/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI.csproj
index 05b8539c..83819d7f 100644
--- a/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI.csproj
+++ b/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI.csproj
@@ -46,6 +46,10 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\bin\net45\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
+    <Reference Include="Caliburn.Micro.Platform.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\bin\net45\Release\Caliburn.Micro.Platform.Core.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data" />
diff --git a/samples/Caliburn.Micro.WinFormsInterop/Caliburn.Micro.WinFormsInterop/Caliburn.Micro.WinFormsInterop.csproj b/samples/Caliburn.Micro.WinFormsInterop/Caliburn.Micro.WinFormsInterop/Caliburn.Micro.WinFormsInterop.csproj
index 7b8d4651..8327bf4c 100644
--- a/samples/Caliburn.Micro.WinFormsInterop/Caliburn.Micro.WinFormsInterop/Caliburn.Micro.WinFormsInterop.csproj
+++ b/samples/Caliburn.Micro.WinFormsInterop/Caliburn.Micro.WinFormsInterop/Caliburn.Micro.WinFormsInterop.csproj
@@ -41,6 +41,9 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\bin\net45\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
+    <Reference Include="Caliburn.Micro.Platform.Core">
+      <HintPath>..\..\..\bin\net45\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
diff --git a/samples/Hello.Forms/Hello.Forms/Hello.Forms.Droid/Hello.Forms.Droid.csproj b/samples/Hello.Forms/Hello.Forms/Hello.Forms.Droid/Hello.Forms.Droid.csproj
index 15aa0cc4..a48e074c 100644
--- a/samples/Hello.Forms/Hello.Forms/Hello.Forms.Droid/Hello.Forms.Droid.csproj
+++ b/samples/Hello.Forms/Hello.Forms/Hello.Forms.Droid/Hello.Forms.Droid.csproj
@@ -49,11 +49,12 @@
     <Reference Include="Caliburn.Micro">
       <HintPath>..\..\..\..\bin\android\Debug\Caliburn.Micro.dll</HintPath>
     </Reference>
-    <Reference Include="Caliburn.Micro.Platform">
+    <Reference Include="Caliburn.Micro.Platform, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\bin\android\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Caliburn.Micro.Platform.Mobile">
-      <HintPath>..\..\..\..\bin\xamarin-forms\Debug\Caliburn.Micro.Platform.Mobile.dll</HintPath>
+    <Reference Include="Caliburn.Micro.Platform.Core">
+      <HintPath>..\..\..\..\bin\android\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
     </Reference>
     <Reference Include="Caliburn.Micro.Platform.Xamarin.Forms">
       <HintPath>..\..\..\..\bin\xamarin-forms\Debug\Caliburn.Micro.Platform.Xamarin.Forms.dll</HintPath>
diff --git a/samples/Hello.Forms/Hello.Forms/Hello.Forms.WinPhone/Hello.Forms.WinPhone.csproj b/samples/Hello.Forms/Hello.Forms/Hello.Forms.WinPhone/Hello.Forms.WinPhone.csproj
index 4417b47e..386a7f3b 100644
--- a/samples/Hello.Forms/Hello.Forms/Hello.Forms.WinPhone/Hello.Forms.WinPhone.csproj
+++ b/samples/Hello.Forms/Hello.Forms/Hello.Forms.WinPhone/Hello.Forms.WinPhone.csproj
@@ -161,8 +161,8 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\..\bin\wp8\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Caliburn.Micro.Platform.Mobile">
-      <HintPath>..\..\..\..\bin\xamarin-forms\Debug\Caliburn.Micro.Platform.Mobile.dll</HintPath>
+    <Reference Include="Caliburn.Micro.Platform.Core">
+      <HintPath>..\..\..\..\bin\wp8\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
     </Reference>
     <Reference Include="Caliburn.Micro.Platform.Xamarin.Forms">
       <HintPath>..\..\..\..\bin\xamarin-forms\Debug\Caliburn.Micro.Platform.Xamarin.Forms.dll</HintPath>
diff --git a/samples/Hello.Forms/Hello.Forms/Hello.Forms.iOS/Hello.Forms.iOS.csproj b/samples/Hello.Forms/Hello.Forms/Hello.Forms.iOS/Hello.Forms.iOS.csproj
index b14e6989..97eceaa1 100644
--- a/samples/Hello.Forms/Hello.Forms/Hello.Forms.iOS/Hello.Forms.iOS.csproj
+++ b/samples/Hello.Forms/Hello.Forms/Hello.Forms.iOS/Hello.Forms.iOS.csproj
@@ -129,8 +129,8 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\..\bin\iOS\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Caliburn.Micro.Platform.Mobile">
-      <HintPath>..\..\..\..\bin\xamarin-forms\Debug\Caliburn.Micro.Platform.Mobile.dll</HintPath>
+    <Reference Include="Caliburn.Micro.Platform.Core">
+      <HintPath>..\..\..\..\bin\iOS\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
     </Reference>
     <Reference Include="Caliburn.Micro.Platform.Xamarin.Forms">
       <HintPath>..\..\..\..\bin\xamarin-forms\Debug\Caliburn.Micro.Platform.Xamarin.Forms.dll</HintPath>
diff --git a/samples/Hello.Forms/Hello.Forms/Hello.Forms/Hello.Forms.csproj b/samples/Hello.Forms/Hello.Forms/Hello.Forms/Hello.Forms.csproj
index 78c0b028..a6d829e6 100644
--- a/samples/Hello.Forms/Hello.Forms/Hello.Forms/Hello.Forms.csproj
+++ b/samples/Hello.Forms/Hello.Forms/Hello.Forms/Hello.Forms.csproj
@@ -45,8 +45,8 @@
     <Reference Include="Caliburn.Micro">
       <HintPath>..\..\..\..\bin\xamarin-forms\Debug\Caliburn.Micro.dll</HintPath>
     </Reference>
-    <Reference Include="Caliburn.Micro.Platform.Mobile">
-      <HintPath>..\..\..\..\bin\xamarin-forms\Debug\Caliburn.Micro.Platform.Mobile.dll</HintPath>
+    <Reference Include="Caliburn.Micro.Platform.Core">
+      <HintPath>..\..\..\..\bin\portable-core\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
     </Reference>
     <Reference Include="Caliburn.Micro.Platform.Xamarin.Forms">
       <HintPath>..\..\..\..\bin\xamarin-forms\Debug\Caliburn.Micro.Platform.Xamarin.Forms.dll</HintPath>
diff --git a/samples/Hello.Xamarin/Hello.Xamarin.Android/Hello.Xamarin.Android.csproj b/samples/Hello.Xamarin/Hello.Xamarin.Android/Hello.Xamarin.Android.csproj
index 3adcd487..e6dcb19c 100644
--- a/samples/Hello.Xamarin/Hello.Xamarin.Android/Hello.Xamarin.Android.csproj
+++ b/samples/Hello.Xamarin/Hello.Xamarin.Android/Hello.Xamarin.Android.csproj
@@ -44,11 +44,12 @@
     <Reference Include="Caliburn.Micro">
       <HintPath>..\..\..\bin\android\Debug\Caliburn.Micro.dll</HintPath>
     </Reference>
-    <Reference Include="Caliburn.Micro.Platform">
+    <Reference Include="Caliburn.Micro.Platform, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\android\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Caliburn.Micro.Platform.Mobile">
-      <HintPath>..\..\..\bin\android\Debug\Caliburn.Micro.Platform.Mobile.dll</HintPath>
+    <Reference Include="Caliburn.Micro.Platform.Core">
+      <HintPath>..\..\..\bin\android\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
diff --git a/samples/Hello.Xamarin/Hello.Xamarin.Windows/Hello.Xamarin.Windows.csproj b/samples/Hello.Xamarin/Hello.Xamarin.Windows/Hello.Xamarin.Windows.csproj
index a2822593..80f56134 100644
--- a/samples/Hello.Xamarin/Hello.Xamarin.Windows/Hello.Xamarin.Windows.csproj
+++ b/samples/Hello.Xamarin/Hello.Xamarin.Windows/Hello.Xamarin.Windows.csproj
@@ -116,6 +116,9 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\bin\wpa81\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
+    <Reference Include="Caliburn.Micro.Platform.Core">
+      <HintPath>..\..\..\bin\wpa81\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <SDKReference Include="BehaviorsXamlSDKManaged, Version=12.0">
diff --git a/samples/Hello.Xamarin/Hello.Xamarin.iOS/Hello.Xamarin.iOS.csproj b/samples/Hello.Xamarin/Hello.Xamarin.iOS/Hello.Xamarin.iOS.csproj
index 987a7c66..97d751f4 100644
--- a/samples/Hello.Xamarin/Hello.Xamarin.iOS/Hello.Xamarin.iOS.csproj
+++ b/samples/Hello.Xamarin/Hello.Xamarin.iOS/Hello.Xamarin.iOS.csproj
@@ -105,8 +105,8 @@
     <Reference Include="Caliburn.Micro.Platform">
       <HintPath>..\..\..\bin\iOS\Debug\Caliburn.Micro.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Caliburn.Micro.Platform.Mobile">
-      <HintPath>..\..\..\bin\iOS\Debug\Caliburn.Micro.Platform.Mobile.dll</HintPath>
+    <Reference Include="Caliburn.Micro.Platform.Core">
+      <HintPath>..\..\..\bin\iOS\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
diff --git a/src/Caliburn.Micro.Extensions.WP71/Caliburn.Micro.Extensions.WP8.csproj b/src/Caliburn.Micro.Extensions.WP71/Caliburn.Micro.Extensions.WP8.csproj
index 64cc41d9..803e91b8 100644
--- a/src/Caliburn.Micro.Extensions.WP71/Caliburn.Micro.Extensions.WP8.csproj
+++ b/src/Caliburn.Micro.Extensions.WP71/Caliburn.Micro.Extensions.WP8.csproj
@@ -78,9 +78,9 @@
     <Compile Include="WindowManagerExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Caliburn.Micro.Platform\Caliburn.Micro.Platform.Mobile.csproj">
+    <ProjectReference Include="..\Caliburn.Micro.Platform\Caliburn.Micro.Platform.Core.csproj">
       <Project>{0ecbe3d9-aed4-419d-a6e3-c53d5ce2a02a}</Project>
-      <Name>Caliburn.Micro.Platform.Mobile</Name>
+      <Name>Caliburn.Micro.Platform.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\Caliburn.Micro.Platform\Caliburn.Micro.Platform.WP8.csproj">
       <Project>{50DAA3F0-3BAD-433A-B4B2-4A38DEF9DFAF}</Project>
diff --git a/src/Caliburn.Micro.Platform/AssemblySource.cs b/src/Caliburn.Micro.Platform/AssemblySource.cs
index d28380ef..4b9dd6fc 100644
--- a/src/Caliburn.Micro.Platform/AssemblySource.cs
+++ b/src/Caliburn.Micro.Platform/AssemblySource.cs
@@ -48,7 +48,7 @@ public static class AssemblySourceCache {
         public static Func<Assembly, IEnumerable<Type>> ExtractTypes = assembly =>
             assembly.GetExportedTypes()
                 .Where(t =>
-#if !MOBILE
+#if !CORE
                     typeof(UIElement).IsAssignableFrom(t) ||
 #endif
                     typeof(INotifyPropertyChanged).IsAssignableFrom(t));
diff --git a/src/Caliburn.Micro.Platform/Bootstrapper.cs b/src/Caliburn.Micro.Platform/Bootstrapper.cs
index 0b12cd11..249f81d7 100644
--- a/src/Caliburn.Micro.Platform/Bootstrapper.cs
+++ b/src/Caliburn.Micro.Platform/Bootstrapper.cs
@@ -38,7 +38,7 @@ public void Initialize() {
 
             PlatformProvider.Current = new XamlPlatformProvider();
 
-#if WP8
+#if WP8 || NET45
             var baseExtractTypes = AssemblySourceCache.ExtractTypes;
 
             AssemblySourceCache.ExtractTypes = assembly =>
diff --git a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.Android.csproj b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.Android.csproj
index 912fb8b3..bde1d21d 100644
--- a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.Android.csproj
+++ b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.Android.csproj
@@ -57,9 +57,9 @@
       <Project>{6d772b52-da8f-4784-971a-4bf50cb6d306}</Project>
       <Name>Caliburn.Micro</Name>
     </ProjectReference>
-    <ProjectReference Include="Caliburn.Micro.Platform.Mobile.csproj">
+    <ProjectReference Include="Caliburn.Micro.Platform.Core.csproj">
       <Project>{0ecbe3d9-aed4-419d-a6e3-c53d5ce2a02a}</Project>
-      <Name>Caliburn.Micro.Platform.Mobile</Name>
+      <Name>Caliburn.Micro.Platform.Core</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
diff --git a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.Mobile.csproj b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.Core.csproj
similarity index 81%
rename from src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.Mobile.csproj
rename to src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.Core.csproj
index f3faeff5..e53ff2fa 100644
--- a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.Mobile.csproj
+++ b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.Core.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Caliburn.Micro</RootNamespace>
-    <AssemblyName>Caliburn.Micro.Platform.Mobile</AssemblyName>
+    <AssemblyName>Caliburn.Micro.Platform.Core</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -20,20 +20,26 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\bin\portable-mobile\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MOBILE</DefineConstants>
+    <OutputPath>..\..\bin\portable-core\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;CORE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\bin\portable-mobile\Debug\Caliburn.Micro.Platform.Mobile.XML</DocumentationFile>
+    <DocumentationFile>..\..\bin\portable-mobile\Debug\Caliburn.Micro.Platform.Core.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\bin\portable-mobile\Release\</OutputPath>
-    <DefineConstants>TRACE;MOBILE</DefineConstants>
+    <OutputPath>..\..\bin\portable-core\Release\</OutputPath>
+    <DefineConstants>TRACE;CORE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\bin\portable-mobile\Release\Caliburn.Micro.Platform.Mobile.XML</DocumentationFile>
+    <DocumentationFile>..\..\bin\portable-mobile\Release\Caliburn.Micro.Platform.Core.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>Caliburn.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
@@ -51,6 +57,9 @@
     <Compile Include="StringSplitter.cs" />
     <Compile Include="TypeMappingConfiguration.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Caliburn.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.NET45.csproj b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.NET45.csproj
index 59afe15a..7d0a47a4 100644
--- a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.NET45.csproj
+++ b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.NET45.csproj
@@ -61,7 +61,6 @@
     <Compile Include="Action.cs" />
     <Compile Include="ActionExecutionContext.cs" />
     <Compile Include="ActionMessage.cs" />
-    <Compile Include="AssemblySource.cs" />
     <Compile Include="Bind.cs" />
     <Compile Include="BindingScope.cs" />
     <Compile Include="BooleanToVisibilityConverter.cs" />
@@ -69,11 +68,9 @@
     <Compile Include="ConventionManager.cs" />
     <Compile Include="DependencyPropertyHelper.cs" />
     <Compile Include="ElementConvention.cs" />
-    <Compile Include="ExtensionMethods.cs" />
     <Compile Include="IHaveParameters.cs" />
     <Compile Include="Message.cs" />
     <Compile Include="MessageBinder.cs" />
-    <Compile Include="NameTransformer.cs" />
     <Compile Include="net40\AttachedCollection.cs" />
     <Compile Include="net40\Parameter.cs" />
     <Compile Include="net40\WindowManager.cs" />
@@ -82,10 +79,7 @@
       <SubType>Code</SubType>
     </Compile>
     <AppDesigner Include="Properties\" />
-    <Compile Include="RegExHelper.cs" />
-    <Compile Include="StringSplitter.cs" />
     <Compile Include="TypeDescriptor.cs" />
-    <Compile Include="TypeMappingConfiguration.cs" />
     <Compile Include="View.cs" />
     <Compile Include="ViewLocator.cs" />
     <Compile Include="ViewModelBinder.cs" />
@@ -103,6 +97,10 @@
       <Project>{6d772b52-da8f-4784-971a-4bf50cb6d306}</Project>
       <Name>Caliburn.Micro</Name>
     </ProjectReference>
+    <ProjectReference Include="Caliburn.Micro.Platform.Core.csproj">
+      <Project>{0ecbe3d9-aed4-419d-a6e3-c53d5ce2a02a}</Project>
+      <Name>Caliburn.Micro.Platform.Core</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WIN8.csproj b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WIN8.csproj
index 2a35245d..beb185ae 100644
--- a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WIN8.csproj
+++ b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WIN8.csproj
@@ -43,28 +43,22 @@
     <Compile Include="Action.cs" />
     <Compile Include="ActionExecutionContext.cs" />
     <Compile Include="ActionMessage.cs" />
-    <Compile Include="AssemblySource.cs" />
     <Compile Include="Bind.cs" />
     <Compile Include="BindingScope.cs" />
     <Compile Include="BooleanToVisibilityConverter.cs" />
     <Compile Include="DependencyPropertyHelper.cs" />
-    <Compile Include="StringSplitter.cs" />
     <Compile Include="XamlPlatformProvider.cs" />
     <None Include="..\Caliburn.snk">
       <Link>Caliburn.snk</Link>
     </None>
     <Compile Include="ConventionManager.cs" />
     <Compile Include="ElementConvention.cs" />
-    <Compile Include="ExtensionMethods.cs" />
     <Compile Include="IHaveParameters.cs" />
     <Compile Include="Message.cs" />
     <Compile Include="MessageBinder.cs" />
-    <Compile Include="NameTransformer.cs" />
     <Compile Include="Parser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RegExHelper.cs" />
     <Compile Include="TypeDescriptor.cs" />
-    <Compile Include="TypeMappingConfiguration.cs" />
     <Compile Include="View.cs" />
     <Compile Include="ViewLocator.cs" />
     <Compile Include="ViewModelBinder.cs" />
@@ -87,6 +81,10 @@
       <Project>{6d772b52-da8f-4784-971a-4bf50cb6d306}</Project>
       <Name>Caliburn.Micro</Name>
     </ProjectReference>
+    <ProjectReference Include="Caliburn.Micro.Platform.Core.csproj">
+      <Project>{0ecbe3d9-aed4-419d-a6e3-c53d5ce2a02a}</Project>
+      <Name>Caliburn.Micro.Platform.Core</Name>
+    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
     <VisualStudioVersion>11.0</VisualStudioVersion>
diff --git a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WIN81.csproj b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WIN81.csproj
index ad384d7c..640d587f 100644
--- a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WIN81.csproj
+++ b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WIN81.csproj
@@ -46,12 +46,10 @@
     <Compile Include="Action.cs" />
     <Compile Include="ActionExecutionContext.cs" />
     <Compile Include="ActionMessage.cs" />
-    <Compile Include="AssemblySource.cs" />
     <Compile Include="Bind.cs" />
     <Compile Include="BindingScope.cs" />
     <Compile Include="BooleanToVisibilityConverter.cs" />
     <Compile Include="DependencyPropertyHelper.cs" />
-    <Compile Include="StringSplitter.cs" />
     <Compile Include="win8\AttachedCollection.81.cs" />
     <Compile Include="win8\IAttachedObject.cs" />
     <Compile Include="win8\TriggerAction.cs" />
@@ -61,16 +59,12 @@
     </None>
     <Compile Include="ConventionManager.cs" />
     <Compile Include="ElementConvention.cs" />
-    <Compile Include="ExtensionMethods.cs" />
     <Compile Include="IHaveParameters.cs" />
     <Compile Include="Message.cs" />
     <Compile Include="MessageBinder.cs" />
-    <Compile Include="NameTransformer.cs" />
     <Compile Include="Parser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RegExHelper.cs" />
     <Compile Include="TypeDescriptor.cs" />
-    <Compile Include="TypeMappingConfiguration.cs" />
     <Compile Include="View.cs" />
     <Compile Include="ViewLocator.cs" />
     <Compile Include="ViewModelBinder.cs" />
@@ -86,6 +80,10 @@
       <Project>{6d772b52-da8f-4784-971a-4bf50cb6d306}</Project>
       <Name>Caliburn.Micro</Name>
     </ProjectReference>
+    <ProjectReference Include="Caliburn.Micro.Platform.Core.csproj">
+      <Project>{0ecbe3d9-aed4-419d-a6e3-c53d5ce2a02a}</Project>
+      <Name>Caliburn.Micro.Platform.Core</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <SDKReference Include="BehaviorsXamlSDKManaged, Version=12.0">
diff --git a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WP8.csproj b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WP8.csproj
index 6e0c463d..5f747825 100644
--- a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WP8.csproj
+++ b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WP8.csproj
@@ -97,9 +97,9 @@
       <Project>{6D772B52-DA8F-4784-971A-4BF50CB6D306}</Project>
       <Name>Caliburn.Micro</Name>
     </ProjectReference>
-    <ProjectReference Include="Caliburn.Micro.Platform.Mobile.csproj">
+    <ProjectReference Include="Caliburn.Micro.Platform.Core.csproj">
       <Project>{0ecbe3d9-aed4-419d-a6e3-c53d5ce2a02a}</Project>
-      <Name>Caliburn.Micro.Platform.Mobile</Name>
+      <Name>Caliburn.Micro.Platform.Core</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WPA81.csproj b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WPA81.csproj
index 8108accb..d7f98775 100644
--- a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WPA81.csproj
+++ b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.WPA81.csproj
@@ -45,6 +45,10 @@
       <Project>{6d772b52-da8f-4784-971a-4bf50cb6d306}</Project>
       <Name>Caliburn.Micro</Name>
     </ProjectReference>
+    <ProjectReference Include="Caliburn.Micro.Platform.Core.csproj">
+      <Project>{0ecbe3d9-aed4-419d-a6e3-c53d5ce2a02a}</Project>
+      <Name>Caliburn.Micro.Platform.Core</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs">
@@ -53,24 +57,18 @@
     <Compile Include="Action.cs" />
     <Compile Include="ActionExecutionContext.cs" />
     <Compile Include="ActionMessage.cs" />
-    <Compile Include="AssemblySource.cs" />
     <Compile Include="Bind.cs" />
     <Compile Include="BindingScope.cs" />
     <Compile Include="BooleanToVisibilityConverter.cs" />
     <Compile Include="ConventionManager.cs" />
     <Compile Include="DependencyPropertyHelper.cs" />
     <Compile Include="ElementConvention.cs" />
-    <Compile Include="ExtensionMethods.cs" />
     <Compile Include="IHaveParameters.cs" />
     <Compile Include="Message.cs" />
     <Compile Include="MessageBinder.cs" />
-    <Compile Include="NameTransformer.cs" />
     <Compile Include="Parser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RegExHelper.cs" />
-    <Compile Include="StringSplitter.cs" />
     <Compile Include="TypeDescriptor.cs" />
-    <Compile Include="TypeMappingConfiguration.cs" />
     <Compile Include="View.cs" />
     <Compile Include="ViewLocator.cs" />
     <Compile Include="ViewModelBinder.cs" />
diff --git a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.Xamarin.Forms.csproj b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.Xamarin.Forms.csproj
index 83fc2197..e3f3a900 100644
--- a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.Xamarin.Forms.csproj
+++ b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.Xamarin.Forms.csproj
@@ -85,9 +85,9 @@
       <Project>{6d772b52-da8f-4784-971a-4bf50cb6d306}</Project>
       <Name>Caliburn.Micro</Name>
     </ProjectReference>
-    <ProjectReference Include="Caliburn.Micro.Platform.Mobile.csproj">
+    <ProjectReference Include="Caliburn.Micro.Platform.Core.csproj">
       <Project>{0ecbe3d9-aed4-419d-a6e3-c53d5ce2a02a}</Project>
-      <Name>Caliburn.Micro.Platform.Mobile</Name>
+      <Name>Caliburn.Micro.Platform.Core</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup />
diff --git a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.iOS.csproj b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.iOS.csproj
index 50d83f2d..88989496 100644
--- a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.iOS.csproj
+++ b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.iOS.csproj
@@ -48,9 +48,9 @@
       <Project>{6d772b52-da8f-4784-971a-4bf50cb6d306}</Project>
       <Name>Caliburn.Micro</Name>
     </ProjectReference>
-    <ProjectReference Include="Caliburn.Micro.Platform.Mobile.csproj">
+    <ProjectReference Include="Caliburn.Micro.Platform.Core.csproj">
       <Project>{0ecbe3d9-aed4-419d-a6e3-c53d5ce2a02a}</Project>
-      <Name>Caliburn.Micro.Platform.Mobile</Name>
+      <Name>Caliburn.Micro.Platform.Core</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Caliburn.Micro.Platform/Caliburn.snk b/src/Caliburn.Micro.Platform/Caliburn.snk
new file mode 100644
index 0000000000000000000000000000000000000000..fed968185df70f9137b8d47931c251580b172f54
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097{@Z~$DZ&xS=e*&S6&gc33QrwU9nsh*Z
z@}g^OZ9b|TM*+Q`Opoqn3aGI>Djn&5zvCcF%o5CD;A!i=JvTDXs<?Fm{3h?EM_jKE
zkEEUtIeUF7{<1Wka{R#=2J&1G4YJu5e^tqt@B$D1#WLIxX632sxancD_YtA1|8Bll
z$XEMXx5O6xl8kZfpyqh4$C0U%2)*<Gg<yn)qE5coMeDURI)d*?MT#SYh6^q?9(%8R
zv>@DT9ugt-;r9At;kn&SyoA(@5|H=34+lXeO>s(U`4VP%ml0V*oT1O>p?@pv$Hqu_
z1!ni#wwmir*t+}b{xAxdAIHbFFhRmuP@GpWRfz<Dv~DA*X9rirwG<=>zN6umxJ%3;
z8#vv2G<O{OB8h3Y5;T6p_EZcr)BTERajw%BWA+v`Dq{v+FDitCa7F%bSY04InbD(}
zT&>{=O0$m>X~vzD9{@+e9D?|00aotKC@pvHiLBQwuo-SpnSNpguu6Dncv_s=(b`^{
zdBY>>G^2NXX7{T|KM=z#a7ZbTvn-~B5Y(|#z!lY$W$JAk_?w?JP7;e<t(5l*j2YPi
z<LqsEm=8I12<|fb6rIrcbSZ7>AUgnDpF&~cp1bs-p#TBVj28+I2!-#vmt3((a}<9O
zHmPflQL#zxu5Olcs?X2hMo5isoUGT-BzeJ)7~aaQjE516ay;A314bf#0du#b>#=1d
iKa2hasOanLu}cP4hBzBjqh=|rWDs3(N?IKePSRA(VI186

literal 0
HcmV?d00001

diff --git a/src/Caliburn.Micro.Platform/ExtensionMethods.cs b/src/Caliburn.Micro.Platform/ExtensionMethods.cs
index 5f2e4565..717c7ada 100644
--- a/src/Caliburn.Micro.Platform/ExtensionMethods.cs
+++ b/src/Caliburn.Micro.Platform/ExtensionMethods.cs
@@ -25,14 +25,14 @@ public static string GetAssemblyName(this Assembly assembly) {
         /// <param name="inherit">Whether or not to search for inherited attributes.</param>
         /// <returns>The list of attributes found.</returns>
         public static IEnumerable<T> GetAttributes<T>(this MemberInfo member, bool inherit) {
-#if WinRT || MOBILE
+#if WinRT || CORE
             return member.GetCustomAttributes(inherit).OfType<T>();
 #else
             return Attribute.GetCustomAttributes(member, inherit).OfType<T>();
 #endif
         }
 
-#if WinRT || MOBILE
+#if WinRT || CORE
         /// <summary>
         /// Gets a collection of the public types defined in this assembly that are visible outside the assembly.
         /// </summary>
diff --git a/src/Caliburn.Micro.Platform/win8/CaliburnApplication.cs b/src/Caliburn.Micro.Platform/win8/CaliburnApplication.cs
index 5b5fa09e..6dbd5565 100644
--- a/src/Caliburn.Micro.Platform/win8/CaliburnApplication.cs
+++ b/src/Caliburn.Micro.Platform/win8/CaliburnApplication.cs
@@ -1,6 +1,7 @@
 namespace Caliburn.Micro {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
     using System.Reflection;
     using Windows.ApplicationModel;
     using Windows.UI.Xaml;
@@ -71,6 +72,21 @@ protected void Initialize() {
             isInitialized = true;
 
             PlatformProvider.Current = new XamlPlatformProvider();
+
+            var baseExtractTypes = AssemblySourceCache.ExtractTypes;
+
+            AssemblySourceCache.ExtractTypes = assembly =>
+            {
+                var baseTypes = baseExtractTypes(assembly);
+                var elementTypes = assembly.GetExportedTypes()
+                    .Where(t => typeof(UIElement).IsAssignableFrom(t));
+
+                return baseTypes.Union(elementTypes);
+            };
+
+            AssemblySource.Instance.Refresh();
+
+
             if (Execute.InDesignMode) {
                 try {
                     StartDesignTime();
diff --git a/src/Caliburn.Micro.Tests.NET45/Caliburn.Micro.Tests.NET45.csproj b/src/Caliburn.Micro.Tests.NET45/Caliburn.Micro.Tests.NET45.csproj
index 6c8c1e24..b951b222 100644
--- a/src/Caliburn.Micro.Tests.NET45/Caliburn.Micro.Tests.NET45.csproj
+++ b/src/Caliburn.Micro.Tests.NET45/Caliburn.Micro.Tests.NET45.csproj
@@ -72,6 +72,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Caliburn.Micro.Platform\Caliburn.Micro.Platform.Core.csproj">
+      <Project>{0ecbe3d9-aed4-419d-a6e3-c53d5ce2a02a}</Project>
+      <Name>Caliburn.Micro.Platform.Core</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Caliburn.Micro.Platform\Caliburn.Micro.Platform.NET45.csproj">
       <Project>{ef2c0c7d-3ffe-4884-9aac-7622fee66809}</Project>
       <Name>Caliburn.Micro.Platform.NET45</Name>
diff --git a/src/Caliburn.Micro.sln b/src/Caliburn.Micro.sln
index 422e59c8..769b62ef 100644
--- a/src/Caliburn.Micro.sln
+++ b/src/Caliburn.Micro.sln
@@ -45,7 +45,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Platform.iOS
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Platform.Xamarin.Forms", "Caliburn.Micro.Platform\Caliburn.Micro.Platform.Xamarin.Forms.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Platform.Mobile", "Caliburn.Micro.Platform\Caliburn.Micro.Platform.Mobile.csproj", "{0ECBE3D9-AED4-419D-A6E3-C53D5CE2A02A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Platform.Core", "Caliburn.Micro.Platform\Caliburn.Micro.Platform.Core.csproj", "{0ECBE3D9-AED4-419D-A6E3-C53D5CE2A02A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution