Release Candidate 13

.paket/Paket.Restore.targets

@@ -43,7 +43,7 @@
     <!-- Step 1 Check if lockfile is properly restored -->
     <PropertyGroup>
       <PaketRestoreRequired>true</PaketRestoreRequired>
-      <NoWarn>$(NoWarn);NU1603</NoWarn>
+      <NoWarn>$(NoWarn);NU1603;NU1604;NU1605;NU1608</NoWarn>
     </PropertyGroup>
 
     <!-- Because ReadAllText is slow on osx/linux, try to find shasum and awk -->
@@ -60,6 +60,9 @@
       <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
     </Exec>
 
+    <!-- Debug whats going on -->
+    <Message Importance="low" Text="calling paket restore with targetframework=$(TargetFramework) targetframeworks=$(TargetFrameworks)" />
+
     <PropertyGroup Condition="Exists('$(PaketRestoreCacheFile)') ">
       <!-- if no hash has been done yet fall back to just reading in the files and comparing them -->
       <PaketRestoreCachedHash Condition=" '$(PaketRestoreCachedHash)' == '' ">$([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)'))</PaketRestoreCachedHash>
@@ -69,11 +72,19 @@
       <PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
     </PropertyGroup>
 
+
     <!-- Do a global restore if required -->
     <Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
     <Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />
 
     <!-- Step 2 Detect project specific changes -->
+    <ItemGroup>
+      <MyTargetFrameworks Condition="'$(TargetFramework)' != '' " Include="$(TargetFramework)"></MyTargetFrameworks>
+      <!-- Don't include all frameworks when msbuild explicitly asks for a single one -->
+      <MyTargetFrameworks Condition="'$(TargetFrameworks)' != '' AND '$(TargetFramework)' == '' " Include="$(TargetFrameworks)"></MyTargetFrameworks>
+      <PaketResolvedFilePaths Include="@(MyTargetFrameworks -> '$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).%(Identity).paket.resolved')"></PaketResolvedFilePaths>
+    </ItemGroup>
+    <Message Importance="low" Text="MyTargetFrameworks=@(MyTargetFrameworks) PaketResolvedFilePaths=@(PaketResolvedFilePaths)" />
     <PropertyGroup>
       <PaketReferencesCachedFilePath>$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).paket.references.cached</PaketReferencesCachedFilePath>
       <!-- MyProject.fsproj.paket.references has the highest precedence -->
@@ -82,7 +93,9 @@
       <PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketOriginalReferencesFilePath>
       <!-- paket.references -->
       <PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\paket.references</PaketOriginalReferencesFilePath>
-      <PaketResolvedFilePath>$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).$(TargetFramework).paket.resolved</PaketResolvedFilePath>
+
+      <DoAllResolvedFilesExist>false</DoAllResolvedFilesExist>
+      <DoAllResolvedFilesExist Condition="Exists(%(PaketResolvedFilePaths.Identity))">true</DoAllResolvedFilesExist>
       <PaketRestoreRequired>true</PaketRestoreRequired>
       <PaketRestoreRequiredReason>references-file-or-cache-not-found</PaketRestoreRequiredReason>
     </PropertyGroup>
@@ -101,33 +114,39 @@
     </PropertyGroup>
 
     <!-- Step 2 b detect relevant changes in project file (new targetframework) -->
-    <PropertyGroup Condition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != '' ">
+    <PropertyGroup Condition=" '$(DoAllResolvedFilesExist)' != 'true' ">
       <PaketRestoreRequired>true</PaketRestoreRequired>
-      <PaketRestoreRequiredReason>target-framework '$(TargetFramework)'</PaketRestoreRequiredReason>
+      <PaketRestoreRequiredReason>target-framework '$(TargetFramework)' or '$(TargetFrameworks)' files @(PaketResolvedFilePaths)</PaketRestoreRequiredReason>
     </PropertyGroup>
 
     <!-- Step 3 Restore project specific stuff if required -->
     <Message Condition=" '$(PaketRestoreRequired)' == 'true' " Importance="low" Text="Detected a change ('$(PaketRestoreRequiredReason)') in the project file '$(MSBuildProjectFullPath)', calling paket restore" />
-    <Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)"' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />
+    <Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" --target-framework "$(TargetFrameworks)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' == '' " ContinueOnError="false" />
+    <Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" --target-framework "$(TargetFramework)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' != '' " ContinueOnError="false" />
 
     <!-- This shouldn't actually happen, but just to be sure. -->
-    <Error Condition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != '' AND '$(ResolveNuGetPackages)' != 'False' " Text="Paket file '$(PaketResolvedFilePath)' is missing while restoring $(MSBuildProjectFile). Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
+    <PropertyGroup>
+      <DoAllResolvedFilesExist>false</DoAllResolvedFilesExist>
+      <DoAllResolvedFilesExist Condition="Exists(%(PaketResolvedFilePaths.Identity))">true</DoAllResolvedFilesExist>
+    </PropertyGroup>
+    <Error Condition=" '$(DoAllResolvedFilesExist)' != 'true' AND '$(ResolveNuGetPackages)' != 'False' " Text="One Paket file '@(PaketResolvedFilePaths)' is missing while restoring $(MSBuildProjectFile). Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
 
     <!-- Step 4 forward all msbuild properties (PackageReference, DotNetCliToolReference) to msbuild -->
-    <ReadLinesFromFile Condition="Exists('$(PaketResolvedFilePath)')" File="$(PaketResolvedFilePath)" >
+    <ReadLinesFromFile Condition="'@(PaketResolvedFilePaths)' != ''" File="%(PaketResolvedFilePaths.Identity)" ><!--Condition="Exists('%(PaketResolvedFilePaths.Identity)')"-->
       <Output TaskParameter="Lines" ItemName="PaketReferencesFileLines"/>
     </ReadLinesFromFile>
 
-    <ItemGroup Condition=" Exists('$(PaketResolvedFilePath)') AND '@(PaketReferencesFileLines)' != '' " >
+    <ItemGroup Condition=" '@(PaketReferencesFileLines)' != '' " >
       <PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
         <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
         <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
         <AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
       </PaketReferencesFileLinesInfo>
       <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
         <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
-        <PrivateAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'true'">All</PrivateAssets>
+        <PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
         <ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
+        <Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
       </PackageReference>
     </ItemGroup>
 

RELEASE_NOTES.md

@@ -1,5 +1,21 @@
 # Release Notes
 
+## 5.0.0-rc014 - 2018-05-20
+
+* BUGFIX: Globbing is now more robust (especially outside the working directory) - https://github.com/fsharp/FAKE/issues/1925 https://github.com/fsharp/FAKE/issues/1750 and some not tracked issues
+* COSMETICS: Fake is printing target description twice - https://github.com/fsharp/FAKE/issues/1931
+* ENHANCEMENT: Fake parallel logic is not even smarter in running targets parallel - https://github.com/fsharp/FAKE/pull/1934
+* DOCS: We now have a full staging environment in place - https://fake.build/contributing.html#Staging-environment
+* DOCS: We now have a place to thank our supporters - https://fake.build/help-supporters.html
+
+## 5.0.0-rc013 - 2018-05-20
+
+* ENHANCEMENT: Add partial restore (to improve the speed when using in a release-pipeline) - https://github.com/fsharp/FAKE/issues/1926
+* FAKE5: Xake now supports FAKE 5 and is advertised as module - https://github.com/xakebuild/Xake
+- ENHANCEMENT: Parallelize targets even more - https://github.com/fsharp/FAKE/pull/1934
+- COSMETICS: Targets are always shown as "failed" - https://github.com/fsharp/FAKE/issues/1929
+- COSMETICS: Target description was printed twice - https://github.com/fsharp/FAKE/issues/1931
+
 ## 5.0.0-rc012 - 2018-05-12
 
 * FAKE5: New module `Fake.Windows.Registry` - https://github.com/fsharp/FAKE/pull/1909

Samples/ContinuousDeploymentWebsite/src/test/Fake_WebSite.Tests/Fake_WebSite.Tests.csproj

@@ -84,7 +84,7 @@
         </Reference>
       </ItemGroup>
     </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
       <ItemGroup>
         <Reference Include="Machine.Specifications">
           <HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll</HintPath>

build.fsx

@@ -81,10 +81,7 @@ let projectName = "FAKE"
 let projectSummary = "FAKE - F# Make - Get rid of the noise in your build scripts."
 let projectDescription = "FAKE - F# Make - is a build automation tool for .NET. Tasks and dependencies are specified in a DSL which is integrated in F#."
 let authors = ["Steffen Forkmann"; "Mauricio Scheffer"; "Colin Bull"; "Matthias Dittrich"]
-let gitRaw = Environment.environVarOrDefault "gitRaw" "https://raw.github.com/fsharp"
-
-let gitOwner = "fsharp"
-let gitHome = "https://github.com/" + gitOwner
+let github_release_user = Environment.environVarOrDefault "github_release_user" "fsharp"
 
 // The name of the project on GitHub
 let gitName = "FAKE"
@@ -134,7 +131,9 @@ let additionalFiles = [
 let nuget_exe = Directory.GetCurrentDirectory() </> "packages" </> "build" </> "NuGet.CommandLine" </> "tools" </> "NuGet.exe"
 let apikey = Environment.environVarOrDefault "nugetkey" ""
 let nugetsource = Environment.environVarOrDefault "nugetsource" "https://www.nuget.org/api/v2/package"
+let chocosource = Environment.environVarOrDefault "chocosource" "https://push.chocolatey.org/"
 let artifactsDir = Environment.environVarOrDefault "artifactsdirectory" ""
+let docsDomain = Environment.environVarOrDefault "docs_domain" "fake.build"
 let fromArtifacts = not <| String.isNullOrEmpty artifactsDir
 
 BuildServer.install [
@@ -199,6 +198,9 @@ let version =
                         Values = p.Values @ source
                         Origin = p.Origin + toAdd })
     { semVer with PreRelease = prerelease; Original = None; BuildMetaData = buildMeta }
+
+let simpleVersion = version.AsString
+
 let nugetVersion =
     if System.String.IsNullOrEmpty version.BuildMetaData
     then version.AsString
@@ -479,16 +481,16 @@ Target.create "GenerateDocs" (fun _ ->
     let source = "./help"
     let docsTemplate = "docpage.cshtml"
     let indexTemplate = "indexpage.cshtml"
-    let githubLink = "https://github.com/fsharp/FAKE"
+    let githubLink = sprintf "https://github.com/%s/%s" github_release_user gitName
     let projInfo =
       [ "page-description", "FAKE - F# Make"
         "page-author", String.separated ", " authors
         "project-author", String.separated ", " authors
         "github-link", githubLink
-        "version", nugetVersion
-        "project-github", "http://github.com/fsharp/fake"
+        "version", simpleVersion
+        "project-github", sprintf "http://github.com/%s/%s" github_release_user gitName
         "project-nuget", "https://www.nuget.org/packages/FAKE"
-        "root", "http://fsharp.github.io/FAKE"
+        "root", sprintf "https://%s" docsDomain
         "project-name", "FAKE - F# Make" ]
 
     let layoutRoots = [ "./help/templates"; "./help/templates/reference"]
@@ -502,7 +504,7 @@ Target.create "GenerateDocs" (fun _ ->
     Directory.ensure docsCircleCi
     Shell.copyDir docsCircleCi ".circleci" FileFilter.allFiles
     File.writeString false "./docs/.nojekyll" ""
-    File.writeString false "./docs/CNAME" "fake.build"
+    File.writeString false "./docs/CNAME" docsDomain
     //CopyDir (docsDir @@ "pics") "help/pics" FileFilter.allFiles
 
     Shell.copy (source @@ "markdown") ["RELEASE_NOTES.md"]
@@ -890,22 +892,26 @@ Target.create "CreateNuGet" (fun _ ->
             Project = package.Project + ".x64" }
 
     let nugetExe =
-        let pref = Path.GetFullPath "packages/build/NuGet.CommandLine/tools/NuGet.exe"
-        if File.Exists pref then pref
-        else
+        let prefs = 
+           [ "packages/build/Nuget.CommandLine/tools/NuGet.exe"
+             "packages/build/NuGet.CommandLine/tools/NuGet.exe" ]
+           |> List.map Path.GetFullPath 
+        match Seq.tryFind (File.Exists) prefs with
+        | Some pref -> pref
+        | None ->
             let rec printDir space d =
                 for f in Directory.EnumerateFiles d do
                     Trace.tracefn "%sFile: %s" space f
                 for sd in Directory.EnumerateDirectories d do
                     Trace.tracefn "%sDirectory: %s" space sd
-                    printDir (space + "  ") d
+                    printDir (space + "  ") sd
             printDir "  " (Path.GetFullPath "packages")
             match !! "packages/**/NuGet.exe" |> Seq.tryHead with
             | Some e ->
                 Trace.tracefn "Found %s" e
                 e
             | None ->
-                pref
+                prefs |> List.head
 
     for package,description in packages do
         let nugetDocsDir = nugetLegacyDir @@ "docs"
@@ -1146,15 +1152,14 @@ Target.create "DotNetCorePushChocolateyPackage" (fun _ ->
         if Environment.isWindows then p else { p with ToolPath = altToolPath }
     path |> Choco.push (fun p ->
         { p with
-            Source = "https://push.chocolatey.org/"
+            Source = chocosource
             ApiKey = Environment.environVarOrFail "CHOCOLATEY_API_KEY" }
         |> changeToolPath)
 )
 
 Target.create "CheckReleaseSecrets" (fun _ ->
     Environment.environVarOrFail "CHOCOLATEY_API_KEY" |> ignore
     Environment.environVarOrFail "nugetkey" |> ignore
-    Environment.environVarOrFail "github_user" |> ignore
     Environment.environVarOrFail "github_token" |> ignore
 )
 
@@ -1278,17 +1283,18 @@ Target.create "ReleaseDocs" (fun _ ->
             TraceSecrets.register "<token>"  s
             sprintf "%s:x-oauth-basic@" s
         | _ -> ""
-    let url = Environment.environVarOrDefault "fake_git_url" (sprintf "https://%sgithub.com/fsharp/FAKE.git" auth)
+    let url = sprintf "https://%sgithub.com/%s/%s.git" auth github_release_user gitName
     Git.Repository.cloneSingleBranch "" url "gh-pages" "gh-pages"
 
     Git.Repository.fullclean "gh-pages"
     Shell.copyRecursive "docs" "gh-pages" true |> printfn "%A"
     Shell.copyFile "gh-pages" "./Samples/FAKE-Calculator.zip"
+    File.writeString false "./gh-pages/CNAME" docsDomain
     Git.Staging.stageAll "gh-pages"
     if not BuildServer.isLocalBuild then
         Git.CommandHelper.directRunGitCommandAndFail "gh-pages" "config user.email [email protected]"
         Git.CommandHelper.directRunGitCommandAndFail "gh-pages" "config user.name \"Matthias Dittrich\""
-    Git.Commit.exec "gh-pages" (sprintf "Update generated documentation %s" nugetVersion)
+    Git.Commit.exec "gh-pages" (sprintf "Update generated documentation %s" simpleVersion)
     Git.Branches.pushBranch "gh-pages" url "gh-pages"
 )
 
@@ -1300,8 +1306,8 @@ Target.create "FastRelease" (fun _ ->
             s
         | _ -> failwith "please set the github_token environment variable to a github personal access token with repro access."
     let auth = sprintf "%s:x-oauth-basic@" token
-    let url = Environment.environVarOrDefault "fake_git_url" (sprintf "https://%sgithub.com/fsharp/FAKE.git" auth)
-    
+    let url = sprintf "https://%sgithub.com/%s/%s.git" auth github_release_user gitName
+
     let gitDirectory = Environment.environVarOrDefault "git_directory" ""
     if not BuildServer.isLocalBuild then
         Git.CommandHelper.directRunGitCommandAndFail gitDirectory "config user.email [email protected]"
@@ -1311,19 +1317,19 @@ Target.create "FastRelease" (fun _ ->
         Git.Branches.checkout gitDirectory false TeamFoundation.Environment.BuildSourceVersion
     else
         Git.Staging.stageAll gitDirectory
-        Git.Commit.exec gitDirectory (sprintf "Bump version to %s" nugetVersion)
+        Git.Commit.exec gitDirectory (sprintf "Bump version to %s" simpleVersion)
         let branch = Git.Information.getBranchName gitDirectory
         Git.Branches.pushBranch gitDirectory "origin" branch
 
-    Git.Branches.tag gitDirectory nugetVersion
-    Git.Branches.pushTag gitDirectory url nugetVersion
+    Git.Branches.tag gitDirectory simpleVersion
+    Git.Branches.pushTag gitDirectory url simpleVersion
 
     let files =
         runtimes @ [ "portable"; "packages" ]
         |> List.map (fun n -> sprintf "nuget/dotnetcore/Fake.netcore/fake-dotnetcore-%s.zip" n)
 
     GitHub.createClientWithToken token
-    |> GitHub.draftNewRelease gitOwner gitName nugetVersion (release.SemVer.PreRelease <> None) release.Notes
+    |> GitHub.draftNewRelease github_release_user gitName simpleVersion (release.SemVer.PreRelease <> None) release.Notes
     |> GitHub.uploadFiles files
     |> GitHub.publishDraft
     |> Async.RunSynchronously
@@ -1352,7 +1358,13 @@ Target.create "PrepareArtifacts" (fun _ ->
     if not fromArtifacts then
         Trace.trace "empty artifactsDir."
     else
-        !! (artifactsDir </> "fake-dotnetcore-*.zip")
+        Trace.trace "ensure artifacts."
+        let files =
+            !! (artifactsDir </> "fake-dotnetcore-*.zip")
+            |> GlobbingPattern.setBaseDir "C:\\" // workaround a globbing bug, remove me with 5.0.0-rc014
+            |> Seq.toList
+        Trace.tracefn "files: %A" files
+        files
         |> Shell.copy "nuget/dotnetcore/Fake.netcore"
 
         unzip "nuget/dotnetcore" (artifactsDir </> "fake-dotnetcore-packages.zip")
@@ -1644,6 +1656,8 @@ prevDocs ?=> "GenerateDocs"
     ==> "Release_Staging"
 "DotNetCorePushNuGet"
     ==> "Release_Staging"
+"DotNetCorePushChocolateyPackage"
+    ==> "Release_Staging"
 
 // If 'Default' happens it needs to happen before 'EnsureTestsRun'
 "Default"