Skip to content

Commit 76b696c

Browse files
committed
Parameterize JSON.Net dependency
1 parent 2aff570 commit 76b696c

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

build/NEST.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@
1818
<dependencies>
1919
<group targetFramework=".NETFramework4.5">
2020
<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
21-
<dependency id="Newtonsoft.Json" version="[10,11)" />
21+
<dependency id="Newtonsoft.Json" version="[$jsonDotNetCurrentVersion$, $jsonDotNetNextVersion$)" />
2222
</group>
2323
<group targetFramework=".NETFramework4.6">
2424
<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
25-
<dependency id="Newtonsoft.Json" version="[10,11)" />
25+
<dependency id="Newtonsoft.Json" version="[$jsonDotNetCurrentVersion$, $jsonDotNetNextVersion$)" />
2626
</group>
2727
<group targetFramework=".NETStandard1.3">
2828
<dependency id="NETStandard.Library" version="[1.6.0, )" />
2929
<dependency id="System.Collections.Specialized" version="[4.3.0, )" />
3030
<dependency id="System.Reflection.TypeExtensions" version="[4.3.0, )" />
3131
<dependency id="System.Linq.Queryable" version="[4.0.1, )" />
3232
<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
33-
<dependency id="Newtonsoft.Json" version="[10,11)" />
33+
<dependency id="Newtonsoft.Json" version="[$jsonDotNetCurrentVersion$, $jsonDotNetNextVersion$)" />
3434
</group>
3535
</dependencies>
3636
</metadata>

build/scripts/Releasing.fsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ module Release =
3333

3434
let year = sprintf "%i" DateTime.UtcNow.Year
3535

36+
let jsonDotNetVersion = 10
37+
38+
let jsonDotNetCurrentVersion = sprintf "%i" jsonDotNetVersion
39+
let jsonDotNetNextVersion = sprintf "%i" (jsonDotNetVersion + 1)
40+
3641
let properties =
3742
let addKeyValue (e:Expr<string>) (builder:StringBuilder) =
3843
// the binding for this tuple looks like key/value should
@@ -46,6 +51,8 @@ module Release =
4651
new StringBuilder()
4752
|> addKeyValue <@nextMajorVersion@>
4853
|> addKeyValue <@year@>
54+
|> addKeyValue <@jsonDotNetCurrentVersion@>
55+
|> addKeyValue <@jsonDotNetNextVersion@>
4956
|> toText
5057

5158
Tooling.Nuget.Exec [ "pack"; nuspec;

0 commit comments

Comments
 (0)