From 11f2315f685dbd936b44080e8e4218a507135670 Mon Sep 17 00:00:00 2001
From: ycastonguay <ycastonguay@mp4m.org>
Date: Wed, 18 Sep 2013 00:06:17 -0400
Subject: [PATCH] WindowsPhone: Project now building correct for ARM and
 deploying to WP8 successfully. Woohoo!

Related to issue #424.
---
 MPfm/MPfm.Core/MPfm.Core.WindowsPhone.csproj  |  31 +++++
 .../Database/WinRTSQLiteGateway.cs            |  19 ++-
 .../MPfm.Library.WindowsPhone.csproj          |  31 +++++
 MPfm/MPfm.MVP/MPfm.MVP.WindowsPhone.csproj    |  42 ++++++-
 .../Presenters/SelectPlaylistPresenter.cs     |   1 -
 .../MPfm.Player.WindowsPhone.csproj           |  34 +++++-
 .../MPfm.Sound/MPfm.Sound.WindowsPhone.csproj |  30 +++++
 .../MPfm.WindowsPhone.csproj                  |  30 +++++
 MPfm/MPfm_WindowsPhone.sln                    | 109 +++++++++++++++---
 9 files changed, 297 insertions(+), 30 deletions(-)

diff --git a/MPfm/MPfm.Core/MPfm.Core.WindowsPhone.csproj b/MPfm/MPfm.Core/MPfm.Core.WindowsPhone.csproj
index 0802189b..32f9bd9f 100644
--- a/MPfm/MPfm.Core/MPfm.Core.WindowsPhone.csproj
+++ b/MPfm/MPfm.Core/MPfm.Core.WindowsPhone.csproj
@@ -82,11 +82,42 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug-ARM\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug-ARM\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|ARM'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug-ARM\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup />
   <ItemGroup>
     <Compile Include="ByteArrayQueue.cs" />
     <Compile Include="CacheStore.cs" />
     <Compile Include="Conversion.cs" />
+    <Compile Include="DatabaseFieldMap.cs" />
     <Compile Include="DatabaseFieldNameAttribute.cs" />
     <Compile Include="Normalizer.cs" />
     <Compile Include="OS.cs" />
diff --git a/MPfm/MPfm.Library/Database/WinRTSQLiteGateway.cs b/MPfm/MPfm.Library/Database/WinRTSQLiteGateway.cs
index 5eb1e6e7..252dc70d 100644
--- a/MPfm/MPfm.Library/Database/WinRTSQLiteGateway.cs
+++ b/MPfm/MPfm.Library/Database/WinRTSQLiteGateway.cs
@@ -80,11 +80,11 @@ public SQLiteConnection GenerateConnection()
         /// Returns the list of properties which have different database field names.
         /// </summary>
         /// <typeparam name="T">Object to scan (generic)</typeparam>
-        /// <returns>Dictionary of DatabaseFieldName/PropertyName</returns>
-        public Dictionary<string, string> GetMap<T>()
+        /// <returns>List of DatabaseFieldMap</returns>
+        public List<DatabaseFieldMap> GetMap<T>()
         {
             // Create map by scanning properties
-            Dictionary<string, string> dictMap = new Dictionary<string, string>();            
+            List<DatabaseFieldMap> maps = new List<DatabaseFieldMap>();
             var propertyInfos = typeof(T).GetTypeInfo().DeclaredProperties;
             foreach (PropertyInfo propertyInfo in propertyInfos)
             {
@@ -95,14 +95,11 @@ public SQLiteConnection GenerateConnection()
                     // Try to cast into attribute map
                     DatabaseFieldAttribute attrMap = attribute as DatabaseFieldAttribute;
                     if (attrMap != null)
-                    {
-                        // Add item to dictionary
-                        dictMap.Add(attrMap.DatabaseFieldName, propertyInfo.Name);
-                    }
+                        maps.Add(new DatabaseFieldMap(propertyInfo.Name, attrMap.DatabaseFieldName, attrMap.SaveToDatabase));
                 }
             }
 
-            return dictMap;
+            return maps;
         }
 
         /// <summary>
@@ -354,7 +351,7 @@ public List<T> Select<T>(string sql) where T : new()
             //DbDataReader reader = null;
             SQLiteCommand command = null;
             List<T> list = new List<T>();
-            Dictionary<string, string> dictMap = GetMap<T>();
+            var maps = GetMap<T>();
 
             return list;
 
@@ -483,7 +480,7 @@ public int Update<T>(T obj, string tableName, Dictionary<string, object> where)
         {            
             SQLiteConnection connection = null;            
             SQLiteCommand command = null;
-            Dictionary<string, string> dictMap = GetMap<T>();
+            var maps = GetMap<T>();
             StringBuilder sql = new StringBuilder();
 
             return 0;
@@ -584,7 +581,7 @@ public int Insert<T>(T obj, string tableName)
         {
             SQLiteConnection connection = null;
             SQLiteCommand command = null;
-            Dictionary<string, string> dictMap = GetMap<T>();
+            var map = GetMap<T>();
             StringBuilder sql = new StringBuilder();
 
             return 0;
diff --git a/MPfm/MPfm.Library/MPfm.Library.WindowsPhone.csproj b/MPfm/MPfm.Library/MPfm.Library.WindowsPhone.csproj
index 72499e9c..7a3f6f04 100644
--- a/MPfm/MPfm.Library/MPfm.Library.WindowsPhone.csproj
+++ b/MPfm/MPfm.Library/MPfm.Library.WindowsPhone.csproj
@@ -82,6 +82,36 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug-ARM\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug-ARM\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;WINDOWS_PHONE;USE_WP8_NATIVE_SQLITE </DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|ARM'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug-ARM\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;WINDOWS_PHONE;USE_WP8_NATIVE_SQLITE </DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Content Include="Lib\taglib-sharp.dll" />
     <EmbeddedResource Include="Scripts\1.03-1.04.sql" />
@@ -112,6 +142,7 @@
     <Compile Include="Database\DatabaseFacade.cs" />
     <Compile Include="Database\WinRTSQLiteGateway.cs" />
     <Compile Include="Objects\NetworkState.cs" />
+    <Compile Include="Objects\PlaylistAudioFile.cs" />
     <Compile Include="Objects\PlaylistFile.cs" />
     <Compile Include="Objects\History.cs" />
     <Compile Include="Objects\Setting.cs" />
diff --git a/MPfm/MPfm.MVP/MPfm.MVP.WindowsPhone.csproj b/MPfm/MPfm.MVP/MPfm.MVP.WindowsPhone.csproj
index 5bb7feb3..9896bf6a 100644
--- a/MPfm/MPfm.MVP/MPfm.MVP.WindowsPhone.csproj
+++ b/MPfm/MPfm.MVP/MPfm.MVP.WindowsPhone.csproj
@@ -82,6 +82,36 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug-ARM\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug-ARM\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|ARM'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug-ARM\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\MPfm.Core\MPfm.Core.WindowsPhone.csproj">
       <Project>{5CA0AA57-8F15-4DC2-B5C6-25692F200869}</Project>
@@ -102,11 +132,18 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Messages\ActivateLockScreenMessage.cs" />
     <Compile Include="Messages\ConnectionStatusChangedMessage.cs" />
     <Compile Include="Messages\MobileLibraryBrowserItemClickedMessage.cs" />
     <Compile Include="Messages\PlayerSetPositionMessage.cs" />
+    <Compile Include="Messages\PlaylistListUpdatedMessage.cs" />
+    <Compile Include="Messages\PlaylistUpdatedMessage.cs" />
+    <Compile Include="Models\PlaylistEntity.cs" />
     <Compile Include="Navigation\MobileNavigationManager.cs" />
+    <Compile Include="Presenters\AddNewPlaylistPresenter.cs" />
     <Compile Include="Presenters\AudioPreferencesPresenter.cs" />
+    <Compile Include="Presenters\Interfaces\IAddNewPlaylistPresenter.cs" />
+    <Compile Include="Presenters\Interfaces\ISelectPlaylistPresenter.cs" />
     <Compile Include="Presenters\MobileFirstRunPresenter.cs" />
     <Compile Include="Presenters\DesktopFirstRunPresenter.cs" />
     <Compile Include="Presenters\EditSongMetadataPresenter.cs" />
@@ -120,8 +157,10 @@
     <Compile Include="Presenters\LibraryPreferencesPresenter.cs" />
     <Compile Include="Presenters\Interfaces\ILibraryPreferencesPresenter.cs" />
     <Compile Include="Presenters\Interfaces\IAudioPreferencesPresenter.cs" />
+    <Compile Include="Presenters\SelectPlaylistPresenter.cs" />
     <Compile Include="Presenters\UpdateLibraryPresenter.cs" />
     <Compile Include="Models\PlayerPositionEntity.cs" />
+    <Compile Include="Views\IAddNewPlaylistView.cs" />
     <Compile Include="Views\IMobileFirstRunView.cs" />
     <Compile Include="Views\IDesktopFirstRunView.cs" />
     <Compile Include="Views\IEditSongMetadataView.cs" />
@@ -130,6 +169,7 @@
     <Compile Include="Views\ILibraryPreferencesView.cs" />
     <Compile Include="Views\IGeneralPreferencesView.cs" />
     <Compile Include="Views\IAudioPreferencesView.cs" />
+    <Compile Include="Views\ISelectPlaylistView.cs" />
     <Compile Include="Views\IUpdateLibraryView.cs" />
     <Compile Include="Bootstrap\Bootstrapper.cs" />
     <Compile Include="Presenters\PlayerPresenter.cs" />
@@ -239,7 +279,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="TinyIoC">
-      <HintPath>Lib\PCL\TinyIoC.dll</HintPath>
+      <HintPath>..\MPfm.Core\Lib\PCL\TinyIoC.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
diff --git a/MPfm/MPfm.MVP/Presenters/SelectPlaylistPresenter.cs b/MPfm/MPfm.MVP/Presenters/SelectPlaylistPresenter.cs
index bf4c0d2c..fab0278d 100644
--- a/MPfm/MPfm.MVP/Presenters/SelectPlaylistPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/SelectPlaylistPresenter.cs
@@ -28,7 +28,6 @@
 using MPfm.MVP.Presenters.Interfaces;
 using MPfm.MVP.Views;
 using MPfm.Sound.Playlists;
-using TagLib.Ape;
 using TinyMessenger;
 
 namespace MPfm.MVP.Presenters
diff --git a/MPfm/MPfm.Player/MPfm.Player.WindowsPhone.csproj b/MPfm/MPfm.Player/MPfm.Player.WindowsPhone.csproj
index b5a8cdfc..22646580 100644
--- a/MPfm/MPfm.Player/MPfm.Player.WindowsPhone.csproj
+++ b/MPfm/MPfm.Player/MPfm.Player.WindowsPhone.csproj
@@ -82,6 +82,36 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug-ARM\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug-ARM\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|ARM'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug-ARM\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Exceptions\PlayerCreateStreamException.cs" />
     <Compile Include="IPlayer.cs" />
@@ -92,9 +122,9 @@
     <Compile Include="Objects\EQPresetBand.cs" />
     <Compile Include="Events\PlayerPlaylistIndexChangedData.cs" />
     <Compile Include="Objects\Loop.cs" />
-    <Compile Include="Objects\Marker.cs" />    
+    <Compile Include="Objects\Marker.cs" />
     <Compile Include="Events\AudioInterruptedData.cs" />
-	<Compile Include="WinRT\Player.cs" />
+    <Compile Include="WinRT\Player.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MPfm.Core\MPfm.Core.WindowsPhone.csproj">
diff --git a/MPfm/MPfm.Sound/MPfm.Sound.WindowsPhone.csproj b/MPfm/MPfm.Sound/MPfm.Sound.WindowsPhone.csproj
index 6ad0f204..3a929e80 100644
--- a/MPfm/MPfm.Sound/MPfm.Sound.WindowsPhone.csproj
+++ b/MPfm/MPfm.Sound/MPfm.Sound.WindowsPhone.csproj
@@ -82,6 +82,36 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug-ARM\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug-ARM\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|ARM'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug-ARM\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Content Include="Lib\taglib-sharp.dll" />
     <Content Include="Lib\WindowsPhone\x86\taglib-sharp.dll" />
diff --git a/MPfm/MPfm.WindowsPhone/MPfm.WindowsPhone.csproj b/MPfm/MPfm.WindowsPhone/MPfm.WindowsPhone.csproj
index 2ac8dc58..d5a10c42 100644
--- a/MPfm/MPfm.WindowsPhone/MPfm.WindowsPhone.csproj
+++ b/MPfm/MPfm.WindowsPhone/MPfm.WindowsPhone.csproj
@@ -89,6 +89,36 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug-ARM\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug-ARM\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-ARM|ARM'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug-ARM\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
diff --git a/MPfm/MPfm_WindowsPhone.sln b/MPfm/MPfm_WindowsPhone.sln
index c7f2388c..6a941edb 100644
--- a/MPfm/MPfm_WindowsPhone.sln
+++ b/MPfm/MPfm_WindowsPhone.sln
@@ -22,6 +22,11 @@ Global
 		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|Win32 = Debug|Win32
 		Debug|x86 = Debug|x86
+		Debug-ARM|Any CPU = Debug-ARM|Any CPU
+		Debug-ARM|ARM = Debug-ARM|ARM
+		Debug-ARM|Mixed Platforms = Debug-ARM|Mixed Platforms
+		Debug-ARM|Win32 = Debug-ARM|Win32
+		Debug-ARM|x86 = Debug-ARM|x86
 		Release|Any CPU = Release|Any CPU
 		Release|ARM = Release|ARM
 		Release|Mixed Platforms = Release|Mixed Platforms
@@ -35,15 +40,30 @@ Global
 		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug|ARM.ActiveCfg = Debug|ARM
 		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug|ARM.Build.0 = Debug|ARM
 		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug|ARM.Deploy.0 = Debug|ARM
-		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug|Mixed Platforms.Deploy.0 = Debug|x86
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug|Mixed Platforms.ActiveCfg = Debug|ARM
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug|Mixed Platforms.Build.0 = Debug|ARM
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug|Mixed Platforms.Deploy.0 = Debug|ARM
 		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug|Win32.ActiveCfg = Debug|x86
 		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug|Win32.Build.0 = Debug|x86
 		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug|Win32.Deploy.0 = Debug|x86
 		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug|x86.ActiveCfg = Debug|x86
 		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug|x86.Build.0 = Debug|x86
 		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug|x86.Deploy.0 = Debug|x86
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug-ARM|Any CPU.ActiveCfg = Debug-ARM|Any CPU
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug-ARM|Any CPU.Build.0 = Debug-ARM|Any CPU
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug-ARM|Any CPU.Deploy.0 = Debug-ARM|Any CPU
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug-ARM|ARM.ActiveCfg = Debug-ARM|ARM
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug-ARM|ARM.Build.0 = Debug-ARM|ARM
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug-ARM|ARM.Deploy.0 = Debug-ARM|ARM
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug-ARM|Mixed Platforms.ActiveCfg = Debug-ARM|ARM
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug-ARM|Mixed Platforms.Build.0 = Debug-ARM|ARM
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug-ARM|Mixed Platforms.Deploy.0 = Debug-ARM|ARM
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug-ARM|Win32.ActiveCfg = Debug-ARM|x86
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug-ARM|Win32.Build.0 = Debug-ARM|x86
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug-ARM|Win32.Deploy.0 = Debug-ARM|x86
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug-ARM|x86.ActiveCfg = Debug-ARM|x86
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug-ARM|x86.Build.0 = Debug-ARM|x86
+		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Debug-ARM|x86.Deploy.0 = Debug-ARM|x86
 		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{04E03A6B-A909-40F0-BE84-86ECB9D8E7D5}.Release|Any CPU.Deploy.0 = Release|Any CPU
@@ -63,12 +83,22 @@ Global
 		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug|ARM.ActiveCfg = Debug|ARM
 		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug|ARM.Build.0 = Debug|ARM
-		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug|Mixed Platforms.ActiveCfg = Debug|ARM
+		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug|Mixed Platforms.Build.0 = Debug|ARM
 		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug|Win32.ActiveCfg = Debug|x86
 		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug|Win32.Build.0 = Debug|x86
 		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug|x86.ActiveCfg = Debug|x86
 		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug|x86.Build.0 = Debug|x86
+		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug-ARM|Any CPU.ActiveCfg = Debug-ARM|Any CPU
+		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug-ARM|Any CPU.Build.0 = Debug-ARM|Any CPU
+		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug-ARM|ARM.ActiveCfg = Debug-ARM|ARM
+		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug-ARM|ARM.Build.0 = Debug-ARM|ARM
+		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug-ARM|Mixed Platforms.ActiveCfg = Debug-ARM|ARM
+		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug-ARM|Mixed Platforms.Build.0 = Debug-ARM|ARM
+		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug-ARM|Win32.ActiveCfg = Debug-ARM|x86
+		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug-ARM|Win32.Build.0 = Debug-ARM|x86
+		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug-ARM|x86.ActiveCfg = Debug-ARM|x86
+		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Debug-ARM|x86.Build.0 = Debug-ARM|x86
 		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5CA0AA57-8F15-4DC2-B5C6-25692F200869}.Release|ARM.ActiveCfg = Release|ARM
@@ -83,12 +113,22 @@ Global
 		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug|ARM.ActiveCfg = Debug|ARM
 		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug|ARM.Build.0 = Debug|ARM
-		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug|Mixed Platforms.ActiveCfg = Debug|ARM
+		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug|Mixed Platforms.Build.0 = Debug|ARM
 		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug|Win32.ActiveCfg = Debug|x86
 		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug|Win32.Build.0 = Debug|x86
 		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug|x86.ActiveCfg = Debug|x86
 		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug|x86.Build.0 = Debug|x86
+		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug-ARM|Any CPU.ActiveCfg = Debug-ARM|Any CPU
+		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug-ARM|Any CPU.Build.0 = Debug-ARM|Any CPU
+		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug-ARM|ARM.ActiveCfg = Debug-ARM|ARM
+		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug-ARM|ARM.Build.0 = Debug-ARM|ARM
+		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug-ARM|Mixed Platforms.ActiveCfg = Debug-ARM|ARM
+		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug-ARM|Mixed Platforms.Build.0 = Debug-ARM|ARM
+		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug-ARM|Win32.ActiveCfg = Debug-ARM|x86
+		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug-ARM|Win32.Build.0 = Debug-ARM|x86
+		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug-ARM|x86.ActiveCfg = Debug-ARM|x86
+		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Debug-ARM|x86.Build.0 = Debug-ARM|x86
 		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{591A3842-87BC-467F-AA99-42749C8DBFB3}.Release|ARM.ActiveCfg = Release|ARM
@@ -103,12 +143,22 @@ Global
 		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug|ARM.ActiveCfg = Debug|ARM
 		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug|ARM.Build.0 = Debug|ARM
-		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug|Mixed Platforms.ActiveCfg = Debug|ARM
+		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug|Mixed Platforms.Build.0 = Debug|ARM
 		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug|Win32.ActiveCfg = Debug|x86
 		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug|Win32.Build.0 = Debug|x86
 		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug|x86.ActiveCfg = Debug|x86
 		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug|x86.Build.0 = Debug|x86
+		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug-ARM|Any CPU.ActiveCfg = Debug-ARM|Any CPU
+		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug-ARM|Any CPU.Build.0 = Debug-ARM|Any CPU
+		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug-ARM|ARM.ActiveCfg = Debug-ARM|ARM
+		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug-ARM|ARM.Build.0 = Debug-ARM|ARM
+		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug-ARM|Mixed Platforms.ActiveCfg = Debug-ARM|ARM
+		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug-ARM|Mixed Platforms.Build.0 = Debug-ARM|ARM
+		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug-ARM|Win32.ActiveCfg = Debug-ARM|x86
+		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug-ARM|Win32.Build.0 = Debug-ARM|x86
+		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug-ARM|x86.ActiveCfg = Debug-ARM|x86
+		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Debug-ARM|x86.Build.0 = Debug-ARM|x86
 		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4ACC27D9-C476-4BCA-B5BE-F1A067B5E317}.Release|ARM.ActiveCfg = Release|ARM
@@ -123,12 +173,22 @@ Global
 		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug|Any CPU.Build.0 = Debug|ARM
 		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug|ARM.ActiveCfg = Debug|ARM
 		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug|ARM.Build.0 = Debug|ARM
-		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug|Mixed Platforms.ActiveCfg = Debug|ARM
+		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug|Mixed Platforms.Build.0 = Debug|ARM
 		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug|Win32.ActiveCfg = Debug|x86
 		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug|Win32.Build.0 = Debug|x86
 		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug|x86.ActiveCfg = Debug|x86
 		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug|x86.Build.0 = Debug|x86
+		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug-ARM|Any CPU.ActiveCfg = Debug-ARM|Any CPU
+		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug-ARM|Any CPU.Build.0 = Debug-ARM|Any CPU
+		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug-ARM|ARM.ActiveCfg = Debug-ARM|ARM
+		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug-ARM|ARM.Build.0 = Debug-ARM|ARM
+		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug-ARM|Mixed Platforms.ActiveCfg = Debug-ARM|ARM
+		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug-ARM|Mixed Platforms.Build.0 = Debug-ARM|ARM
+		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug-ARM|Win32.ActiveCfg = Debug-ARM|x86
+		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug-ARM|Win32.Build.0 = Debug-ARM|x86
+		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug-ARM|x86.ActiveCfg = Debug-ARM|x86
+		{317F03EF-9294-47D4-A915-7ABDC647897A}.Debug-ARM|x86.Build.0 = Debug-ARM|x86
 		{317F03EF-9294-47D4-A915-7ABDC647897A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{317F03EF-9294-47D4-A915-7ABDC647897A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{317F03EF-9294-47D4-A915-7ABDC647897A}.Release|ARM.ActiveCfg = Release|ARM
@@ -142,12 +202,21 @@ Global
 		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug|ARM.ActiveCfg = Debug|ARM
 		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug|ARM.Build.0 = Debug|ARM
-		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug|Mixed Platforms.ActiveCfg = Debug|ARM
+		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug|Mixed Platforms.Build.0 = Debug|ARM
 		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug|Win32.Build.0 = Debug|Win32
 		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug|x86.ActiveCfg = Debug|Win32
 		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug|x86.Build.0 = Debug|Win32
+		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug-ARM|Any CPU.ActiveCfg = Debug-ARM|Win32
+		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug-ARM|ARM.ActiveCfg = Debug-ARM|ARM
+		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug-ARM|ARM.Build.0 = Debug-ARM|ARM
+		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug-ARM|Mixed Platforms.ActiveCfg = Debug-ARM|ARM
+		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug-ARM|Mixed Platforms.Build.0 = Debug-ARM|ARM
+		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug-ARM|Win32.ActiveCfg = Debug-ARM|Win32
+		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug-ARM|Win32.Build.0 = Debug-ARM|Win32
+		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug-ARM|x86.ActiveCfg = Debug-ARM|Win32
+		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Debug-ARM|x86.Build.0 = Debug-ARM|Win32
 		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Release|Any CPU.ActiveCfg = Release|Win32
 		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Release|ARM.ActiveCfg = Release|ARM
 		{59B35F6C-E062-4F0E-88D8-13F3F82A24F3}.Release|ARM.Build.0 = Release|ARM
@@ -161,12 +230,22 @@ Global
 		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug|ARM.ActiveCfg = Debug|ARM
 		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug|ARM.Build.0 = Debug|ARM
-		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug|Mixed Platforms.ActiveCfg = Debug|ARM
+		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug|Mixed Platforms.Build.0 = Debug|ARM
 		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug|Win32.ActiveCfg = Debug|x86
 		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug|Win32.Build.0 = Debug|x86
 		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug|x86.ActiveCfg = Debug|x86
 		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug|x86.Build.0 = Debug|x86
+		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug-ARM|Any CPU.ActiveCfg = Debug-ARM|Any CPU
+		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug-ARM|Any CPU.Build.0 = Debug-ARM|Any CPU
+		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug-ARM|ARM.ActiveCfg = Debug-ARM|ARM
+		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug-ARM|ARM.Build.0 = Debug-ARM|ARM
+		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug-ARM|Mixed Platforms.ActiveCfg = Debug-ARM|ARM
+		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug-ARM|Mixed Platforms.Build.0 = Debug-ARM|ARM
+		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug-ARM|Win32.ActiveCfg = Debug-ARM|x86
+		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug-ARM|Win32.Build.0 = Debug-ARM|x86
+		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug-ARM|x86.ActiveCfg = Debug-ARM|x86
+		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Debug-ARM|x86.Build.0 = Debug-ARM|x86
 		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FC1E0293-0863-4C96-A514-98B70C695DAC}.Release|ARM.ActiveCfg = Release|ARM