From 226e1e07a17c5d0d8ea742d4c8e95eb74e0830e6 Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Wed, 26 Nov 2014 14:34:18 +0100 Subject: [PATCH] Build: for F# on net35 use traditional FSharp.Core reference instead of NuGet For C# and also for all non-net35 F# targets we still use the proper NuGet package. This allows us to use one FSharp.Core NuGet package only (instead of two with platform-groups), resolving quite a few issues. --- README.md | 1 - build.fsx | 3 +- docs/content/index.fsx | 1 - paket.dependencies | 1 - paket.lock | 3 +- src/Data/Matlab/Matlab.csproj | 2 +- src/Data/Text/Text.csproj | 2 +- src/DataUnitTests/UnitTests.csproj | 2 +- src/FSharp/FSharp-Net35.fsproj | 131 +------------ .../FSharp-Net35.fsproj.paket.references | 1 - src/FSharp/FSharp-Portable47.fsproj | 2 +- src/FSharp/FSharp.fsproj | 2 +- .../FSharpUnitTests-Net35.fsproj | 182 ++---------------- ...arpUnitTests-Net35.fsproj.paket.references | 1 - .../FSharpUnitTests-Portable47.fsproj | 2 +- src/FSharpUnitTests/FSharpUnitTests.fsproj | 2 +- src/UnitTests/UnitTests.csproj | 1 + 17 files changed, 36 insertions(+), 303 deletions(-) diff --git a/README.md b/README.md index 27b05154..c4525ebf 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,6 @@ Package Dependencies: - .Net 4.0 and higher, Mono, PCL Profiles: None - .Net 3.5: [Task Parallel Library for .NET 3.5](http://www.nuget.org/packages/TaskParallelLibrary) - F# on .Net 4.0 an higher, Mono, PCL Profiles: additionally [FSharp.Core.Microsoft.Signed](http://www.nuget.org/packages/FSharp.Core.Microsoft.Signed) -- F# on .Net 3.5: additionally [FSharp.Core.4.3.0.0.Microsoft.Signed](http://www.nuget.org/packages/FSharp.Core.4.3.0.0.Microsoft.Signed) Framework Dependencies (part of the .NET Framework): diff --git a/build.fsx b/build.fsx index a36ea5c8..e79c033d 100644 --- a/build.fsx +++ b/build.fsx @@ -130,8 +130,7 @@ let fsharpPack = Tags = "fsharp F# " + tags Dependencies = [ { FrameworkVersion="net35" - Dependencies=[ "MathNet.Numerics", RequireExactly packageVersion - "FSharp.Core.4.3.0.0.Microsoft.Signed", GetPackageVersion "packages" "FSharp.Core.4.3.0.0.Microsoft.Signed" ] } + Dependencies=[ ] } { FrameworkVersion="net40" Dependencies=[ "MathNet.Numerics", RequireExactly packageVersion "FSharp.Core.Microsoft.Signed", GetPackageVersion "packages" "FSharp.Core.Microsoft.Signed" ] } diff --git a/docs/content/index.fsx b/docs/content/index.fsx index 2acef72c..c912514c 100644 --- a/docs/content/index.fsx +++ b/docs/content/index.fsx @@ -49,7 +49,6 @@ Package Dependencies: - .Net 4.0 and higher, Mono, PCL Profiles: None - .Net 3.5: [Task Parallel Library for .NET 3.5](http://www.nuget.org/packages/TaskParallelLibrary) - F# on .Net 4.0 an higher, Mono, PCL Profiles: additionally [FSharp.Core.Microsoft.Signed](http://www.nuget.org/packages/FSharp.Core.Microsoft.Signed) -- F# on .Net 3.5: additionally [FSharp.Core.4.3.0.0.Microsoft.Signed](http://www.nuget.org/packages/FSharp.Core.4.3.0.0.Microsoft.Signed) Framework Dependencies (part of the .NET Framework): diff --git a/paket.dependencies b/paket.dependencies index 2b530598..996e2b1b 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -2,7 +2,6 @@ source http://nuget.org/api/v2 # Core Dependencies nuget FSharp.Core.Microsoft.Signed ~> 3.1.1 -nuget FSharp.Core.4.3.0.0.Microsoft.Signed ~> 3.0.0 nuget TaskParallelLibrary 1.0.2856.0 # Data Dependencies diff --git a/paket.lock b/paket.lock index 4ea92ce0..6bfffdd7 100644 --- a/paket.lock +++ b/paket.lock @@ -3,9 +3,8 @@ NUGET specs: BenchShark (1.0.0) ConsoleDump (0.6.0.1) - FAKE (3.7.5) + FAKE (3.9.9) FSharp.Compiler.Service (0.0.67) - FSharp.Core.4.3.0.0.Microsoft.Signed (3.0.0.1) FSharp.Core.Microsoft.Signed (3.1.1.1) FSharp.Formatting (2.4.36) FSharp.Compiler.Service (0.0.67) diff --git a/src/Data/Matlab/Matlab.csproj b/src/Data/Matlab/Matlab.csproj index 3b4f26a1..6228b1d4 100644 --- a/src/Data/Matlab/Matlab.csproj +++ b/src/Data/Matlab/Matlab.csproj @@ -137,7 +137,7 @@ - ..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll + ..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll True True diff --git a/src/Data/Text/Text.csproj b/src/Data/Text/Text.csproj index db23ea3e..4ef56ea8 100644 --- a/src/Data/Text/Text.csproj +++ b/src/Data/Text/Text.csproj @@ -137,7 +137,7 @@ - ..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll + ..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll True True diff --git a/src/DataUnitTests/UnitTests.csproj b/src/DataUnitTests/UnitTests.csproj index ed6f9f31..7943c39c 100644 --- a/src/DataUnitTests/UnitTests.csproj +++ b/src/DataUnitTests/UnitTests.csproj @@ -192,7 +192,7 @@ - ..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll + ..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll True True diff --git a/src/FSharp/FSharp-Net35.fsproj b/src/FSharp/FSharp-Net35.fsproj index 9d350d64..d1c94ff7 100644 --- a/src/FSharp/FSharp-Net35.fsproj +++ b/src/FSharp/FSharp-Net35.fsproj @@ -66,55 +66,8 @@ - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net35\FSharp.Core.dll - True - True - - - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net40\FSharp.Core.dll - True - True - - - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net40\FSharp.Core.dll - True - True - - - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll - True - True - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll - True - True - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll True @@ -124,22 +77,17 @@ - + - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll True True - + - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll - True - True - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll True @@ -147,13 +95,8 @@ - + - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll - True - True - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll True @@ -161,59 +104,8 @@ - - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll - True - True - - - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll - True - True - - - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll - True - True - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll True @@ -223,11 +115,6 @@ - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll - True - True - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll True @@ -237,11 +124,6 @@ - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll - True - True - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll True @@ -269,6 +151,9 @@ + + False + diff --git a/src/FSharp/FSharp-Net35.fsproj.paket.references b/src/FSharp/FSharp-Net35.fsproj.paket.references index cfff6d69..f74f916a 100644 --- a/src/FSharp/FSharp-Net35.fsproj.paket.references +++ b/src/FSharp/FSharp-Net35.fsproj.paket.references @@ -1,2 +1 @@ -FSharp.Core.4.3.0.0.Microsoft.Signed TaskParallelLibrary diff --git a/src/FSharp/FSharp-Portable47.fsproj b/src/FSharp/FSharp-Portable47.fsproj index 27b9dca8..8ddad9fa 100644 --- a/src/FSharp/FSharp-Portable47.fsproj +++ b/src/FSharp/FSharp-Portable47.fsproj @@ -177,7 +177,7 @@ - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll True True diff --git a/src/FSharp/FSharp.fsproj b/src/FSharp/FSharp.fsproj index 9fca536b..d6759fbb 100644 --- a/src/FSharp/FSharp.fsproj +++ b/src/FSharp/FSharp.fsproj @@ -189,7 +189,7 @@ - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll True True diff --git a/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj b/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj index 20162b39..814dc23e 100644 --- a/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj @@ -92,11 +92,6 @@ - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net35\FSharp.Core.dll - True - True - ..\..\packages\FsUnit\Lib\Net20\FsUnit.NUnit.dll True @@ -114,61 +109,8 @@ - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net40\FSharp.Core.dll - True - True - - - ..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll - True - True - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net40\FSharp.Core.dll - True - True - - - ..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll - True - True - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll - True - True - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll - True - True - ..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll True @@ -188,22 +130,27 @@ - + - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll + + ..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll True True - - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll + + ..\..\packages\NUnit\lib\nunit.framework.dll True True + + ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll + True + True + + + + + ..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll True @@ -221,13 +168,8 @@ - + - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll - True - True - ..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll True @@ -245,89 +187,8 @@ - - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll - True - True - - - ..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll - True - True - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll - True - True - - - ..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll - True - True - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll - True - True - - - ..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll - True - True - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - ..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll - True - True - - - - - - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll - True - True - ..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll True @@ -347,11 +208,6 @@ - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll - True - True - ..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll True @@ -371,11 +227,6 @@ - - ..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll - True - True - ..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll True @@ -411,6 +262,9 @@ + + False + diff --git a/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj.paket.references b/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj.paket.references index a43e9903..02b57d87 100644 --- a/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj.paket.references +++ b/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj.paket.references @@ -1,3 +1,2 @@ -FSharp.Core.4.3.0.0.Microsoft.Signed FsUnit TaskParallelLibrary diff --git a/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj b/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj index dd693808..19814170 100644 --- a/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj @@ -289,7 +289,7 @@ - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll True True diff --git a/src/FSharpUnitTests/FSharpUnitTests.fsproj b/src/FSharpUnitTests/FSharpUnitTests.fsproj index f4ae02ba..99e791a0 100644 --- a/src/FSharpUnitTests/FSharpUnitTests.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests.fsproj @@ -298,7 +298,7 @@ - ..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll + ..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll True True diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj index c3e34659..e2ca1269 100644 --- a/src/UnitTests/UnitTests.csproj +++ b/src/UnitTests/UnitTests.csproj @@ -676,6 +676,7 @@ + \ No newline at end of file