Skip to content

Commit 1aa8052

Browse files
committed
version calculated before build params are set
1 parent c6753bd commit 1aa8052

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

build/scripts/Commandline.fsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ module Commandline =
8787
setBuildParam "clusterfilter" clusterFilter
8888
setBuildParam "testfilter" testFilter
8989

90+
| ["canary"; ] -> ignore()
9091
| ["canary"; apiKey ] ->
9192
setBuildParam "apiKey" apiKey
9293
setBuildParam "feed" "elasticsearch-net"

build/scripts/Targets.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ open Benchmarking
2626
open XmlDocPatcher
2727
open Documentation
2828
open Signing
29-
3029
open Commandline
30+
3131
Commandline.parse()
3232

3333
Target "Build" <| fun _ -> traceHeader "STARTING BUILD"

build/scripts/Versioning.fsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#load @"Projects.fsx"
88
#load @"Paths.fsx"
9+
#load @"Commandline.fsx"
910

1011
open System
1112
open System.Diagnostics
@@ -20,6 +21,7 @@ open SemVerHelper
2021
open Paths
2122
open Projects
2223
open SemVerHelper
24+
open Commandline
2325

2426
module Versioning =
2527
// We used to rely on AssemblyInfo.cs from NEST to read and write the current version.
@@ -35,7 +37,8 @@ module Versioning =
3537
newGlobalJson.JsonValue.WriteTo(tw, JsonSaveOptions.None)
3638
tracefn "Written (%s) to global.json as the current version will use this version from now on as current in the build" (version.ToString())
3739

38-
let CurrentVersion =
40+
let CurrentVersion =
41+
Commandline.parse()
3942
let currentVersion = parse(globalJson.Version)
4043
let bv = getBuildParam "version"
4144
let buildVersion = if (isNullOrEmpty bv) then None else Some(parse(bv))

0 commit comments

Comments
 (0)