diff --git a/.gitignore b/.gitignore
index bae08ffb..1baa0dff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,5 @@ tests/PerformanceTools/Deedle.PerfTest.Core/bin
tests/PerformanceTools/Deedle.PerfTest.Runner/obj
tests/PerformanceTools/Deedle.PerfTest.Runner/bin
tests/PerformanceTools/Deedle.PerfTest/obj
-tests/PerformanceTools/Deedle.PerfTest/bin
\ No newline at end of file
+tests/PerformanceTools/Deedle.PerfTest/bin
+.paket/paket.exe
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
deleted file mode 100755
index 67f8ea04..00000000
--- a/.nuget/NuGet.Config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
deleted file mode 100755
index c41a0d0d..00000000
Binary files a/.nuget/NuGet.exe and /dev/null differ
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
deleted file mode 100755
index 83fe9060..00000000
--- a/.nuget/NuGet.targets
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
- $(MSBuildProjectDirectory)\..\
-
-
- false
-
-
- false
-
-
- true
-
-
- false
-
-
-
-
-
-
-
-
-
-
- $([System.IO.Path]::Combine($(SolutionDir), ".nuget"))
- $([System.IO.Path]::Combine($(ProjectDir), "packages.config"))
-
-
-
-
- $(SolutionDir).nuget
- packages.config
-
-
-
-
- $(NuGetToolsPath)\NuGet.exe
- @(PackageSource)
-
- "$(NuGetExePath)"
- mono --runtime=v4.0.30319 $(NuGetExePath)
-
- $(TargetDir.Trim('\\'))
-
- -RequireConsent
- -NonInteractive
-
- "$(SolutionDir) "
- "$(SolutionDir)"
-
-
- $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)
- $(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols
-
-
-
- RestorePackages;
- $(BuildDependsOn);
-
-
-
-
- $(BuildDependsOn);
- BuildPackage;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.paket/paket.bootstrapper.exe b/.paket/paket.bootstrapper.exe
new file mode 100644
index 00000000..32a28ee1
Binary files /dev/null and b/.paket/paket.bootstrapper.exe differ
diff --git a/.paket/paket.targets b/.paket/paket.targets
new file mode 100644
index 00000000..22c9f0a8
--- /dev/null
+++ b/.paket/paket.targets
@@ -0,0 +1,38 @@
+
+
+
+
+ true
+
+ true
+ $(MSBuildThisFileDirectory)
+ $(MSBuildThisFileDirectory)..\
+
+
+
+ $(PaketToolsPath)paket.exe
+ $(PaketToolsPath)paket.bootstrapper.exe
+ "$(PaketExePath)"
+ mono --runtime=v4.0.30319 $(PaketExePath)
+ "$(PaketBootStrapperExePath)"
+ mono --runtime=v4.0.30319 $(PaketBootStrapperExePath)
+
+ $(MSBuildProjectDirectory)\paket.references
+ $(MSBuildProjectFullPath).paket.references
+ $(PaketCommand) restore --references-files "$(PaketReferences)"
+ $(PaketBootStrapperCommand)
+
+ RestorePackages; $(BuildDependsOn);
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Deedle.Core.sln b/Deedle.Core.sln
index 1f21053c..20f133fa 100644
--- a/Deedle.Core.sln
+++ b/Deedle.Core.sln
@@ -1,8 +1,13 @@
-
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
+ 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}"
ProjectSection(ProjectDependencies) = postProject
{22729065-4C30-4E43-A63F-4F3338A03878} = {22729065-4C30-4E43-A63F-4F3338A03878}
@@ -27,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/Deedle.Tests.sln b/Deedle.Tests.sln
index 0f28b879..e0708981 100644
--- a/Deedle.Tests.sln
+++ b/Deedle.Tests.sln
@@ -1,13 +1,11 @@
-
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{6D802F6C-A258-4F6B-B1E4-03B24D319126}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{ACC11088-D082-4141-BBA5-B80209449475}"
ProjectSection(SolutionItems) = preProject
- .nuget\NuGet.Config = .nuget\NuGet.Config
- .nuget\NuGet.exe = .nuget\NuGet.exe
- .nuget\NuGet.targets = .nuget\NuGet.targets
+ 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}"
diff --git a/Deedle.sln b/Deedle.sln
index d10cbe02..eb5971f5 100755
--- a/Deedle.sln
+++ b/Deedle.sln
@@ -1,8 +1,13 @@
-
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{B003806F-9C76-4BE6-B3EB-54102529E4FC}"
+ ProjectSection(SolutionItems) = preProject
+ paket.dependencies = paket.dependencies
+ paket.lock = paket.lock
+ EndProjectSection
+EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Deedle", "src\Deedle\Deedle.fsproj", "{22729065-4C30-4E43-A63F-4F3338A03878}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{245F1283-32FA-4B38-AC76-448B8AE5F7AC}"
@@ -42,7 +47,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{C45F5ABF
ProjectSection(SolutionItems) = preProject
docs\tools\formatters.fsx = docs\tools\formatters.fsx
docs\tools\generate.fsx = docs\tools\generate.fsx
- docs\tools\packages.config = docs\tools\packages.config
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{839C977B-55D4-4EFC-8B81-290357C836D3}"
@@ -79,7 +83,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{8BD8876A-28FC-4B7D-89E4-09AC07794D0E} = {245F1283-32FA-4B38-AC76-448B8AE5F7AC}
{C45F5ABF-7BCD-4C3A-BD51-81E0769E0F29} = {245F1283-32FA-4B38-AC76-448B8AE5F7AC}
- {1700F933-C7B2-48E6-80F3-E1C1B677BA6D} = {245F1283-32FA-4B38-AC76-448B8AE5F7AC}
{839C977B-55D4-4EFC-8B81-290357C836D3} = {C45F5ABF-7BCD-4C3A-BD51-81E0769E0F29}
+ {1700F933-C7B2-48E6-80F3-E1C1B677BA6D} = {245F1283-32FA-4B38-AC76-448B8AE5F7AC}
EndGlobalSection
EndGlobal
diff --git a/build.cmd b/build.cmd
index 8ca7acd7..29cd7d86 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,3 +1,14 @@
@echo off
-.nuget\nuget.exe install FAKE -OutputDirectory packages -ExcludeVersion
+cls
+
+.paket\paket.bootstrapper.exe
+if errorlevel 1 (
+ exit /b %errorlevel%
+)
+
+.paket\paket.exe restore
+if errorlevel 1 (
+ exit /b %errorlevel%
+)
+
packages\FAKE\tools\FAKE.exe build.fsx %*
\ No newline at end of file
diff --git a/build.fsx b/build.fsx
index e412eae4..9082cd73 100644
--- a/build.fsx
+++ b/build.fsx
@@ -69,12 +69,7 @@ Target "UpdateFsxVersions" (fun _ ->
)
// --------------------------------------------------------------------------------------
-// Clean build results & restore NuGet packages
-
-Target "RestorePackages" (fun _ ->
- !! "./**/packages.config"
- |> Seq.iter (RestorePackage (fun p -> { p with ToolPath = "./.nuget/NuGet.exe" }))
-)
+// Clean build results
Target "Clean" (fun _ ->
CleanDirs ["bin"; "temp" ]
@@ -116,14 +111,11 @@ Target "BuildCore" (fun _ ->
// Run the unit tests using test runner & kill test runner when complete
Target "RunTests" (fun _ ->
- let nunitVersion = GetPackageVersion "packages" "NUnit.Runners"
- let nunitPath = sprintf "packages/NUnit.Runners.%s/Tools" nunitVersion
ActivateFinalTarget "CloseTestRunner"
!! "tests/Deedle.*Tests/bin/Release/Deedle*Tests*.dll"
|> NUnit (fun p ->
{ p with
- ToolPath = nunitPath
DisableShadowCopy = true
TimeOut = TimeSpan.FromMinutes 20.
OutputFile = "TestResults.xml" })
@@ -223,7 +215,6 @@ Target "All" DoNothing
Target "AllCore" DoNothing
"Clean"
- ==> "RestorePackages"
==> "UpdateFsxVersions"
==> "AssemblyInfo"
==> "Build"
diff --git a/build.sh b/build.sh
index 9cbc8057..4570a7eb 100755
--- a/build.sh
+++ b/build.sh
@@ -2,10 +2,32 @@
if test "$OS" = "Windows_NT"
then
# use .Net
- .nuget/NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion
- packages/FAKE/tools/FAKE.exe build.fsx $@
+
+ .paket/paket.bootstrapper.exe
+ exit_code=$?
+ if [ $exit_code -ne 0 ]; then
+ exit $exit_code
+ fi
+
+ .paket/paket.exe restore
+ exit_code=$?
+ if [ $exit_code -ne 0 ]; then
+ exit $exit_code
+ fi
+
+ packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
else
# use mono
- mono .nuget/NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion
- mono packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
-fi
\ No newline at end of file
+ mono .paket/paket.bootstrapper.exe prerelease
+ exit_code=$?
+ if [ $exit_code -ne 0 ]; then
+ exit $exit_code
+ fi
+
+ mono .paket/paket.exe restore
+ exit_code=$?
+ if [ $exit_code -ne 0 ]; then
+ exit $exit_code
+ fi
+ mono packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
+fi
diff --git a/docs/content/frame.fsx b/docs/content/frame.fsx
index b44d8521..30dfc24a 100644
--- a/docs/content/frame.fsx
+++ b/docs/content/frame.fsx
@@ -1,5 +1,5 @@
-(*** hide ***)
-#I "../../packages/FSharp.Data.2.0.14/lib/net40"
+(*** hide ***)
+#I "../../packages/FSharp.Data/lib/net40"
#r "FSharp.Data.dll"
ignore <| FSharp.Data.WorldBankData.GetDataContext() // Force fsi to load F# Data (required on Mono)
diff --git a/docs/content/rinterop.fsx b/docs/content/rinterop.fsx
index ed2e5ce7..31da01f9 100644
--- a/docs/content/rinterop.fsx
+++ b/docs/content/rinterop.fsx
@@ -1,7 +1,11 @@
-(*** hide ***)
+(*** hide ***)
#nowarn "211"
-#I "../../packages/FSharp.Charting.0.90.6"
-#I "../../packages/RProvider.1.0.17/"
+#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"
@@ -51,8 +55,8 @@ Getting started
In a typical project ("F# Tutorial"), the NuGet packages are installed in the `../packages`
directory. To use R provider and Deedle, you need to write something like this:
*)
-#I "../packages/Deedle.0.9.9-beta/"
-#I "../packages/RProvider.1.0.17/"
+#I "../packages/Deedle/"
+#I "../packages/RProvider/"
#load "RProvider.fsx"
#load "Deedle.fsx"
@@ -63,7 +67,7 @@ open Deedle
If you're not using NuGet from Visual Studio, then you'll need to manually copy the
file `Deedle.RProvider.Plugin.dll` from the package `Deedle.RPlugin` to the
-directory where `RProvider.dll` is located (in `RProvider.1.0.17/lib`). Once that's
+directory where `RProvider.dll` is located (in `RProvider/lib`). Once that's
done, the R provider will automatically find the plugin.
diff --git a/docs/content/samples/formatting.fsx b/docs/content/samples/formatting.fsx
index 9f4c738e..634fcd9d 100644
--- a/docs/content/samples/formatting.fsx
+++ b/docs/content/samples/formatting.fsx
@@ -1,7 +1,7 @@
-(*** hide ***)
+(*** hide ***)
#load "../../../bin/Deedle.fsx"
-#load "../../../packages/FSharp.Charting.0.90.6/FSharp.Charting.fsx"
-#r "../../../packages/FSharp.Data.2.0.14/lib/net40/FSharp.Data.dll"
+#load "../../../packages/FSharp.Charting/FSharp.Charting.fsx"
+#r "../../../packages/FSharp.Data/lib/net40/FSharp.Data.dll"
open System
open System.IO
open FSharp.Data
diff --git a/docs/content/samples/historyvol.fsx b/docs/content/samples/historyvol.fsx
index 14d8a39a..3d3c6dca 100644
--- a/docs/content/samples/historyvol.fsx
+++ b/docs/content/samples/historyvol.fsx
@@ -2,10 +2,10 @@
// Load everything
// ----------------------------------------------------------------------------
-#I "../../../packages/FSharp.Charting.0.90.6"
+#I "../../../packages/FSharp.Charting"
#r "../../../bin/MathNet.Numerics.dll"
#load "../../bin/Deedle.fsx"
-#r "../../../packages/FSharp.Data.2.0.14/lib/net40/FSharp.Data.dll"
+#r "../../../packages/FSharp.Data/lib/net40/FSharp.Data.dll"
#load "FSharp.Charting.fsx"
open System
diff --git a/docs/content/samples/missing.fsx b/docs/content/samples/missing.fsx
index 1016ba95..94acd1c2 100644
--- a/docs/content/samples/missing.fsx
+++ b/docs/content/samples/missing.fsx
@@ -1,7 +1,7 @@
-(*** hide ***)
+(*** hide ***)
#I "../../../bin/"
-#I "../../../packages/FSharp.Charting.0.90.6"
-#I "../../../packages/Deedle.0.9.5"
+#I "../../../packages/FSharp.Charting"
+#I "../../../packages/Deedle"
#load "FSharp.Charting.fsx"
#load "Deedle.fsx"
open System
diff --git a/docs/content/samples/presidents.fsx b/docs/content/samples/presidents.fsx
index c68ea5b6..13032cc2 100644
--- a/docs/content/samples/presidents.fsx
+++ b/docs/content/samples/presidents.fsx
@@ -1,10 +1,10 @@
-// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
// Load everything & add extensions for F# charting
// ----------------------------------------------------------------------------
#nowarn "58"
#I "../../../bin"
-#I "../../../packages/FSharp.Data.2.0.14/lib/net40"
-#I "../../../packages/FSharp.Charting.0.90.6"
+#I "../../../packages/FSharp.Data/lib/net40"
+#I "../../../packages/FSharp.Charting"
#r "FSharp.Data.dll"
#load "FSharp.Charting.fsx"
diff --git a/docs/content/samples/titanic.fsx b/docs/content/samples/titanic.fsx
index ba91f4a3..00d671c6 100644
--- a/docs/content/samples/titanic.fsx
+++ b/docs/content/samples/titanic.fsx
@@ -1,6 +1,6 @@
-(*** hide ***)
-#load "../../../packages/FSharp.Charting.0.90.6/FSharp.Charting.fsx"
-#r "../../../packages/FSharp.Data.2.0.14/lib/net40/FSharp.Data.dll"
+(*** hide ***)
+#load "../../../packages/FSharp.Charting/FSharp.Charting.fsx"
+#r "../../../packages/FSharp.Data/lib/net40/FSharp.Data.dll"
#load "../../../bin/Deedle.fsx"
open System
open FSharp.Data
diff --git a/docs/content/series.fsx b/docs/content/series.fsx
index 0435683c..ab902f7a 100644
--- a/docs/content/series.fsx
+++ b/docs/content/series.fsx
@@ -1,8 +1,8 @@
-(*** hide ***)
+(*** hide ***)
#I "../../bin"
#load "Deedle.fsx"
-#I "../../packages/MathNet.Numerics.3.0.0/lib/net40"
-#load "../../packages/FSharp.Charting.0.90.6/FSharp.Charting.fsx"
+#I "../../packages/MathNet.Numerics/lib/net40"
+#load "../../packages/FSharp.Charting/FSharp.Charting.fsx"
open System
open FSharp.Data
open Deedle
diff --git a/docs/content/stats.fsx b/docs/content/stats.fsx
index f86382ce..afc67e6d 100644
--- a/docs/content/stats.fsx
+++ b/docs/content/stats.fsx
@@ -1,6 +1,6 @@
-(*** hide ***)
+(*** hide ***)
#load "../../bin/Deedle.fsx"
-#load "../../packages/FSharp.Charting.0.90.6/FSharp.Charting.fsx"
+#load "../../packages/FSharp.Charting/FSharp.Charting.fsx"
open System
open System.Globalization
open System.IO
diff --git a/docs/content/tutorial.fsx b/docs/content/tutorial.fsx
index 36cf4842..9a103f2a 100644
--- a/docs/content/tutorial.fsx
+++ b/docs/content/tutorial.fsx
@@ -1,4 +1,4 @@
-(*** hide ***)
+(*** hide ***)
#I "../../bin/"
(**
@@ -17,8 +17,8 @@ we also need [F# Charting](http://fsharp.github.io/FSharp.Charting), which
works similarly:
*)
-#I "../../packages/FSharp.Charting.0.90.6"
-#I "../../packages/Deedle.0.9.5"
+#I "../../packages/FSharp.Charting"
+#I "../../packages/Deedle"
#load "FSharp.Charting.fsx"
#load "Deedle.fsx"
diff --git a/docs/csharp/App.config b/docs/csharp/App.config
index 8e156463..9e82cbfd 100644
--- a/docs/csharp/App.config
+++ b/docs/csharp/App.config
@@ -1,6 +1,30 @@
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/csharp/CSharp.DocSnippets.csproj b/docs/csharp/CSharp.DocSnippets.csproj
index f8280c3d..d5ff2b92 100644
--- a/docs/csharp/CSharp.DocSnippets.csproj
+++ b/docs/csharp/CSharp.DocSnippets.csproj
@@ -63,4 +63,5 @@
-->
+
\ No newline at end of file
diff --git a/docs/tools/formatters.fsx b/docs/tools/formatters.fsx
index 54c7344c..8c8df0eb 100644
--- a/docs/tools/formatters.fsx
+++ b/docs/tools/formatters.fsx
@@ -1,14 +1,14 @@
-module Formatters
-#I "../../packages/FSharp.Formatting.2.4.36/lib/net40"
+module Formatters
+#I "../../packages/FSharp.Formatting/lib/net40"
#r "FSharp.Markdown.dll"
#r "FSharp.Literate.dll"
#r "../../bin/Deedle.dll"
#r "../../packages/FAKE/tools/FakeLib.dll"
-#r "../../packages/R.NET.Community.1.5.15/lib/net40/RDotNet.dll"
-#r "../../packages/RProvider.1.0.17/lib/net40/RProvider.dll"
-#r "../../packages/RProvider.1.0.17/lib/net40/RProvider.Runtime.dll"
-#r "../../packages/MathNet.Numerics.3.0.0/lib/net40/MathNet.Numerics.dll"
-#load "../../packages/FSharp.Charting.0.90.6/FSharp.Charting.fsx"
+#r "../../packages/R.NET.Community/lib/net40/RDotNet.dll"
+#r "../../packages/RProvider/lib/net40/RProvider.dll"
+#r "../../packages/RProvider/lib/net40/RProvider.Runtime.dll"
+#r "../../packages/MathNet.Numerics/lib/net40/MathNet.Numerics.dll"
+#load "../../packages/FSharp.Charting/FSharp.Charting.fsx"
// --------------------------------------------------------------------------------------
// NOTE: The rest of the file is copied from the FsLab project:
diff --git a/docs/tools/generate.fsx b/docs/tools/generate.fsx
index ee479c76..401cc44a 100644
--- a/docs/tools/generate.fsx
+++ b/docs/tools/generate.fsx
@@ -1,4 +1,4 @@
-// --------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------
// Builds the documentation from `.fsx` and `.md` files in the 'docs/content' directory
// (the generated documentation is stored in the 'docs/output' directory)
// --------------------------------------------------------------------------------------
@@ -20,10 +20,10 @@ let info =
// For typical project, no changes are needed below
// --------------------------------------------------------------------------------------
-#I "../../packages/FSharp.Compiler.Service.0.0.67/lib/net40"
-#I "../../packages/FSharp.Formatting.2.4.36/lib/net40"
-#I "../../packages/RazorEngine.3.3.0/lib/net40/"
-#r "../../packages/Microsoft.AspNet.Razor.2.0.30506.0/lib/net40/System.Web.Razor.dll"
+#I "../../packages/FSharp.Compiler.Service/lib/net40"
+#I "../../packages/FSharp.Formatting/lib/net40"
+#I "../../packages/RazorEngine/lib/net40/"
+#r "../../packages/Microsoft.AspNet.Razor/lib/net40/System.Web.Razor.dll"
#r "../../packages/FAKE/tools/FakeLib.dll"
#r "RazorEngine.dll"
#r "FSharp.Markdown.dll"
@@ -51,7 +51,7 @@ let content = __SOURCE_DIRECTORY__ @@ "../content"
let output = __SOURCE_DIRECTORY__ @@ "../output"
let files = __SOURCE_DIRECTORY__ @@ "../files"
let templates = __SOURCE_DIRECTORY__ @@ "templates"
-let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting.2.4.36/"
+let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting/"
let docTemplate = formatting @@ "templates/docpage.cshtml"
// Where to look for *.csproj templates (in this order)
diff --git a/docs/tools/packages.config b/docs/tools/packages.config
deleted file mode 100644
index dac4ad1a..00000000
--- a/docs/tools/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/paket.dependencies b/paket.dependencies
new file mode 100644
index 00000000..68395df7
--- /dev/null
+++ b/paket.dependencies
@@ -0,0 +1,12 @@
+source https://nuget.org/api/v2
+
+nuget FsCheck 0.9.1.0
+nuget FSharp.Charting
+nuget FSharp.Data
+nuget FSharp.Formatting
+nuget MathNet.Numerics
+nuget NUnit
+nuget NUnit.Runners
+nuget RProvider
+nuget Nuget.CommandLine
+nuget FAKE
\ No newline at end of file
diff --git a/paket.lock b/paket.lock
new file mode 100644
index 00000000..01c026ef
--- /dev/null
+++ b/paket.lock
@@ -0,0 +1,29 @@
+NUGET
+ remote: https://nuget.org/api/v2
+ specs:
+ FAKE (3.10.0)
+ FsCheck (0.9.1.0)
+ FSharp.Charting (0.90.7)
+ FSharp.Compiler.Service (0.0.67)
+ FSharp.Data (2.1.0)
+ Zlib.Portable (>= 1.10.0)
+ FSharp.Formatting (2.4.36)
+ FSharp.Compiler.Service (0.0.67)
+ Microsoft.AspNet.Razor (2.0.30506.0)
+ RazorEngine (3.3.0)
+ MathNet.Numerics (3.3.0)
+ TaskParallelLibrary (>= 1.0.2856) - net35
+ Microsoft.AspNet.Razor (2.0.30506.0)
+ NuGet.CommandLine (2.8.3)
+ NUnit (2.6.3)
+ NUnit.Runners (2.6.3)
+ R.NET.Community (1.5.15)
+ R.NET.Community.FSharp (0.1.8)
+ R.NET.Community (>= 1.5.15)
+ RazorEngine (3.3.0)
+ Microsoft.AspNet.Razor (>= 2.0.30506.0)
+ RProvider (1.0.17)
+ R.NET.Community (1.5.15)
+ R.NET.Community.FSharp (0.1.8)
+ TaskParallelLibrary (1.0.2856) - net35
+ Zlib.Portable (1.10.0)
diff --git a/src/Deedle.RProvider.Plugin/Deedle.RProvider.Plugin.fsproj b/src/Deedle.RProvider.Plugin/Deedle.RProvider.Plugin.fsproj
index 228f390f..433ed321 100644
--- a/src/Deedle.RProvider.Plugin/Deedle.RProvider.Plugin.fsproj
+++ b/src/Deedle.RProvider.Plugin/Deedle.RProvider.Plugin.fsproj
@@ -1,4 +1,4 @@
-
+
@@ -13,7 +13,6 @@
4.3.0.0
Deedle.RProvider.Plugin
..\..\
- true
@@ -51,33 +50,14 @@
-
+
-
- ..\..\packages\R.NET.Community.1.5.15\lib\net40\RDotNet.dll
-
-
- ..\..\packages\R.NET.Community.FSharp.0.1.8\lib\net40\RDotNet.FSharp.dll
-
-
- ..\..\packages\R.NET.Community.1.5.15\lib\net40\RDotNet.NativeLibrary.dll
-
-
- ..\..\packages\RProvider.1.0.17\lib\net40\RProvider.dll
-
-
- ..\..\packages\RProvider.1.0.17\lib\net40\RProvider.Runtime.dll
-
-
- False
-
-
Deedle
{22729065-4c30-4e43-a63f-4f3338a03878}
@@ -92,10 +72,72 @@
-->
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ ..\..\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
+
+
+
+
\ No newline at end of file
diff --git a/src/Deedle.RProvider.Plugin/packages.config b/src/Deedle.RProvider.Plugin/packages.config
deleted file mode 100644
index 935ea89d..00000000
--- a/src/Deedle.RProvider.Plugin/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Deedle.RProvider.Plugin/paket.references b/src/Deedle.RProvider.Plugin/paket.references
new file mode 100644
index 00000000..7695a31b
--- /dev/null
+++ b/src/Deedle.RProvider.Plugin/paket.references
@@ -0,0 +1 @@
+RProvider
\ No newline at end of file
diff --git a/src/Deedle/Common/AssemblyInfo.fs b/src/Deedle/Common/AssemblyInfo.fs
index 99b4687e..accb5330 100755
--- a/src/Deedle/Common/AssemblyInfo.fs
+++ b/src/Deedle/Common/AssemblyInfo.fs
@@ -4,9 +4,9 @@ open System.Reflection
[]
[]
[]
-[]
-[]
+[]
+[]
do ()
module internal AssemblyVersionInformation =
- let [] Version = "1.0.6"
+ let [] Version = "1.0.7"
diff --git a/src/Deedle/Deedle.fsproj b/src/Deedle/Deedle.fsproj
index ce9a8e42..7c9c6d86 100644
--- a/src/Deedle/Deedle.fsproj
+++ b/src/Deedle/Deedle.fsproj
@@ -12,7 +12,6 @@
v4.0
Deedle
..\..\
- true
4.3.0.0
@@ -73,7 +72,7 @@
-
+
PreserveNewest
@@ -82,26 +81,55 @@
False
-
- ..\..\packages\FSharp.Data.2.0.14\lib\net40\FSharp.Data.dll
- True
-
-
-
-
-
+
+
+
+
+
+
+
+ ..\..\packages\FSharp.Data\lib\portable-net40+sl5+wp8+win8\FSharp.Data.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\FSharp.Data\lib\net40\FSharp.Data.dll
+ True
+ True
+
+
+ True
+
+
+
+
+
+
+
+
+ ..\..\packages\Zlib.Portable\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll
+ True
+ True
+
+
+
+
\ No newline at end of file
diff --git a/src/Deedle/Deedle.fsx b/src/Deedle/Deedle.fsx
index 13d777a6..61e4af9b 100755
--- a/src/Deedle/Deedle.fsx
+++ b/src/Deedle/Deedle.fsx
@@ -4,11 +4,11 @@
#I "../bin"
#I "bin"
#I "lib"
-#I "../packages/Deedle.1.0.6/lib/net40"
-#I "../../packages/Deedle.1.0.6/lib/net40"
-#I "../../../packages/Deedle.1.0.6/lib/net40"
+#I "../packages/Deedle.1.0.7/lib/net40"
+#I "../../packages/Deedle.1.0.7/lib/net40"
+#I "../../../packages/Deedle.1.0.7/lib/net40"
// Also reference path with FSharp.Data.DesignTime.dll
-#I "../FSharp.Data.2.0.14/lib/net40/"
+#I "../FSharp.Data/lib/net40/"
// Reference Deedle
#r "Deedle.dll"
diff --git a/src/Deedle/FrameExtensions.fs b/src/Deedle/FrameExtensions.fs
index 91b23a96..b5c34533 100644
--- a/src/Deedle/FrameExtensions.fs
+++ b/src/Deedle/FrameExtensions.fs
@@ -15,6 +15,7 @@ open System.Collections.Generic
open FSharp.Data.Runtime
open Deedle.Keys
open Deedle.Vectors
+open FSharp.Data
/// Provides static methods for creating frames, reading frame data
/// from CSV files and database (via IDataReader). The type also provides
diff --git a/src/Deedle/FrameUtils.fs b/src/Deedle/FrameUtils.fs
index 6e84f8bf..5ca001e2 100644
--- a/src/Deedle/FrameUtils.fs
+++ b/src/Deedle/FrameUtils.fs
@@ -398,7 +398,7 @@ module internal FrameUtils =
let createVector typ (data:string[]) =
let missingValuesStr = String.Join(",", missingValues)
- if typ = typeof then Vector.ofOptionalValues (Array.map (fun s -> TextRuntime.ConvertBoolean(culture, Some(s))) data) :> IVector
+ if typ = typeof then Vector.ofOptionalValues (Array.map (fun s -> TextRuntime.ConvertBoolean(Some(s))) data) :> IVector
elif typ = typeof then Vector.ofOptionalValues (Array.map (fun s -> TextRuntime.ConvertDecimal(culture, Some(s))) data) :> IVector
elif typ = typeof then Vector.ofOptionalValues (Array.map (fun s -> TextRuntime.ConvertFloat(culture, missingValuesStr, Some(s))) data) :> IVector
elif typ = typeof then Vector.ofOptionalValues (Array.map (fun s -> TextRuntime.ConvertInteger(culture, Some(s))) data) :> IVector
diff --git a/src/Deedle/packages.config b/src/Deedle/packages.config
deleted file mode 100644
index 8b4a1cec..00000000
--- a/src/Deedle/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/Deedle/paket.references b/src/Deedle/paket.references
new file mode 100644
index 00000000..828ba5f0
--- /dev/null
+++ b/src/Deedle/paket.references
@@ -0,0 +1 @@
+FSharp.Data
\ No newline at end of file
diff --git a/tests/Deedle.CSharp.Tests/App.config b/tests/Deedle.CSharp.Tests/App.config
index 8e156463..26bd6096 100644
--- a/tests/Deedle.CSharp.Tests/App.config
+++ b/tests/Deedle.CSharp.Tests/App.config
@@ -1,6 +1,30 @@
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tests/Deedle.CSharp.Tests/Deedle.CSharp.Tests.csproj b/tests/Deedle.CSharp.Tests/Deedle.CSharp.Tests.csproj
index 497d176a..a671a662 100755
--- a/tests/Deedle.CSharp.Tests/Deedle.CSharp.Tests.csproj
+++ b/tests/Deedle.CSharp.Tests/Deedle.CSharp.Tests.csproj
@@ -12,7 +12,6 @@
v4.5
512
..\..\
- true
AnyCPU
@@ -40,16 +39,8 @@
..\..\bin\Deedle.dll
-
- ..\..\packages\FSharp.Data.2.0.14\lib\net40\FSharp.Data.dll
-
-
- False
- ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll
-
-
@@ -62,13 +53,12 @@
-
+
-
+
+
+
+
+
+ ..\..\packages\FSharp.Data\lib\portable-net40+sl5+wp8+win8\FSharp.Data.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\FSharp.Data\lib\net40\FSharp.Data.dll
+ True
+ True
+
+
+ True
+
+
+
+
+
+
+ ..\..\packages\NUnit\lib\nunit.framework.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\Zlib.Portable\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll
+ True
+ True
+
+
+
+
\ No newline at end of file
diff --git a/tests/Deedle.CSharp.Tests/packages.config b/tests/Deedle.CSharp.Tests/packages.config
deleted file mode 100644
index 1c0c4ea3..00000000
--- a/tests/Deedle.CSharp.Tests/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/tests/Deedle.CSharp.Tests/paket.references b/tests/Deedle.CSharp.Tests/paket.references
new file mode 100644
index 00000000..0174a987
--- /dev/null
+++ b/tests/Deedle.CSharp.Tests/paket.references
@@ -0,0 +1,2 @@
+FSharp.Data
+NUnit
\ No newline at end of file
diff --git a/tests/Deedle.Documentation.Tests/Deedle.Documentation.Tests.fsproj b/tests/Deedle.Documentation.Tests/Deedle.Documentation.Tests.fsproj
index 60de72d9..fb37c615 100644
--- a/tests/Deedle.Documentation.Tests/Deedle.Documentation.Tests.fsproj
+++ b/tests/Deedle.Documentation.Tests/Deedle.Documentation.Tests.fsproj
@@ -14,7 +14,6 @@
..\..\
- true
4.3.0.0
@@ -42,52 +41,22 @@
FsUnit.fs
-
+
-
- ..\..\packages\FSharp.Formatting.2.4.36\lib\net40\CSharpFormat.dll
-
-
- ..\..\packages\FSharp.Formatting.2.4.36\lib\net40\FSharp.CodeFormat.dll
-
..\..\lib\FSharp.Compiler.Interactive.Settings.dll
True
-
- ..\..\packages\FSharp.Compiler.Service.0.0.67\lib\net40\FSharp.Compiler.Service.dll
-
-
- ..\..\packages\FSharp.Formatting.2.4.36\lib\net40\FSharp.Literate.dll
-
False
-
- ..\..\packages\FSharp.Formatting.2.4.36\lib\net40\FSharp.Markdown.dll
-
-
- ..\..\packages\FSharp.Formatting.2.4.36\lib\net40\FSharp.MetadataFormat.dll
-
-
- ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll
- True
-
-
- ..\..\packages\RazorEngine.3.3.0\lib\net40\RazorEngine.dll
- True
-
-
- ..\..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll
- True
-
11
@@ -99,7 +68,6 @@
$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets
-
+
+
+
+
+
+ ..\..\packages\FSharp.Compiler.Service\lib\net40\FSharp.Compiler.Service.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll
+ True
+ True
+
+
+
+
+
+
+
+
+ ..\..\packages\FSharp.Formatting\lib\net40\CSharpFormat.dll
+ True
+ True
+
+
+ ..\..\packages\FSharp.Formatting\lib\net40\FSharp.CodeFormat.dll
+ True
+ True
+
+
+ ..\..\packages\FSharp.Formatting\lib\net40\FSharp.Literate.dll
+ True
+ True
+
+
+ ..\..\packages\FSharp.Formatting\lib\net40\FSharp.Markdown.dll
+ True
+ True
+
+
+ ..\..\packages\FSharp.Formatting\lib\net40\FSharp.MetadataFormat.dll
+ True
+ True
+
+
+
+
+
+
+
+
+ ..\..\packages\Microsoft.AspNet.Razor\lib\net40\System.Web.Razor.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\NUnit\lib\nunit.framework.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\RazorEngine\lib\net40\RazorEngine.dll
+ True
+ True
+
+
+
+
\ No newline at end of file
diff --git a/tests/Deedle.Documentation.Tests/DocTests.fs b/tests/Deedle.Documentation.Tests/DocTests.fs
index 5145b81d..fe3769c8 100644
--- a/tests/Deedle.Documentation.Tests/DocTests.fs
+++ b/tests/Deedle.Documentation.Tests/DocTests.fs
@@ -2,15 +2,15 @@
// Test that the documentation is generated correctly withtout F# errors
// --------------------------------------------------------------------------------------
#if INTERACTIVE
-#I "../../packages/FSharp.Formatting.2.4.36/lib/net40"
-#I "../../packages/RazorEngine.3.3.0/lib/net40/"
-#r "../../packages/Microsoft.AspNet.Razor.2.0.30506.0/lib/net40/System.Web.Razor.dll"
-#r "../../packages/FSharp.Compiler.Service.0.0.67/lib/net40/FSharp.Compiler.Service.dll"
+#I "../../packages/FSharp.Formatting/lib/net40"
+#I "../../packages/RazorEngine/lib/net40/"
+#r "../../packages/Microsoft.AspNet.Razor/lib/net40/System.Web.Razor.dll"
+#r "../../packages/FSharp.Compiler.Service/lib/net40/FSharp.Compiler.Service.dll"
#r "RazorEngine.dll"
#r "FSharp.Literate.dll"
#r "FSharp.CodeFormat.dll"
#r "FSharp.MetadataFormat.dll"
-#r "../../packages/NUnit.2.6.3/lib/nunit.framework.dll"
+#r "../../packages/NUnit/lib/nunit.framework.dll"
#load "../Common/FsUnit.fs"
#else
module FSharp.Data.Tests.DocumentationTests
diff --git a/tests/Deedle.Documentation.Tests/app.config b/tests/Deedle.Documentation.Tests/app.config
index a2f4d2f0..912e44ae 100644
--- a/tests/Deedle.Documentation.Tests/app.config
+++ b/tests/Deedle.Documentation.Tests/app.config
@@ -4,10 +4,26 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/Deedle.Documentation.Tests/packages.config b/tests/Deedle.Documentation.Tests/packages.config
deleted file mode 100644
index 6598c6ce..00000000
--- a/tests/Deedle.Documentation.Tests/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tests/Deedle.Documentation.Tests/paket.references b/tests/Deedle.Documentation.Tests/paket.references
new file mode 100644
index 00000000..d7e3a99e
--- /dev/null
+++ b/tests/Deedle.Documentation.Tests/paket.references
@@ -0,0 +1,3 @@
+NUnit
+RazorEngine
+FSharp.Formatting
\ No newline at end of file
diff --git a/tests/Deedle.PerfTests/Deedle.PerfTests.fsproj b/tests/Deedle.PerfTests/Deedle.PerfTests.fsproj
index c4856191..c27bde1e 100644
--- a/tests/Deedle.PerfTests/Deedle.PerfTests.fsproj
+++ b/tests/Deedle.PerfTests/Deedle.PerfTests.fsproj
@@ -12,7 +12,6 @@
v4.5
Deedle.Tests
..\..\
- true
4.3.0.0
@@ -39,40 +38,24 @@
..\..\bin\Deedle.dll
-
- ..\PerformanceTools\bin\Deedle.PerfTest.Core.dll
-
-
- ..\..\packages\FsCheck.0.9.1.0\lib\net40-Client\FsCheck.dll
-
-
+
False
-
- ..\..\packages\FSharp.Data.2.0.14\lib\net40\FSharp.Data.dll
- True
-
-
- ..\..\packages\MathNet.Numerics.3.0.0\lib\net40\MathNet.Numerics.dll
+
+ ..\PerformanceTools\bin\Deedle.PerfTest.Core.dll
-
- ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll
- True
-
-
-
FsUnit.fs
-
+
11
@@ -84,7 +67,6 @@
$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets
-
+
+
+
+
+
+ ..\..\packages\FsCheck\lib\net40-Client\FsCheck.dll
+ True
+ True
+
+
+
+
+
+
+
+
+ ..\..\packages\FSharp.Data\lib\portable-net40+sl5+wp8+win8\FSharp.Data.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\FSharp.Data\lib\net40\FSharp.Data.dll
+ True
+ True
+
+
+ True
+
+
+
+
+
+
+
+
+ ..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\MathNet.Numerics\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll
+ True
+ True
+
+
+ True
+
+
+
+
+
+
+ ..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll
+ True
+ True
+
+
+ True
+
+
+
+
+
+
+ ..\..\packages\MathNet.Numerics\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\MathNet.Numerics\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\MathNet.Numerics\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\NUnit\lib\nunit.framework.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll
+ True
+ True
+
+
+
+
+
+
+
+
+ ..\..\packages\Zlib.Portable\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll
+ True
+ True
+
+
+
+
\ No newline at end of file
diff --git a/tests/Deedle.PerfTests/Performance.fs b/tests/Deedle.PerfTests/Performance.fs
index 9db8cc9b..1581d675 100644
--- a/tests/Deedle.PerfTests/Performance.fs
+++ b/tests/Deedle.PerfTests/Performance.fs
@@ -1,9 +1,9 @@
#if INTERACTIVE
#I "../../bin"
#load "Deedle.fsx"
-#r "../../packages/NUnit.2.6.3/lib/nunit.framework.dll"
-#r "../../packages/FsCheck.0.9.1.0/lib/net40-Client/FsCheck.dll"
-#r "../../packages/FSharp.Data.2.0.14/lib/net40/FSharp.Data.dll"
+#r "../../packages/NUnit/lib/nunit.framework.dll"
+#r "../../packages/FsCheck/lib/net40-Client/FsCheck.dll"
+#r "../../packages/FSharp.Data/lib/net40/FSharp.Data.dll"
#r "../PerformanceTools/bin/Deedle.PerfTest.Core.dll"
#load "../Common/FsUnit.fs"
#else
diff --git a/tests/Deedle.PerfTests/packages.config b/tests/Deedle.PerfTests/packages.config
deleted file mode 100644
index 269bac2a..00000000
--- a/tests/Deedle.PerfTests/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tests/Deedle.PerfTests/paket.references b/tests/Deedle.PerfTests/paket.references
new file mode 100644
index 00000000..273fc1c4
--- /dev/null
+++ b/tests/Deedle.PerfTests/paket.references
@@ -0,0 +1,5 @@
+FsCheck
+MathNet.Numerics
+FSharp.Data
+NUnit
+NUnit.Runners
\ No newline at end of file
diff --git a/tests/Deedle.RPlugin.Tests/Deedle.RPlugin.Tests.fsproj b/tests/Deedle.RPlugin.Tests/Deedle.RPlugin.Tests.fsproj
index 3bb00030..68dd0efe 100644
--- a/tests/Deedle.RPlugin.Tests/Deedle.RPlugin.Tests.fsproj
+++ b/tests/Deedle.RPlugin.Tests/Deedle.RPlugin.Tests.fsproj
@@ -13,7 +13,6 @@
4.3.0.0
Deedle.RPlugin.Tests
..\..\
- true
true
@@ -50,7 +49,7 @@
FsUnit.fs
-
+
@@ -60,26 +59,9 @@
..\..\bin\Deedle.RProvider.Plugin.dll
-
- True
-
-
- ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll
- True
-
-
- ..\..\bin\RDotNet.dll
-
-
- ..\..\packages\RProvider.1.0.17\lib\net40\RProvider.dll
-
-
- ..\..\packages\RProvider.1.0.17\lib\net40\RProvider.Runtime.dll
-
-
+
+
+
+ ..\..\packages\NUnit\lib\nunit.framework.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\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
+
+
+
+
\ No newline at end of file
diff --git a/tests/Deedle.RPlugin.Tests/RPlugin.fs b/tests/Deedle.RPlugin.Tests/RPlugin.fs
index c69cb6e7..967cf8f8 100644
--- a/tests/Deedle.RPlugin.Tests/RPlugin.fs
+++ b/tests/Deedle.RPlugin.Tests/RPlugin.fs
@@ -3,7 +3,7 @@
#r "../../bin/RProvider.dll"
#r "../../bin/RProvider.Runtime.dll"
#r "../../bin/RDotNet.dll"
-#r "../../packages/NUnit.2.6.3/lib/nunit.framework.dll"
+#r "../../packages/NUnit/lib/nunit.framework.dll"
#load "../Common/FsUnit.fs"
#else
module Deedle.RPlugin.Tests
diff --git a/tests/Deedle.RPlugin.Tests/packages.config b/tests/Deedle.RPlugin.Tests/packages.config
deleted file mode 100644
index ad37a528..00000000
--- a/tests/Deedle.RPlugin.Tests/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/tests/Deedle.RPlugin.Tests/paket.references b/tests/Deedle.RPlugin.Tests/paket.references
new file mode 100644
index 00000000..25383fbf
--- /dev/null
+++ b/tests/Deedle.RPlugin.Tests/paket.references
@@ -0,0 +1,2 @@
+NUnit
+RProvider
\ No newline at end of file
diff --git a/tests/Deedle.Tests.Console/App.config b/tests/Deedle.Tests.Console/App.config
index c9bdc98e..314293e5 100644
--- a/tests/Deedle.Tests.Console/App.config
+++ b/tests/Deedle.Tests.Console/App.config
@@ -1,17 +1,32 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tests/Deedle.Tests.Console/Deedle.Tests.Console.fsproj b/tests/Deedle.Tests.Console/Deedle.Tests.Console.fsproj
index d6e4b2d7..fa5ff239 100644
--- a/tests/Deedle.Tests.Console/Deedle.Tests.Console.fsproj
+++ b/tests/Deedle.Tests.Console/Deedle.Tests.Console.fsproj
@@ -1,4 +1,4 @@
-
+
@@ -13,7 +13,6 @@
Deedle.Tests
4.3.0.0
..\..\
- true
true
@@ -39,17 +38,13 @@
true
-
+
False
..\..\bin\Deedle.dll
-
- ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll
- True
-
@@ -59,7 +54,7 @@
-
+
@@ -101,4 +96,12 @@
-->
+
+
+
+ ..\..\packages\NUnit\lib\nunit.framework.dll
+ True
+ True
+
+
\ No newline at end of file
diff --git a/tests/Deedle.Tests.Console/Program.fs b/tests/Deedle.Tests.Console/Program.fs
index b9d4477a..1717ae23 100644
--- a/tests/Deedle.Tests.Console/Program.fs
+++ b/tests/Deedle.Tests.Console/Program.fs
@@ -2,8 +2,8 @@
#time
#I "../../bin"
#load "Deedle.fsx"
-#r "../../packages/NUnit.2.6.3/lib/nunit.framework.dll"
-#r "../../packages/FsCheck.0.9.1.0/lib/net40-Client/FsCheck.dll"
+#r "../../packages/NUnit/lib/nunit.framework.dll"
+#r "../../packages/FsCheck/lib/net40-Client/FsCheck.dll"
#load "../Common/FsUnit.fs"
#else
module Main
diff --git a/tests/Deedle.Tests.Console/packages.config b/tests/Deedle.Tests.Console/packages.config
deleted file mode 100644
index baaa82fa..00000000
--- a/tests/Deedle.Tests.Console/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/tests/Deedle.Tests.Console/paket.references b/tests/Deedle.Tests.Console/paket.references
new file mode 100644
index 00000000..37c33ed0
--- /dev/null
+++ b/tests/Deedle.Tests.Console/paket.references
@@ -0,0 +1,2 @@
+NUnit
+NUnit.Runners
\ No newline at end of file
diff --git a/tests/Deedle.Tests/Common.fs b/tests/Deedle.Tests/Common.fs
index d02edb33..fc0a6def 100644
--- a/tests/Deedle.Tests/Common.fs
+++ b/tests/Deedle.Tests/Common.fs
@@ -1,7 +1,7 @@
#if INTERACTIVE
#r "../../bin/Deedle.dll"
-#r "../../packages/NUnit.2.6.3/lib/nunit.framework.dll"
-#r "../../packages/FsCheck.0.9.1.0/lib/net40-Client/FsCheck.dll"
+#r "../../packages/NUnit/lib/nunit.framework.dll"
+#r "../../packages/FsCheck/lib/net40-Client/FsCheck.dll"
#load "../Common/FsUnit.fs"
#else
module Deedle.Tests.Common
diff --git a/tests/Deedle.Tests/Deedle.Tests.fsproj b/tests/Deedle.Tests/Deedle.Tests.fsproj
index c5a86f90..d154b392 100644
--- a/tests/Deedle.Tests/Deedle.Tests.fsproj
+++ b/tests/Deedle.Tests/Deedle.Tests.fsproj
@@ -12,7 +12,6 @@
v4.5
Deedle.Tests
..\..\
- true
4.3.0.0
@@ -39,30 +38,14 @@
..\..\bin\Deedle.dll
-
- ..\..\packages\FsCheck.0.9.1.0\lib\net40-Client\FsCheck.dll
-
-
+
False
-
- ..\..\packages\FSharp.Data.2.0.14\lib\net40\FSharp.Data.dll
- True
-
-
- ..\..\packages\MathNet.Numerics.3.0.0\lib\net40\MathNet.Numerics.dll
-
-
- ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll
- True
-
-
-
@@ -78,7 +61,7 @@
-
+
11
@@ -90,7 +73,6 @@
$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets
-
+
+
+
+
+
+ ..\..\packages\FsCheck\lib\net40-Client\FsCheck.dll
+ True
+ True
+
+
+
+
+
+
+
+
+ ..\..\packages\FSharp.Data\lib\portable-net40+sl5+wp8+win8\FSharp.Data.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\FSharp.Data\lib\net40\FSharp.Data.dll
+ True
+ True
+
+
+ True
+
+
+
+
+
+
+
+
+ ..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\MathNet.Numerics\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll
+ True
+ True
+
+
+ True
+
+
+
+
+
+
+ ..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll
+ True
+ True
+
+
+ True
+
+
+
+
+
+
+ ..\..\packages\MathNet.Numerics\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\MathNet.Numerics\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\MathNet.Numerics\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\NUnit\lib\nunit.framework.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll
+ True
+ True
+
+
+
+
+
+
+
+
+ ..\..\packages\Zlib.Portable\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll
+ True
+ True
+
+
+
+
\ No newline at end of file
diff --git a/tests/Deedle.Tests/Deque.fs b/tests/Deedle.Tests/Deque.fs
index fcfc144a..e3613aee 100644
--- a/tests/Deedle.Tests/Deque.fs
+++ b/tests/Deedle.Tests/Deque.fs
@@ -1,7 +1,7 @@
#if INTERACTIVE
#load "../../bin/Deedle.fsx"
-#r "../../packages/NUnit.2.6.3/lib/nunit.framework.dll"
-#r "../../packages/FsCheck.0.9.1.0/lib/net40-Client/FsCheck.dll"
+#r "../../packages/NUnit/lib/nunit.framework.dll"
+#r "../../packages/FsCheck/lib/net40-Client/FsCheck.dll"
#load "../Common/FsUnit.fs"
#else
module Deedle.Tests.Deque
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/Deedle.Tests/Frame.fs b/tests/Deedle.Tests/Frame.fs
index dddc8b3b..a0a3688e 100755
--- a/tests/Deedle.Tests/Frame.fs
+++ b/tests/Deedle.Tests/Frame.fs
@@ -1,9 +1,9 @@
#if INTERACTIVE
#I "../../bin"
#load "Deedle.fsx"
-#r "../../packages/NUnit.2.6.3/lib/nunit.framework.dll"
-#r "../../packages/FsCheck.0.9.1.0/lib/net40-Client/FsCheck.dll"
-#r "../../packages/FSharp.Data.2.0.14/lib/net40/FSharp.Data.dll"
+#r "../../packages/NUnit/lib/nunit.framework.dll"
+#r "../../packages/FsCheck/lib/net40-Client/FsCheck.dll"
+#r "../../packages/FSharp.Data/lib/net40/FSharp.Data.dll"
#load "../Common/FsUnit.fs"
#else
module Deedle.Tests.Frame
diff --git a/tests/Deedle.Tests/LazySeries.fs b/tests/Deedle.Tests/LazySeries.fs
index 3815a09e..b8397ecc 100644
--- a/tests/Deedle.Tests/LazySeries.fs
+++ b/tests/Deedle.Tests/LazySeries.fs
@@ -1,8 +1,8 @@
#if INTERACTIVE
#I "../../bin/"
#load "Deedle.fsx"
-#r "../../packages/NUnit.2.6.3/lib/nunit.framework.dll"
-#r "../../packages/FsCheck.0.9.1.0/lib/net40-Client/FsCheck.dll"
+#r "../../packages/NUnit/lib/nunit.framework.dll"
+#r "../../packages/FsCheck/lib/net40-Client/FsCheck.dll"
#load "../Common/FsUnit.fs"
#else
module Deedle.Tests.LazySeries
diff --git a/tests/Deedle.Tests/MultiKey.fs b/tests/Deedle.Tests/MultiKey.fs
index 6d7ddcf3..b0c8fd03 100644
--- a/tests/Deedle.Tests/MultiKey.fs
+++ b/tests/Deedle.Tests/MultiKey.fs
@@ -2,8 +2,8 @@
#if INTERACTIVE
#r "../../bin/Deedle.dll"
-#r "../../packages/NUnit.2.6.3/lib/nunit.framework.dll"
-#r "../../packages/FsCheck.0.9.1.0/lib/net40-Client/FsCheck.dll"
+#r "../../packages/NUnit/lib/nunit.framework.dll"
+#r "../../packages/FsCheck/lib/net40-Client/FsCheck.dll"
#load "../Common/FsUnit.fs"
#endif
diff --git a/tests/Deedle.Tests/Ranges.fs b/tests/Deedle.Tests/Ranges.fs
index e87ee265..4144a0a0 100644
--- a/tests/Deedle.Tests/Ranges.fs
+++ b/tests/Deedle.Tests/Ranges.fs
@@ -1,8 +1,8 @@
#if INTERACTIVE
#I "../../bin/"
#load "Deedle.fsx"
-#r "../../packages/NUnit.2.6.3/lib/nunit.framework.dll"
-#r "../../packages/FsCheck.0.9.1.0/lib/net40-Client/FsCheck.dll"
+#r "../../packages/NUnit/lib/nunit.framework.dll"
+#r "../../packages/FsCheck/lib/net40-Client/FsCheck.dll"
#load "../Common/FsUnit.fs"
#else
module Deedle.Tests.Ranges
diff --git a/tests/Deedle.Tests/Series.fs b/tests/Deedle.Tests/Series.fs
index dd9b681f..b812ce5a 100755
--- a/tests/Deedle.Tests/Series.fs
+++ b/tests/Deedle.Tests/Series.fs
@@ -1,7 +1,7 @@
#if INTERACTIVE
#load "../../bin/Deedle.fsx"
-#r "../../packages/NUnit.2.6.3/lib/nunit.framework.dll"
-#r "../../packages/FsCheck.0.9.1.0/lib/net40-Client/FsCheck.dll"
+#r "../../packages/NUnit/lib/nunit.framework.dll"
+#r "../../packages/FsCheck/lib/net40-Client/FsCheck.dll"
#load "../Common/FsUnit.fs"
#else
module Deedle.Tests.Series
diff --git a/tests/Deedle.Tests/Stats.fs b/tests/Deedle.Tests/Stats.fs
index b71d4e62..5a90e939 100755
--- a/tests/Deedle.Tests/Stats.fs
+++ b/tests/Deedle.Tests/Stats.fs
@@ -1,8 +1,8 @@
#if INTERACTIVE
#load "../../bin/Deedle.fsx"
-#r "../../packages/NUnit.2.6.3/lib/nunit.framework.dll"
-#r "../../packages/FsCheck.0.9.1.0/lib/net40-Client/FsCheck.dll"
-#r "../../packages/MathNet.Numerics.3.0.0/lib/net40/MathNet.Numerics.dll"
+#r "../../packages/NUnit/lib/nunit.framework.dll"
+#r "../../packages/FsCheck/lib/net40-Client/FsCheck.dll"
+#r "../../packages/MathNet.Numerics/lib/net40/MathNet.Numerics.dll"
#load "../Common/FsUnit.fs"
#else
module Deedle.Tests.Stats
diff --git a/tests/Deedle.Tests/Vector.fs b/tests/Deedle.Tests/Vector.fs
index 332f286d..e924de97 100644
--- a/tests/Deedle.Tests/Vector.fs
+++ b/tests/Deedle.Tests/Vector.fs
@@ -2,8 +2,8 @@
#if INTERACTIVE
#r "../../bin/Deedle.dll"
-#r "../../packages/NUnit.2.6.3/lib/nunit.framework.dll"
-#r "../../packages/FsCheck.0.9.1.0/lib/net40-Client/FsCheck.dll"
+#r "../../packages/NUnit/lib/nunit.framework.dll"
+#r "../../packages/FsCheck/lib/net40-Client/FsCheck.dll"
#load "../Common/FsUnit.fs"
#endif
diff --git a/tests/Deedle.Tests/VirtualFrame.fs b/tests/Deedle.Tests/VirtualFrame.fs
index eb090508..b6269718 100644
--- a/tests/Deedle.Tests/VirtualFrame.fs
+++ b/tests/Deedle.Tests/VirtualFrame.fs
@@ -1,8 +1,8 @@
#if INTERACTIVE
#I "../../bin/"
#load "Deedle.fsx"
-#r "../../packages/NUnit.2.6.3/lib/nunit.framework.dll"
-#r "../../packages/FsCheck.0.9.1.0/lib/net40-Client/FsCheck.dll"
+#r "../../packages/NUnit/lib/nunit.framework.dll"
+#r "../../packages/FsCheck/lib/net40-Client/FsCheck.dll"
#load "../Common/FsUnit.fs"
#else
module Deedle.Tests.VirtualFrame
diff --git a/tests/Deedle.Tests/packages.config b/tests/Deedle.Tests/packages.config
deleted file mode 100644
index 269bac2a..00000000
--- a/tests/Deedle.Tests/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tests/Deedle.Tests/paket.references b/tests/Deedle.Tests/paket.references
new file mode 100644
index 00000000..273fc1c4
--- /dev/null
+++ b/tests/Deedle.Tests/paket.references
@@ -0,0 +1,5 @@
+FsCheck
+MathNet.Numerics
+FSharp.Data
+NUnit
+NUnit.Runners
\ No newline at end of file
diff --git a/tests/PerformanceTools.sln b/tests/PerformanceTools.sln
index 017abe72..f6112526 100644
--- a/tests/PerformanceTools.sln
+++ b/tests/PerformanceTools.sln
@@ -1,8 +1,14 @@
-
+
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", "{2791DDF0-F88B-49AA-B3EF-202C8B21BB0F}"
+ ProjectSection(SolutionItems) = preProject
+ ..\..\deedle\paket.dependencies = ..\..\deedle\paket.dependencies
+ ..\..\deedle\paket.lock = ..\..\deedle\paket.lock
+ EndProjectSection
+EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Deedle.PerfTest.Core", "PerformanceTools\Deedle.PerfTest.Core\Deedle.PerfTest.Core.fsproj", "{D1E7603A-AA82-4517-8605-360DC708B0E9}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Deedle.PerfTest", "PerformanceTools\Deedle.PerfTest\Deedle.PerfTest.fsproj", "{371F8CE6-B031-4589-843F-583FE9180948}"
diff --git a/tests/PerformanceTools/Deedle.PerfTest.Core/Deedle.PerfTest.Core.fsproj b/tests/PerformanceTools/Deedle.PerfTest.Core/Deedle.PerfTest.Core.fsproj
index eb2a4981..aaa883db 100644
--- a/tests/PerformanceTools/Deedle.PerfTest.Core/Deedle.PerfTest.Core.fsproj
+++ b/tests/PerformanceTools/Deedle.PerfTest.Core/Deedle.PerfTest.Core.fsproj
@@ -1,4 +1,4 @@
-
+
@@ -36,7 +36,7 @@
-
+
False
@@ -63,4 +63,5 @@
-->
+
\ No newline at end of file
diff --git a/tests/PerformanceTools/Deedle.PerfTest/App.config b/tests/PerformanceTools/Deedle.PerfTest/App.config
index 8e156463..26bd6096 100644
--- a/tests/PerformanceTools/Deedle.PerfTest/App.config
+++ b/tests/PerformanceTools/Deedle.PerfTest/App.config
@@ -1,6 +1,30 @@
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tests/PerformanceTools/Deedle.PerfTest/Deedle.PerfTest.fsproj b/tests/PerformanceTools/Deedle.PerfTest/Deedle.PerfTest.fsproj
index 9146e1f8..50a54839 100644
--- a/tests/PerformanceTools/Deedle.PerfTest/Deedle.PerfTest.fsproj
+++ b/tests/PerformanceTools/Deedle.PerfTest/Deedle.PerfTest.fsproj
@@ -44,24 +44,18 @@
..\..\..\bin\Deedle.dll
-
- ..\..\..\packages\FSharp.Compiler.Service.0.0.67\lib\net40\FSharp.Compiler.Service.dll
-
-
- ..\..\..\packages\FSharp.Data.2.0.14\lib\net40\FSharp.Data.dll
-
-
+
False
-
+
@@ -88,4 +82,59 @@
-->
+
+
+
+
+
+ ..\..\..\packages\FSharp.Compiler.Service\lib\net40\FSharp.Compiler.Service.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll
+ True
+ True
+
+
+
+
+
+
+
+
+ ..\..\..\packages\FSharp.Data\lib\portable-net40+sl5+wp8+win8\FSharp.Data.dll
+ True
+ True
+
+
+
+
+
+
+ ..\..\..\packages\FSharp.Data\lib\net40\FSharp.Data.dll
+ True
+ True
+
+
+ True
+
+
+
+
+
+
+
+
+ ..\..\..\packages\Zlib.Portable\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll
+ True
+ True
+
+
+
+
\ No newline at end of file
diff --git a/tests/PerformanceTools/Deedle.PerfTest/Program.fs b/tests/PerformanceTools/Deedle.PerfTest/Program.fs
index 7f482865..9fd32542 100644
--- a/tests/PerformanceTools/Deedle.PerfTest/Program.fs
+++ b/tests/PerformanceTools/Deedle.PerfTest/Program.fs
@@ -56,7 +56,7 @@ module internal Compiler =
yield! [ "-r"; microsoft @@"Framework" @@ ".NETFramework" @@ "v4.5" @@ "System.Data.dll" ]
// Generate "--define" argument for all symbols
- for def in config.Defines.Defines do
+ for def in config.Defines do
yield "--define:" + def.Symbol
// Generate "-r" argument for all libraries to be referenced
diff --git a/tests/PerformanceTools/Deedle.PerfTest/paket.references b/tests/PerformanceTools/Deedle.PerfTest/paket.references
new file mode 100644
index 00000000..7c22a147
--- /dev/null
+++ b/tests/PerformanceTools/Deedle.PerfTest/paket.references
@@ -0,0 +1,2 @@
+FSharp.Compiler.Service
+FSharp.Data
\ No newline at end of file