From f28e6844a15d3ca69374f91355943eb51f0b23c2 Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Wed, 23 Dec 2015 14:06:19 +0100 Subject: [PATCH] Build: use paket groups, project file cleanups --- .gitignore | 6 +- build.cmd | 2 +- build.fsx | 18 +- build.sh | 2 +- docs/tools/build-docs.fsx | 8 +- docs/tools/paket.references | 9 +- packages/.gitattributes | 1 - packages/FSharp.Core/license.html | 60 +- packages/FsUnit/FsUnit.1.3.1.nupkg | Bin 40980 -> 0 bytes packages/FsUnit/FsUnit.nuspec | 24 - packages/FsUnit/[Content_Types].xml | 10 - packages/FsUnit/_rels/.rels | 5 - packages/FsUnit/lib/FsUnit.CustomMatchers.dll | Bin 25600 -> 0 bytes packages/FsUnit/lib/FsUnit.CustomMatchers.pdb | Bin 42496 -> 0 bytes packages/FsUnit/lib/FsUnit.CustomMatchers.xml | 6 - packages/FsUnit/lib/FsUnit.NUnit.XML | 304 - packages/FsUnit/lib/FsUnit.NUnit.dll | Bin 45056 -> 0 bytes packages/FsUnit/lib/FsUnit.NUnit.pdb | Bin 36352 -> 0 bytes .../metadata/core-properties/coreProp.psmdcp | 10 - packages/FsUnit/tools/install.ps1 | 3 - packages/NUnit.Runners/NUnit.Runners.nuspec | 20 - packages/NUnit.Runners/_rels/.rels | 1 - packages/NUnit.Runners/license.txt | 15 - packages/NUnit.Runners/tools/agent.conf | 4 - packages/NUnit.Runners/tools/agent.log.conf | 18 - .../NUnit.Runners/tools/launcher.log.conf | 18 - .../tools/lib/Images/Tree/Circles/Failure.jpg | Bin 761 -> 0 bytes .../tools/lib/Images/Tree/Circles/Ignored.jpg | Bin 688 -> 0 bytes .../lib/Images/Tree/Circles/Inconclusive.jpg | Bin 734 -> 0 bytes .../tools/lib/Images/Tree/Circles/Skipped.jpg | Bin 689 -> 0 bytes packages/NUnit.Runners/tools/lib/log4net.dll | Bin 258048 -> 0 bytes .../tools/lib/nunit-console-runner.dll | Bin 36864 -> 0 bytes .../tools/lib/nunit-gui-runner.dll | Bin 155648 -> 0 bytes .../NUnit.Runners/tools/lib/nunit.core.dll | Bin 155648 -> 0 bytes .../tools/lib/nunit.core.interfaces.dll | Bin 61440 -> 0 bytes .../tools/lib/nunit.uiexception.dll | Bin 90112 -> 0 bytes .../NUnit.Runners/tools/lib/nunit.uikit.dll | Bin 241664 -> 0 bytes .../NUnit.Runners/tools/lib/nunit.util.dll | Bin 135168 -> 0 bytes .../NUnit.Runners/tools/nunit-agent-x86.exe | Bin 8192 -> 0 bytes .../tools/nunit-agent-x86.exe.config | 37 - packages/NUnit.Runners/tools/nunit-agent.exe | Bin 8192 -> 0 bytes .../tools/nunit-agent.exe.config | 37 - .../NUnit.Runners/tools/nunit-console-x86.exe | Bin 5120 -> 0 bytes .../tools/nunit-console-x86.exe.config | 24 - .../NUnit.Runners/tools/nunit-console.exe | Bin 5120 -> 0 bytes .../tools/nunit-console.exe.config | 24 - packages/NUnit.Runners/tools/nunit-editor.exe | Bin 143360 -> 0 bytes packages/NUnit.Runners/tools/nunit-x86.exe | Bin 6656 -> 0 bytes .../NUnit.Runners/tools/nunit-x86.exe.config | 23 - packages/NUnit.Runners/tools/nunit.exe | Bin 6656 -> 0 bytes packages/NUnit.Runners/tools/nunit.exe.config | 23 - .../NUnit.Runners/tools/nunit.framework.dll | Bin 151552 -> 0 bytes packages/NUnit.Runners/tools/pnunit-agent.exe | Bin 32768 -> 0 bytes .../tools/pnunit-agent.exe.config | 77 - .../NUnit.Runners/tools/pnunit-launcher.exe | Bin 36864 -> 0 bytes .../tools/pnunit-launcher.exe.config | 77 - .../NUnit.Runners/tools/pnunit.framework.dll | Bin 9728 -> 0 bytes packages/NUnit.Runners/tools/pnunit.tests.dll | Bin 8192 -> 0 bytes packages/NUnit.Runners/tools/runpnunit.bat | 3 - packages/NUnit.Runners/tools/test.conf | 82 - packages/NUnit/NUnit.2.6.4.nupkg | Bin 99004 -> 0 bytes packages/NUnit/NUnit.nuspec | 23 - packages/NUnit/[Content_Types].xml | 1 - packages/NUnit/_rels/.rels | 1 - packages/NUnit/lib/nunit.framework.dll | Bin 151552 -> 0 bytes packages/NUnit/lib/nunit.framework.xml | 10984 ---------------- packages/NUnit/license.html | 39 - packages/NUnit/license.txt | 15 - .../c346e7af292d401e86e307d6778e3cf7.psmdcp | 3 - packages/TaskParallelLibrary/license.html | 18 +- paket.dependencies | 33 +- paket.lock | 36 +- src/Data/Matlab/Matlab.csproj | 10 +- src/Data/Matlab/Properties/AssemblyInfo.cs | 2 +- src/Data/Matlab/paket.references | 3 +- src/Data/Text/Properties/AssemblyInfo.cs | 2 +- src/Data/Text/Text.csproj | 10 +- src/Data/Text/paket.references | 3 +- src/DataUnitTests/Properties/AssemblyInfo.cs | 2 +- src/DataUnitTests/UnitTests.csproj | 12 +- src/DataUnitTests/paket.references | 7 +- src/FSharp/AssemblyInfo.fs | 2 +- src/FSharp/FSharp-Net35.fsproj | 2 +- src/FSharp/FSharp-Portable47.fsproj | 2 +- src/FSharp/FSharp.fsproj | 2 +- src/FSharpUnitTests/App.config | 33 +- src/FSharpUnitTests/AssemblyInfo.fs | 2 +- .../FSharpUnitTests-Net35.fsproj | 132 +- ...arpUnitTests-Net35.fsproj.paket.references | 4 +- .../FSharpUnitTests-Portable47.fsproj | 66 +- src/FSharpUnitTests/FSharpUnitTests.fsproj | 66 +- src/FSharpUnitTests/paket.references | 5 +- src/Numerics/Numerics-Net35.csproj | 2 +- src/Numerics/Properties/AssemblyInfo.cs | 2 +- src/Performance/Performance.csproj | 6 +- src/Performance/paket.references | 5 +- src/UnitTests/App.config | 30 - src/UnitTests/Properties/AssemblyInfo.cs | 2 +- src/UnitTests/UnitTests-CUDA.csproj | 291 +- src/UnitTests/UnitTests-MKL.csproj | 292 +- src/UnitTests/UnitTests-Net35.csproj | 302 +- .../UnitTests-Net35.csproj.paket.references | 4 +- src/UnitTests/UnitTests-OpenBLAS.csproj | 292 +- src/UnitTests/UnitTests-Portable259.csproj | 291 +- src/UnitTests/UnitTests-Portable328.csproj | 291 +- src/UnitTests/UnitTests-Portable47.csproj | 291 +- src/UnitTests/UnitTests-Portable7.csproj | 291 +- src/UnitTests/UnitTests-Portable78.csproj | 291 +- src/UnitTests/UnitTests.csproj | 23 +- src/UnitTests/paket.references | 3 +- 110 files changed, 457 insertions(+), 14723 deletions(-) delete mode 100644 packages/FsUnit/FsUnit.1.3.1.nupkg delete mode 100644 packages/FsUnit/FsUnit.nuspec delete mode 100644 packages/FsUnit/[Content_Types].xml delete mode 100644 packages/FsUnit/_rels/.rels delete mode 100644 packages/FsUnit/lib/FsUnit.CustomMatchers.dll delete mode 100644 packages/FsUnit/lib/FsUnit.CustomMatchers.pdb delete mode 100644 packages/FsUnit/lib/FsUnit.CustomMatchers.xml delete mode 100644 packages/FsUnit/lib/FsUnit.NUnit.XML delete mode 100644 packages/FsUnit/lib/FsUnit.NUnit.dll delete mode 100644 packages/FsUnit/lib/FsUnit.NUnit.pdb delete mode 100644 packages/FsUnit/package/services/metadata/core-properties/coreProp.psmdcp delete mode 100644 packages/FsUnit/tools/install.ps1 delete mode 100644 packages/NUnit.Runners/NUnit.Runners.nuspec delete mode 100644 packages/NUnit.Runners/_rels/.rels delete mode 100644 packages/NUnit.Runners/license.txt delete mode 100644 packages/NUnit.Runners/tools/agent.conf delete mode 100644 packages/NUnit.Runners/tools/agent.log.conf delete mode 100644 packages/NUnit.Runners/tools/launcher.log.conf delete mode 100644 packages/NUnit.Runners/tools/lib/Images/Tree/Circles/Failure.jpg delete mode 100644 packages/NUnit.Runners/tools/lib/Images/Tree/Circles/Ignored.jpg delete mode 100644 packages/NUnit.Runners/tools/lib/Images/Tree/Circles/Inconclusive.jpg delete mode 100644 packages/NUnit.Runners/tools/lib/Images/Tree/Circles/Skipped.jpg delete mode 100644 packages/NUnit.Runners/tools/lib/log4net.dll delete mode 100644 packages/NUnit.Runners/tools/lib/nunit-console-runner.dll delete mode 100644 packages/NUnit.Runners/tools/lib/nunit-gui-runner.dll delete mode 100644 packages/NUnit.Runners/tools/lib/nunit.core.dll delete mode 100644 packages/NUnit.Runners/tools/lib/nunit.core.interfaces.dll delete mode 100644 packages/NUnit.Runners/tools/lib/nunit.uiexception.dll delete mode 100644 packages/NUnit.Runners/tools/lib/nunit.uikit.dll delete mode 100644 packages/NUnit.Runners/tools/lib/nunit.util.dll delete mode 100644 packages/NUnit.Runners/tools/nunit-agent-x86.exe delete mode 100644 packages/NUnit.Runners/tools/nunit-agent-x86.exe.config delete mode 100644 packages/NUnit.Runners/tools/nunit-agent.exe delete mode 100644 packages/NUnit.Runners/tools/nunit-agent.exe.config delete mode 100644 packages/NUnit.Runners/tools/nunit-console-x86.exe delete mode 100644 packages/NUnit.Runners/tools/nunit-console-x86.exe.config delete mode 100644 packages/NUnit.Runners/tools/nunit-console.exe delete mode 100644 packages/NUnit.Runners/tools/nunit-console.exe.config delete mode 100644 packages/NUnit.Runners/tools/nunit-editor.exe delete mode 100644 packages/NUnit.Runners/tools/nunit-x86.exe delete mode 100644 packages/NUnit.Runners/tools/nunit-x86.exe.config delete mode 100644 packages/NUnit.Runners/tools/nunit.exe delete mode 100644 packages/NUnit.Runners/tools/nunit.exe.config delete mode 100644 packages/NUnit.Runners/tools/nunit.framework.dll delete mode 100644 packages/NUnit.Runners/tools/pnunit-agent.exe delete mode 100644 packages/NUnit.Runners/tools/pnunit-agent.exe.config delete mode 100644 packages/NUnit.Runners/tools/pnunit-launcher.exe delete mode 100644 packages/NUnit.Runners/tools/pnunit-launcher.exe.config delete mode 100644 packages/NUnit.Runners/tools/pnunit.framework.dll delete mode 100644 packages/NUnit.Runners/tools/pnunit.tests.dll delete mode 100644 packages/NUnit.Runners/tools/runpnunit.bat delete mode 100644 packages/NUnit.Runners/tools/test.conf delete mode 100644 packages/NUnit/NUnit.2.6.4.nupkg delete mode 100644 packages/NUnit/NUnit.nuspec delete mode 100644 packages/NUnit/[Content_Types].xml delete mode 100644 packages/NUnit/_rels/.rels delete mode 100644 packages/NUnit/lib/nunit.framework.dll delete mode 100644 packages/NUnit/lib/nunit.framework.xml delete mode 100644 packages/NUnit/license.html delete mode 100644 packages/NUnit/license.txt delete mode 100644 packages/NUnit/package/services/metadata/core-properties/c346e7af292d401e86e307d6778e3cf7.psmdcp delete mode 100644 src/UnitTests/App.config diff --git a/.gitignore b/.gitignore index 00c7a87f..5b0bcd1b 100644 --- a/.gitignore +++ b/.gitignore @@ -57,11 +57,11 @@ Desktop.ini # NOTE: we do NOT use package restore in the core projects, but do use it with FAKE builds. packages/* !packages/.gitattributes -!packages/repositories.config -!packages/NUnit -!packages/FsUnit !packages/TaskParallelLibrary !packages/FSharp.Core +!packages/test/NUnit +!packages/test/FsUnit +!packages/test/FSharp.Core # FAKE & Paket packages/FAKE diff --git a/build.cmd b/build.cmd index 40aff456..cd4d1669 100644 --- a/build.cmd +++ b/build.cmd @@ -11,4 +11,4 @@ if errorlevel 1 ( exit /b %errorlevel% ) -packages\FAKE\tools\FAKE.exe build.fsx %* +packages\build\FAKE\tools\FAKE.exe build.fsx %* diff --git a/build.fsx b/build.fsx index 328c816c..7242ce8c 100644 --- a/build.fsx +++ b/build.fsx @@ -15,8 +15,8 @@ // PRELUDE // -------------------------------------------------------------------------------------- -#I "packages/FAKE/tools" -#r "packages/FAKE/tools/FakeLib.dll" +#I "packages/build/FAKE/tools" +#r "packages/build/FAKE/tools/FakeLib.dll" open Fake open Fake.DocuHelper @@ -123,7 +123,7 @@ let numericsPack = Authors = [ "Christoph Ruegg"; "Marcus Cuda"; "Jurgen Van Gael" ] Dependencies = [ { FrameworkVersion="net35" - Dependencies=[ "TaskParallelLibrary", GetPackageVersion "packages" "TaskParallelLibrary" ] } + Dependencies=[ "TaskParallelLibrary", GetPackageVersion "./packages/" "TaskParallelLibrary" ] } { FrameworkVersion="net40" Dependencies=[] } ] Files = @@ -146,7 +146,7 @@ let fsharpPack = Dependencies = [ { FrameworkVersion="" Dependencies=[ "MathNet.Numerics", RequireExactly packageVersion - "FSharp.Core", GetPackageVersion "packages" "FSharp.Core" ] } ] + "FSharp.Core", GetPackageVersion "./packages/" "FSharp.Core" ] } ] Files = [ @"..\..\out\lib\Net35\MathNet.Numerics.FSharp.*", Some libnet35, None; @"..\..\out\lib\Net40\MathNet.Numerics.FSharp.*", Some libnet40, None; @@ -175,7 +175,7 @@ let fsharpSignedPack = Dependencies = [ { FrameworkVersion="" Dependencies=[ "MathNet.Numerics.Signed", RequireExactly packageVersion - "FSharp.Core", GetPackageVersion "packages" "FSharp.Core" ] } ] + "FSharp.Core", GetPackageVersion "./packages/" "FSharp.Core" ] } ] Files = [ @"..\..\out\lib-signed\Net40\MathNet.Numerics.FSharp.*", Some libnet40, None; @"MathNet.Numerics.fsx", None, None; @@ -363,7 +363,7 @@ let dataTextPack = Authors = [ "Christoph Ruegg"; "Marcus Cuda" ] Dependencies = [ { FrameworkVersion="" - Dependencies=[ "MathNet.Numerics", GetPackageVersion "packages" "MathNet.Numerics" ] } ] + Dependencies=[ "MathNet.Numerics", GetPackageVersion "./packages/data/" "MathNet.Numerics" ] } ] Files = [ @"..\..\out\Data\lib\Net40\MathNet.Numerics.Data.Text.dll", Some libnet40, None; @"..\..\out\Data\lib\Net40\MathNet.Numerics.Data.Text.xml", Some libnet40, None ] } @@ -379,7 +379,7 @@ let dataMatlabPack = Authors = [ "Christoph Ruegg"; "Marcus Cuda" ] Dependencies = [ { FrameworkVersion="" - Dependencies=[ "MathNet.Numerics", GetPackageVersion "packages" "MathNet.Numerics" ] } ] + Dependencies=[ "MathNet.Numerics", GetPackageVersion "./packages/data/" "MathNet.Numerics" ] } ] Files = [ @"..\..\out\Data\lib\Net40\MathNet.Numerics.Data.Matlab.dll", Some libnet40, None; @"..\..\out\Data\lib\Net40\MathNet.Numerics.Data.Matlab.xml", Some libnet40, None ] } @@ -653,7 +653,7 @@ Target "DataZip" (fun _ -> // NUGET let updateNuspec (pack:Package) outPath symbols updateFiles spec = - { spec with ToolPath = "packages/NuGet.CommandLine/tools/NuGet.exe" + { spec with ToolPath = "packages/build/NuGet.CommandLine/tools/NuGet.exe" OutputPath = outPath WorkingDir = "obj/NuGet" Version = pack.Version @@ -881,7 +881,7 @@ let publishNuGet packageFiles = let args = sprintf "push \"%s\"" (FullName file) let result = ExecProcess (fun info -> - info.FileName <- "packages/NuGet.CommandLine/tools/NuGet.exe" + info.FileName <- "packages/tools/NuGet.CommandLine/tools/NuGet.exe" info.WorkingDirectory <- FullName "obj/NuGet" info.Arguments <- args) (TimeSpan.FromMinutes 10.) if result <> 0 then failwith "Error during NuGet push." diff --git a/build.sh b/build.sh index 659c1a67..af6a467c 100755 --- a/build.sh +++ b/build.sh @@ -28,4 +28,4 @@ fi run .paket/paket.bootstrapper.exe run .paket/paket.exe restore -run packages/FAKE/tools/FAKE.exe "$@" $FSIARGS build.fsx +run packages/build/FAKE/tools/FAKE.exe "$@" $FSIARGS build.fsx diff --git a/docs/tools/build-docs.fsx b/docs/tools/build-docs.fsx index 9540a5b0..63f6b2cf 100644 --- a/docs/tools/build-docs.fsx +++ b/docs/tools/build-docs.fsx @@ -21,9 +21,9 @@ let info = // For typical project, no changes are needed below // -------------------------------------------------------------------------------------- -#load "../../packages/FSharp.Formatting/FSharp.Formatting.fsx" -#r "../../packages/FAKE/tools/NuGet.Core.dll" -#r "../../packages/FAKE/tools/FakeLib.dll" +#load "../../packages/build/FSharp.Formatting/FSharp.Formatting.fsx" +#r "../../packages/build/FAKE/tools/NuGet.Core.dll" +#r "../../packages/build/FAKE/tools/FakeLib.dll" open Fake open System @@ -47,7 +47,7 @@ let content = __SOURCE_DIRECTORY__ @@ "../content" let output = __SOURCE_DIRECTORY__ @@ "../../out/docs" let files = __SOURCE_DIRECTORY__ @@ "../files" let templates = __SOURCE_DIRECTORY__ @@ "templates" -let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting/" +let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/build/FSharp.Formatting/" let docTemplate = formatting @@ "templates/docpage.cshtml" // Where to look for *.csproj templates (in this order) diff --git a/docs/tools/paket.references b/docs/tools/paket.references index 5d1ce53e..a5be1eb2 100644 --- a/docs/tools/paket.references +++ b/docs/tools/paket.references @@ -1,4 +1,5 @@ -FSharp.Formatting -Microsoft.AspNet.Razor -RazorEngine -FSharp.Compiler.Service +group Build + FSharp.Formatting + Microsoft.AspNet.Razor + RazorEngine + FSharp.Compiler.Service diff --git a/packages/.gitattributes b/packages/.gitattributes index 06a58639..62544950 100644 --- a/packages/.gitattributes +++ b/packages/.gitattributes @@ -1,2 +1 @@ -repositories.config text * -text diff --git a/packages/FSharp.Core/license.html b/packages/FSharp.Core/license.html index 194448a1..a029d82c 100644 --- a/packages/FSharp.Core/license.html +++ b/packages/FSharp.Core/license.html @@ -33,13 +33,19 @@ - + + + + + + + + + + + + - - - - - @@ -47,17 +53,18 @@ - - + + - - + + + - + @@ -69,7 +76,7 @@ - + Skip to content @@ -153,7 +160,7 @@ Watch - 150 + 155 @@ -167,7 +174,7 @@ - 1,003 + 1,016 @@ -181,7 +188,7 @@ - 212 + 216 @@ -255,9 +262,9 @@
-

HTTPS clone URL

+

HTTPS clone URL

- @@ -268,9 +275,9 @@
-

Subversion checkout URL

+

Subversion checkout URL

- @@ -280,8 +287,8 @@ -
You can clone with -
or
. +
You can clone with +
or
. @@ -301,7 +308,7 @@ - + @@ -309,7 +316,6 @@
Branch: @@ -1164,8 +1170,8 @@ compiler/2.0/Nov2010 folder on http://fsharppowerpack.codeplex.com">Clean source