From b323aef299f337fbfbbc72fcc737d8652c658426 Mon Sep 17 00:00:00 2001 From: Matthias Dittrich Date: Tue, 25 Jul 2017 19:44:45 +0200 Subject: [PATCH] Bump version to 5.0.0-alpha012 --- build.fsx | 32 ++++++++++++++++---------------- paket.dependencies | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build.fsx b/build.fsx index 3d465e095a8..4e8a59af33e 100644 --- a/build.fsx +++ b/build.fsx @@ -972,17 +972,19 @@ Target "DotnetCoreCreateDebianPackage" (fun _ -> ) -Target "DotnetCorePushNuGet" (fun _ -> - let nuget_exe = Directory.GetCurrentDirectory() "packages" "build" "NuGet.CommandLine" "tools" "NuGet.exe" - let apikey = environVarOrDefault "nugetkey" "" - let nugetsource = environVarOrDefault "nugetsource" "https://www.nuget.org/api/v2/package" - let nugetPush nugetpackage = - if not <| System.String.IsNullOrEmpty apikey then - ExecProcess (fun info -> - info.FileName <- nuget_exe - info.Arguments <- sprintf "push %s %s -Source %s" (toParam nugetpackage) (toParam apikey) (toParam nugetsource)) (System.TimeSpan.FromMinutes 5.) - |> (fun r -> if r <> 0 then failwithf "failed to push package %s" nugetpackage) +let nuget_exe = Directory.GetCurrentDirectory() "packages" "build" "NuGet.CommandLine" "tools" "NuGet.exe" +let apikey = environVarOrDefault "nugetkey" "" +let nugetsource = environVarOrDefault "nugetsource" "https://www.nuget.org/api/v2/package" +let nugetPush nugetpackage = + if not <| System.String.IsNullOrEmpty apikey then + ExecProcess (fun info -> + info.FileName <- nuget_exe + info.Arguments <- sprintf "push %s %s -Source %s" (toParam nugetpackage) (toParam apikey) (toParam nugetsource)) + (System.TimeSpan.FromMinutes 10.) + |> (fun r -> if r <> 0 then failwithf "failed to push package %s" nugetpackage) + else traceFAKE "could not push '%s', because api key was not set" nugetpackage +Target "DotnetCorePushNuGet" (fun _ -> // dotnet pack netCoreProjs -- "src/app/Fake.netcore/*.fsproj" @@ -995,15 +997,13 @@ Target "DotnetCorePushNuGet" (fun _ -> Target "PublishNuget" (fun _ -> // uses NugetKey environment variable. - Paket.Push(fun p -> - { p with - DegreeOfParallelism = 2 - WorkingDir = nugetLegacyDir }) - // We have some nugets in there we don't want to push + // Timeout atm //Paket.Push(fun p -> // { p with // DegreeOfParallelism = 2 - // WorkingDir = nugetDncDir }) + // WorkingDir = nugetLegacyDir }) + !! (nugetLegacyDir "**/*.nupkg") + |> Seq.iter nugetPush ) Target "ReleaseDocs" (fun _ -> diff --git a/paket.dependencies b/paket.dependencies index c97a4e27ecc..81958cab4db 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -57,7 +57,7 @@ group Build source http://nuget.org/api/v2 source https://ci.appveyor.com/nuget/fake source https://ci.appveyor.com/nuget/fsharp-formatting - + nuget FSharp.Core ~> 4.1.0 nuget Nuget.CommandLine nuget FAKE prerelease