From 363ad22438f3917d2f2b0d1770d1c9bff3408030 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 5 May 2015 22:03:20 +0200
Subject: [PATCH] Uninstalled Stylecop.MSBuild

It was causing problems and doesn't work properly with C#6 anyway.
---
 Cairo/Perspex.Cairo/Perspex.Cairo.csproj      | 10 ++------
 Cairo/Perspex.Cairo/packages.config           |  7 +++---
 Gtk/Perspex.Gtk/Perspex.Gtk.csproj            | 10 ++------
 Gtk/Perspex.Gtk/packages.config               |  9 ++++---
 .../Perspex.Application.csproj                | 10 ++------
 Perspex.Application/packages.config           | 13 +++++-----
 Perspex.Base/Perspex.Base.csproj              |  9 ++-----
 Perspex.Base/packages.config                  | 13 +++++-----
 Perspex.Controls/Perspex.Controls.csproj      |  9 ++-----
 Perspex.Controls/packages.config              | 13 +++++-----
 .../Perspex.Diagnostics.csproj                | 10 ++------
 Perspex.Diagnostics/packages.config           | 17 +++++++------
 Perspex.Input/Perspex.Input.csproj            |  9 ++-----
 Perspex.Input/packages.config                 | 13 +++++-----
 .../Perspex.Interactive.UnitTests.csproj      |  6 ++---
 .../Perspex.Interactivity.csproj              |  9 ++-----
 Perspex.Interactivity/packages.config         | 13 +++++-----
 Perspex.Layout/Perspex.Layout.csproj          |  9 ++-----
 Perspex.Layout/packages.config                | 13 +++++-----
 Perspex.SceneGraph/Perspex.SceneGraph.csproj  |  9 ++-----
 Perspex.SceneGraph/packages.config            | 13 +++++-----
 Perspex.Styling/Perspex.Styling.csproj        | 10 ++------
 Perspex.Styling/packages.config               | 13 +++++-----
 .../Perspex.Themes.Default.csproj             | 10 ++------
 Perspex.Themes.Default/packages.config        | 13 +++++-----
 TestApplication/TestApplication.csproj        |  6 ++---
 TestApplication/packages.config               | 24 +++++++++----------
 .../Perspex.Base.UnitTests.csproj             | 12 +++++-----
 .../Perspex.Controls.UnitTests.csproj         | 20 ++++++++--------
 Tests/Perspex.Controls.UnitTests/app.config   |  2 +-
 .../Perspex.Input.UnitTests.csproj            |  8 ++-----
 Tests/Perspex.Input.UnitTests/packages.config |  3 +--
 .../Perspex.Layout.UnitTests.csproj           | 22 +++++++++--------
 Tests/Perspex.Layout.UnitTests/app.config     |  2 +-
 .../Perspex.Direct2D1.RenderTests.csproj      | 12 ++++++++--
 .../Perspex.SceneGraph.UnitTests.csproj       |  6 ++---
 .../Perspex.Styling.UnitTests.csproj          | 12 +++++-----
 .../Perspex.Direct2D1.csproj                  |  5 ++--
 Windows/Perspex.Direct2D1/packages.config     | 15 ++++++------
 Windows/Perspex.Win32/Perspex.Win32.csproj    |  9 ++-----
 Windows/Perspex.Win32/packages.config         | 13 +++++-----
 41 files changed, 180 insertions(+), 261 deletions(-)

diff --git a/Cairo/Perspex.Cairo/Perspex.Cairo.csproj b/Cairo/Perspex.Cairo/Perspex.Cairo.csproj
index eaad49e49d..1ecf911e22 100644
--- a/Cairo/Perspex.Cairo/Perspex.Cairo.csproj
+++ b/Cairo/Perspex.Cairo/Perspex.Cairo.csproj
@@ -11,7 +11,8 @@
     <AssemblyName>Perspex.Cairo</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>b122e795</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -95,13 +96,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.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\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
-  </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">
diff --git a/Cairo/Perspex.Cairo/packages.config b/Cairo/Perspex.Cairo/packages.config
index 67dd0e8176..8e2b55fd7e 100644
--- a/Cairo/Perspex.Cairo/packages.config
+++ b/Cairo/Perspex.Cairo/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
-  <package id="Splat" version="1.6.1" targetFramework="net45" />
-  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="net45" developmentDependency="true" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Splat" version="1.6.1" targetFramework="net45" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/Gtk/Perspex.Gtk/Perspex.Gtk.csproj b/Gtk/Perspex.Gtk/Perspex.Gtk.csproj
index 4d38b350df..21cd90c5cd 100644
--- a/Gtk/Perspex.Gtk/Perspex.Gtk.csproj
+++ b/Gtk/Perspex.Gtk/Perspex.Gtk.csproj
@@ -8,7 +8,8 @@
     <RootNamespace>Perspex.Gtk</RootNamespace>
     <AssemblyName>Perspex.Gtk</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <NuGetPackageImportStamp>ad245ae8</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -103,11 +104,4 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
-  <Import Project="..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.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\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/Gtk/Perspex.Gtk/packages.config b/Gtk/Perspex.Gtk/packages.config
index 549c25abbe..60ef7eafd7 100644
--- a/Gtk/Perspex.Gtk/packages.config
+++ b/Gtk/Perspex.Gtk/packages.config
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
-  <package id="Splat" version="1.6.1" targetFramework="net45" />
-  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="net45" developmentDependency="true" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Splat" version="1.6.1" targetFramework="net45" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/Perspex.Application/Perspex.Application.csproj b/Perspex.Application/Perspex.Application.csproj
index ec6d8ebe2b..b777bafe8f 100644
--- a/Perspex.Application/Perspex.Application.csproj
+++ b/Perspex.Application/Perspex.Application.csproj
@@ -15,7 +15,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <NuGetPackageImportStamp>088bcbce</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -91,13 +92,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.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\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
-  </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">
diff --git a/Perspex.Application/packages.config b/Perspex.Application/packages.config
index be1e98158f..8671e3d37b 100644
--- a/Perspex.Application/packages.config
+++ b/Perspex.Application/packages.config
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win" />
-  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win8" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/Perspex.Base/Perspex.Base.csproj b/Perspex.Base/Perspex.Base.csproj
index d6c261cee3..21e2a361db 100644
--- a/Perspex.Base/Perspex.Base.csproj
+++ b/Perspex.Base/Perspex.Base.csproj
@@ -15,6 +15,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -91,13 +93,6 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.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\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
-  </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">
diff --git a/Perspex.Base/packages.config b/Perspex.Base/packages.config
index be1e98158f..8671e3d37b 100644
--- a/Perspex.Base/packages.config
+++ b/Perspex.Base/packages.config
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win" />
-  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win8" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/Perspex.Controls/Perspex.Controls.csproj b/Perspex.Controls/Perspex.Controls.csproj
index c03c2d568d..774a3e57f6 100644
--- a/Perspex.Controls/Perspex.Controls.csproj
+++ b/Perspex.Controls/Perspex.Controls.csproj
@@ -15,6 +15,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -173,13 +175,6 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.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\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
-  </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">
diff --git a/Perspex.Controls/packages.config b/Perspex.Controls/packages.config
index be1e98158f..8671e3d37b 100644
--- a/Perspex.Controls/packages.config
+++ b/Perspex.Controls/packages.config
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win" />
-  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win8" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/Perspex.Diagnostics/Perspex.Diagnostics.csproj b/Perspex.Diagnostics/Perspex.Diagnostics.csproj
index 5662f0d923..a86d5b0f01 100644
--- a/Perspex.Diagnostics/Perspex.Diagnostics.csproj
+++ b/Perspex.Diagnostics/Perspex.Diagnostics.csproj
@@ -15,7 +15,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <NuGetPackageImportStamp>4c22110b</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -114,13 +115,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.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\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
-  </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">
diff --git a/Perspex.Diagnostics/packages.config b/Perspex.Diagnostics/packages.config
index 96efcfe767..a71de84fbf 100644
--- a/Perspex.Diagnostics/packages.config
+++ b/Perspex.Diagnostics/packages.config
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="reactiveui" version="6.4.0.1" targetFramework="portable-net45+win" />
-  <package id="reactiveui-core" version="6.4.0.1" targetFramework="portable-net45+win" />
-  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win" />
-  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
+  <package id="reactiveui" version="6.4.0.1" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="reactiveui-core" version="6.4.0.1" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Splat" version="1.6.2" targetFramework="portable45-net45+win8" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/Perspex.Input/Perspex.Input.csproj b/Perspex.Input/Perspex.Input.csproj
index 69fb1b83c0..ba2efa9c0a 100644
--- a/Perspex.Input/Perspex.Input.csproj
+++ b/Perspex.Input/Perspex.Input.csproj
@@ -15,6 +15,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -113,13 +115,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.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\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
-  </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">
diff --git a/Perspex.Input/packages.config b/Perspex.Input/packages.config
index be1e98158f..8671e3d37b 100644
--- a/Perspex.Input/packages.config
+++ b/Perspex.Input/packages.config
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win" />
-  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win8" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/Perspex.Interactive.UnitTests/Perspex.Interactive.UnitTests.csproj b/Perspex.Interactive.UnitTests/Perspex.Interactive.UnitTests.csproj
index f18b5296b7..46ec7c67df 100644
--- a/Perspex.Interactive.UnitTests/Perspex.Interactive.UnitTests.csproj
+++ b/Perspex.Interactive.UnitTests/Perspex.Interactive.UnitTests.csproj
@@ -33,9 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Splat, Version=1.6.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Splat.1.6.1\lib\Net45\Splat.dll</HintPath>
+    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Perspex.Interactivity/Perspex.Interactivity.csproj b/Perspex.Interactivity/Perspex.Interactivity.csproj
index 0a68ce36e5..33ed8ea448 100644
--- a/Perspex.Interactivity/Perspex.Interactivity.csproj
+++ b/Perspex.Interactivity/Perspex.Interactivity.csproj
@@ -15,6 +15,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -82,13 +84,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.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\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
-  </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">
diff --git a/Perspex.Interactivity/packages.config b/Perspex.Interactivity/packages.config
index be1e98158f..8671e3d37b 100644
--- a/Perspex.Interactivity/packages.config
+++ b/Perspex.Interactivity/packages.config
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win" />
-  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win8" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/Perspex.Layout/Perspex.Layout.csproj b/Perspex.Layout/Perspex.Layout.csproj
index 84b3da3407..f35d51bb67 100644
--- a/Perspex.Layout/Perspex.Layout.csproj
+++ b/Perspex.Layout/Perspex.Layout.csproj
@@ -15,6 +15,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -83,13 +85,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.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\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
-  </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">
diff --git a/Perspex.Layout/packages.config b/Perspex.Layout/packages.config
index be1e98158f..8671e3d37b 100644
--- a/Perspex.Layout/packages.config
+++ b/Perspex.Layout/packages.config
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win" />
-  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win8" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/Perspex.SceneGraph/Perspex.SceneGraph.csproj b/Perspex.SceneGraph/Perspex.SceneGraph.csproj
index f2102415d7..58e275a098 100644
--- a/Perspex.SceneGraph/Perspex.SceneGraph.csproj
+++ b/Perspex.SceneGraph/Perspex.SceneGraph.csproj
@@ -15,6 +15,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -126,13 +128,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.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\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
-  </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">
diff --git a/Perspex.SceneGraph/packages.config b/Perspex.SceneGraph/packages.config
index be1e98158f..8671e3d37b 100644
--- a/Perspex.SceneGraph/packages.config
+++ b/Perspex.SceneGraph/packages.config
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win" />
-  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win8" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/Perspex.Styling/Perspex.Styling.csproj b/Perspex.Styling/Perspex.Styling.csproj
index 20a249cce2..9f0bac063e 100644
--- a/Perspex.Styling/Perspex.Styling.csproj
+++ b/Perspex.Styling/Perspex.Styling.csproj
@@ -15,7 +15,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <NuGetPackageImportStamp>2cd51e01</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -84,13 +85,6 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.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\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
-  </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">
diff --git a/Perspex.Styling/packages.config b/Perspex.Styling/packages.config
index be1e98158f..8671e3d37b 100644
--- a/Perspex.Styling/packages.config
+++ b/Perspex.Styling/packages.config
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win" />
-  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win8" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/Perspex.Themes.Default/Perspex.Themes.Default.csproj b/Perspex.Themes.Default/Perspex.Themes.Default.csproj
index 4d3dfece80..28b527f41f 100644
--- a/Perspex.Themes.Default/Perspex.Themes.Default.csproj
+++ b/Perspex.Themes.Default/Perspex.Themes.Default.csproj
@@ -15,7 +15,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <NuGetPackageImportStamp>b77a73b5</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -117,13 +118,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.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\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
-  </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">
diff --git a/Perspex.Themes.Default/packages.config b/Perspex.Themes.Default/packages.config
index be1e98158f..8671e3d37b 100644
--- a/Perspex.Themes.Default/packages.config
+++ b/Perspex.Themes.Default/packages.config
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
-  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win" />
-  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win8" userInstalled="true" />
+  <package id="Splat" version="1.6.1" targetFramework="portable-net45+win8" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/TestApplication/TestApplication.csproj b/TestApplication/TestApplication.csproj
index 4a60af1c3c..bebd32e1a2 100644
--- a/TestApplication/TestApplication.csproj
+++ b/TestApplication/TestApplication.csproj
@@ -38,9 +38,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\reactiveui-core.6.4.0.1\lib\Net45\ReactiveUI.dll</HintPath>
     </Reference>
-    <Reference Include="Splat, Version=1.6.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Splat.1.6.1\lib\Net45\Splat.dll</HintPath>
+    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/TestApplication/packages.config b/TestApplication/packages.config
index cf3a479a49..8337079d29 100644
--- a/TestApplication/packages.config
+++ b/TestApplication/packages.config
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="reactiveui" version="6.4.0.1" targetFramework="net45" />
-  <package id="reactiveui-core" version="6.4.0.1" targetFramework="net45" />
-  <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-XAML" version="2.2.5" targetFramework="net45" />
-  <package id="SharpDX" version="2.6.3" targetFramework="net45" />
-  <package id="SharpDX.Direct2D1" version="2.6.3" targetFramework="net45" />
-  <package id="SharpDX.DXGI" version="2.6.3" targetFramework="net45" />
-  <package id="Splat" version="1.6.1" targetFramework="net45" />
+  <package id="reactiveui" version="6.4.0.1" targetFramework="net45" userInstalled="true" />
+  <package id="reactiveui-core" version="6.4.0.1" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-XAML" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="SharpDX" version="2.6.3" targetFramework="net45" userInstalled="true" />
+  <package id="SharpDX.Direct2D1" version="2.6.3" targetFramework="net45" userInstalled="true" />
+  <package id="SharpDX.DXGI" version="2.6.3" targetFramework="net45" userInstalled="true" />
+  <package id="Splat" version="1.6.2" targetFramework="net45" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj b/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj
index 7406c6050d..0baa50f6be 100644
--- a/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj
+++ b/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj
@@ -37,13 +37,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Moq, Version=4.2.1409.1722, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Splat, Version=1.6.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Splat.1.6.1\lib\Net45\Splat.dll</HintPath>
+    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj b/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
index 59f39b1a5c..ed4798208c 100644
--- a/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
+++ b/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
@@ -37,21 +37,21 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Moq, Version=4.2.1409.1722, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Ploeh.AutoFixture, Version=3.30.3.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AutoFixture.3.30.3\lib\net40\Ploeh.AutoFixture.dll</HintPath>
+    <Reference Include="Ploeh.AutoFixture, Version=3.30.4.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\AutoFixture.3.30.4\lib\net40\Ploeh.AutoFixture.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Ploeh.AutoFixture.AutoMoq, Version=3.30.3.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AutoFixture.AutoMoq.3.30.3\lib\net40\Ploeh.AutoFixture.AutoMoq.dll</HintPath>
+    <Reference Include="Ploeh.AutoFixture.AutoMoq, Version=3.30.4.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\AutoFixture.AutoMoq.3.30.4\lib\net40\Ploeh.AutoFixture.AutoMoq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Splat, Version=1.6.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Splat.1.6.1\lib\Net45\Splat.dll</HintPath>
+    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/Tests/Perspex.Controls.UnitTests/app.config b/Tests/Perspex.Controls.UnitTests/app.config
index 9d7f3f5e5a..5c3b0df066 100644
--- a/Tests/Perspex.Controls.UnitTests/app.config
+++ b/Tests/Perspex.Controls.UnitTests/app.config
@@ -16,7 +16,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.1409.1722" newVersion="4.2.1409.1722" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1502.911" newVersion="4.2.1502.911" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj b/Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj
index c785a2fa74..7c16f91547 100644
--- a/Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj
+++ b/Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj
@@ -38,12 +38,8 @@
       <HintPath>..\..\packages\Moq.4.2.1502.911\lib\net40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Ploeh.AutoFixture, Version=3.30.3.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AutoFixture.3.30.3\lib\net40\Ploeh.AutoFixture.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Ploeh.AutoFixture.AutoMoq, Version=3.30.3.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AutoFixture.AutoMoq.3.30.3\lib\net40\Ploeh.AutoFixture.AutoMoq.dll</HintPath>
+    <Reference Include="Ploeh.AutoFixture, Version=3.30.4.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\AutoFixture.3.30.4\lib\net40\Ploeh.AutoFixture.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/Tests/Perspex.Input.UnitTests/packages.config b/Tests/Perspex.Input.UnitTests/packages.config
index d949519049..186b649bf1 100644
--- a/Tests/Perspex.Input.UnitTests/packages.config
+++ b/Tests/Perspex.Input.UnitTests/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoFixture" version="3.30.3" targetFramework="net45" userInstalled="true" />
-  <package id="AutoFixture.AutoMoq" version="3.30.3" targetFramework="net45" userInstalled="true" />
+  <package id="AutoFixture" version="3.30.4" targetFramework="net45" userInstalled="true" />
   <package id="Moq" version="4.2.1502.911" targetFramework="net45" userInstalled="true" />
   <package id="Splat" version="1.6.2" targetFramework="net45" userInstalled="true" />
   <package id="xunit" version="2.0.0" targetFramework="net45" userInstalled="true" />
diff --git a/Tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj b/Tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj
index 7d03e60c4d..0ea96771df 100644
--- a/Tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj
+++ b/Tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj
@@ -37,19 +37,21 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Moq, Version=4.2.1409.1722, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Ploeh.AutoFixture">
-      <HintPath>..\..\packages\AutoFixture.3.21.1\lib\net40\Ploeh.AutoFixture.dll</HintPath>
+    <Reference Include="Ploeh.AutoFixture, Version=3.30.4.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\AutoFixture.3.30.4\lib\net40\Ploeh.AutoFixture.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Ploeh.AutoFixture.AutoMoq">
-      <HintPath>..\..\packages\AutoFixture.AutoMoq.3.21.1\lib\net40\Ploeh.AutoFixture.AutoMoq.dll</HintPath>
+    <Reference Include="Ploeh.AutoFixture.AutoMoq, Version=3.30.4.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\AutoFixture.AutoMoq.3.30.4\lib\net40\Ploeh.AutoFixture.AutoMoq.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Splat, Version=1.6.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Splat.1.6.1\lib\Net45\Splat.dll</HintPath>
+    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
diff --git a/Tests/Perspex.Layout.UnitTests/app.config b/Tests/Perspex.Layout.UnitTests/app.config
index 3bdf7fb823..133577da84 100644
--- a/Tests/Perspex.Layout.UnitTests/app.config
+++ b/Tests/Perspex.Layout.UnitTests/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.1409.1722" newVersion="4.2.1409.1722" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1502.911" newVersion="4.2.1502.911" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj b/Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj
index 7f03144af2..06d899827c 100644
--- a/Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj
+++ b/Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj
@@ -39,8 +39,16 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Magick.NET-x86, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Magick.NET-Q16-x86.7.0.0.0007\lib\net40-client\Magick.NET-x86.dll</HintPath>
+      <HintPath>..\..\packages\Magick.NET-Q16-x86.7.0.0.0014\lib\net40-client\Magick.NET-x86.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Magick.NET.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Magick.NET-Q16-x86.7.0.0.0014\lib\net40-client\Magick.NET.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Magick.NET.Wrapper-x86, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=x86">
+      <HintPath>..\..\packages\Magick.NET-Q16-x86.7.0.0.0014\lib\net40-client\Magick.NET.Wrapper-x86.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
diff --git a/Tests/Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj b/Tests/Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj
index 3c3dec3304..f88f515381 100644
--- a/Tests/Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj
+++ b/Tests/Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj
@@ -41,9 +41,9 @@
       <HintPath>..\..\packages\Moq.4.2.1502.911\lib\net40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Splat, Version=1.6.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Splat.1.6.1\lib\Net45\Splat.dll</HintPath>
+    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj b/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj
index e2dc77b568..b02801da2c 100644
--- a/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj
+++ b/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj
@@ -37,13 +37,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Moq, Version=4.2.1409.1722, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Splat, Version=1.6.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Splat.1.6.1\lib\Net45\Splat.dll</HintPath>
+    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj b/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
index 93b0731e45..ae9ea6fc31 100644
--- a/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
+++ b/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
@@ -11,7 +11,8 @@
     <AssemblyName>Perspex.Direct2D1</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>48ceee32</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -106,9 +107,7 @@
       <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\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SharpDX.2.6.3\build\SharpDX.targets'))" />
-    <Error Condition="!Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
   </Target>
-  <Import Project="..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.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.
   <Target Name="BeforeBuild">
diff --git a/Windows/Perspex.Direct2D1/packages.config b/Windows/Perspex.Direct2D1/packages.config
index 4aeea61314..0f5dedb6f0 100644
--- a/Windows/Perspex.Direct2D1/packages.config
+++ b/Windows/Perspex.Direct2D1/packages.config
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
-  <package id="SharpDX" version="2.6.3" targetFramework="net45" />
-  <package id="SharpDX.Direct2D1" version="2.6.3" targetFramework="net45" />
-  <package id="SharpDX.DXGI" version="2.6.3" targetFramework="net45" />
-  <package id="Splat" version="1.6.1" targetFramework="net45" />
-  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="net45" developmentDependency="true" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="SharpDX" version="2.6.3" targetFramework="net45" userInstalled="true" />
+  <package id="SharpDX.Direct2D1" version="2.6.3" targetFramework="net45" userInstalled="true" />
+  <package id="SharpDX.DXGI" version="2.6.3" targetFramework="net45" userInstalled="true" />
+  <package id="Splat" version="1.6.1" targetFramework="net45" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/Windows/Perspex.Win32/Perspex.Win32.csproj b/Windows/Perspex.Win32/Perspex.Win32.csproj
index bb1f826f8e..b7ecbbe538 100644
--- a/Windows/Perspex.Win32/Perspex.Win32.csproj
+++ b/Windows/Perspex.Win32/Perspex.Win32.csproj
@@ -11,6 +11,8 @@
     <AssemblyName>Perspex.Win32</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -139,11 +141,4 @@
   <PropertyGroup>
     <PrepareForBuildDependsOn Condition="!Exists('$(StyleCopMSBuildTargetsFile)')">StyleCopMSBuildTargetsNotFound;$(PrepareForBuildDependsOn)</PrepareForBuildDependsOn>
   </PropertyGroup>
-  <Import Project="..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.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\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/Windows/Perspex.Win32/packages.config b/Windows/Perspex.Win32/packages.config
index a0b6a6eb45..6788e3704e 100644
--- a/Windows/Perspex.Win32/packages.config
+++ b/Windows/Perspex.Win32/packages.config
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
-  <package id="Splat" version="1.6.1" targetFramework="net45" />
-  <package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="net45" />
+  <package id="Rx-Core" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-Linq" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-Main" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" userInstalled="true" />
+  <package id="Splat" version="1.6.1" targetFramework="net45" userInstalled="true" />
 </packages>
\ No newline at end of file