diff --git a/Fake.sln b/Fake.sln index 9daccf003cf..d984d7ae8b0 100644 --- a/Fake.sln +++ b/Fake.sln @@ -185,6 +185,12 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Tools.SignTool", "src\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestTools", "TestTools", "{9200793A-8B59-4242-A5C8-F37CE08DE801}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{092B9791-915B-43BC-A2FD-1EA62BF5DF15}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{0141CA13-3E9C-4DB7-9BAE-0920F5B7A12D}" +EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.Core.DependencyManager.Paket", "src\app\Fake.Core.DependencyManager.Paket\Fake.Core.DependencyManager.Paket.fsproj", "{F4D3249D-F4EC-4B86-BEA8-3F2314ED9B65}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1154,6 +1160,18 @@ Global {3AC9D697-54FA-44CC-B69D-25BA5B656181}.Release|x64.Build.0 = Release|Any CPU {3AC9D697-54FA-44CC-B69D-25BA5B656181}.Release|x86.ActiveCfg = Release|Any CPU {3AC9D697-54FA-44CC-B69D-25BA5B656181}.Release|x86.Build.0 = Release|Any CPU + {F4D3249D-F4EC-4B86-BEA8-3F2314ED9B65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F4D3249D-F4EC-4B86-BEA8-3F2314ED9B65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F4D3249D-F4EC-4B86-BEA8-3F2314ED9B65}.Debug|x64.ActiveCfg = Debug|Any CPU + {F4D3249D-F4EC-4B86-BEA8-3F2314ED9B65}.Debug|x64.Build.0 = Debug|Any CPU + {F4D3249D-F4EC-4B86-BEA8-3F2314ED9B65}.Debug|x86.ActiveCfg = Debug|Any CPU + {F4D3249D-F4EC-4B86-BEA8-3F2314ED9B65}.Debug|x86.Build.0 = Debug|Any CPU + {F4D3249D-F4EC-4B86-BEA8-3F2314ED9B65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F4D3249D-F4EC-4B86-BEA8-3F2314ED9B65}.Release|Any CPU.Build.0 = Release|Any CPU + {F4D3249D-F4EC-4B86-BEA8-3F2314ED9B65}.Release|x64.ActiveCfg = Release|Any CPU + {F4D3249D-F4EC-4B86-BEA8-3F2314ED9B65}.Release|x64.Build.0 = Release|Any CPU + {F4D3249D-F4EC-4B86-BEA8-3F2314ED9B65}.Release|x86.ActiveCfg = Release|Any CPU + {F4D3249D-F4EC-4B86-BEA8-3F2314ED9B65}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1240,6 +1258,8 @@ Global {43B8BB3C-9BE7-466D-BF15-18842AF1A4B8} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A} {3AC9D697-54FA-44CC-B69D-25BA5B656181} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A} {9200793A-8B59-4242-A5C8-F37CE08DE801} = {CCAC5CAB-03C8-4C11-ADBE-A0D05F6A4F18} + {0141CA13-3E9C-4DB7-9BAE-0920F5B7A12D} = {092B9791-915B-43BC-A2FD-1EA62BF5DF15} + {F4D3249D-F4EC-4B86-BEA8-3F2314ED9B65} = {0141CA13-3E9C-4DB7-9BAE-0920F5B7A12D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {058A0C5E-2216-4306-8AFB-0AE28320C26A} diff --git a/build.fsx b/build.fsx index 0ec53fe465c..c640d98240b 100644 --- a/build.fsx +++ b/build.fsx @@ -252,6 +252,7 @@ let dotnetAssemblyInfos = "Fake.BuildServer.Travis", "Integration into Travis buildserver" "Fake.Core.CommandLineParsing", "Core commandline parsing support via docopt like syntax" "Fake.Core.Context", "Core Context Infrastructure" + "Fake.Core.DependencyManager.Paket", "Paket Dependency Manager" "Fake.Core.Environment", "Environment Detection" "Fake.Core.Process", "Starting and managing Processes" "Fake.Core.ReleaseNotes", "Parsing ReleaseNotes" diff --git a/paket.lock b/paket.lock index c522d158274..42c70a317a1 100644 --- a/paket.lock +++ b/paket.lock @@ -79,7 +79,7 @@ NUGET FsCheck.Xunit (2.14) FsCheck (2.14) xunit.extensibility.execution (>= 2.2 < 3.0) - FSharp.Compiler.Service (34.1) + FSharp.Compiler.Service (34.1.1) FSharp.Core (>= 4.6.2) - restriction: || (>= net461) (>= netstandard2.0) System.Buffers (>= 4.5) - restriction: || (>= net461) (>= netstandard2.0) System.Collections.Immutable (>= 1.5) - restriction: || (>= net461) (>= netstandard2.0) @@ -1892,11 +1892,13 @@ NUGET FSharp.Core (>= 4.0.0.1) - restriction: || (== net462) (&& (== netcoreapp2.0) (>= net40)) (&& (== netcoreapp2.1) (>= net40)) (&& (== netstandard2.0) (>= net40)) FSharp.Core (>= 4.2.3) - restriction: || (&& (== net462) (< net40) (>= netstandard1.6)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net462) (< net40) (>= netstandard1.6)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) - FSharp.Compiler.Service (33.0.1) - content: none + FSharp.Compiler.Service (34.1.1) - content: none FSharp.Core (>= 4.6.2) + System.Buffers (>= 4.5) System.Collections.Immutable (>= 1.5) System.Diagnostics.Process (>= 4.1) - restriction: || (&& (== net462) (< net461) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Diagnostics.TraceSource (>= 4.0) - restriction: || (&& (== net462) (< net461) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) + System.Memory (>= 4.5.3) System.Reflection.Emit (>= 4.3) - restriction: || (&& (== net462) (< net461) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Reflection.Metadata (>= 1.6) System.Reflection.TypeExtensions (>= 4.3) - restriction: || (&& (== net462) (< net461) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) @@ -2064,7 +2066,7 @@ NUGET runtime.win-arm64.runtime.native.System.Data.SqlClient.sni (4.4) - restriction: || (&& (== net462) (< net451)) (&& (== net462) (>= netcoreapp2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) runtime.win-x64.runtime.native.System.Data.SqlClient.sni (4.4) - restriction: || (&& (== net462) (< net451)) (&& (== net462) (>= netcoreapp2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) runtime.win-x86.runtime.native.System.Data.SqlClient.sni (4.4) - restriction: || (&& (== net462) (< net451)) (&& (== net462) (>= netcoreapp2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) - System.Buffers (4.5) - restriction: || (&& (== net462) (< net45)) (&& (== net462) (< net451) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) + System.Buffers (4.5) - content: none System.CodeDom (4.7) - restriction: || (&& (== net462) (< net46) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Collections (4.3) - restriction: || (&& (== net462) (< net45) (>= netstandard1.6)) (&& (== net462) (< net46) (>= netstandard1.6)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) @@ -2133,7 +2135,7 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Runtime (>= 4.3) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) - System.Diagnostics.TraceSource (4.3) - restriction: || (&& (== net462) (< net46) (>= netstandard2.0)) (&& (== net462) (>= netcoreapp2.1)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) + System.Diagnostics.TraceSource (4.3) - content: none, restriction: || (&& (== net462) (< net461) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net462) (< net46)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) runtime.native.System (>= 4.3) - restriction: || (&& (== net462) (< net46)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Collections (>= 4.3) - restriction: || (&& (== net462) (< net46)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) @@ -2273,7 +2275,7 @@ NUGET System.Runtime.Extensions (>= 4.3) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Threading (>= 4.3) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Threading.Tasks (>= 4.3) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) - System.Memory (4.5.3) - restriction: || (== net462) (== netcoreapp2.0) (&& (== netcoreapp2.1) (>= net46)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (&& (== netcoreapp2.1) (< netstandard2.0)) (&& (== netcoreapp2.1) (>= uap10.1)) (== netstandard2.0) + System.Memory (4.5.3) - content: none System.Buffers (>= 4.4) - restriction: || (== net462) (&& (== netcoreapp2.0) (>= monotouch)) (&& (== netcoreapp2.0) (>= net461)) (&& (== netcoreapp2.0) (< netstandard1.1)) (&& (== netcoreapp2.0) (< netstandard2.0)) (&& (== netcoreapp2.0) (>= xamarinios)) (&& (== netcoreapp2.0) (>= xamarinmac)) (&& (== netcoreapp2.0) (>= xamarintvos)) (&& (== netcoreapp2.0) (>= xamarinwatchos)) (&& (== netcoreapp2.1) (>= monotouch)) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (&& (== netcoreapp2.1) (< netstandard1.1)) (&& (== netcoreapp2.1) (< netstandard2.0)) (&& (== netcoreapp2.1) (>= xamarinios)) (&& (== netcoreapp2.1) (>= xamarinmac)) (&& (== netcoreapp2.1) (>= xamarintvos)) (&& (== netcoreapp2.1) (>= xamarinwatchos)) (== netstandard2.0) System.Numerics.Vectors (>= 4.4) - restriction: || (== net462) (&& (== netcoreapp2.0) (>= net461)) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 4.5.2) - restriction: || (== net462) (== netcoreapp2.0) (&& (== netcoreapp2.1) (>= monotouch)) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (&& (== netcoreapp2.1) (< netstandard1.1)) (&& (== netcoreapp2.1) (< netstandard2.0)) (&& (== netcoreapp2.1) (>= uap10.1)) (&& (== netcoreapp2.1) (>= xamarinios)) (&& (== netcoreapp2.1) (>= xamarinmac)) (&& (== netcoreapp2.1) (>= xamarintvos)) (&& (== netcoreapp2.1) (>= xamarinwatchos)) (== netstandard2.0) @@ -2312,7 +2314,7 @@ NUGET Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (== net462) (< net45)) (&& (== net462) (< netstandard1.1)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Runtime (>= 4.3.1) - restriction: || (&& (== net462) (< net45)) (&& (== net462) (< netstandard1.1)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Runtime.Handles (>= 4.3) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) - System.Numerics.Vectors (4.5) - restriction: || (&& (== net462) (== netcoreapp2.0)) (&& (== net462) (== netcoreapp2.1)) (&& (== net462) (< net45) (>= netstandard2.0)) (&& (== net462) (< net451) (>= netstandard2.0)) (&& (== net462) (>= netcoreapp2.0)) (&& (== net462) (>= uap10.1)) (&& (== netcoreapp2.0) (>= net461)) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (&& (== netcoreapp2.1) (>= uap10.1)) (== netstandard2.0) + System.Numerics.Vectors (4.5) - content: none, restriction: || (== net462) (&& (== netcoreapp2.0) (>= net461)) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (== netstandard2.0) System.ObjectModel (4.3) - restriction: || (&& (== net462) (< net45) (>= netstandard1.6)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Collections (>= 4.3) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) @@ -3818,11 +3820,13 @@ NUGET NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net462) (< net40) (>= netstandard1.6)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) FsCheck (2.14) FSharp.Core (>= 4.2.3) - FSharp.Compiler.Service (33.0.1) - content: none + FSharp.Compiler.Service (34.1.1) - content: none FSharp.Core (>= 4.6.2) + System.Buffers (>= 4.5) System.Collections.Immutable (>= 1.5) System.Diagnostics.Process (>= 4.1) - restriction: || (&& (== net462) (< net461) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Diagnostics.TraceSource (>= 4.0) - restriction: || (&& (== net462) (< net461) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) + System.Memory (>= 4.5.3) System.Reflection.Emit (>= 4.3) - restriction: || (&& (== net462) (< net461) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Reflection.Metadata (>= 1.6) System.Reflection.TypeExtensions (>= 4.3) - restriction: || (&& (== net462) (< net461) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) @@ -3912,7 +3916,7 @@ NUGET runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - content: none, restriction: || (&& (== net462) (< net46) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.AppContext (4.3) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Runtime (>= 4.3) - restriction: || (&& (== net462) (< net46)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) - System.Buffers (4.5) + System.Buffers (4.5) - content: none System.Collections (4.3) - content: none, restriction: || (&& (== net462) (< net46) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) @@ -3997,14 +4001,14 @@ NUGET System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (== net462) (< net45) (>= netstandard1.6)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Runtime (>= 4.3) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Runtime.Extensions (>= 4.3) - restriction: || (&& (== net462) (< net45) (>= netstandard1.6)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) - System.Memory (4.5.3) - restriction: || (== net462) (== netcoreapp2.0) (&& (== netcoreapp2.1) (>= net46)) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (&& (== netcoreapp2.1) (< netstandard2.0)) (&& (== netcoreapp2.1) (>= uap10.1)) (== netstandard2.0) + System.Memory (4.5.3) - content: none System.Buffers (>= 4.4) - restriction: || (== net462) (&& (== netcoreapp2.0) (>= monotouch)) (&& (== netcoreapp2.0) (>= net461)) (&& (== netcoreapp2.0) (< netstandard1.1)) (&& (== netcoreapp2.0) (< netstandard2.0)) (&& (== netcoreapp2.0) (>= xamarinios)) (&& (== netcoreapp2.0) (>= xamarinmac)) (&& (== netcoreapp2.0) (>= xamarintvos)) (&& (== netcoreapp2.0) (>= xamarinwatchos)) (&& (== netcoreapp2.1) (>= monotouch)) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (&& (== netcoreapp2.1) (< netstandard1.1)) (&& (== netcoreapp2.1) (< netstandard2.0)) (&& (== netcoreapp2.1) (>= xamarinios)) (&& (== netcoreapp2.1) (>= xamarinmac)) (&& (== netcoreapp2.1) (>= xamarintvos)) (&& (== netcoreapp2.1) (>= xamarinwatchos)) (== netstandard2.0) System.Numerics.Vectors (>= 4.4) - restriction: || (== net462) (&& (== netcoreapp2.0) (>= net461)) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 4.5.2) - restriction: || (== net462) (== netcoreapp2.0) (&& (== netcoreapp2.1) (>= monotouch)) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (&& (== netcoreapp2.1) (< netstandard1.1)) (&& (== netcoreapp2.1) (< netstandard2.0)) (&& (== netcoreapp2.1) (>= uap10.1)) (&& (== netcoreapp2.1) (>= xamarinios)) (&& (== netcoreapp2.1) (>= xamarinmac)) (&& (== netcoreapp2.1) (>= xamarintvos)) (&& (== netcoreapp2.1) (>= xamarinwatchos)) (== netstandard2.0) System.Net.Http.WinHttpHandler (4.7) - restriction: || (&& (== net462) (< net45) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) System.Buffers (>= 4.5) - restriction: || (== net462) (&& (== netcoreapp2.0) (>= monoandroid) (< netstandard2.0)) (&& (== netcoreapp2.0) (>= monotouch)) (&& (== netcoreapp2.0) (>= net461)) (&& (== netcoreapp2.0) (>= xamarinios)) (&& (== netcoreapp2.0) (>= xamarinmac)) (&& (== netcoreapp2.0) (>= xamarintvos)) (&& (== netcoreapp2.0) (>= xamarinwatchos)) (&& (== netcoreapp2.1) (>= monoandroid) (< netstandard2.0)) (&& (== netcoreapp2.1) (>= monotouch)) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (&& (== netcoreapp2.1) (>= xamarinios)) (&& (== netcoreapp2.1) (>= xamarinmac)) (&& (== netcoreapp2.1) (>= xamarintvos)) (&& (== netcoreapp2.1) (>= xamarinwatchos)) (== netstandard2.0) System.Memory (>= 4.5.3) - restriction: || (== net462) (== netcoreapp2.0) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (&& (== netcoreapp2.1) (>= uap10.1)) (== netstandard2.0) - System.Numerics.Vectors (4.5) - restriction: || (== net462) (&& (== netcoreapp2.0) (== netstandard2.0)) (&& (== netcoreapp2.0) (>= net461)) (&& (== netcoreapp2.1) (== netstandard2.0)) (&& (== netcoreapp2.1) (>= net46)) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netstandard2.0)) (&& (== netcoreapp2.1) (>= uap10.1)) (&& (== netstandard2.0) (>= net461)) (&& (== netstandard2.0) (>= netcoreapp2.0)) + System.Numerics.Vectors (4.5) - content: none, restriction: || (== net462) (&& (== netcoreapp2.0) (>= net461)) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (== netstandard2.0) System.Reflection (4.3) - content: none, restriction: || (&& (== net462) (< net461) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) @@ -4035,7 +4039,7 @@ NUGET System.Runtime (4.3.1) - content: none, restriction: || (&& (== net462) (< net45) (>= netstandard2.0)) (&& (== net462) (< net46) (>= netstandard2.0)) (&& (== net462) (< net461) (>= net463) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (4.7) - restriction: || (== net462) (== netcoreapp2.0) (&& (== netcoreapp2.1) (== netstandard2.0)) (&& (== netcoreapp2.1) (>= monotouch)) (&& (== netcoreapp2.1) (>= net46)) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netstandard1.1)) (&& (== netcoreapp2.1) (< netstandard2.0)) (&& (== netcoreapp2.1) (>= uap10.1)) (&& (== netcoreapp2.1) (>= xamarintvos)) (&& (== netcoreapp2.1) (>= xamarinwatchos)) (&& (== netstandard2.0) (>= net461)) (&& (== netstandard2.0) (>= netcoreapp2.0)) + System.Runtime.CompilerServices.Unsafe (4.7) - content: none, restriction: || (== net462) (== netcoreapp2.0) (&& (== netcoreapp2.1) (>= monotouch)) (&& (== netcoreapp2.1) (>= net461)) (&& (== netcoreapp2.1) (< netcoreapp2.0)) (&& (== netcoreapp2.1) (< netstandard1.1)) (&& (== netcoreapp2.1) (< netstandard2.0)) (&& (== netcoreapp2.1) (>= uap10.1)) (&& (== netcoreapp2.1) (>= xamarinios)) (&& (== netcoreapp2.1) (>= xamarinmac)) (&& (== netcoreapp2.1) (>= xamarintvos)) (&& (== netcoreapp2.1) (>= xamarinwatchos)) (== netstandard2.0) System.Runtime.Extensions (4.3.1) - content: none, restriction: || (&& (== net462) (< net46) (>= netstandard2.0)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (== net462) (< net45)) (== netcoreapp2.0) (== netcoreapp2.1) (== netstandard2.0) diff --git a/src/app/Fake.Core.DependencyManager.Paket/AssemblyInfo.fs b/src/app/Fake.Core.DependencyManager.Paket/AssemblyInfo.fs new file mode 100644 index 00000000000..92c848e5ecf --- /dev/null +++ b/src/app/Fake.Core.DependencyManager.Paket/AssemblyInfo.fs @@ -0,0 +1,19 @@ +// Auto-Generated by FAKE; do not edit +namespace System +open System.Reflection + +[] +[] +[] +[] +[] +[] +do () + +module internal AssemblyVersionInformation = + let [] AssemblyTitle = "FAKE - F# Make Paket Dependency Manager" + let [] AssemblyProduct = "FAKE - F# Make" + let [] AssemblyVersion = "5.19.2" + let [] AssemblyInformationalVersion = "5.19.2-alpha.local.1+2020-03-06-09-23" + let [] AssemblyFileVersion = "5.19.2" + let [] AssemblyMetadata_BuildDate = "2020-03-06" diff --git a/src/app/Fake.Core.DependencyManager.Paket/Fake.Core.DependencyManager.Paket.fsproj b/src/app/Fake.Core.DependencyManager.Paket/Fake.Core.DependencyManager.Paket.fsproj new file mode 100644 index 00000000000..afd908d0f58 --- /dev/null +++ b/src/app/Fake.Core.DependencyManager.Paket/Fake.Core.DependencyManager.Paket.fsproj @@ -0,0 +1,16 @@ + + + netstandard2.0;net462 + + Fake.Core.DependencyManager.Paket + Library + + + $(DefineConstants);DOTNETCORE + + + + + + + diff --git a/src/app/Fake.Core.DependencyManager.Paket/PaketDependencyManager.fs b/src/app/Fake.Core.DependencyManager.Paket/PaketDependencyManager.fs new file mode 100644 index 00000000000..54ea58aea37 --- /dev/null +++ b/src/app/Fake.Core.DependencyManager.Paket/PaketDependencyManager.fs @@ -0,0 +1,58 @@ +namespace Fake.Core.DependencyManager.Paket + +module Internals = + open System + + /// A marker attribute to tell FCS that this assembly contains a Dependency Manager, or + /// that a class with the attribute is a DependencyManager + [] + type DependencyManagerAttribute() = + inherit Attribute() + + [] + do () + + /// returned structure from the ResolveDependencies method call. + type ResolveDependenciesResult (success: bool, stdOut: string array, stdError: string array, resolutions: string seq, sourceFiles: string seq, roots: string seq) = + + /// Succeded? + member __.Success = success + + /// The resolution output log + member __.StdOut = stdOut + + /// The resolution error log (* process stderror *) + member __.StdError = stdError + + /// The resolution paths (will be treated as #r options) + member __.Resolutions = resolutions + + /// The source code file paths (will be treated as #load options) + member __.SourceFiles = sourceFiles + + /// The roots to package directories (will be treated like #I options) + member __.Roots = roots + + type ScriptExtension = string + type HashRLines = string seq + type TFM = string + + [] + /// the type _must_ take an optional output directory + type PaketDependencyManager(outputDir: string option) = + + /// Name of the dependency manager + member val Name = "Dummy Paket Dependency Manager" with get + + /// Key that identifies the types of dependencies that this DependencyManager operates on + member val Key = "paket" with get + + /// Resolve the dependencies, for the given set of arguments, go find the .dll references, scripts and additional include values. + member _.ResolveDependencies(scriptExt: ScriptExtension, includeLines: HashRLines, tfm: TFM): obj = + // generally, here we'd parse the includeLines to determine what to do, + // package those results into a `ResolveDepndenciesResult`, + // and return it boxed as obj. + // but here we will return a dummy + ResolveDependenciesResult(true, [|"Skipped processing of paket references"|], [||], Seq.empty, Seq.empty, Seq.empty) :> _ + + diff --git a/src/app/Fake.Core.DependencyManager.Paket/paket.references b/src/app/Fake.Core.DependencyManager.Paket/paket.references new file mode 100644 index 00000000000..edc34b53625 --- /dev/null +++ b/src/app/Fake.Core.DependencyManager.Paket/paket.references @@ -0,0 +1,4 @@ +group netcore + +FSharp.Core +NETStandard.Library diff --git a/src/app/Fake.Runtime/CompileRunner.fs b/src/app/Fake.Runtime/CompileRunner.fs index 6d066f329c0..bb058c021a3 100644 --- a/src/app/Fake.Runtime/CompileRunner.fs +++ b/src/app/Fake.Runtime/CompileRunner.fs @@ -13,6 +13,8 @@ open System.IO open Yaaf.FSharp.Scripting open FSharp.Compiler.SourceCodeServices +type Marker = class end + /// Handles a cache store operation, this should not throw as it is executed in a finally block and /// therefore might eat other exceptions. And a caching error is not critical. @@ -104,12 +106,19 @@ let compile (context:FakeContext) outDll = if (destinationFile.Exists) then destinationFile.Delete() let co = context.Config.CompileOptions + let dummyPaketDependencyManagerOption = + match typeof.Assembly.Location with + | "" -> "" + | s -> + let currentDir = Path.GetDirectoryName s + sprintf "--compilertool:%s" currentDir + // see https://github.com/fsharp/FSharp.Compiler.Service/issues/755 // see https://github.com/fsharp/FSharp.Compiler.Service/issues/799 let options = { co.FsiOptions with FullPaths = true - ScriptArgs = "--simpleresolution" :: "--targetprofile:netstandard" :: "--nowin32manifest" :: "-o" :: outDll :: context.Config.ScriptFilePath :: co.FsiOptions.ScriptArgs + ScriptArgs = "--simpleresolution" :: "--targetprofile:netstandard" :: "--nowin32manifest" :: "--langversion:preview" :: dummyPaketDependencyManagerOption :: "-o" :: outDll :: context.Config.ScriptFilePath :: co.FsiOptions.ScriptArgs } // Replace fsharp.core with current version, see https://github.com/fsharp/FAKE/issues/2001 let fixReferences (s:string list) = diff --git a/src/app/Fake.Runtime/Fake.Runtime.fsproj b/src/app/Fake.Runtime/Fake.Runtime.fsproj index 0cac682d023..5a0bfb6b98f 100644 --- a/src/app/Fake.Runtime/Fake.Runtime.fsproj +++ b/src/app/Fake.Runtime/Fake.Runtime.fsproj @@ -35,6 +35,7 @@ +