update FCS 34.1.1 across all paket groups

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}

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"

src/app/Fake.Core.DependencyManager.Paket/AssemblyInfo.fs

@@ -0,0 +1,19 @@
+// Auto-Generated by FAKE; do not edit
+namespace System
+open System.Reflection
+
+[<assembly: AssemblyTitleAttribute("FAKE - F# Make Paket Dependency Manager")>]
+[<assembly: AssemblyProductAttribute("FAKE - F# Make")>]
+[<assembly: AssemblyVersionAttribute("5.19.2")>]
+[<assembly: AssemblyInformationalVersionAttribute("5.19.2-alpha.local.1+2020-03-06-09-23")>]
+[<assembly: AssemblyFileVersionAttribute("5.19.2")>]
+[<assembly: AssemblyMetadataAttribute("BuildDate","2020-03-06")>]
+do ()
+
+module internal AssemblyVersionInformation =
+    let [<Literal>] AssemblyTitle = "FAKE - F# Make Paket Dependency Manager"
+    let [<Literal>] AssemblyProduct = "FAKE - F# Make"
+    let [<Literal>] AssemblyVersion = "5.19.2"
+    let [<Literal>] AssemblyInformationalVersion = "5.19.2-alpha.local.1+2020-03-06-09-23"
+    let [<Literal>] AssemblyFileVersion = "5.19.2"
+    let [<Literal>] AssemblyMetadata_BuildDate = "2020-03-06"

src/app/Fake.Core.DependencyManager.Paket/Fake.Core.DependencyManager.Paket.fsproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
+    <!-- To be found by FCS, the dependency manager assembly must match the pattern *DependencyManager*.dll -->
+    <AssemblyName>Fake.Core.DependencyManager.Paket</AssemblyName>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);DOTNETCORE</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="PaketDependencyManager.fs" />
+  </ItemGroup>
+  <Import Project="..\..\..\.paket\Paket.Restore.targets" />
+</Project>

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
+    [<AttributeUsage(AttributeTargets.Assembly ||| AttributeTargets.Class , AllowMultiple = false)>]
+    type DependencyManagerAttribute() =
+        inherit Attribute()
+
+    [<assembly: DependencyManagerAttribute()>]
+    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
+
+    [<DependencyManager>]
+    /// 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) :> _
+
+

src/app/Fake.Core.DependencyManager.Paket/paket.references

@@ -0,0 +1,4 @@
+group netcore
+
+FSharp.Core
+NETStandard.Library

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<Marker>.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) =

src/app/Fake.Runtime/Fake.Runtime.fsproj

@@ -35,6 +35,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Fake.Core.Context\Fake.Core.Context.fsproj" />
+    <ProjectReference Include="..\Fake.Core.DependencyManager.Paket\Fake.Core.DependencyManager.Paket.fsproj" />
   </ItemGroup>
   <Import Project="..\..\..\.paket\Paket.Restore.targets" />
 </Project>