Skip to content

Commit 21bc9e2

Browse files
committed
Merge pull request #1347 from cstlaurent/develop
Fix bad nuspec output path for .NET 4.0 nuget packages
2 parents fd1ac35 + 041fb4f commit 21bc9e2

File tree

4 files changed

+26
-10
lines changed

4 files changed

+26
-10
lines changed

build/Elasticsearch.Net.Connection.Thrift.nuspec

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@
1818
<tags>elasticsearch elastic search lucene thrift nest</tags>
1919
</metadata>
2020
<files>
21-
<file src="output\Elasticsearch.Net.Connection.Thrift\net40\Elasticsearch.Net.Connection.Thrift.dll" target="lib"/>
22-
<file src="output\Elasticsearch.Net.Connection.Thrift\net40\Elasticsearch.Net.Connection.Thrift.pdb" target="lib"/>
23-
<file src="output\Elasticsearch.Net.Connection.Thrift\net40\Elasticsearch.Net.Connection.Thrift.XML" target="lib"/>
21+
<file src="output\Elasticsearch.Net.Connection.Thrift\net40\Elasticsearch.Net.Connection.Thrift.dll" target="lib"/>
22+
<file src="output\Elasticsearch.Net.Connection.Thrift\net40\Elasticsearch.Net.Connection.Thrift.pdb" target="lib"/>
23+
<file src="output\Elasticsearch.Net.Connection.Thrift\net40\Elasticsearch.Net.Connection.Thrift.XML" target="lib"/>
24+
25+
<file src="output\Elasticsearch.Net.Connection.Thrift\net40\Elasticsearch.Net.Connection.Thrift.dll" target="lib\net40"/>
26+
<file src="output\Elasticsearch.Net.Connection.Thrift\net40\Elasticsearch.Net.Connection.Thrift.pdb" target="lib\net40"/>
27+
<file src="output\Elasticsearch.Net.Connection.Thrift\net40\Elasticsearch.Net.Connection.Thrift.XML" target="lib\net40"/>
2428

2529
<file src="output\Elasticsearch.Net.Connection.Thrift\net45\Elasticsearch.Net.Connection.Thrift.dll" target="lib\net45"/>
2630
<file src="output\Elasticsearch.Net.Connection.Thrift\net45\Elasticsearch.Net.Connection.Thrift.pdb" target="lib\net45"/>

build/Elasticsearch.Net.JsonNET.nuspec

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@
1919
<tags>elasticsearch elastic search lucene thrift nest</tags>
2020
</metadata>
2121
<files>
22-
<file src="output\Elasticsearch.Net.JsonNET\net40\Elasticsearch.Net.JsonNET.dll" target="lib"/>
23-
<file src="output\Elasticsearch.Net.JsonNET\net40\Elasticsearch.Net.JsonNET.pdb" target="lib"/>
24-
<file src="output\Elasticsearch.Net.JsonNET\net40\Elasticsearch.Net.JsonNET.XML" target="lib"/>
22+
<file src="output\Elasticsearch.Net.JsonNET\net40\Elasticsearch.Net.JsonNET.dll" target="lib"/>
23+
<file src="output\Elasticsearch.Net.JsonNET\net40\Elasticsearch.Net.JsonNET.pdb" target="lib"/>
24+
<file src="output\Elasticsearch.Net.JsonNET\net40\Elasticsearch.Net.JsonNET.XML" target="lib"/>
25+
26+
<file src="output\Elasticsearch.Net.JsonNET\net40\Elasticsearch.Net.JsonNET.dll" target="lib\net40"/>
27+
<file src="output\Elasticsearch.Net.JsonNET\net40\Elasticsearch.Net.JsonNET.pdb" target="lib\net40"/>
28+
<file src="output\Elasticsearch.Net.JsonNET\net40\Elasticsearch.Net.JsonNET.XML" target="lib\net40"/>
2529

2630
<file src="output\Elasticsearch.Net.JsonNET\net45\Elasticsearch.Net.JsonNET.dll" target="lib\net45"/>
2731
<file src="output\Elasticsearch.Net.JsonNET\net45\Elasticsearch.Net.JsonNET.pdb" target="lib\net45"/>

build/Elasticsearch.Net.nuspec

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@
1919
<tags>elasticsearch elastic search lucene nest</tags>
2020
</metadata>
2121
<files>
22-
<file src="output\Elasticsearch.Net\net40\Elasticsearch.Net.dll" target="lib"/>
23-
<file src="output\Elasticsearch.Net\net40\Elasticsearch.Net.pdb" target="lib"/>
24-
<file src="output\Elasticsearch.Net\net40\Elasticsearch.Net.XML" target="lib"/>
22+
<file src="output\Elasticsearch.Net\net40\Elasticsearch.Net.dll" target="lib"/>
23+
<file src="output\Elasticsearch.Net\net40\Elasticsearch.Net.pdb" target="lib"/>
24+
<file src="output\Elasticsearch.Net\net40\Elasticsearch.Net.XML" target="lib"/>
25+
26+
<file src="output\Elasticsearch.Net\net40\Elasticsearch.Net.dll" target="lib\net40"/>
27+
<file src="output\Elasticsearch.Net\net40\Elasticsearch.Net.pdb" target="lib\net40"/>
28+
<file src="output\Elasticsearch.Net\net40\Elasticsearch.Net.XML" target="lib\net40"/>
2529

2630
<file src="output\Elasticsearch.Net\net45\Elasticsearch.Net.dll" target="lib\net45"/>
2731
<file src="output\Elasticsearch.Net\net45\Elasticsearch.Net.pdb" target="lib\net45"/>

build/NEST.nuspec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@
1919
<tags>elasticsearch elastic search lucene nest</tags>
2020
</metadata>
2121
<files>
22-
<file src="output\Nest\net40\Nest.dll" target="lib"/>
22+
<file src="output\Nest\net40\Nest.dll" target="lib"/>
2323
<file src="output\Nest\net40\Nest.pdb" target="lib"/>
2424
<file src="output\Nest\net40\Nest.XML" target="lib"/>
25+
26+
<file src="output\Nest\net40\Nest.dll" target="lib\net40"/>
27+
<file src="output\Nest\net40\Nest.pdb" target="lib\net40"/>
28+
<file src="output\Nest\net40\Nest.XML" target="lib\net40"/>
2529

2630
<file src="output\Nest\net45\Nest.dll" target="lib\net45"/>
2731
<file src="output\Nest\net45\Nest.pdb" target="lib\net45"/>

0 commit comments

Comments
 (0)