Skip to content

Commit 112d597

Browse files
committed
make sure net461 output is included in the Nuget packages, also fixes some case sensitive issues in the build scripts
1 parent 0bac181 commit 112d597

File tree

6 files changed

+24
-9
lines changed

6 files changed

+24
-9
lines changed

build/Elasticsearch.Net.nuspec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,15 @@
1616
<copyright>2014-$year$ Elasticsearch BV</copyright>
1717
<tags>elasticsearch,elastic,search,lucene,nest</tags>
1818
<dependencies>
19-
<group targetFramework=".NETStandard2.0" />
19+
<group targetFramework="netstandard2.0" />
20+
<group targetFramework="net461" />
2021
</dependencies>
2122
</metadata>
2223
<files>
2324
<file src="output\Elasticsearch.Net\netstandard2.0\Elasticsearch.Net.dll" target="lib\netstandard2.0"/>
2425
<file src="output\Elasticsearch.Net\netstandard2.0\Elasticsearch.Net.xml" target="lib\netstandard2.0"/>
26+
27+
<file src="output\Elasticsearch.Net\net461\Elasticsearch.Net.dll" target="lib\net461"/>
28+
<file src="output\Elasticsearch.Net\net461\Elasticsearch.Net.xml" target="lib\net461"/>
2529
</files>
2630
</package>

build/NEST.JsonNetSerializer.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<copyright>2017-$year$ Elasticsearch BV</copyright>
1717
<tags>elasticsearch,elastic,search,lucene,nest,serializer,json</tags>
1818
<dependencies>
19-
<group targetFramework=".NETStandard2.0">
19+
<group targetFramework="netstandard2.0">
2020
<dependency id="NEST" version="[$version$, $nextMajorVersion$)" />
2121
<dependency id="Newtonsoft.Json" version="$jsonDotNetCurrentVersion$" />
2222
</group>

build/NEST.nuspec

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,18 @@
1616
<copyright>2014-$year$ Elasticsearch BV</copyright>
1717
<tags>elasticsearch,elastic,search,lucene,nest</tags>
1818
<dependencies>
19-
<group targetFramework=".NETStandard2.0">
19+
<group targetFramework="net461">
20+
<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
21+
</group>
22+
<group targetFramework="netstandard2.0">
2023
<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
21-
22-
<!-- since we no longer reference JSON.NET (internalized) we do need to ship with its System references -->
23-
<dependency id="System.ComponentModel.TypeConverter" version="[4.3.0, )"/>
24-
<dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )"/>
2524
</group>
2625
</dependencies>
2726
</metadata>
2827
<files>
28+
<file src="output\Nest\net461\Nest.dll" target="lib\net461"/>
29+
<file src="output\Nest\net461\Nest.XML" target="lib\net461"/>
30+
2931
<file src="output\Nest\netstandard2.0\Nest.dll" target="lib\netstandard2.0"/>
3032
<file src="output\Nest\netstandard2.0\Nest.xml" target="lib\netstandard2.0"/>
3133
</files>

build/scripts/Paths.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ module Paths =
2626
sprintf "%s/%s/%s" BuildOutput project.Name framework.Identifier.Nuget
2727

2828
let Tool tool = sprintf "packages/build/%s" tool
29-
let CheckedInToolsFolder = "build/Tools"
29+
let CheckedInToolsFolder = "build/tools"
3030
let KeysFolder = sprintf "%s/keys" BuildFolder
3131
let NugetOutput = sprintf "%s/_packages" BuildOutput
3232
let SourceFolder = "src"

build/scripts/Projects.fsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,15 @@ module Projects =
5959
match p with
6060
| Tests -> "Tests"
6161
| DocGenerator -> "DocGenerator"
62+
63+
member this.Nuspec =
64+
match this with
65+
| Project p ->
66+
match p with
67+
| Nest -> "NEST"
68+
| NestJsonNetSerializer -> "NEST.JsonNetSerializer"
69+
| _ -> this.Name
70+
| _ -> this.Name
6271

6372
static member TryFindName (name: string) =
6473
DotNetProject.All

build/scripts/Releasing.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ module Release =
3131
|> Seq.iter(fun p ->
3232
CreateDir Paths.NugetOutput
3333

34+
let nuspec = (sprintf @"build/%s.nuspec" p.Nuspec)
3435
let name = p.Name;
35-
let nuspec = (sprintf @"build/%s.nuspec" name)
3636
let nugetOutFile = Paths.Output(sprintf "%s.%s.nupkg" name (Versioning.CurrentVersion.ToString()))
3737

3838
let nextMajorVersion =

0 commit comments

Comments
 (0)