Merge pull request #940 from moswald/uap

Bringing official UAP branch up to date with latest UWP SDK changes, and rxui7-master
reactiveui · Dec 31, 2015 · e06a712 · e06a712
2 parents 78237ef + 9a49215
commit e06a712
Show file tree

Hide file tree

Showing 190 changed files with 8,392 additions and 3,340 deletions.
diff --git a/.nuget/packages.config b/.nuget/packages.config
diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("6.4.0.1")]
-[assembly: AssemblyFileVersion("6.4.0.1")]
+[assembly: AssemblyVersion("6.90.0")]
+[assembly: AssemblyFileVersion("6.90.0")]
diff --git a/NuGet/ReactiveUI-AndroidSupport/ReactiveUI-AndroidSupport.nuspec b/NuGet/ReactiveUI-AndroidSupport/ReactiveUI-AndroidSupport.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>reactiveui-androidsupport</id>
-    <version>6.4.0.1</version>
+    <version>6.5.0</version>
     <description>ReactiveUI extensions for the Android Support Library</description>
     <authors>Paul Betts</authors>
     <projectUrl>http://www.reactiveui.net</projectUrl>
@@ -11,9 +11,10 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
 
     <dependencies>
-      <dependency id="reactiveui-core" version="[6.4.0.1]" />
-      <dependency id="Xamarin.Android.Support.v4" version="20.0.0.3" />
-      <dependency id="Xamarin.Android.Support.v7.AppCompat" version="21.0.3.0" />
+      <dependency id="reactiveui-core" version="[6.5.0]" />
+      <dependency id="Xamarin.Android.Support.v4" version="22.1.1.1" />
+      <dependency id="Xamarin.Android.Support.v7.AppCompat" version="22.1.1.1" />
+      <dependency id="Xamarin.Android.Support.v7.RecyclerView" version="22.1.1.1" />
     </dependencies>
   </metadata>
 </package>
diff --git a/NuGet/ReactiveUI-Blend/ReactiveUI-Blend.nuspec b/NuGet/ReactiveUI-Blend/ReactiveUI-Blend.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>reactiveui-blend</id>
-    <version>6.4.0.1</version>
+    <version>6.5.0</version>
     <description>Blend behaviors for ReactiveUI</description>
     <authors>Paul Betts</authors>
     <projectUrl>http://www.reactiveui.net</projectUrl>
@@ -12,18 +12,18 @@
 
     <dependencies>
       <group>
-        <dependency id="reactiveui-core" version="[6.4.0.1]" />
+        <dependency id="reactiveui-core" version="[6.5.0]" />
       </group>
       <group targetFramework="net45">
-        <dependency id="reactiveui-core" version="[6.4.0.1]" />
+        <dependency id="reactiveui-core" version="[6.5.0]" />
         <dependency id="Rx-Xaml" version="2.2.5" />
       </group>
       <group targetFramework="wp8">
-        <dependency id="reactiveui-core" version="[6.4.0.1]" />
+        <dependency id="reactiveui-core" version="[6.5.0]" />
         <dependency id="Rx-Xaml" version="2.2.5" />
       </group>
       <group targetFramework="Portable-Win81+WPA81">
-        <dependency id="reactiveui-core" version="[6.4.0.1]" />
+        <dependency id="reactiveui-core" version="[6.5.0]" />
         <dependency id="Rx-Xaml" version="2.2.5" />
       </group>
     </dependencies>

diff --git a/NuGet/ReactiveUI-Core/ReactiveUI-Core.nuspec b/NuGet/ReactiveUI-Core/ReactiveUI-Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>reactiveui-core</id>
-    <version>6.4.0.1</version>
+    <version>6.5.0</version>
     <description>An MVVM library for .NET that is deeply integrated with the Reactive Extensions</description>
     <authors>Paul Betts</authors>
     <projectUrl>http://www.reactiveui.net</projectUrl>
@@ -12,28 +12,28 @@
     <dependencies>
       <group>
         <dependency id="Rx-Main" version="2.2.5" />
-        <dependency id="Splat" version="1.6.0" />
+        <dependency id="Splat" version="[1,2)" />
       </group>
       <group targetFramework="win8">
         <dependency id="Rx-Main" version="2.2.5" />
-        <dependency id="Splat" version="1.6.0" />
+        <dependency id="Splat" version="[1,2)" />
         <dependency id="Rx-Xaml" version="2.2.5" />
         <dependency id="Rx-WinRT" version="2.2.5" />
       </group>
 	  <group targetFramework="wp8">
         <dependency id="Rx-Main" version="2.2.5" />
-        <dependency id="Splat" version="1.6.0" />
+        <dependency id="Splat" version="[1,2)" />
         <dependency id="Rx-Xaml" version="2.2.5" />
         <dependency id="Rx-WinRT" version="2.2.5" />
       </group>
 	  <group targetFramework="net45">
         <dependency id="Rx-Main" version="2.2.5" />
-        <dependency id="Splat" version="1.6.0" />
+        <dependency id="Splat" version="[1,2)" />
         <dependency id="Rx-Xaml" version="2.2.5" />
       </group>
 	  <group targetFramework="Portable-Win81+Wpa81">
         <dependency id="Rx-Main" version="2.2.5" />
-        <dependency id="Splat" version="1.6.0" />
+        <dependency id="Splat" version="[1,2)" />
         <dependency id="Rx-Xaml" version="2.2.5" />
         <dependency id="Rx-WinRT" version="2.2.5" />
       </group>	  

diff --git a/NuGet/ReactiveUI-Events/ReactiveUI-Events.nuspec b/NuGet/ReactiveUI-Events/ReactiveUI-Events.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>reactiveui-events</id>
-    <version>6.4.0.1</version>
+    <version>6.5.0</version>
     <description>ReactiveUI.Events adds Observable-based events to UI controls and other appropriate places.</description>
     <authors>Paul Betts</authors>
     <projectUrl>http://www.reactiveui.net</projectUrl>

diff --git a/...s/lib/Portable-Net45+WinRT45+WP8+MonoAndroid10+MonoTouch10/ReactiveUI.Events_XamForms.dll b/...s/lib/Portable-Net45+WinRT45+WP8+MonoAndroid10+MonoTouch10/ReactiveUI.Events_XamForms.dll
diff --git a/...b/Portable-Net45+WinRT45+WP8+MonoAndroid10+MonoTouch10/ReactiveUI.Events_XamForms.dll.mdb b/...b/Portable-Net45+WinRT45+WP8+MonoAndroid10+MonoTouch10/ReactiveUI.Events_XamForms.dll.mdb
diff --git a/...s/lib/Portable-Net45+WinRT45+WP8+MonoAndroid10+MonoTouch10/ReactiveUI.Events_XamForms.xml b/...s/lib/Portable-Net45+WinRT45+WP8+MonoAndroid10+MonoTouch10/ReactiveUI.Events_XamForms.xml
diff --git a/NuGet/ReactiveUI-Testing/ReactiveUI-Testing.nuspec b/NuGet/ReactiveUI-Testing/ReactiveUI-Testing.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>reactiveui-testing</id>
-    <version>6.4.0.1</version>
+    <version>6.5.0</version>
     <description>A library to aid in writing unit tests for ReactiveUI projects</description>
     <authors>Paul Betts</authors>
     <projectUrl>http://www.reactiveui.net</projectUrl>
@@ -11,22 +11,22 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
       <group targetFramework="net45">
-        <dependency id="reactiveui-core" version="[6.4.0.1]" />
+        <dependency id="reactiveui-core" version="[6.5.0]" />
         <dependency id="Rx-Testing" version="2.2.5" />
       </group>
       <group targetFramework="WP8">
-        <dependency id="reactiveui-core" version="[6.4.0.1]" />
+        <dependency id="reactiveui-core" version="[6.5.0]" />
         <dependency id="Rx-Testing" version="2.2.5" />
       </group>
       <group targetFramework="Win8">
-        <dependency id="reactiveui-core" version="[6.4.0.1]" />
+        <dependency id="reactiveui-core" version="[6.5.0]" />
         <dependency id="Rx-Testing" version="2.2.5" />
       </group>
       <group targetFramework="monoandroid">
-        <dependency id="reactiveui-core" version="[6.4.0.1]" />
+        <dependency id="reactiveui-core" version="[6.5.0]" />
       </group>
       <group targetFramework="monotouch">
-        <dependency id="reactiveui-core" version="[6.4.0.1]" />
+        <dependency id="reactiveui-core" version="[6.5.0]" />
       </group>
     </dependencies>
   </metadata>

diff --git a/NuGet/ReactiveUI-Winforms/ReactiveUI-Winforms.nuspec b/NuGet/ReactiveUI-Winforms/ReactiveUI-Winforms.nuspec
@@ -2,15 +2,15 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>reactiveui-winforms</id>
-    <version>6.4.0.1</version>
+    <version>6.5.0</version>
     <description>Windows Forms specific extensions to ReactiveUI</description>
     <authors>Paul Betts</authors>
     <projectUrl>http://www.reactiveui.net</projectUrl>
     <licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
     <language>en-us</language>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
-      <dependency id="reactiveui-core" version="[6.4.0.1]" />
+      <dependency id="reactiveui-core" version="[6.5.0]" />
     </dependencies>
   </metadata>
 </package>
diff --git a/NuGet/ReactiveUI-XamForms/ReactiveUI-XamForms.nuspec b/NuGet/ReactiveUI-XamForms/ReactiveUI-XamForms.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>reactiveui-xamforms</id>
-    <version>6.4.0.1</version>
+    <version>6.5.0</version>
     <description>Xamarin Forms specific extensions to ReactiveUI</description>
     <authors>Paul Betts</authors>
     <projectUrl>http://www.reactiveui.net</projectUrl>
@@ -11,8 +11,8 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
 
     <dependencies>
-      <dependency id="reactiveui-core" version="[6.4.0.1]" />
-      <dependency id="Xamarin.Forms" version="1.3.1.6296" />
+      <dependency id="reactiveui-core" version="[6.5.0]" />
+      <dependency id="Xamarin.Forms" version="1.5.0.6446" />
     </dependencies>
   </metadata>
 </package>
diff --git a/NuGet/ReactiveUI/ReactiveUI-Mobile.nuspec b/NuGet/ReactiveUI/ReactiveUI-Mobile.nuspec
@@ -2,15 +2,15 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>reactiveui-mobile</id>
-    <version>6.4.0.1</version>
+    <version>6.5.0</version>
     <description>Deprecated package that is no longer needed. You are looking for ReactiveUI-Core.</description>
     <authors>Paul Betts</authors>
     <projectUrl>http://www.reactiveui.net</projectUrl>
     <licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
     <language>en-us</language>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
-      <dependency id="reactiveui-core" version="[6.4.0.1]" />
+      <dependency id="reactiveui-core" version="[6.5.0]" />
     </dependencies>
   </metadata>
 </package>

diff --git a/NuGet/ReactiveUI/ReactiveUI-Platforms.nuspec b/NuGet/ReactiveUI/ReactiveUI-Platforms.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>reactiveui-platforms</id>
-    <version>6.4.0.1</version>
+    <version>6.5.0</version>
     <description>Deprecated package that is no longer needed. You are looking for ReactiveUI-Core.</description>
     <authors>Paul Betts</authors>
     <projectUrl>http://www.reactiveui.net</projectUrl>
@@ -11,19 +11,19 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
       <group>
-        <dependency id="reactiveui-core" version="[6.4.0.1]" />
+        <dependency id="reactiveui-core" version="[6.5.0]" />
       </group>
       <group targetFramework="wp8">
-        <dependency id="reactiveui-core" version="[6.4.0.1]" />
-        <dependency id="reactiveui-blend" version="[6.4.0.1]" />
+        <dependency id="reactiveui-core" version="[6.5.0]" />
+        <dependency id="reactiveui-blend" version="[6.5.0]" />
       </group>
       <group targetFramework="net45">
-        <dependency id="reactiveui-core" version="[6.4.0.1]" />
-        <dependency id="reactiveui-blend" version="[6.4.0.1]" />
+        <dependency id="reactiveui-core" version="[6.5.0]" />
+        <dependency id="reactiveui-blend" version="[6.5.0]" />
       </group>
       <group targetFramework="Portable-Win81+Wpa81">
-        <dependency id="reactiveui-core" version="[6.4.0.1]" />
-        <dependency id="reactiveui-blend" version="[6.4.0.1]" />
+        <dependency id="reactiveui-core" version="[6.5.0]" />
+        <dependency id="reactiveui-blend" version="[6.5.0]" />
       </group>
     </dependencies>
   </metadata>

diff --git a/NuGet/ReactiveUI/ReactiveUI.nuspec b/NuGet/ReactiveUI/ReactiveUI.nuspec
@@ -2,15 +2,15 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>reactiveui</id>
-    <version>6.4.0.1</version>
+    <version>6.5.0</version>
     <description>An MVVM library for WPF and Silverlight that is deeply integrated with the Reactive Extensions</description>
     <authors>Paul Betts</authors>
     <projectUrl>http://www.reactiveui.net</projectUrl>
     <licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
     <language>en-us</language>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
-      <dependency id="reactiveui-core" version="[6.4.0.1]" />
+      <dependency id="reactiveui-core" version="[6.5.0]" />
     </dependencies>
   </metadata>
 </package>
diff --git a/PerfConsoleRunner/PerfConsoleRunner.csproj b/PerfConsoleRunner/PerfConsoleRunner.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\xunit.core.2.1.0-beta1-build2945\build\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.1.0-beta1-build2945\build\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -16,6 +17,7 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <NuGetPackageImportStamp>4da90602</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -46,18 +48,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.console.clr4, Version=1.9.1.1600, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\xunit.runners.1.9.2\tools\xunit.console.clr4.exe</HintPath>
-    </Reference>
-    <Reference Include="xunit.extensions, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\xunit.extensions.1.9.2\lib\net20\xunit.extensions.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
@@ -90,11 +80,17 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\xunit.core.2.1.0-beta1-build2945\build\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.1.0-beta1-build2945\build\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
+  </Target>
   <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/PerfConsoleRunner/packages.config b/PerfConsoleRunner/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit" version="1.9.2" targetFramework="net45" />
-  <package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
+  <package id="xunit.core" version="2.1.0-beta1-build2945" targetFramework="net45" />
 </packages>
diff --git a/Playground-Android/Playground-Android.csproj b/Playground-Android/Playground-Android.csproj
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D444AA58-1C6B-4CEE-B5F5-761.6.0B86E5}</ProjectGuid>
+    <ProjectGuid>{D444AA58-1C6B-4CEE-B5F5-761A650B86E5}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -43,7 +43,7 @@
   <ItemGroup>
     <Reference Include="Splat">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Splat.1.6.0\lib\monoandroid\Splat.dll</HintPath>
+      <HintPath>..\packages\Splat.1.6.2\lib\monoandroid\Splat.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

diff --git a/Playground-Android/packages.config b/Playground-Android/packages.config
@@ -5,5 +5,5 @@
   <package id="Rx-Linq" version="2.2.5" targetFramework="MonoAndroid403" />
   <package id="Rx-Main" version="2.2.5" targetFramework="MonoAndroid403" />
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="MonoAndroid403" />
-  <package id="Splat" version="1.6.0" targetFramework="MonoAndroid403" />
+  <package id="Splat" version="1.6.2" targetFramework="MonoAndroid403" />
 </packages>
diff --git a/Playground-Wpa81/Playground-Wpa81.Windows/Playground-Wpa81.Windows.csproj b/Playground-Wpa81/Playground-Wpa81.Windows/Playground-Wpa81.Windows.csproj
@@ -15,7 +15,6 @@
     <FileAlignment>512</FileAlignment>
     <SynthesizeLinkMetadata>true</SynthesizeLinkMetadata>
     <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>Playground-Wpa81.Windows_TemporaryKey.pfx</PackageCertificateKeyFile>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
@@ -115,7 +114,6 @@
       <SubType>Designer</SubType>
     </AppxManifest>
     <None Include="packages.config" />
-    <None Include="Playground-Wpa81.Windows_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\Logo.scale-100.png" />
@@ -130,9 +128,9 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Splat, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Splat.1.6.0\lib\NetCore45\Splat.dll</HintPath>
+    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Portable-Win81+Wpa81\Splat.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/Playground-Wpa81/Playground-Wpa81.Windows/packages.config b/Playground-Wpa81/Playground-Wpa81.Windows/packages.config
@@ -7,5 +7,5 @@
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="win81" />
   <package id="Rx-WinRT" version="2.2.5" targetFramework="win81" />
   <package id="Rx-Xaml" version="2.2.5" targetFramework="win81" />
-  <package id="Splat" version="1.6.0" targetFramework="win81" />
+  <package id="Splat" version="1.6.2" targetFramework="win81" />
 </packages>
diff --git a/Playground-Wpa81/Playground-Wpa81.WindowsPhone/Playground-Wpa81.WindowsPhone.csproj b/Playground-Wpa81/Playground-Wpa81.WindowsPhone/Playground-Wpa81.WindowsPhone.csproj
@@ -109,7 +109,7 @@
   <ItemGroup>
     <Reference Include="Splat, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Splat.1.6.0\lib\Portable-Win81+Wpa81\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Portable-Win81+Wpa81\Splat.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>