Merge pull request #2084 from fsharp/release/next

Release 5.7.0 / 5.7.1

.gitlab-ci.yml

@@ -20,6 +20,8 @@ do_build:
     TERM: "xterm-256color"
     MSBUILDDISABLENODEREUSE: "1"
     BuildInParallel: "false"
+    LANG: "C"
+    LC_ALL: "C"
 
   script: |
     export PATH=$PATH:$PWD/fake-dotnetcore/

.travis.yml

@@ -1,7 +1,7 @@
 language: csharp
 sudo: required
 dist: trusty # Ubuntu 14.04
-dotnet : 2.1.302
+dotnet : 2.1.402
 env:
  - HOME=/home/travis APPDATA=/home/travis LocalAppData=/home/travis
 

RELEASE_NOTES.md

@@ -1,5 +1,20 @@
 # Release Notes
 
+## 5.7.1 - 2018-09-24
+
+* BUGFIX: Ignore some arguments when running `dotnet msbuild /version` - https://github.com/fsharp/FAKE/issues/2102
+
+## 5.7.0 - 2018-09-23
+
+* ENHANCEMENT: Use VSWhere to detect msbuild location - https://github.com/fsharp/FAKE/pull/2077
+* ENHANCEMENT: Add Dotnet SDK 2.1.400, 2.1.401 and 2.1.402 - https://github.com/fsharp/FAKE/pull/2089
+* ENHANCEMENT: Improve error reporting of msbuild errors across all CI servers - https://github.com/fsharp/FAKE/issues/2096
+* ENHANCEMENT: Add /logger support for MSBuild - https://github.com/fsharp/FAKE/issues/1712
+* ENHANCEMENT: Add /consoleloggerparameters support for MSBuild - https://github.com/fsharp/FAKE/issues/1607
+* ENHANCEMENT: Added `DotNet.msbuild` to call `dotnet msbuild` - https://github.com/fsharp/FAKE/pull/2098
+* ENHANCEMENT: Added `MSBuildParams` to `DotNet.restore`, `DotNet.build`, `DotNet.pack`, `DotNet.publish` and `DotNet.test` in order to add regular msbuild parameters - https://github.com/fsharp/FAKE/pull/2098
+* ENHANCEMENT: AppVeyor now reports errors and warnings to the 'Messages'-tab - https://github.com/fsharp/FAKE/pull/2098
+
 ## 5.6.1 - 2018-09-09
 
 * BUGFIX: dotnet restore with configfile did not work - https://github.com/fsharp/FAKE/issues/2082

build.fsx

@@ -160,7 +160,7 @@ let chocoVersion =
 
 Trace.setBuildNumber nugetVersion
 
-let dotnetSdk = lazy DotNet.install DotNet.Versions.Release_2_1_302
+let dotnetSdk = lazy DotNet.install DotNet.Versions.FromGlobalJson
 let inline dtntWorkDir wd =
     DotNet.Options.lift dotnetSdk.Value
     >> DotNet.Options.withWorkingDirectory wd
@@ -547,10 +547,11 @@ Target.create "DotNetCoreIntegrationTests" (fun _ ->
 )
 
 Target.create "TemplateIntegrationTests" (fun _ ->
+    let targetDir = srcDir </> "test" </> "Fake.DotNet.Cli.IntegrationTests"
     let processResult =
-        DotNet.exec (dtntWorkDir (srcDir </> "test" </> "Fake.DotNet.Cli.IntegrationTests")) "bin/Release/netcoreapp2.1/Fake.DotNet.Cli.IntegrationTests.dll" "--summary"
+        DotNet.exec (dtntWorkDir targetDir) "bin/Release/netcoreapp2.1/Fake.DotNet.Cli.IntegrationTests.dll" "--summary"
     if processResult.ExitCode <> 0 then failwithf "DotNet CLI Template Integration tests failed."
-    Trace.publish (ImportData.Nunit NunitDataVersion.Nunit) "Fake_DotNet_Cli_IntegrationTests.TestResults.xml"
+    Trace.publish (ImportData.Nunit NunitDataVersion.Nunit) (targetDir </> "Fake_DotNet_Cli_IntegrationTests.TestResults.xml")
 )
 
 Target.create "DotNetCoreUnitTests" (fun _ ->
@@ -815,9 +816,11 @@ Target.create "CheckReleaseSecrets" (fun _ ->
 Target.create "DotNetCoreCreateDebianPackage" (fun _ ->
     let runtime = "linux-x64"
     let targetFramework =  "netcoreapp2.1"
+    // See https://github.com/dotnet/cli/issues/9823
     let args =
         [
-            sprintf "/t:%s" "Restore;CreateDeb"
+            sprintf "/restore"
+            sprintf "/t:%s" "CreateDeb"
             sprintf "/p:TargetFramework=%s" targetFramework
             sprintf "/p:CustomTarget=%s" "CreateDeb"
             sprintf "/p:RuntimeIdentifier=%s" runtime
@@ -942,21 +945,6 @@ Target.create "FastRelease" (fun _ ->
 Target.create "Release_Staging" (fun _ -> ())
 
 open System.IO.Compression
-let unzip target (fileName : string) =
-    use stream = new FileStream(fileName, FileMode.Open)
-    use zipFile = new ZipArchive(stream)
-    for zipEntry in zipFile.Entries do
-        let unzipPath = Path.Combine(target, zipEntry.FullName)
-        let directoryPath = Path.GetDirectoryName(unzipPath)
-        if unzipPath.EndsWith "/" then
-            Directory.CreateDirectory(unzipPath) |> ignore
-        else
-            // unzip the file
-            Directory.ensure directoryPath
-            let zipStream = zipEntry.Open()
-            if unzipPath.EndsWith "/" |> not then
-                use unzippedFileStream = File.Create(unzipPath)
-                zipStream.CopyTo(unzippedFileStream)
 
 Target.create "PrepareArtifacts" (fun _ ->
     if not fromArtifacts then
@@ -971,23 +959,23 @@ Target.create "PrepareArtifacts" (fun _ ->
         files
         |> Shell.copy (nugetDncDir </> "Fake.netcore")
 
-        unzip nugetDncDir (artifactsDir </> "fake-dotnetcore-packages.zip")
+        Zip.unzip nugetDncDir (artifactsDir </> "fake-dotnetcore-packages.zip")
 
         if Environment.isWindows then
             Directory.ensure chocoReleaseDir
             let name = sprintf "%s.%s.nupkg" "fake" chocoVersion
             Shell.copyFile (sprintf "%s/%s" chocoReleaseDir name) (artifactsDir </> sprintf "chocolatey-%s" name)
         else
-            unzip "." (artifactsDir </> "chocolatey-requirements.zip")
+            Zip.unzip "." (artifactsDir </> "chocolatey-requirements.zip")
 
         if buildLegacy then
             Directory.ensure nugetLegacyDir
-            unzip nugetLegacyDir (artifactsDir </> "fake-legacy-packages.zip")
+            Zip.unzip nugetLegacyDir (artifactsDir </> "fake-legacy-packages.zip")
 
             Directory.ensure "temp/build"
             !! (nugetLegacyDir </> "*.nupkg")
             |> Seq.iter (fun pack ->
-                unzip "temp/build" pack
+                Zip.unzip "temp/build" pack
             )
             Shell.copyDir "build" "temp/build" (fun _ -> true)
 
@@ -1000,7 +988,7 @@ Target.create "PrepareArtifacts" (fun _ ->
         let unzipIfExists dir file =
             Directory.ensure dir
             if File.Exists file then
-                unzip dir file
+                Zip.unzip dir file
 
         // File is not available in case we already have build the full docs
         unzipIfExists "help" (artifactsDir </> "help-markdown.zip")

build.proj

@@ -3,6 +3,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

global.json

@@ -1,5 +1,5 @@
 {
     "sdk" : {
-        "version": "2.1.302"
+        "version": "2.1.402"
     }
 }

help/markdown/fake-what-is-fake.md

@@ -51,6 +51,7 @@ Try to not use fake:
 
 Examples:
 
+- [Scripting with FAKE](https://atlemann.github.io/fsharp/2018/06/15/standalone-scripts-with-fake-cli.html)
 - [Twitter](https://twitter.com/JonathanOhlrich/status/1031591590186442753)
 - [(Video) Immutable application deployments with F# Make - Nikolay Norman Andersen](https://www.youtube.com/watch?v=_sZT0CpJ6Vo)
 - [(fake 4 API) Elasticsearch.Net](https://www.elastic.co/de/blog/solidifying-releases-with-fsharp-make)

legacy-build.fsx

@@ -184,13 +184,7 @@ let legacyAssemblyInfos =
         AssemblyInfo.Guid "E18BDD6F-1AF8-42BB-AEB6-31CD1AC7E56D"] @ common ]
 
 let publish f =
-    // Workaround
-    let path = Path.GetFullPath f
-    let name = Path.GetFileName path
-    let target = Path.Combine("artifacts", name)
-    let targetDir = Path.GetDirectoryName target
-    Directory.ensure targetDir
-    Trace.publish ImportData.BuildArtifact (Path.GetFullPath f)
+    Trace.publish ImportData.BuildArtifact f
 
 Target.create "_Legacy_BuildSolution" (fun _ ->
     MSBuild.runWithDefaults "Build" ["./src/Legacy-FAKE.sln"; "./src/Legacy-FAKE.Deploy.Web.sln"]

paket.dependencies

@@ -153,7 +153,7 @@ group netcorerunner
     nuget Mono.Cecil
     nuget Microsoft.NETCore.App framework: netstandard1.6, netstandard2.0, netcoreapp1.1
     nuget NETStandard.Library  ~> 2.0
-    nuget Packaging.Targets 
+    nuget Packaging.Targets
 
 group netcore
     //source https://ci.appveyor.com/nuget/paket
@@ -178,7 +178,9 @@ group netcore
     nuget FSharp.Control.Reactive
     nuget System.Reactive.Compatibility
     nuget System.Security.Cryptography.Algorithms
-
+    nuget MSBuild.StructuredLogger
+    nuget BlackFox.VsWhere
+
     // Testing
     nuget Expecto >= 5.0
     nuget Expecto.TestResults
@@ -196,4 +198,4 @@ group netcore
     nuget System.IO.Compression.ZipFile
     nuget System.Runtime.Loader
     nuget System.IO.FileSystem.Watcher
-    
+