Rename Platform.Mobile to Platform.Core

Caliburn-Micro · Apr 21, 2015 · 394bf47 · 394bf47
1 parent b586102
commit 394bf47
Show file tree

Hide file tree

Showing 38 changed files with 131 additions and 62 deletions.
diff --git a/...lloUniversal/CM.HelloUniversal/CM.HelloUniversal.Windows/CM.HelloUniversal.Windows.csproj b/...lloUniversal/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/...al/CM.HelloUniversal/CM.HelloUniversal.WindowsPhone/CM.HelloUniversal.WindowsPhone.csproj b/...al/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/...Portable/Caliburn.Micro.HelloPortable.Windows/Caliburn.Micro.HelloPortable.Windows.csproj b/...Portable/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/...aliburn.Micro.HelloPortable.WindowsPhone/Caliburn.Micro.HelloPortable.WindowsPhone.csproj b/...aliburn.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
@@ -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
@@ -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/...aliburn.Micro.HelloWinRT81/Caliburn.Micro.HelloWinRT81/Caliburn.Micro.HelloWinRT81.csproj b/...aliburn.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/...oWindowManager/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager.csproj b/...oWindowManager/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/...urn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71/AppBootstrapper.cs b/...urn.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/...erWP71/Caliburn.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71.csproj b/...erWP71/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/...n.Micro.HelloWindowManagerWP71/Caliburn.Micro.HelloWindowManagerWP71/MainPageViewModel.cs b/...n.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
@@ -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
@@ -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/...icro.WinFormsInterop/Caliburn.Micro.WinFormsInterop/Caliburn.Micro.WinFormsInterop.csproj b/...icro.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...orm/Caliburn.Micro.Platform.Mobile.csproj → ...tform/Caliburn.Micro.Platform.Core.csproj b/...orm/Caliburn.Micro.Platform.Mobile.csproj → ...tform/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
@@ -61,19 +61,16 @@
     <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="Bootstrapper.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="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.