From efff71c61a2bf1fc9eaa2875943418fc9e32fe66 Mon Sep 17 00:00:00 2001
From: beto rodriguez <rodriguezo.alberto@gmail.com>
Date: Tue, 15 Nov 2016 02:29:02 -0600
Subject: [PATCH] uwp build fixes, and general build clean

---
 .gitignore                         |   1 +
 Core/Core.csproj                   |  23 ++
 Core/Properties/AssemblyInfo.cs    |   4 -
 Core40/Core40.csproj               |  29 +++
 Core40/Properties/AssemblyInfo.cs  |   3 -
 Examples/Uwp/Uwp.csproj            |  87 ++++++++
 Examples/WinForms/Winforms.csproj  |  23 ++
 Examples/Wpf/Wpf.csproj            |  23 ++
 LiveCharts.sln                     | 331 +----------------------------
 UnitTests/UnitTests.csproj         |  21 ++
 UwpView/Properties/AssemblyInfo.cs |   4 +-
 UwpView/UwpView.csproj             | 121 +++++++++++
 UwpView/UwpView.nuspec             |  12 +-
 WinFormsView/WinFormsView.csproj   |  25 ++-
 WpfView/Properties/AssemblyInfo.cs |   5 +-
 WpfView/WpfView.csproj             |  23 ++
 build.cake                         |  29 +--
 17 files changed, 411 insertions(+), 353 deletions(-)

diff --git a/.gitignore b/.gitignore
index a485b6143..80e6ace4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -229,3 +229,4 @@ ModelManifest.xml
 /VirtualizedValues/Properties/AssemblyInfo.cs
 /binaries
 /binaries.zip
+/internals.txt
diff --git a/Core/Core.csproj b/Core/Core.csproj
index d4520bf73..47bb424dc 100644
--- a/Core/Core.csproj
+++ b/Core/Core.csproj
@@ -45,6 +45,29 @@
   <PropertyGroup>
     <DelaySign>false</DelaySign>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r86|AnyCPU'">
+    <OutputPath>bin\r86\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\LiveCharts.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r64|AnyCPU'">
+    <OutputPath>bin\r64\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\LiveCharts.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'arm|AnyCPU'">
+    <OutputPath>bin\arm\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
     <None Include="sign.pfx" />
diff --git a/Core/Properties/AssemblyInfo.cs b/Core/Properties/AssemblyInfo.cs
index cac6c227d..e98b48641 100644
--- a/Core/Properties/AssemblyInfo.cs
+++ b/Core/Properties/AssemblyInfo.cs
@@ -31,7 +31,3 @@
 [assembly: InternalsVisibleTo("LiveCharts.Wpf")]
 [assembly: InternalsVisibleTo("LiveCharts.Uwp")]
 [assembly: InternalsVisibleTo("LiveCharts.Geared")]
-
-[assembly: InternalsVisibleTo("LiveCharts.Wpf,PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd75e78956f97c7369ca28eb4214633471da9d13357dc192414bec59b911c99718d9d16a803e527a40a42f947bb297e9d2236d9e541937c4acfc0bc1ca8ee57114963445259b14532d56951de47e773d790110f63b04721bb853c23d9db25c45b83b45dea9aa4157aba95ad890bf69a7d2583e711c786a32817ab1937f43e7d5")]
-[assembly: InternalsVisibleTo("LiveCharts.Geared,PublicKey=0024000004800000940000000602000000240000525341310004000001000100bd2e66fab8ce9a4900047ffda57d2f525cf6313dcc9d20994c5e6b3cd8fca906ba7ccd54bea5f7bd6cb503deb81d685259e355e3a9b5c21e5bc80091f08846246371b2a71ab306655651261e910adfa61be236b77d11df23a44d48f00a0e07c689f9a2daaff16d505a1c861d9854d92ed5a8a38fb28c1343fb691462873e71a1")]
-
diff --git a/Core40/Core40.csproj b/Core40/Core40.csproj
index d8e21d4d9..65a58ccbb 100644
--- a/Core40/Core40.csproj
+++ b/Core40/Core40.csproj
@@ -31,6 +31,35 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\LiveCharts.XML</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>sign.pfx</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r86|AnyCPU'">
+    <OutputPath>bin\r86\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\LiveCharts.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r64|AnyCPU'">
+    <OutputPath>bin\r64\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\LiveCharts.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'arm|AnyCPU'">
+    <OutputPath>bin\arm\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Core40/Properties/AssemblyInfo.cs b/Core40/Properties/AssemblyInfo.cs
index b5bcdc372..266e834ca 100644
--- a/Core40/Properties/AssemblyInfo.cs
+++ b/Core40/Properties/AssemblyInfo.cs
@@ -40,6 +40,3 @@
 [assembly: InternalsVisibleTo("LiveCharts.Wpf")]
 [assembly: InternalsVisibleTo("LiveCharts.Uwp")]
 [assembly: InternalsVisibleTo("LiveCharts.Geared")]
-
-[assembly: InternalsVisibleTo("LiveCharts.Wpf,PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd75e78956f97c7369ca28eb4214633471da9d13357dc192414bec59b911c99718d9d16a803e527a40a42f947bb297e9d2236d9e541937c4acfc0bc1ca8ee57114963445259b14532d56951de47e773d790110f63b04721bb853c23d9db25c45b83b45dea9aa4157aba95ad890bf69a7d2583e711c786a32817ab1937f43e7d5")]
-[assembly: InternalsVisibleTo("LiveCharts.Geared,PublicKey=0024000004800000940000000602000000240000525341310004000001000100bd2e66fab8ce9a4900047ffda57d2f525cf6313dcc9d20994c5e6b3cd8fca906ba7ccd54bea5f7bd6cb503deb81d685259e355e3a9b5c21e5bc80091f08846246371b2a71ab306655651261e910adfa61be236b77d11df23a44d48f00a0e07c689f9a2daaff16d505a1c861d9854d92ed5a8a38fb28c1343fb691462873e71a1")]
\ No newline at end of file
diff --git a/Examples/Uwp/Uwp.csproj b/Examples/Uwp/Uwp.csproj
index ccadee50f..693cf42c3 100644
--- a/Examples/Uwp/Uwp.csproj
+++ b/Examples/Uwp/Uwp.csproj
@@ -519,6 +519,93 @@
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r86|x86'">
+    <OutputPath>bin\x86\r86\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r86|ARM'">
+    <OutputPath>bin\ARM\r86\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r86|x64'">
+    <OutputPath>bin\x64\r86\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r64|x86'">
+    <OutputPath>bin\x86\r64\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r64|ARM'">
+    <OutputPath>bin\ARM\r64\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r64|x64'">
+    <OutputPath>bin\x64\r64\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'arm|x86'">
+    <OutputPath>bin\x86\arm\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'arm|ARM'">
+    <OutputPath>bin\ARM\arm\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'arm|x64'">
+    <OutputPath>bin\x64\arm\</OutputPath>
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.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/Examples/WinForms/Winforms.csproj b/Examples/WinForms/Winforms.csproj
index 4539d60e0..2a708a721 100644
--- a/Examples/WinForms/Winforms.csproj
+++ b/Examples/WinForms/Winforms.csproj
@@ -33,6 +33,29 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r86|AnyCPU'">
+    <OutputPath>bin\r86\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r64|AnyCPU'">
+    <OutputPath>bin\r64\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'arm|AnyCPU'">
+    <OutputPath>bin\arm\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
diff --git a/Examples/Wpf/Wpf.csproj b/Examples/Wpf/Wpf.csproj
index 4d853af9f..4a2a861d1 100644
--- a/Examples/Wpf/Wpf.csproj
+++ b/Examples/Wpf/Wpf.csproj
@@ -53,6 +53,29 @@
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r86|AnyCPU'">
+    <OutputPath>bin\r86\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r64|AnyCPU'">
+    <OutputPath>bin\r64\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'arm|AnyCPU'">
+    <OutputPath>bin\arm\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/LiveCharts.sln b/LiveCharts.sln
index aeee6d426..324c2dd23 100644
--- a/LiveCharts.sln
+++ b/LiveCharts.sln
@@ -23,6 +23,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UWP", "Examples\UWP\UWP.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core40", "Core40\Core40.csproj", "{F261C3D7-6194-4625-9516-044081B06028}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2C6AC81D-9A5A-41B7-884F-F3AB1443F0F9}"
+	ProjectSection(SolutionItems) = preProject
+		internals.txt = internals.txt
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -37,22 +42,6 @@ Global
 		net45|ARM = net45|ARM
 		net45|x64 = net45|x64
 		net45|x86 = net45|x86
-		net451|Any CPU = net451|Any CPU
-		net451|ARM = net451|ARM
-		net451|x64 = net451|x64
-		net451|x86 = net451|x86
-		net452|Any CPU = net452|Any CPU
-		net452|ARM = net452|ARM
-		net452|x64 = net452|x64
-		net452|x86 = net452|x86
-		net46|Any CPU = net46|Any CPU
-		net46|ARM = net46|ARM
-		net46|x64 = net46|x64
-		net46|x86 = net46|x86
-		net461|Any CPU = net461|Any CPU
-		net461|ARM = net461|ARM
-		net461|x64 = net461|x64
-		net461|x86 = net461|x86
 		Release|Any CPU = Release|Any CPU
 		Release|ARM = Release|ARM
 		Release|x64 = Release|x64
@@ -83,38 +72,6 @@ Global
 		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net45|x64.Build.0 = Release|Any CPU
 		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net45|x86.ActiveCfg = Release|Any CPU
 		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net45|x86.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net451|Any CPU.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net451|Any CPU.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net451|ARM.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net451|ARM.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net451|x64.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net451|x64.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net451|x86.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net451|x86.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net452|Any CPU.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net452|Any CPU.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net452|ARM.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net452|ARM.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net452|x64.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net452|x64.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net452|x86.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net452|x86.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net46|Any CPU.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net46|Any CPU.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net46|ARM.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net46|ARM.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net46|x64.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net46|x64.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net46|x86.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net46|x86.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net461|Any CPU.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net461|Any CPU.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net461|ARM.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net461|ARM.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net461|x64.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net461|x64.Build.0 = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net461|x86.ActiveCfg = Release|Any CPU
-		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.net461|x86.Build.0 = Release|Any CPU
 		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D447642C-A85F-4AB0-96D9-C66CFF91AADA}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -147,38 +104,6 @@ Global
 		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net45|x64.Build.0 = net45|Any CPU
 		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net45|x86.ActiveCfg = net45|Any CPU
 		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net45|x86.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net451|Any CPU.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net451|Any CPU.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net451|ARM.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net451|ARM.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net451|x64.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net451|x64.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net451|x86.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net451|x86.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net452|Any CPU.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net452|Any CPU.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net452|ARM.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net452|ARM.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net452|x64.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net452|x64.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net452|x86.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net452|x86.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net46|Any CPU.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net46|Any CPU.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net46|ARM.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net46|ARM.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net46|x64.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net46|x64.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net46|x86.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net46|x86.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net461|Any CPU.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net461|Any CPU.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net461|ARM.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net461|ARM.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net461|x64.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net461|x64.Build.0 = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net461|x86.ActiveCfg = net45|Any CPU
-		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.net461|x86.Build.0 = net45|Any CPU
 		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4D253423-AE05-47F6-A59D-9162EC0BB1F2}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -211,38 +136,6 @@ Global
 		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net45|x64.Build.0 = Release|Any CPU
 		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net45|x86.ActiveCfg = Release|Any CPU
 		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net45|x86.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net451|Any CPU.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net451|Any CPU.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net451|ARM.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net451|ARM.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net451|x64.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net451|x64.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net451|x86.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net451|x86.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net452|Any CPU.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net452|Any CPU.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net452|ARM.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net452|ARM.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net452|x64.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net452|x64.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net452|x86.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net452|x86.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net46|Any CPU.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net46|Any CPU.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net46|ARM.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net46|ARM.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net46|x64.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net46|x64.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net46|x86.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net46|x86.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net461|Any CPU.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net461|Any CPU.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net461|ARM.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net461|ARM.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net461|x64.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net461|x64.Build.0 = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net461|x86.ActiveCfg = Release|Any CPU
-		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.net461|x86.Build.0 = Release|Any CPU
 		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -275,38 +168,6 @@ Global
 		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net45|x64.Build.0 = net45|Any CPU
 		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net45|x86.ActiveCfg = net45|Any CPU
 		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net45|x86.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net451|Any CPU.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net451|Any CPU.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net451|ARM.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net451|ARM.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net451|x64.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net451|x64.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net451|x86.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net451|x86.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net452|Any CPU.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net452|Any CPU.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net452|ARM.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net452|ARM.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net452|x64.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net452|x64.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net452|x86.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net452|x86.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net46|Any CPU.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net46|Any CPU.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net46|ARM.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net46|ARM.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net46|x64.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net46|x64.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net46|x86.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net46|x86.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net461|Any CPU.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net461|Any CPU.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net461|ARM.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net461|ARM.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net461|x64.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net461|x64.Build.0 = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net461|x86.ActiveCfg = net45|Any CPU
-		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.net461|x86.Build.0 = net45|Any CPU
 		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.Release|Any CPU.Build.0 = Release|Any CPU
 		{45E67C4F-88DF-4617-ACB1-B54C5DBF8390}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -339,38 +200,6 @@ Global
 		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net45|x64.Build.0 = Release|Any CPU
 		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net45|x86.ActiveCfg = Release|Any CPU
 		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net45|x86.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net451|Any CPU.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net451|Any CPU.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net451|ARM.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net451|ARM.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net451|x64.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net451|x64.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net451|x86.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net451|x86.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net452|Any CPU.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net452|Any CPU.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net452|ARM.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net452|ARM.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net452|x64.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net452|x64.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net452|x86.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net452|x86.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net46|Any CPU.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net46|Any CPU.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net46|ARM.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net46|ARM.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net46|x64.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net46|x64.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net46|x86.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net46|x86.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net461|Any CPU.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net461|Any CPU.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net461|ARM.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net461|ARM.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net461|x64.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net461|x64.Build.0 = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net461|x86.ActiveCfg = Release|Any CPU
-		{CA7BA22C-ECB7-4930-9981-E9B121588401}.net461|x86.Build.0 = Release|Any CPU
 		{CA7BA22C-ECB7-4930-9981-E9B121588401}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CA7BA22C-ECB7-4930-9981-E9B121588401}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CA7BA22C-ECB7-4930-9981-E9B121588401}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -403,38 +232,6 @@ Global
 		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net45|x64.Build.0 = Release|Any CPU
 		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net45|x86.ActiveCfg = Release|Any CPU
 		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net45|x86.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net451|Any CPU.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net451|Any CPU.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net451|ARM.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net451|ARM.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net451|x64.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net451|x64.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net451|x86.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net451|x86.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net452|Any CPU.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net452|Any CPU.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net452|ARM.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net452|ARM.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net452|x64.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net452|x64.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net452|x86.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net452|x86.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net46|Any CPU.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net46|Any CPU.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net46|ARM.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net46|ARM.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net46|x64.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net46|x64.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net46|x86.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net46|x86.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net461|Any CPU.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net461|Any CPU.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net461|ARM.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net461|ARM.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net461|x64.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net461|x64.Build.0 = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net461|x86.ActiveCfg = Release|Any CPU
-		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net461|x86.Build.0 = Release|Any CPU
 		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Release|Any CPU.Build.0 = Release|Any CPU
 		{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -467,38 +264,6 @@ Global
 		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net45|x64.Build.0 = Release|x64
 		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net45|x86.ActiveCfg = Release|x86
 		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net45|x86.Build.0 = Release|x86
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net451|Any CPU.ActiveCfg = Release|Any CPU
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net451|Any CPU.Build.0 = Release|Any CPU
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net451|ARM.ActiveCfg = Release|ARM
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net451|ARM.Build.0 = Release|ARM
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net451|x64.ActiveCfg = Release|x64
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net451|x64.Build.0 = Release|x64
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net451|x86.ActiveCfg = Release|x86
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net451|x86.Build.0 = Release|x86
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net452|Any CPU.ActiveCfg = Release|Any CPU
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net452|Any CPU.Build.0 = Release|Any CPU
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net452|ARM.ActiveCfg = Release|ARM
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net452|ARM.Build.0 = Release|ARM
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net452|x64.ActiveCfg = Release|x64
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net452|x64.Build.0 = Release|x64
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net452|x86.ActiveCfg = Release|x86
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net452|x86.Build.0 = Release|x86
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net46|Any CPU.ActiveCfg = Release|Any CPU
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net46|Any CPU.Build.0 = Release|Any CPU
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net46|ARM.ActiveCfg = Release|ARM
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net46|ARM.Build.0 = Release|ARM
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net46|x64.ActiveCfg = Release|x64
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net46|x64.Build.0 = Release|x64
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net46|x86.ActiveCfg = Release|x86
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net46|x86.Build.0 = Release|x86
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net461|Any CPU.ActiveCfg = Release|Any CPU
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net461|Any CPU.Build.0 = Release|Any CPU
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net461|ARM.ActiveCfg = Release|ARM
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net461|ARM.Build.0 = Release|ARM
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net461|x64.ActiveCfg = Release|x64
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net461|x64.Build.0 = Release|x64
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net461|x86.ActiveCfg = Release|x86
-		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.net461|x86.Build.0 = Release|x86
 		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9F22A3E2-CE88-41C3-8117-E9D3901BAA48}.Release|ARM.ActiveCfg = Release|ARM
@@ -510,9 +275,9 @@ Global
 		{F9637741-4358-40D8-8638-2B35AC72FA39}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{F9637741-4358-40D8-8638-2B35AC72FA39}.Debug|Any CPU.Build.0 = Debug|x86
 		{F9637741-4358-40D8-8638-2B35AC72FA39}.Debug|Any CPU.Deploy.0 = Debug|x86
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.Debug|ARM.ActiveCfg = Debug|ARM
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.Debug|ARM.Build.0 = Debug|ARM
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.Debug|ARM.Deploy.0 = Debug|ARM
+		{F9637741-4358-40D8-8638-2B35AC72FA39}.Debug|ARM.ActiveCfg = Release|ARM
+		{F9637741-4358-40D8-8638-2B35AC72FA39}.Debug|ARM.Build.0 = Release|ARM
+		{F9637741-4358-40D8-8638-2B35AC72FA39}.Debug|ARM.Deploy.0 = Release|ARM
 		{F9637741-4358-40D8-8638-2B35AC72FA39}.Debug|x64.ActiveCfg = Debug|x64
 		{F9637741-4358-40D8-8638-2B35AC72FA39}.Debug|x64.Build.0 = Debug|x64
 		{F9637741-4358-40D8-8638-2B35AC72FA39}.Debug|x64.Deploy.0 = Debug|x64
@@ -543,54 +308,6 @@ Global
 		{F9637741-4358-40D8-8638-2B35AC72FA39}.net45|x86.ActiveCfg = Release|x86
 		{F9637741-4358-40D8-8638-2B35AC72FA39}.net45|x86.Build.0 = Release|x86
 		{F9637741-4358-40D8-8638-2B35AC72FA39}.net45|x86.Deploy.0 = Release|x86
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net451|Any CPU.ActiveCfg = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net451|Any CPU.Build.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net451|Any CPU.Deploy.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net451|ARM.ActiveCfg = Release|ARM
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net451|ARM.Build.0 = Release|ARM
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net451|ARM.Deploy.0 = Release|ARM
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net451|x64.ActiveCfg = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net451|x64.Build.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net451|x64.Deploy.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net451|x86.ActiveCfg = Release|x86
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net451|x86.Build.0 = Release|x86
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net451|x86.Deploy.0 = Release|x86
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net452|Any CPU.ActiveCfg = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net452|Any CPU.Build.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net452|Any CPU.Deploy.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net452|ARM.ActiveCfg = Release|ARM
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net452|ARM.Build.0 = Release|ARM
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net452|ARM.Deploy.0 = Release|ARM
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net452|x64.ActiveCfg = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net452|x64.Build.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net452|x64.Deploy.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net452|x86.ActiveCfg = Release|x86
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net452|x86.Build.0 = Release|x86
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net452|x86.Deploy.0 = Release|x86
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net46|Any CPU.ActiveCfg = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net46|Any CPU.Build.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net46|Any CPU.Deploy.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net46|ARM.ActiveCfg = Release|ARM
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net46|ARM.Build.0 = Release|ARM
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net46|ARM.Deploy.0 = Release|ARM
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net46|x64.ActiveCfg = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net46|x64.Build.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net46|x64.Deploy.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net46|x86.ActiveCfg = Release|x86
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net46|x86.Build.0 = Release|x86
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net46|x86.Deploy.0 = Release|x86
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net461|Any CPU.ActiveCfg = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net461|Any CPU.Build.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net461|Any CPU.Deploy.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net461|ARM.ActiveCfg = Release|ARM
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net461|ARM.Build.0 = Release|ARM
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net461|ARM.Deploy.0 = Release|ARM
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net461|x64.ActiveCfg = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net461|x64.Build.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net461|x64.Deploy.0 = Release|x64
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net461|x86.ActiveCfg = Release|x86
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net461|x86.Build.0 = Release|x86
-		{F9637741-4358-40D8-8638-2B35AC72FA39}.net461|x86.Deploy.0 = Release|x86
 		{F9637741-4358-40D8-8638-2B35AC72FA39}.Release|Any CPU.ActiveCfg = Release|x86
 		{F9637741-4358-40D8-8638-2B35AC72FA39}.Release|ARM.ActiveCfg = Release|ARM
 		{F9637741-4358-40D8-8638-2B35AC72FA39}.Release|ARM.Build.0 = Release|ARM
@@ -625,38 +342,6 @@ Global
 		{F261C3D7-6194-4625-9516-044081B06028}.net45|x64.Build.0 = Release|Any CPU
 		{F261C3D7-6194-4625-9516-044081B06028}.net45|x86.ActiveCfg = Release|Any CPU
 		{F261C3D7-6194-4625-9516-044081B06028}.net45|x86.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net451|Any CPU.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net451|Any CPU.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net451|ARM.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net451|ARM.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net451|x64.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net451|x64.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net451|x86.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net451|x86.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net452|Any CPU.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net452|Any CPU.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net452|ARM.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net452|ARM.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net452|x64.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net452|x64.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net452|x86.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net452|x86.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net46|Any CPU.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net46|Any CPU.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net46|ARM.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net46|ARM.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net46|x64.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net46|x64.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net46|x86.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net46|x86.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net461|Any CPU.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net461|Any CPU.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net461|ARM.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net461|ARM.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net461|x64.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net461|x64.Build.0 = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net461|x86.ActiveCfg = Release|Any CPU
-		{F261C3D7-6194-4625-9516-044081B06028}.net461|x86.Build.0 = Release|Any CPU
 		{F261C3D7-6194-4625-9516-044081B06028}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F261C3D7-6194-4625-9516-044081B06028}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F261C3D7-6194-4625-9516-044081B06028}.Release|ARM.ActiveCfg = Release|Any CPU
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index 3b05703f1..8ba72b69d 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -34,6 +34,27 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r86|AnyCPU'">
+    <OutputPath>bin\r86\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r64|AnyCPU'">
+    <OutputPath>bin\r64\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'arm|AnyCPU'">
+    <OutputPath>bin\arm\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
diff --git a/UwpView/Properties/AssemblyInfo.cs b/UwpView/Properties/AssemblyInfo.cs
index 79718c26f..d08a8b284 100644
--- a/UwpView/Properties/AssemblyInfo.cs
+++ b/UwpView/Properties/AssemblyInfo.cs
@@ -24,6 +24,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.0")]
-[assembly: AssemblyFileVersion("0.1.0")]
+[assembly: AssemblyVersion("0.8.0")]
+[assembly: AssemblyFileVersion("0.8.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/UwpView/UwpView.csproj b/UwpView/UwpView.csproj
index 14b340c2e..4a91f5f24 100644
--- a/UwpView/UwpView.csproj
+++ b/UwpView/UwpView.csproj
@@ -108,6 +108,7 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
+    <None Include="key.pfx" />
     <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
@@ -219,6 +220,126 @@
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>key.pfx</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r86|AnyCPU'">
+    <OutputPath>bin\r86\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DocumentationFile>bin\Debug\LiveCharts.Uwp.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r86|x86'">
+    <OutputPath>bin\x86\r86\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DocumentationFile>bin\Debug\LiveCharts.Uwp.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r86|ARM'">
+    <OutputPath>bin\ARM\r86\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DocumentationFile>bin\Debug\LiveCharts.Uwp.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r86|x64'">
+    <OutputPath>bin\x64\r86\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DocumentationFile>bin\Debug\LiveCharts.Uwp.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r64|AnyCPU'">
+    <OutputPath>bin\r64\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DocumentationFile>bin\Debug\LiveCharts.Uwp.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r64|x86'">
+    <OutputPath>bin\x86\r64\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DocumentationFile>bin\Debug\LiveCharts.Uwp.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r64|ARM'">
+    <OutputPath>bin\ARM\r64\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DocumentationFile>bin\Debug\LiveCharts.Uwp.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r64|x64'">
+    <OutputPath>bin\x64\r64\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DocumentationFile>bin\Debug\LiveCharts.Uwp.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'arm|AnyCPU'">
+    <OutputPath>bin\arm\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'arm|x86'">
+    <OutputPath>bin\x86\arm\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'arm|ARM'">
+    <OutputPath>bin\ARM\arm\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'arm|x64'">
+    <OutputPath>bin\x64\arm\</OutputPath>
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.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/UwpView/UwpView.nuspec b/UwpView/UwpView.nuspec
index ba4792d1f..f1efd3c5c 100644
--- a/UwpView/UwpView.nuspec
+++ b/UwpView/UwpView.nuspec
@@ -21,8 +21,14 @@
   </metadata>
   <files>
     <file src="install.ps1" target="tools" /> 
-    <file src="bin\Release\LiveCharts.Uwp.dll" target="lib\uap10.0"/>
-    <file src="bin\Release\LiveCharts.Uwp.pdb" target="lib\uap10.0"/>
-    <file src="bin\Release\LiveCharts.Uwp.xml" target="lib\uap10.0"/>
+    <file src="bin\ARM\LiveCharts.Uwp.dll" target="runtimes\win10-arm\native"/>
+    <file src="bin\ARM\LiveCharts.Uwp.pdb" target="runtimes\win10-arm\native"/>    
+    <file src="bin\ARM\LiveCharts.Uwp.xml" target="runtimes\win10-arm\native"/>
+    <file src="bin\x64\LiveCharts.Uwp.dll" target="runtimes\win10-x64\native"/>
+    <file src="bin\x64\LiveCharts.Uwp.pdb" target="runtimes\win10-x64\native"/>    
+    <file src="bin\x64\LiveCharts.Uwp.xml" target="runtimes\win10-x64\native"/>
+    <file src="bin\x86\LiveCharts.Uwp.dll" target="runtimes\win10-x86\native"/>
+    <file src="bin\x86\LiveCharts.Uwp.pdb" target="runtimes\win10-x86\native"/>    
+    <file src="bin\x86\LiveCharts.Uwp.xml" target="runtimes\win10-x86\native"/>
   </files>
 </package>
\ No newline at end of file
diff --git a/WinFormsView/WinFormsView.csproj b/WinFormsView/WinFormsView.csproj
index 55b75c291..1d6c83ea9 100644
--- a/WinFormsView/WinFormsView.csproj
+++ b/WinFormsView/WinFormsView.csproj
@@ -22,7 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>    
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -65,6 +65,29 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>sign.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r86|AnyCPU'">
+    <OutputPath>bin\r86\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Debug\LiveCharts.WinForms.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r64|AnyCPU'">
+    <OutputPath>bin\r64\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Debug\LiveCharts.WinForms.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'arm|AnyCPU'">
+    <OutputPath>bin\arm\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
diff --git a/WpfView/Properties/AssemblyInfo.cs b/WpfView/Properties/AssemblyInfo.cs
index 5696bac70..e32de3867 100644
--- a/WpfView/Properties/AssemblyInfo.cs
+++ b/WpfView/Properties/AssemblyInfo.cs
@@ -55,7 +55,4 @@
 [assembly: AssemblyFileVersion("0.8.0")]
 
 [assembly: InternalsVisibleTo("LiveCharts.Geared")]
-[assembly: InternalsVisibleTo("LiveCharts.WinForms")]
-
-[assembly: InternalsVisibleTo("LiveCharts.Geared,PublicKey=0024000004800000940000000602000000240000525341310004000001000100bd2e66fab8ce9a4900047ffda57d2f525cf6313dcc9d20994c5e6b3cd8fca906ba7ccd54bea5f7bd6cb503deb81d685259e355e3a9b5c21e5bc80091f08846246371b2a71ab306655651261e910adfa61be236b77d11df23a44d48f00a0e07c689f9a2daaff16d505a1c861d9854d92ed5a8a38fb28c1343fb691462873e71a1")]
-[assembly: InternalsVisibleTo("LiveCharts.WinForms,PublicKey=0024000004800000940000000602000000240000525341310004000001000100350c0d66a049ff682dde73f82292f9f6fc3da862f96726095d135cbb1e37f338312b771c89616ee6d241447293585eb53522aed80ba396f196d8108beba690c5563b45a10a8202b67e0e9e01d5843871a74bf8715463550f10f3004e5a1ed8727e48afc64822c7286bd3dc6c6e1439d910d762d9d7ed65ef32ac1fd633bc35c4")]
+[assembly: InternalsVisibleTo("LiveCharts.WinForms")]
\ No newline at end of file
diff --git a/WpfView/WpfView.csproj b/WpfView/WpfView.csproj
index 3560de35e..aefab24c4 100644
--- a/WpfView/WpfView.csproj
+++ b/WpfView/WpfView.csproj
@@ -72,6 +72,29 @@
   <PropertyGroup>
     <DelaySign>false</DelaySign>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r86|AnyCPU'">
+    <OutputPath>bin\r86\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Debug\LiveCharts.Wpf.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'r64|AnyCPU'">
+    <OutputPath>bin\r64\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Debug\LiveCharts.Wpf.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'arm|AnyCPU'">
+    <OutputPath>bin\arm\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/build.cake b/build.cake
index d982b81fa..7070e0b00 100644
--- a/build.cake
+++ b/build.cake
@@ -40,8 +40,8 @@ Task("Core")
 
         if(!DirectoryExists(ouputDirectory)) CreateDirectory(ouputDirectory);
 
-        BuildProject("./Core/Core.csproj", ouputDirectory, buildType);
-        BuildProject("./Core40/Core40.csproj", ouputDirectory, buildType);
+        BuildProject("./Core/Core.csproj", ouputDirectory, buildType, "AnyCPU");
+        BuildProject("./Core40/Core40.csproj", ouputDirectory, buildType, "AnyCPU");
         
         if(buildType == "Release") NugetPack("./Core/Core.nuspec", "./Core/bin/Release/LiveCharts.dll");
 
@@ -64,7 +64,7 @@ Task("WPF")
             {
                 CreateDirectory(buildDirectories[r]);
             }
-            BuildProject(wpfPath, buildDirectories[r], configurationList[r]);
+            BuildProject(wpfPath, buildDirectories[r], configurationList[r], "AnyCPU");
         }
 
         if(buildType == "Release")
@@ -78,11 +78,14 @@ Task("UWP")
     .Does(() =>
     {
         Information("-- UWP - " + buildType.ToUpper() + " --");
-        var ouputDirectory = "./bin/" + buildType;
 
-        if(!DirectoryExists(ouputDirectory)) CreateDirectory(ouputDirectory);
+        if(!DirectoryExists("./bin/Arm")) CreateDirectory("./bin/Arm");
+        if(!DirectoryExists("./bin/x64")) CreateDirectory("./bin/x64");
+        if(!DirectoryExists("./bin/x86")) CreateDirectory("./bin/x86");
         
-        BuildProject("./UwpView/UwpView.csproj", ouputDirectory, buildType);
+        BuildProject("./UwpView/UwpView.csproj", "./bin/Arm", buildType, "ARM");
+        BuildProject("./UwpView/UwpView.csproj", "./bin/x64", buildType, "x64");
+        BuildProject("./UwpView/UwpView.csproj", "./bin/x86", buildType, "x86");
 
         if(buildType == "Release") NugetPack("./UwpView/UwpView.nuspec", "./UwpView/bin/Release/LiveCharts.Uwp.dll");
 
@@ -104,7 +107,7 @@ Task("WinForms")
             {
                 CreateDirectory(buildDirectories[r]);
             }
-            BuildProject(formsPath, buildDirectories[r], configurationList[r]);
+            BuildProject(formsPath, buildDirectories[r], configurationList[r], "AnyCPU");
         }
 
         if(buildType == "Release")
@@ -127,18 +130,18 @@ RunTarget (target);
 //Helper Methods
 
 //Build a project
-public void BuildProject(string path, string outputPath, string configuration)
+public void BuildProject(string path, string outputPath, string configuration, string platform)
 {
     Information("Building " + path);
     try
     {
         DotNetBuild(path, settings =>
         settings.SetConfiguration(configuration)
-        .WithProperty("Platform", "AnyCPU")
-        .WithTarget("Clean,Build")
-        .WithProperty("OutputPath", outputPath)
-        .SetVerbosity(Cake.Core.Diagnostics.Verbosity.Minimal)
-        );
+            .WithProperty("Platform", platform)
+            .WithTarget("Clean,Build")
+            .WithProperty("OutputPath", outputPath)
+            .SetVerbosity(Cake.Core.Diagnostics.Verbosity.Minimal
+        ));
     }
     catch(Exception ex)
     {