Skip to content

Commit b773d63

Browse files
committed
updated build nightly
1 parent 808ca43 commit b773d63

File tree

4 files changed

+24
-17
lines changed

4 files changed

+24
-17
lines changed

build/Elasticsearch.Net.Connection.Thrift.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net.Connection.Thrift</id>
5-
<version>1.0.0-beta1</version>
5+
<version>1.0.0-ci20140604105901</version>
66
<title>Elasticsearch.Net.Connection.Thrift - Thrift support for Elasticsearch.Net</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</description>
1515
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="1.0.0-beta1"/>
16+
<dependency id="Elasticsearch.Net" version="1.0.0-ci20140604105901"/>
1717
<dependency id="NetReflector" />
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene thrift nest</tags>

build/Elasticsearch.Net.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net</id>
5-
<version>1.0.0-beta1</version>
5+
<version>1.0.0-ci20140604105901</version>
66
<title>Elasticsearch.Net - official low level elasticsearch client</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -20,6 +20,6 @@
2020
<file src="output\Elasticsearch.Net\Elasticsearch.Net.dll" target="lib"/>
2121
<file src="output\Elasticsearch.Net\Elasticsearch.Net.pdb" target="lib"/>
2222
<file src="output\Elasticsearch.Net\Elasticsearch.Net.XML" target="lib"/>
23-
<file src="output\Elasticsearch.Net\init.ps1" target="tools"/>
23+
<file src="output\Elasticsearch.Net\install.ps1" target="tools"/>
2424
</files>
2525
</package>

build/NEST.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>NEST</id>
5-
<version>1.0.0-beta1</version>
5+
<version>1.0.0-ci20140604105901</version>
66
<title>NEST - Elasticsearch Client</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>Elasticsearch client, strongly typed interface to Elasticsearch. Fluent request builder, mapped responses and powerful query dsl. Uses and exposes Elasticsearch.Net</description>
1515
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="1.0.0-beta1"/>
16+
<dependency id="Elasticsearch.Net" version="1.0.0-ci20140604105901"/>
1717
<dependency id="Newtonsoft.Json" version="6.0.1" />
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene nest</tags>

build/build.fsx

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -145,19 +145,26 @@ let buildDocs = fun action ->
145145
p.Arguments <- sprintf "\"%s\" %s" wintersmith action
146146
)
147147
(TimeSpan.FromMinutes (if action = "preview" then 300.0 else 5.0))
148-
149-
Target "Version" (fun _ ->
150-
trace fileVersion
151-
let version = SemVerHelper.parse fileVersion
152148

153-
let suffix = fun (prerelease: PreRelease) -> sprintf "-%s%i" prerelease.Name prerelease.Number.Value
154-
let assemblySuffix = if version.PreRelease.IsSome then suffix version.PreRelease.Value else "";
155-
let assemblyVersion = sprintf "%i.0.0%s" version.Major assemblySuffix
149+
let getAssemblyVersion = (fun _ ->
150+
let version = SemVerHelper.parse fileVersion
151+
152+
let suffix = fun (prerelease: PreRelease) -> sprintf "-%s%i" prerelease.Name prerelease.Number.Value
153+
let assemblySuffix = if version.PreRelease.IsSome then suffix version.PreRelease.Value else "";
154+
let assemblyVersion = sprintf "%i.0.0%s" version.Major assemblySuffix
156155

157-
match (assemblySuffix, version.Minor, version.Patch) with
158-
| (s, m, p) when s <> "" && (m <> 0 || p <> 0) -> failwithf "Cannot create prereleases for minor or major builds!"
159-
| ("", _, _) -> traceFAKE "Building fileversion %s for asssembly version %s" fileVersion assemblyVersion
160-
| _ -> traceFAKE "Building prerelease %s for major assembly version %s " fileVersion assemblyVersion
156+
match (assemblySuffix, version.Minor, version.Patch) with
157+
| (s, m, p) when s <> "" && (m <> 0 || p <> 0) -> failwithf "Cannot create prereleases for minor or major builds!"
158+
| ("", _, _) -> traceFAKE "Building fileversion %s for asssembly version %s" fileVersion assemblyVersion
159+
| _ -> traceFAKE "Building prerelease %s for major assembly version %s " fileVersion assemblyVersion
160+
161+
assemblyVersion
162+
)
163+
164+
165+
Target "Version" (fun _ ->
166+
trace fileVersion
167+
let assemblyVersion = if fileVersion.Contains("-ci") then fileVersion else getAssemblyVersion()
161168

162169
let assemblyDescription = fun (f: string) ->
163170
let name = f

0 commit comments

Comments
 (0)