diff --git a/Deedle.Core.sln b/Deedle.Core.sln
index 16127b36..20f133fa 100644
--- a/Deedle.Core.sln
+++ b/Deedle.Core.sln
@@ -1,12 +1,11 @@
-
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{1D865FE1-0F3D-4F98-BBEC-1D03B8A00931}"
- ProjectSection(SolutionItems) = preProject
- ..\deedle\paket.dependencies = ..\deedle\paket.dependencies
- ..\deedle\paket.lock = ..\deedle\paket.lock
+ ProjectSection(SolutionItems) = preProject
+ paket.dependencies = paket.dependencies
+ paket.lock = paket.lock
EndProjectSection
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Deedle.Tests", "tests\Deedle.Tests\Deedle.Tests.fsproj", "{484A96E6-D217-47EE-974C-5D7B3CFB401E}"
@@ -33,6 +32,7 @@ EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Deedle.PerfTests", "tests\Deedle.PerfTests\Deedle.PerfTests.fsproj", "{0275C56B-9A00-4578-A826-A6CF1F089086}"
ProjectSection(ProjectDependencies) = postProject
{D1E7603A-AA82-4517-8605-360DC708B0E9} = {D1E7603A-AA82-4517-8605-360DC708B0E9}
+ {22729065-4C30-4E43-A63F-4F3338A03878} = {22729065-4C30-4E43-A63F-4F3338A03878}
{371F8CE6-B031-4589-843F-583FE9180948} = {371F8CE6-B031-4589-843F-583FE9180948}
EndProjectSection
EndProject
diff --git a/docs/content/rinterop.fsx b/docs/content/rinterop.fsx
index 1c2f19fd..31da01f9 100644
--- a/docs/content/rinterop.fsx
+++ b/docs/content/rinterop.fsx
@@ -2,6 +2,10 @@
#nowarn "211"
#I "../../packages/FSharp.Charting"
#I "../../packages/RProvider/"
+// (loading RProvider.fsx should do this, but not atm. using Paket dir structure)
+#I "../../packages/RProvider/lib/net40/"
+#I "../../packages/R.NET.Community/lib/net40/"
+//
#I @"../../bin"
open System
let airQuality = __SOURCE_DIRECTORY__ + "/data/AirQuality.csv"
diff --git a/src/Deedle/Deedle.fsproj b/src/Deedle/Deedle.fsproj
index b1308f6d..7c9c6d86 100644
--- a/src/Deedle/Deedle.fsproj
+++ b/src/Deedle/Deedle.fsproj
@@ -106,9 +106,6 @@
True
True
-
- True
-
diff --git a/tests/Deedle.CSharp.Tests/Deedle.CSharp.Tests.csproj b/tests/Deedle.CSharp.Tests/Deedle.CSharp.Tests.csproj
index 0258bc9e..a671a662 100755
--- a/tests/Deedle.CSharp.Tests/Deedle.CSharp.Tests.csproj
+++ b/tests/Deedle.CSharp.Tests/Deedle.CSharp.Tests.csproj
@@ -75,9 +75,6 @@
True
True
-
- True
-
diff --git a/tests/Deedle.Documentation.Tests/app.config b/tests/Deedle.Documentation.Tests/app.config
index a32e4f21..912e44ae 100644
--- a/tests/Deedle.Documentation.Tests/app.config
+++ b/tests/Deedle.Documentation.Tests/app.config
@@ -4,7 +4,7 @@
-
+
diff --git a/tests/Deedle.PerfTests/Deedle.PerfTests.fsproj b/tests/Deedle.PerfTests/Deedle.PerfTests.fsproj
index 0ccbacb4..c27bde1e 100644
--- a/tests/Deedle.PerfTests/Deedle.PerfTests.fsproj
+++ b/tests/Deedle.PerfTests/Deedle.PerfTests.fsproj
@@ -38,6 +38,9 @@
..\..\bin\Deedle.dll
+
+ False
+
..\PerformanceTools\bin\Deedle.PerfTest.Core.dll
@@ -91,9 +94,6 @@
True
True
-
- True
-
@@ -117,9 +117,6 @@
True
True
-
- True
-
@@ -129,9 +126,6 @@
True
True
-
- True
-
@@ -165,9 +159,6 @@
True
True
-
- True
-
@@ -177,9 +168,6 @@
True
True
-
- True
-
@@ -189,9 +177,6 @@
True
True
-
- True
-
@@ -203,68 +188,7 @@
-
-
-
- ..\..\packages\R.NET.Community\lib\net40\RDotNet.NativeLibrary.dll
- True
- True
-
-
- ..\..\packages\R.NET.Community\lib\net40\RDotNet.dll
- True
- True
-
-
- True
-
-
-
-
-
-
-
-
- ..\..\packages\R.NET.Community.FSharp\lib\net40\RDotNet.FSharp.dll
- True
- True
-
-
-
-
-
-
-
-
- ..\..\packages\RProvider\lib\net40\FSharp.Core.dll
- True
- True
-
-
- ..\..\packages\RProvider\lib\net40\RProvider.DesignTime.dll
- True
- True
-
-
- ..\..\packages\RProvider\lib\net40\RProvider.Runtime.dll
- True
- True
-
-
- ..\..\packages\RProvider\lib\net40\RProvider.Server.exe
- True
- True
-
-
- ..\..\packages\RProvider\lib\net40\RProvider.dll
- True
- True
-
-
-
-
-
-
+
..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll
diff --git a/tests/Deedle.PerfTests/paket.references b/tests/Deedle.PerfTests/paket.references
index 7bf9c413..273fc1c4 100644
--- a/tests/Deedle.PerfTests/paket.references
+++ b/tests/Deedle.PerfTests/paket.references
@@ -2,5 +2,4 @@ FsCheck
MathNet.Numerics
FSharp.Data
NUnit
-NUnit.Runners
-RProvider
\ No newline at end of file
+NUnit.Runners
\ No newline at end of file
diff --git a/tests/Deedle.Tests/Deedle.Tests.fsproj b/tests/Deedle.Tests/Deedle.Tests.fsproj
index 3168d5d7..d154b392 100644
--- a/tests/Deedle.Tests/Deedle.Tests.fsproj
+++ b/tests/Deedle.Tests/Deedle.Tests.fsproj
@@ -1,4 +1,4 @@
-
+
@@ -100,9 +100,6 @@
True
True
-
- True
-
@@ -126,9 +123,6 @@
True
True
-
- True
-
@@ -138,9 +132,6 @@
True
True
-
- True
-
@@ -174,9 +165,6 @@
True
True
-
- True
-
@@ -186,9 +174,6 @@
True
True
-
- True
-
@@ -198,9 +183,6 @@
True
True
-
- True
-
@@ -212,7 +194,7 @@
-
+
..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll
diff --git a/tests/Deedle.Tests/FSharp.DataFrame.Tests.v11.suo b/tests/Deedle.Tests/FSharp.DataFrame.Tests.v11.suo
deleted file mode 100644
index 15962ae0..00000000
Binary files a/tests/Deedle.Tests/FSharp.DataFrame.Tests.v11.suo and /dev/null differ
diff --git a/tests/PerformanceTools/Deedle.PerfTest/Deedle.PerfTest.fsproj b/tests/PerformanceTools/Deedle.PerfTest/Deedle.PerfTest.fsproj
index bad1b762..50a54839 100644
--- a/tests/PerformanceTools/Deedle.PerfTest/Deedle.PerfTest.fsproj
+++ b/tests/PerformanceTools/Deedle.PerfTest/Deedle.PerfTest.fsproj
@@ -1,4 +1,4 @@
-
+
@@ -111,9 +111,6 @@
True
True
-
- True
-