diff --git a/Perspex.Application/Perspex.Application.csproj b/Perspex.Application/Perspex.Application.csproj
index e66ffc1fc4..8c2d7c6c41 100644
--- a/Perspex.Application/Perspex.Application.csproj
+++ b/Perspex.Application/Perspex.Application.csproj
@@ -71,19 +71,23 @@
- ..\packages\Splat.1.3.3\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+ ..\packages\Splat.1.5.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll
- ..\packages\Rx-Core.2.1.30214.0\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Core.dll
+ ..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
- ..\packages\Rx-Interfaces.2.1.30214.0\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Interfaces.dll
+ ..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll
- ..\packages\Rx-Linq.2.1.30214.0\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Linq.dll
+ ..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll
+
+
+ ..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll
+
diff --git a/Perspex.Application/app.config b/Perspex.Application/app.config
new file mode 100644
index 0000000000..517d060521
--- /dev/null
+++ b/Perspex.Application/app.config
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Perspex.Application/packages.config b/Perspex.Application/packages.config
index af8b5868bf..f1c7efa52d 100644
--- a/Perspex.Application/packages.config
+++ b/Perspex.Application/packages.config
@@ -1,10 +1,10 @@
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Perspex.Base/Perspex.Base.csproj b/Perspex.Base/Perspex.Base.csproj
index 637a4d6120..6547b5bf99 100644
--- a/Perspex.Base/Perspex.Base.csproj
+++ b/Perspex.Base/Perspex.Base.csproj
@@ -53,19 +53,23 @@
- ..\packages\Splat.1.3.3\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+ ..\packages\Splat.1.5.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll
- ..\packages\Rx-Core.2.1.30214.0\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Core.dll
+ ..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
- ..\packages\Rx-Interfaces.2.1.30214.0\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Interfaces.dll
+ ..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll
- ..\packages\Rx-Linq.2.1.30214.0\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Linq.dll
+ ..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll
+
+
+ ..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll
+
diff --git a/Perspex.Base/app.config b/Perspex.Base/app.config
new file mode 100644
index 0000000000..517d060521
--- /dev/null
+++ b/Perspex.Base/app.config
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Perspex.Base/packages.config b/Perspex.Base/packages.config
index af8b5868bf..f1c7efa52d 100644
--- a/Perspex.Base/packages.config
+++ b/Perspex.Base/packages.config
@@ -1,10 +1,10 @@
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj b/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
index e14fd7eb8d..9e2d9ff2d9 100644
--- a/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
+++ b/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
@@ -35,11 +35,13 @@
4
-
- ..\packages\Moq.4.2.1312.1622\lib\net40\Moq.dll
+
+ False
+ ..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll
-
- ..\packages\Splat.1.3.3\lib\Net45\Splat.dll
+
+ False
+ ..\packages\Splat.1.5.0\lib\Net45\Splat.dll
@@ -94,6 +96,7 @@
+
diff --git a/Perspex.Controls.UnitTests/app.config b/Perspex.Controls.UnitTests/app.config
new file mode 100644
index 0000000000..393911e643
--- /dev/null
+++ b/Perspex.Controls.UnitTests/app.config
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Perspex.Controls.UnitTests/packages.config b/Perspex.Controls.UnitTests/packages.config
index 3b7c7a697a..3a7ae08989 100644
--- a/Perspex.Controls.UnitTests/packages.config
+++ b/Perspex.Controls.UnitTests/packages.config
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/Perspex.Controls/Perspex.Controls.csproj b/Perspex.Controls/Perspex.Controls.csproj
index ece27dea29..69ed028e0c 100644
--- a/Perspex.Controls/Perspex.Controls.csproj
+++ b/Perspex.Controls/Perspex.Controls.csproj
@@ -87,19 +87,23 @@
- ..\packages\Splat.1.3.3\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+ ..\packages\Splat.1.5.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll
- ..\packages\Rx-Core.2.1.30214.0\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Core.dll
+ ..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
- ..\packages\Rx-Interfaces.2.1.30214.0\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Interfaces.dll
+ ..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll
- ..\packages\Rx-Linq.2.1.30214.0\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Linq.dll
+ ..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll
+
+
+ ..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll
+
diff --git a/Perspex.Controls/app.config b/Perspex.Controls/app.config
new file mode 100644
index 0000000000..393911e643
--- /dev/null
+++ b/Perspex.Controls/app.config
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Perspex.Controls/packages.config b/Perspex.Controls/packages.config
index af8b5868bf..f1c7efa52d 100644
--- a/Perspex.Controls/packages.config
+++ b/Perspex.Controls/packages.config
@@ -1,10 +1,10 @@
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Perspex.Diagnostics/Perspex.Diagnostics.csproj b/Perspex.Diagnostics/Perspex.Diagnostics.csproj
index ecf90a5d76..ed7c41e824 100644
--- a/Perspex.Diagnostics/Perspex.Diagnostics.csproj
+++ b/Perspex.Diagnostics/Perspex.Diagnostics.csproj
@@ -72,19 +72,23 @@
- ..\packages\Splat.1.3.3\lib\Portable-net45+win+wpa81+wp80\Splat.dll
+ ..\packages\Splat.1.5.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll
- ..\packages\Rx-Core.2.1.30214.0\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Core.dll
+ ..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll
- ..\packages\Rx-Interfaces.2.1.30214.0\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Interfaces.dll
+ ..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll
- ..\packages\Rx-Linq.2.1.30214.0\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Linq.dll
+ ..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll
+
+
+ ..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll
+
diff --git a/Perspex.Diagnostics/app.config b/Perspex.Diagnostics/app.config
new file mode 100644
index 0000000000..517d060521
--- /dev/null
+++ b/Perspex.Diagnostics/app.config
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Perspex.Diagnostics/packages.config b/Perspex.Diagnostics/packages.config
index 6567db553e..e99a951913 100644
--- a/Perspex.Diagnostics/packages.config
+++ b/Perspex.Diagnostics/packages.config
@@ -1,9 +1,9 @@
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj b/Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj
index fcd589884f..379bea90d7 100644
--- a/Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj
+++ b/Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj
@@ -35,12 +35,13 @@
4
-
- ..\packages\Magick.NET-Q16-x86.6.8.9.101\lib\net40-client\Magick.NET-x86.dll
+
+ False
+ ..\packages\Magick.NET-Q16-x86.7.0.0.0004\lib\net40-client\Magick.NET-x86.dll
-
+
False
- ..\packages\Splat.1.3.3\lib\Net45\Splat.dll
+ ..\packages\Splat.1.5.0\lib\Net45\Splat.dll
@@ -100,6 +101,7 @@
+
diff --git a/Perspex.Direct2D1.RenderTests/app.config b/Perspex.Direct2D1.RenderTests/app.config
new file mode 100644
index 0000000000..393911e643
--- /dev/null
+++ b/Perspex.Direct2D1.RenderTests/app.config
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Perspex.Direct2D1.RenderTests/packages.config b/Perspex.Direct2D1.RenderTests/packages.config
index 2693a06d52..b56e9d0c81 100644
--- a/Perspex.Direct2D1.RenderTests/packages.config
+++ b/Perspex.Direct2D1.RenderTests/packages.config
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/Perspex.Direct2D1/Perspex.Direct2D1.csproj b/Perspex.Direct2D1/Perspex.Direct2D1.csproj
index 2ae763fca8..8a0f266931 100644
--- a/Perspex.Direct2D1/Perspex.Direct2D1.csproj
+++ b/Perspex.Direct2D1/Perspex.Direct2D1.csproj
@@ -11,6 +11,7 @@
Perspex.Direct2D1
v4.5
512
+ 4ce7db7c
true
@@ -30,30 +31,36 @@
4
-
- ..\packages\SharpDX.2.5.0\lib\net40\SharpDX.dll
+
+ False
+ $(SharpDXPackageBinDir)\SharpDX.dll
-
- ..\packages\SharpDX.Direct2D1.2.5.0\lib\net40\SharpDX.Direct2D1.dll
+
+ False
+ $(SharpDXPackageBinDir)\SharpDX.Direct2D1.dll
-
- ..\packages\SharpDX.DXGI.2.5.0\lib\net40\SharpDX.DXGI.dll
+
+ False
+ $(SharpDXPackageBinDir)\SharpDX.DXGI.dll
-
+
False
- ..\packages\Splat.1.3.3\lib\Net45\Splat.dll
+ ..\packages\Splat.1.5.0\lib\Net45\Splat.dll
-
- ..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll
+
+ False
+ ..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll
-
- ..\packages\Rx-Interfaces.2.1.30214.0\lib\Net45\System.Reactive.Interfaces.dll
+
+ False
+ ..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll
-
- ..\packages\Rx-PlatformServices.2.1.30214.0\lib\Net45\System.Reactive.PlatformServices.dll
+
+ False
+ ..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll
@@ -76,6 +83,7 @@
+
@@ -89,6 +97,13 @@
+
+
+
+ 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}.
+
+
+